From owner-svn-ports-branches@freebsd.org Sun Dec 6 12:01: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 EBC1A75D3; Sun, 6 Dec 2015 12:01:40 +0000 (UTC) (envelope-from antoine@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 A3FD21EE3; Sun, 6 Dec 2015 12:01:40 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB6C1dBa072040; Sun, 6 Dec 2015 12:01:39 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB6C1d2K072038; Sun, 6 Dec 2015 12:01:39 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201512061201.tB6C1d2K072038@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 6 Dec 2015 12:01:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403106 - branches/2015Q4/shells/bash 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, 06 Dec 2015 12:01:41 -0000 Author: antoine Date: Sun Dec 6 12:01:39 2015 New Revision: 403106 URL: https://svnweb.freebsd.org/changeset/ports/403106 Log: MFH: r403104 The latest patch (42) has been slightly adjusted. See the following diff: --- diff begins here --- --- /usr/distfiles/bash.old/bash43-042 2015-08-13 21:41:06.000000000 +0200 +++ /usr/distfiles/bash/bash43-042 2015-12-01 22:57:39.000000000 +0100 @@ -27,7 +27,7 @@ + lex_rwlen = 0; } } -*** ../bash-4.3-patched/parse.y 2015-05-18 19:27:05.000000000 -0400 +*** ../bash-4.3-patched/y.tab.c 2015-05-18 19:27:05.000000000 -0400 --- y.tab.c 2015-06-29 10:59:27.000000000 -0400 *************** *** 6021,6024 **** --- diff ends here --- Notified by: many Modified: branches/2015Q4/shells/bash/Makefile branches/2015Q4/shells/bash/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/shells/bash/Makefile ============================================================================== --- branches/2015Q4/shells/bash/Makefile Sun Dec 6 11:58:22 2015 (r403105) +++ branches/2015Q4/shells/bash/Makefile Sun Dec 6 12:01:39 2015 (r403106) @@ -4,7 +4,7 @@ PORTNAME= bash PATCHLEVEL= 42 PORTVERSION= 4.3.${PATCHLEVEL:S/^0//g} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= shells MASTER_SITES= GNU/${PORTNAME} DISTNAME= ${PORTNAME}-${PORTVERSION:R} Modified: branches/2015Q4/shells/bash/distinfo ============================================================================== --- branches/2015Q4/shells/bash/distinfo Sun Dec 6 11:58:22 2015 (r403105) +++ branches/2015Q4/shells/bash/distinfo Sun Dec 6 12:01:39 2015 (r403106) @@ -82,5 +82,5 @@ SHA256 (bash/bash43-040) = 84bb396b92629 SIZE (bash/bash43-040) = 1532 SHA256 (bash/bash43-041) = 4ec432966e4198524a7e0cd685fe222e96043769c9613e66742ac475db132c1a SIZE (bash/bash43-041) = 2362 -SHA256 (bash/bash43-042) = b75a53141ab3d8fff3fa74b5f3dc76468b01eae299f50bbc2bc71ae395d690af +SHA256 (bash/bash43-042) = ac219322db2791da87a496ee6e8e5544846494bdaaea2626270c2f73c1044919 SIZE (bash/bash43-042) = 1535 From owner-svn-ports-branches@freebsd.org Sun Dec 6 19: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 D5B099A087D; Sun, 6 Dec 2015 19:03:36 +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 938A61A75; Sun, 6 Dec 2015 19:03:36 +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 tB6J3ZNP020087; Sun, 6 Dec 2015 19:03:35 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB6J3ZmN020084; Sun, 6 Dec 2015 19:03:35 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201512061903.tB6J3ZmN020084@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 6 Dec 2015 19:03:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403152 - in branches/2015Q4/sysutils/pesign: . 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, 06 Dec 2015 19:03:36 -0000 Author: jbeich Date: Sun Dec 6 19:03:35 2015 New Revision: 403152 URL: https://svnweb.freebsd.org/changeset/ports/403152 Log: MFH: r403110 sysutils/pesign: unbreak on pre-10.2 systems - No reason to use ppoll(2), so switch to poll(2) - Include missing strchrnul(3) for 9.x No PORTREVISION bump because 10.2+ behavior doesn't change. PR: 205039 Approved by: trasz (maintainer) Approved by: ports-secteam (delphij) Added: branches/2015Q4/sysutils/pesign/files/extra-patch-src_client.c - copied unchanged from r403110, head/sysutils/pesign/files/extra-patch-src_client.c Modified: branches/2015Q4/sysutils/pesign/Makefile branches/2015Q4/sysutils/pesign/files/patch-src-daemon.c (contents, props changed) Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/sysutils/pesign/Makefile ============================================================================== --- branches/2015Q4/sysutils/pesign/Makefile Sun Dec 6 18:45:57 2015 (r403151) +++ branches/2015Q4/sysutils/pesign/Makefile Sun Dec 6 19:03:35 2015 (r403152) @@ -23,11 +23,8 @@ GH_ACCOUNT= rhinstaller USES= gmake pkgconfig USE_LDCONFIG= yes -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1001505 -BROKEN= This port requires ppoll(2) system call -.endif +EXTRA_PATCHES= ${EXTRA_PATCHES_${OPSYS}_${OSREL:R}} +EXTRA_PATCHES_FreeBSD_9= ${FILESDIR}/extra-patch-src_client.c post-patch: @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' ${WRKSRC}/Make.defaults @@ -43,4 +40,4 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/src/pesign-client.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/src/pesign.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 -.include +.include Copied: branches/2015Q4/sysutils/pesign/files/extra-patch-src_client.c (from r403110, head/sysutils/pesign/files/extra-patch-src_client.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/sysutils/pesign/files/extra-patch-src_client.c Sun Dec 6 19:03:35 2015 (r403152, copy of r403110, head/sysutils/pesign/files/extra-patch-src_client.c) @@ -0,0 +1,52 @@ +--- src/client.c.orig 2014-10-24 19:51:06 UTC ++++ src/client.c +@@ -47,6 +47,49 @@ static struct { + {FLAG_LIST_END, NULL}, + }; + ++#if defined(__FreeBSD__) && __FreeBSD__ < 10 ++/*- ++ * Copyright (c) 2013 Niclas Zeising ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE ++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ * ++ * $FreeBSD: head/lib/libc/string/strchrnul.c 288004 2015-09-20 03:51:15Z rodrigc ++ */ ++ ++static char * ++strchrnul(const char *p, int ch) ++{ ++ char c; ++ ++ c = ch; ++ for (;; ++p) { ++ if (*p == c || *p == '\0') ++ return ((char *)p); ++ } ++ /* NOTREACHED */ ++} ++#endif ++ + static void + print_flag_name(FILE *f, int flag) + { Modified: branches/2015Q4/sysutils/pesign/files/patch-src-daemon.c ============================================================================== --- branches/2015Q4/sysutils/pesign/files/patch-src-daemon.c Sun Dec 6 18:45:57 2015 (r403151) +++ branches/2015Q4/sysutils/pesign/files/patch-src-daemon.c Sun Dec 6 19:03:35 2015 (r403152) @@ -8,6 +8,15 @@ #include #include #include +@@ -839,7 +838,7 @@ shutdown: + do_shutdown(ctx, nsockets, pollfds); + return 0; + } +- rc = ppoll(pollfds, nsockets, NULL, NULL); ++ rc = poll(pollfds, nsockets, INFTIM); + if (should_exit != 0) + goto shutdown; + if (rc < 0) { @@ -864,8 +863,8 @@ shutdown: struct sockaddr_un remote; From owner-svn-ports-branches@freebsd.org Mon Dec 7 08:22:48 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 490E59B72CF; Mon, 7 Dec 2015 08:22:48 +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 1C2831F4A; Mon, 7 Dec 2015 08:22:48 +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 tB78Mlwr059169; Mon, 7 Dec 2015 08:22:47 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB78Ml9O059168; Mon, 7 Dec 2015 08:22:47 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201512070822.tB78Ml9O059168@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, 7 Dec 2015 08:22:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403187 - branches/2015Q4/misc/py-qt4-demo 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, 07 Dec 2015 08:22:48 -0000 Author: rakuco Date: Mon Dec 7 08:22:47 2015 New Revision: 403187 URL: https://svnweb.freebsd.org/changeset/ports/403187 Log: MFH: r403165 py-qt4-demo: Fix runtime dependency list. r344123 broke it by replacing RUN_DEPENDS with PYQT4_RUN_DEPENDS. The latter has no meaning, so the port stopped depending on all other PyQt4 ports. Approved by: ports-secteam (delphij) Modified: branches/2015Q4/misc/py-qt4-demo/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/misc/py-qt4-demo/Makefile ============================================================================== --- branches/2015Q4/misc/py-qt4-demo/Makefile Mon Dec 7 08:21:16 2015 (r403186) +++ branches/2015Q4/misc/py-qt4-demo/Makefile Mon Dec 7 08:22:47 2015 (r403187) @@ -3,6 +3,7 @@ PORTNAME= demo PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= misc devel python MASTER_SITES= ${MASTER_SITES_PYQT4} @@ -21,7 +22,7 @@ EXAMPLESDIR= ${PREFIX}/share/examples/py .include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk" .for component in ${PYQT4_COMPONENTS:Ndemo} -PYQT4_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}qt4-${component}>=0:${PORTSDIR}/${${component}_PORT} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}qt4-${component}>=0:${PORTSDIR}/${${component}_PORT} .endfor do-build: From owner-svn-ports-branches@freebsd.org Mon Dec 7 08:43:24 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 C22479B7670; Mon, 7 Dec 2015 08:43:24 +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 5E7B218B2; Mon, 7 Dec 2015 08:43:24 +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 tB78hNcb065526; Mon, 7 Dec 2015 08:43:23 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB78hKCS065492; Mon, 7 Dec 2015 08:43:20 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201512070843.tB78hKCS065492@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Mon, 7 Dec 2015 08:43:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403188 - 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: Mon, 07 Dec 2015 08:43:25 -0000 Author: rene Date: Mon Dec 7 08:43:20 2015 New Revision: 403188 URL: https://svnweb.freebsd.org/changeset/ports/403188 Log: MFH: r403185 www/chromium: update to 47.0.2526.73 Currently broken on 9. Submitted by: LeFroid (tmvfroid gmail) Obtained from: https://github.com/gliaskos/freebsd-chromium/pull/41 Security: http://vuxml.freebsd.org/freebsd/548f74bd-993c-11e5-956b-00262d5ed8ee.html Approved by: portmgr (erwin) Added: branches/2015Q4/www/chromium/files/patch-chrome__app__theme__theme_resources.grd - copied unchanged from r403185, head/www/chromium/files/patch-chrome__app__theme__theme_resources.grd branches/2015Q4/www/chromium/files/patch-chrome__browser__browser_resources.grd - copied unchanged from r403185, head/www/chromium/files/patch-chrome__browser__browser_resources.grd branches/2015Q4/www/chromium/files/patch-chrome__chrome_common.gypi - copied unchanged from r403185, head/www/chromium/files/patch-chrome__chrome_common.gypi branches/2015Q4/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp - copied unchanged from r403185, head/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp branches/2015Q4/www/chromium/files/patch-components__metrics__system_memory_stats_recorder_linux.cc - copied unchanged from r403185, head/www/chromium/files/patch-components__metrics__system_memory_stats_recorder_linux.cc branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.h - copied unchanged from r403185, head/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.h branches/2015Q4/www/chromium/files/patch-media__filters__vp9_parser.h - copied unchanged from r403185, head/www/chromium/files/patch-media__filters__vp9_parser.h branches/2015Q4/www/chromium/files/patch-third_party__WebKit__Source__platform__fonts__FontPlatformData.cpp - copied unchanged from r403185, head/www/chromium/files/patch-third_party__WebKit__Source__platform__fonts__FontPlatformData.cpp branches/2015Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__JS_Value.cpp - copied unchanged from r403185, head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__JS_Value.cpp Deleted: branches/2015Q4/www/chromium/files/patch-chrome__browser__memory__system_memory_stats_recorder_linux.cc branches/2015Q4/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__browser.cc branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_widget_delegate.cc branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__views__message_center__web_notification_tray.cc branches/2015Q4/www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp branches/2015Q4/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h branches/2015Q4/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc branches/2015Q4/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h branches/2015Q4/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc branches/2015Q4/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_share_group.cc branches/2015Q4/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc branches/2015Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp Modified: branches/2015Q4/www/chromium/Makefile branches/2015Q4/www/chromium/distinfo branches/2015Q4/www/chromium/files/extra-patch-clang branches/2015Q4/www/chromium/files/extra-patch-gcc 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__app__chrome_main_delegate.cc branches/2015Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main.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-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__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-remoting__remoting_host.gypi 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__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 branches/2015Q4/www/chromium/pkg-plist Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/www/chromium/Makefile ============================================================================== --- branches/2015Q4/www/chromium/Makefile Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/Makefile Mon Dec 7 08:43:20 2015 (r403188) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 46.0.2490.86 +PORTVERSION= 47.0.2526.73 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 @@ -22,7 +22,9 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${ ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \ ${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}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 \ libdbus-1.so:${PORTSDIR}/devel/dbus \ @@ -242,6 +244,9 @@ 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} \ @@ -270,13 +275,6 @@ pre-configure: 'third_party/brotli' \ 'third_party/boringssl' \ 'third_party/cacheinvalidation' \ - 'third_party/catapult' \ - '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/beautifulsoup' \ - '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 +297,13 @@ pre-configure: 'third_party/libjingle' \ 'third_party/libphonenumber' \ 'third_party/libsrtp' \ - 'third_party/libvpx' \ - 'third_party/libvpx/source/libvpx/third_party/x86inc' \ - 'third_party/libwebm' \ + 'third_party/libvpx_new' \ + 'third_party/libvpx_new/source/libvpx/third_party/x86inc' \ '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,6 +332,13 @@ 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' \ @@ -349,10 +356,6 @@ 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 Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/distinfo Mon Dec 7 08:43:20 2015 (r403188) @@ -1,4 +1,4 @@ -SHA256 (chromium-46.0.2490.86.tar.xz) = ee18d28ac80ff958e8a6c770bfc0d7d770b55452ed91a87f731e1b432a7d1d92 -SIZE (chromium-46.0.2490.86.tar.xz) = 356008056 -SHA256 (chromium-46.0.2490.86-testdata.tar.xz) = 16f4dd0eb784f52b5ac7a297be2fe93a157d6d3c44082e7d4d2cd439f7f18a73 -SIZE (chromium-46.0.2490.86-testdata.tar.xz) = 116964688 +SHA256 (chromium-47.0.2526.73.tar.xz) = 6d66d01c8ddff6562ff13d30ed65ef0cdc2888d9e4924be615d576b7eb15f4f5 +SIZE (chromium-47.0.2526.73.tar.xz) = 394631144 +SHA256 (chromium-47.0.2526.73-testdata.tar.xz) = b7a3d7d77a2161f33728c357e62f746b29330d23920dc1b42dd86e3f1948805a +SIZE (chromium-47.0.2526.73-testdata.tar.xz) = 117390036 Modified: branches/2015Q4/www/chromium/files/extra-patch-clang ============================================================================== --- branches/2015Q4/www/chromium/files/extra-patch-clang Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/extra-patch-clang Mon Dec 7 08:43:20 2015 (r403188) @@ -164,8 +164,8 @@ char * check_twosfx_morph(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = FLAG_NULL); ---- third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-15 00:31:48.000000000 +0200 -+++ third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-18 22:05:41.000000000 +0200 +--- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-15 00:31:48.000000000 +0200 ++++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-18 22:05:41.000000000 +0200 @@ -439,7 +439,7 @@ } @@ -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 -@@ -1028,7 +1028,7 @@ +@@ -844,7 +844,7 @@ const AudioEncoder* AudioCodingImpl::GetSenderInfo() const { FATAL() << "Not implemented yet."; @@ -233,7 +233,7 @@ } const CodecInst* AudioCodingImpl::GetSenderCodecInst() { -@@ -1048,7 +1048,7 @@ +@@ -864,7 +864,7 @@ const ReceiverInfo* AudioCodingImpl::GetReceiverInfo() const { FATAL() << "Not implemented yet."; @@ -242,14 +242,3 @@ } bool AudioCodingImpl::RegisterReceiveCodec(AudioDecoder* receive_codec) { ---- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2015-10-14 22:17:57.580250000 +0200 -+++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp 2015-10-14 22:18:13.766229000 +0200 -@@ -358,7 +358,7 @@ - { - RefPtr buffer; - -- SkFontTableTag tag = WTF::bswap32(table); -+ SkFontTableTag tag = bswap32(table); - const size_t tableSize = m_typeface->getTableSize(tag); - if (tableSize) { - Vector tableBuffer(tableSize); Modified: branches/2015Q4/www/chromium/files/extra-patch-gcc ============================================================================== --- branches/2015Q4/www/chromium/files/extra-patch-gcc Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/extra-patch-gcc Mon Dec 7 08:43:20 2015 (r403188) @@ -135,25 +135,3 @@ const char* suffix, const char* mode); struct AsDOT { ---- v8/src/log-utils.h.orig 2015-10-13 21:04:45.000000000 +0200 -+++ v8/src/log-utils.h 2015-10-17 10:17:35.535561000 +0200 -@@ -5,6 +5,9 @@ - #ifndef V8_LOG_UTILS_H_ - #define V8_LOG_UTILS_H_ - -+#include -+#include -+ - #include "src/allocation.h" - #include "src/base/platform/mutex.h" - #include "src/flags.h" ---- third_party/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc.orig 2015-10-22 21:00:59.000000000 +0200 -+++ third_party/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc 2015-11-01 11:32:36.293750000 +0100 -@@ -11,6 +11,7 @@ - #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h" - - #include -+#include - #include - #include - #include Modified: branches/2015Q4/www/chromium/files/patch-base__process__memory_unittest.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-base__process__memory_unittest.cc Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-base__process__memory_unittest.cc Mon Dec 7 08:43:20 2015 (r403188) @@ -1,6 +1,6 @@ ---- base/process/memory_unittest.cc.orig 2015-07-15 16:29:55.000000000 -0400 -+++ base/process/memory_unittest.cc 2015-07-21 19:03:40.407090000 -0400 -@@ -127,11 +127,11 @@ +--- 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 +@@ -137,11 +137,11 @@ #endif // defined(OS_MACOSX) // Android doesn't implement set_new_handler, so we can't use the @@ -8,16 +8,16 @@ +// OutOfMemoryTest cases. OpenBSD and FreeBSD do not support these tests either. // Don't test these on ASan/TSan/MSan configurations: only test the real // allocator. - // TODO(vandebo) make this work on Windows too. --#if !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !defined(OS_WIN) && \ -+#if !defined(OS_ANDROID) && !defined(OS_BSD) && !defined(OS_WIN) && \ + // Windows only supports these tests with the allocator shim in place. +-#if !defined(OS_ANDROID) && !defined(OS_OPENBSD) && \ ++#if !defined(OS_ANDROID) && !defined(OS_BSD) && \ + !(defined(OS_WIN) && !defined(ALLOCATOR_SHIM)) && \ !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) - #if defined(USE_TCMALLOC) -@@ -415,5 +415,5 @@ +@@ -483,5 +483,5 @@ EXPECT_TRUE(value_ == NULL); } #endif // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) --#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !defined(OS_WIN) && +-#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !(defined(OS_WIN) && +#endif // !defined(OS_ANDROID) && !defined(OS_BSD) && !defined(OS_WIN) - // !defined(ADDRESS_SANITIZER) + // !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 Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-base__process__process_info_linux.cc Mon Dec 7 08:43:20 2015 (r403188) @@ -1,5 +1,5 @@ ---- 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 +--- 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 @@ -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 Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-base__process__process_posix.cc Mon Dec 7 08:43:20 2015 (r403188) @@ -1,5 +1,5 @@ ---- base/process/process_posix.cc.orig 2015-08-22 15:01:51.000000000 -0400 -+++ base/process/process_posix.cc 2015-09-05 09:44:45.526291000 -0400 +--- 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 @@ -17,8 +17,18 @@ #include #endif @@ -37,29 +37,21 @@ // On Mac we can wait on non child processes. return WaitForSingleNonChildProcess(handle, timeout); #else -@@ -255,13 +265,6 @@ - return Process(handle); +@@ -258,7 +268,11 @@ + #if !defined(OS_LINUX) + // static + bool Process::CanBackgroundProcesses() { ++#if defined(OS_BSD) ++ return true; ++#else + return false; ++#endif } + #endif // !defined(OS_LINUX) --#if !defined(OS_LINUX) && !defined(OS_MACOSX) --// static --bool Process::CanBackgroundProcesses() { -- return false; --} --#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) -- - bool Process::IsValid() const { - return process_ != kNullProcessHandle; - } -@@ -357,18 +360,27 @@ - } +@@ -358,17 +372,21 @@ - #if !defined(OS_LINUX) && !defined(OS_MACOSX) -+// static -+bool Process::CanBackgroundProcesses() { -+ return true; -+} -+ + #if !defined(OS_LINUX) bool Process::IsProcessBackgrounded() const { - // See SetProcessBackgrounded(). DCHECK(IsValid()); @@ -68,9 +60,9 @@ } bool Process::SetProcessBackgrounded(bool value) { -- // Not implemented for POSIX systems other than Mac and Linux. With POSIX, if -- // we were to lower the process priority we wouldn't be able to raise it back -- // to its initial priority. +- // 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; + DCHECK(IsValid()); @@ -84,5 +76,5 @@ + DPCHECK(result == 0); + return result == 0; } - #endif // !defined(OS_LINUX) && !defined(OS_MACOSX) + #endif // !defined(OS_LINUX) Modified: branches/2015Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Mon Dec 7 08:43:20 2015 (r403188) @@ -1,15 +1,24 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2014-10-10 09:15:29 UTC -+++ chrome/app/chrome_main_delegate.cc -@@ -97,7 +97,7 @@ +--- chrome/app/chrome_main_delegate.cc.orig 2015-10-21 18:00:37.000000000 -0400 ++++ chrome/app/chrome_main_delegate.cc 2015-10-23 12:25:02.965569000 -0400 +@@ -103,7 +103,7 @@ #include "ui/base/x/x11_util.h" #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - #include "components/crash/app/breakpad_linux.h" + #include "components/crash/content/app/breakpad_linux.h" #endif -@@ -449,7 +449,7 @@ +@@ -405,7 +405,7 @@ + } // namespace + + ChromeMainDelegate::ChromeMainDelegate() { +-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + // Record the startup process creation time on supported platforms. + startup_metric_utils::RecordStartupProcessCreationTime( + base::CurrentProcessInfo::CreationTime()); +@@ -508,7 +508,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -18,7 +27,7 @@ } else if (format_str == "log") { format = diagnostics::DiagnosticsWriter::LOG; } else { -@@ -500,7 +500,7 @@ +@@ -558,7 +558,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -27,7 +36,7 @@ } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -640,7 +640,7 @@ +@@ -641,7 +641,7 @@ std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -36,16 +45,16 @@ crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer()); #endif -@@ -767,7 +767,7 @@ +@@ -762,7 +762,7 @@ + chrome::InitializePDF(); #endif - } -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -779,7 +779,7 @@ +@@ -776,7 +776,7 @@ breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -54,7 +63,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -875,7 +875,7 @@ +@@ -886,7 +886,7 @@ #endif return process_type == switches::kRelauncherProcess; } Copied: branches/2015Q4/www/chromium/files/patch-chrome__app__theme__theme_resources.grd (from r403185, head/www/chromium/files/patch-chrome__app__theme__theme_resources.grd) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-chrome__app__theme__theme_resources.grd Mon Dec 7 08:43:20 2015 (r403188, copy of r403185, head/www/chromium/files/patch-chrome__app__theme__theme_resources.grd) @@ -0,0 +1,11 @@ +--- chrome/app/theme/theme_resources.grd.orig 2015-11-18 08:18:51.872583000 -0500 ++++ chrome/app/theme/theme_resources.grd 2015-11-18 08:19:44.804018000 -0500 +@@ -481,7 +481,7 @@ + + + +- ++ + + + Copied: branches/2015Q4/www/chromium/files/patch-chrome__browser__browser_resources.grd (from r403185, head/www/chromium/files/patch-chrome__browser__browser_resources.grd) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-chrome__browser__browser_resources.grd Mon Dec 7 08:43:20 2015 (r403188, copy of r403185, head/www/chromium/files/patch-chrome__browser__browser_resources.grd) @@ -0,0 +1,11 @@ +--- chrome/browser/browser_resources.grd.orig 2015-11-18 08:21:01.846760000 -0500 ++++ chrome/browser/browser_resources.grd 2015-11-18 08:21:22.801803000 -0500 +@@ -251,7 +251,7 @@ + + + +- ++ + + + Modified: branches/2015Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Mon Dec 7 08:43:20 2015 (r403188) @@ -1,11 +1,29 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2014-10-10 09:15:30 UTC -+++ chrome/browser/chrome_browser_main.cc -@@ -947,7 +947,7 @@ +--- chrome/browser/chrome_browser_main.cc.orig 2015-10-13 15:04:31.000000000 -0400 ++++ chrome/browser/chrome_browser_main.cc 2015-10-15 13:19:01.371935000 -0400 +@@ -158,7 +158,7 @@ + #include "chrome/browser/feedback/feedback_profile_observer.h" + #endif // defined(OS_ANDROID) + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + #include "chrome/browser/first_run/upgrade_util_linux.h" + #include "chrome/browser/sxs_linux.h" + #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +@@ -1013,7 +1013,7 @@ } - #endif + #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -#if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_MACOSX) // Set the product channel for crash reports. base::debug::SetCrashKeyValue(crash_keys::kChannel, - chrome::VersionInfo::GetVersionStringModifier()); + chrome::GetChannelString()); +@@ -1349,7 +1349,7 @@ + return chrome::RESULT_CODE_MACHINE_LEVEL_INSTALL_EXISTS; + #endif // defined(OS_WIN) + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + if (sxs_linux::ShouldMigrateUserDataDir()) + return sxs_linux::MigrateUserDataDir(); + #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) 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 Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc Mon Dec 7 08:43:20 2015 (r403188) @@ -1,24 +1,11 @@ ---- 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 { +--- 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)); + } -#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 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 Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Mon Dec 7 08:43:20 2015 (r403188) @@ -1,5 +1,5 @@ ---- 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 +--- 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 @@ -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 Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser.gypi Mon Dec 7 08:43:20 2015 (r403188) @@ -1,6 +1,6 @@ ---- chrome/chrome_browser.gypi.orig 2015-07-21 22:00:15.902799000 -0400 -+++ chrome/chrome_browser.gypi 2015-07-21 22:08:53.180707000 -0400 -@@ -3277,6 +3277,13 @@ +--- 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 @@ 'browser/download/download_dir_policy_handler.h', ], }], @@ -14,7 +14,7 @@ ['OS=="mac"', { 'dependencies': [ 'app_shim', -@@ -3416,7 +3423,7 @@ +@@ -3518,7 +3525,7 @@ '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol', ], }], @@ -23,7 +23,7 @@ 'dependencies': [ '../build/linux/system.gyp:libspeechd', ], -@@ -3472,7 +3479,7 @@ +@@ -3572,7 +3579,7 @@ ['use_x11==1', { 'sources': [ '<@(chrome_browser_x11_sources)' ], }], @@ -32,12 +32,12 @@ 'sources': [ 'app/chrome_crash_reporter_client.cc', 'app/chrome_crash_reporter_client.h', -@@ -3667,7 +3674,7 @@ +@@ -3813,7 +3820,7 @@ }], ], }], - ['OS=="linux"', { + ['OS=="linux" or os_bsd==1', { - 'sources': [ '<@(chrome_browser_linux_sources)' ], 'conditions': [ ['use_aura==1', { + 'dependencies': [ Modified: branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi Mon Dec 7 08:43:20 2015 (r403188) @@ -1,5 +1,5 @@ ---- 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 +--- 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 @@ -2921,7 +2921,7 @@ }], ], Copied: branches/2015Q4/www/chromium/files/patch-chrome__chrome_common.gypi (from r403185, head/www/chromium/files/patch-chrome__chrome_common.gypi) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-chrome__chrome_common.gypi Mon Dec 7 08:43:20 2015 (r403188, copy of r403185, head/www/chromium/files/patch-chrome__chrome_common.gypi) @@ -0,0 +1,13 @@ +--- chrome/chrome_common.gypi.orig 2015-10-21 18:00:37.000000000 -0400 ++++ chrome/chrome_common.gypi 2015-10-23 12:33:22.684474000 -0400 +@@ -43,8 +43,8 @@ + 'common/common_param_traits.cc', + 'common/common_param_traits.h', + 'common/common_param_traits_macros.h', +- 'common/component_flash_hint_file_linux.cc', +- 'common/component_flash_hint_file_linux.h', ++# 'common/component_flash_hint_file_linux.cc', ++# 'common/component_flash_hint_file_linux.h', + 'common/content_restriction.h', + 'common/content_settings_pattern_serializer.cc', + 'common/content_settings_pattern_serializer.h', Modified: branches/2015Q4/www/chromium/files/patch-chrome__common__chrome_paths.h ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__common__chrome_paths.h Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-chrome__common__chrome_paths.h Mon Dec 7 08:43:20 2015 (r403188) @@ -1,33 +1,11 @@ ---- chrome/common/chrome_paths.h.orig 2015-10-14 23:15:23.226535000 +0200 -+++ chrome/common/chrome_paths.h 2015-10-14 23:18:15.292087000 +0200 -@@ -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. -@@ -114,7 +114,7 @@ - DIR_SUPERVISED_USERS_DEFAULT_APPS, // Directory where installer places .crx - // files to be installed when managed user - // session starts. +--- 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 +@@ -117,7 +117,7 @@ + DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized + // supervised user whitelists are + // installed. -#if defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) +#if defined(OS_LINUX) || defined(OS_BSD) || (defined(OS_MACOSX) && !defined(OS_IOS)) DIR_NATIVE_MESSAGING, // System directory where native messaging host // manifest files are stored. DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts -@@ -133,10 +133,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__variations__fieldtrial_testing_config.gyp (from r403185, head/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp Mon Dec 7 08:43:20 2015 (r403188, copy of r403185, head/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp) @@ -0,0 +1,11 @@ +--- 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 +@@ -19,7 +19,7 @@ + 'conditions': [ + ['OS!="android"', {'sources/': [['exclude', '_android\\.json$']]}], + ['OS!="win"', {'sources/': [['exclude', '_win\\.json$']]}], +- ['OS!="linux" or chromeos==1', {'sources/': [['exclude', '_linux\\.json$']]}], ++ ['(OS!="linux" or chromeos==1) and os_bsd!=1', {'sources/': [['exclude', '_linux\\.json$']]}], + ['OS!="mac"', {'sources/': [['exclude', '_mac\\.json$']]}], + ['chromeos!=1', {'sources/': [['exclude', '_chromeos\\.json$']]}], + ['OS!="ios"', {'sources/': [['exclude', '_ios\\.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 Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc Mon Dec 7 08:43:20 2015 (r403188) @@ -1,5 +1,5 @@ ---- 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 +--- 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 @@ -4,7 +4,13 @@ #include "components/metrics/drive_metrics_provider.h" Copied: branches/2015Q4/www/chromium/files/patch-components__metrics__system_memory_stats_recorder_linux.cc (from r403185, head/www/chromium/files/patch-components__metrics__system_memory_stats_recorder_linux.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-components__metrics__system_memory_stats_recorder_linux.cc Mon Dec 7 08:43:20 2015 (r403188, copy of r403185, head/www/chromium/files/patch-components__metrics__system_memory_stats_recorder_linux.cc) @@ -0,0 +1,18 @@ +--- components/metrics/system_memory_stats_recorder_linux.cc.orig 2015-09-03 20:30:21.188785000 -0400 ++++ components/metrics/system_memory_stats_recorder_linux.cc 2015-09-03 20:25:00.522580000 -0400 +@@ -29,6 +29,7 @@ + UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50) + + void RecordMemoryStats(RecordMemoryStatsType type) { ++#if !defined(OS_FREEBSD) + base::SystemMemoryInfoKB memory; + if (!base::GetSystemMemoryInfo(&memory)) + return; +@@ -92,6 +93,7 @@ + break; + } + } ++#endif // !defined(OS_FREEBSD) + } + + } // namespace memory 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 Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc Mon Dec 7 08:43:20 2015 (r403188) @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2015-05-13 18:35:46.000000000 -0400 -+++ content/renderer/renderer_blink_platform_impl.cc 2015-05-20 15:52:34.484662000 -0400 -@@ -99,7 +99,7 @@ +--- 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 +@@ -104,7 +104,7 @@ #if defined(OS_POSIX) #include "base/file_descriptor_posix.h" @@ -9,7 +9,7 @@ #include #include -@@ -189,7 +189,7 @@ +@@ -195,7 +195,7 @@ scoped_refptr thread_safe_sender_; }; @@ -18,7 +18,7 @@ class RendererBlinkPlatformImpl::SandboxSupport : public blink::WebSandboxSupport { public: -@@ -216,7 +216,7 @@ +@@ -222,7 +222,7 @@ std::map unicode_font_families_; #endif }; @@ -27,7 +27,7 @@ //------------------------------------------------------------------------------ -@@ -232,7 +232,7 @@ +@@ -238,7 +238,7 @@ plugin_refresh_allowed_(true), default_task_runner_(renderer_scheduler->DefaultTaskRunner()), web_scrollbar_behavior_(new WebScrollbarBehaviorImpl) { @@ -36,7 +36,16 @@ if (g_sandbox_enabled && sandboxEnabled()) { sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport); } else { -@@ -289,7 +289,7 @@ +@@ -263,7 +263,7 @@ + } + + void RendererBlinkPlatformImpl::Shutdown() { +-#if !defined(OS_ANDROID) && !defined(OS_WIN) ++#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD) + // SandboxSupport contains a map of WebFontFamily objects, which hold + // WebCStrings, which become invalidated when blink is shut down. Hence, we + // need to clear that map now, just before blink::shutdown() is called. +@@ -300,7 +300,7 @@ } blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() { @@ -45,7 +54,7 @@ // These platforms do not require sandbox support. return NULL; #else -@@ -557,7 +557,7 @@ +@@ -570,7 +570,7 @@ return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out); } 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 Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc Mon Dec 7 08:43:20 2015 (r403188) @@ -1,5 +1,5 @@ ---- 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 +--- 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 @@ -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 Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-device__usb__usb_service_impl.cc Mon Dec 7 08:43:20 2015 (r403188) @@ -1,5 +1,5 @@ ---- device/usb/usb_service_impl.cc.orig 2015-10-14 17:21:32.323520000 +0200 -+++ device/usb/usb_service_impl.cc 2015-10-14 17:28:13.062771000 +0200 +--- 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 @@ -20,7 +20,11 @@ #include "device/usb/usb_device_handle.h" #include "device/usb/usb_error.h" @@ -20,29 +20,23 @@ rv = libusb_hotplug_register_callback( context_->context(), static_cast(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -553,6 +558,8 @@ +@@ -559,12 +564,15 @@ + device_observer_.Add(device_monitor); } - - RefreshDevices(); -+#endif // !OS_FREEBSD -+ - #if defined(OS_WIN) - DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces(); - if (device_monitor) { -@@ -562,10 +569,11 @@ + #endif // OS_WIN ++#endif // OS_FREEBSD } UsbServiceImpl::~UsbServiceImpl() { -- +#if !defined(OS_FREEBSD) if (hotplug_enabled_) { libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_); } -+#endif // !OS_FREEBSD ++#endif // OS_FREEBSD for (const auto& map_entry : devices_) { map_entry.second->OnDisconnect(); } -@@ -803,6 +811,7 @@ +@@ -802,6 +810,7 @@ device->OnDisconnect(); } @@ -50,11 +44,11 @@ // static int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, PlatformUsbDevice device, -@@ -840,6 +849,7 @@ +@@ -839,6 +848,7 @@ return 0; } -+#endif // !OS_FREEBSD ++#endif // !OS_FREEBSD void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) { DCHECK(CalledOnValidThread()); 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 Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc Mon Dec 7 08:43:20 2015 (r403188) @@ -1,5 +1,5 @@ ---- 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 +--- 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 @@ -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 Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc Mon Dec 7 08:43:20 2015 (r403188) @@ -1,5 +1,5 @@ ---- 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 +--- 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 @@ -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 Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc Mon Dec 7 08:43:20 2015 (r403188) @@ -1,40 +1,57 @@ ---- media/capture/video/linux/video_capture_device_linux.cc.orig 2015-10-14 17:46:45.617486000 +0200 -+++ media/capture/video/linux/video_capture_device_linux.cc 2015-10-14 21:44:58.276861000 +0200 +--- 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 @@ // Translates Video4Linux pixel formats to Chromium pixel formats. // static +#if !defined(OS_FREEBSD) - VideoCapturePixelFormat + VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat(uint32 v4l2_fourcc) { return V4L2CaptureDelegate::V4l2FourCcToChromiumPixelFormat(v4l2_fourcc); @@ -54,6 +55,7 @@ bool favour_mjpeg) { return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg); } -+#endif // !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". -@@ -88,6 +90,7 @@ +@@ -91,6 +93,7 @@ + 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(), + params.requested_format.frame_size.height(), + params.requested_format.frame_rate, base::Passed(&client))); ++#endif + } + + void VideoCaptureDeviceLinux::StopAndDeAllocate() { ++#if !defined(OS_FREEBSD) + if (!v4l2_thread_.IsRunning()) + return; // Wrong state. + v4l2_thread_.message_loop()->PostTask( +@@ -121,8 +126,10 @@ v4l2_thread_.Stop(); + + capture_impl_ = NULL; ++#endif } +#if !defined(OS_FREEBSD) - void VideoCaptureDeviceLinux::AllocateAndStart( - const VideoCaptureParams& params, - scoped_ptr client) { -@@ -130,6 +133,13 @@ + void VideoCaptureDeviceLinux::SetRotation(int rotation) { + if (v4l2_thread_.IsRunning()) { + v4l2_thread_.message_loop()->PostTask( +@@ -130,6 +137,7 @@ base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation)); } } -+#else // !OS_FREEBSD -+void VideoCaptureDeviceLinux::AllocateAndStart( -+ const VideoCaptureParams& params, -+ scoped_ptr client) {} -+void VideoCaptureDeviceLinux::StopAndDeAllocate() {} -+void VideoCaptureDeviceLinux::SetRotation(int rotation) {} -+#endif // !OS_FREEBSD ++#endif // !defined(OS_FREEBSD) // static int VideoCaptureDeviceLinux::TranslatePowerLineFrequencyToV4L2(int frequency) { Copied: branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.h (from r403185, head/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.h Mon Dec 7 08:43:20 2015 (r403188, copy of r403185, head/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.h) @@ -0,0 +1,13 @@ +--- media/capture/video/linux/video_capture_device_linux.h.orig 2015-10-13 15:04:33.000000000 -0400 ++++ media/capture/video/linux/video_capture_device_linux.h 2015-10-14 14:59:17.508402000 -0400 +@@ -37,8 +37,10 @@ + scoped_ptr client) override; + void StopAndDeAllocate() override; + ++#if !defined(OS_FREEBSD) + protected: + void SetRotation(int rotation); ++#endif // !defined(OS_FREEBSD) + + private: + static int 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 Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.cc Mon Dec 7 08:43:20 2015 (r403188) @@ -1,6 +1,6 @@ ---- media/capture/video/video_capture_device.cc.orig 2015-10-14 17:57:48.996214000 +0200 -+++ media/capture/video/video_capture_device.cc 2015-10-14 18:00:26.654041000 +0200 -@@ -9,6 +9,10 @@ +--- 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 +@@ -11,6 +11,10 @@ namespace media { @@ -8,10 +8,10 @@ + return ""; +} + + // TODO(msu.koo): http://crbug.com/532272, remove checking the switch in favour + // of deferring GetModel() call to the actual VideoCaptureDevice object. const std::string VideoCaptureDevice::Name::GetNameAndModel() const { - const std::string model_id = GetModel(); - if (model_id.empty()) -@@ -26,7 +30,7 @@ +@@ -33,7 +37,7 @@ : device_name_(name), unique_id_(id) { } @@ -20,7 +20,7 @@ VideoCaptureDevice::Name::Name(const std::string& name, const std::string& id, const CaptureApiType api_type) -@@ -73,7 +77,7 @@ +@@ -80,7 +84,7 @@ VideoCaptureDevice::Name::~Name() { } 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 Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.h Mon Dec 7 08:43:20 2015 (r403188) @@ -1,5 +1,5 @@ ---- 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 +--- 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 @@ -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 Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc Mon Dec 7 08:43:20 2015 (r403188) @@ -1,5 +1,5 @@ ---- 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 +--- 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 @@ -14,6 +14,10 @@ // static scoped_ptr VideoCaptureDeviceFactory::CreateFactory( @@ -15,7 +15,7 @@ return scoped_ptr( CreateVideoCaptureDeviceFactory(ui_task_runner)); } -+#endif ++#endif } VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() { Copied: branches/2015Q4/www/chromium/files/patch-media__filters__vp9_parser.h (from r403185, head/www/chromium/files/patch-media__filters__vp9_parser.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-media__filters__vp9_parser.h Mon Dec 7 08:43:20 2015 (r403188, copy of r403185, head/www/chromium/files/patch-media__filters__vp9_parser.h) @@ -0,0 +1,10 @@ +--- 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 +@@ -14,6 +14,7 @@ + + #include + #include ++#include + + #include + Modified: branches/2015Q4/www/chromium/files/patch-media__media.gyp ============================================================================== --- branches/2015Q4/www/chromium/files/patch-media__media.gyp Mon Dec 7 08:22:47 2015 (r403187) +++ branches/2015Q4/www/chromium/files/patch-media__media.gyp Mon Dec 7 08:43:20 2015 (r403188) @@ -1,20 +1,20 @@ ---- media/media.gyp.orig 2014-10-10 09:15:31 UTC -+++ media/media.gyp -@@ -760,6 +760,12 @@ +--- 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 @@ ['exclude', '_alsa\\.(h|cc)$'], ], }], +- ['OS=="openbsd"', { + ['OS=="freebsd"', { + 'sources!': [ -+ 'video/capture/linux/v4l2_capture_delegate.cc', -+ 'video/capture/linux/video_capture_device_factory_linux.cc', -+ ] ++ 'capture/video/linux/v4l2_capture_delegate.cc', ++ 'capture/video/linux/video_capture_device_factory_linux.cc', ++ ], + }], - ['OS!="openbsd"', { ++ ['OS=="openbsd" or OS=="freebsd"', { 'sources!': [ - 'audio/openbsd/audio_manager_openbsd.cc', -@@ -771,7 +777,7 @@ - 'video/capture/linux/v4l2_capture_delegate_multi_plane.h', + 'capture/video/linux/v4l2_capture_delegate_multi_plane.cc', + 'capture/video/linux/v4l2_capture_delegate_multi_plane.h', ], }], - ['OS=="linux"', { @@ -22,8 +22,8 @@ 'conditions': [ ['use_x11==1', { 'dependencies': [ -@@ -1085,7 +1091,7 @@ - 'base/simd/convert_yuv_to_rgb_x86.cc', +@@ -1122,7 +1128,7 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Mon Dec 7 14:13: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 D5A669A0D09; Mon, 7 Dec 2015 14:13:07 +0000 (UTC) (envelope-from gahr@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 A61DD1620; Mon, 7 Dec 2015 14:13:07 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB7ED63n062809; Mon, 7 Dec 2015 14:13:06 GMT (envelope-from gahr@FreeBSD.org) Received: (from gahr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB7ED63O062808; Mon, 7 Dec 2015 14:13:06 GMT (envelope-from gahr@FreeBSD.org) Message-Id: <201512071413.tB7ED63O062808@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gahr set sender to gahr@FreeBSD.org using -f From: Pietro Cerutti Date: Mon, 7 Dec 2015 14:13:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403207 - branches/2015Q4/devel/avro-cpp/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, 07 Dec 2015 14:13:07 -0000 Author: gahr Date: Mon Dec 7 14:13:06 2015 New Revision: 403207 URL: https://svnweb.freebsd.org/changeset/ports/403207 Log: MFH: r403189 devel/avro-cpp - fix escaping of unicode characters PR: 204991 Submitted by: gahr Approved by: maintainer Approved by: portmgr Obtained from: https://issues.apache.org/jira/browse/AVRO-1191 Added: branches/2015Q4/devel/avro-cpp/files/patch-impl_json_JsonIO.hh - copied unchanged from r403189, head/devel/avro-cpp/files/patch-impl_json_JsonIO.hh Modified: Directory Properties: branches/2015Q4/ (props changed) Copied: branches/2015Q4/devel/avro-cpp/files/patch-impl_json_JsonIO.hh (from r403189, head/devel/avro-cpp/files/patch-impl_json_JsonIO.hh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/devel/avro-cpp/files/patch-impl_json_JsonIO.hh Mon Dec 7 14:13:06 2015 (r403207, copy of r403189, head/devel/avro-cpp/files/patch-impl_json_JsonIO.hh) @@ -0,0 +1,11 @@ +--- impl/json/JsonIO.hh.orig 2015-12-02 18:53:55 UTC ++++ impl/json/JsonIO.hh +@@ -159,7 +159,7 @@ class AVRO_DECL JsonGenerator { + + void escapeCtl(char c) { + out_.write('\\'); +- out_.write('U'); ++ out_.write('u'); // https://issues.apache.org/jira/browse/AVRO-1191 + out_.write('0'); + out_.write('0'); + out_.write(toHex((static_cast(c)) / 16)); From owner-svn-ports-branches@freebsd.org Mon Dec 7 18:42: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 1FA7A9B9154; Mon, 7 Dec 2015 18:42:39 +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 E113C1735; Mon, 7 Dec 2015 18:42:38 +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 tB7Igbgx042882; Mon, 7 Dec 2015 18:42:37 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB7Igblb042881; Mon, 7 Dec 2015 18:42:37 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201512071842.tB7Igblb042881@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Mon, 7 Dec 2015 18:42:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403226 - branches/2015Q4/www/chromium 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, 07 Dec 2015 18:42:39 -0000 Author: rene Date: Mon Dec 7 18:42:37 2015 New Revision: 403226 URL: https://svnweb.freebsd.org/changeset/ports/403226 Log: MFH: r403215 www/chromium: add a missing pkg-plist entry Approved by: ports-secteam (feld) Modified: branches/2015Q4/www/chromium/pkg-plist Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/www/chromium/pkg-plist ============================================================================== --- branches/2015Q4/www/chromium/pkg-plist Mon Dec 7 18:40:28 2015 (r403225) +++ branches/2015Q4/www/chromium/pkg-plist Mon Dec 7 18:42:37 2015 (r403226) @@ -150,6 +150,7 @@ share/applications/chromium-browser.desk %%DATADIR%%/resources/inspector/devices_module.js %%DATADIR%%/resources/inspector/devtools.js %%DATADIR%%/resources/inspector/devtools_extension_api.js +%%DATADIR%%/resources/inspector/diff_module.js %%DATADIR%%/resources/inspector/elements_module.js %%DATADIR%%/resources/inspector/emulated_devices_module.js %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-1x.png From owner-svn-ports-branches@freebsd.org Tue Dec 8 01:39: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 836DB9C11A5; Tue, 8 Dec 2015 01:39:28 +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 448C11EC1; Tue, 8 Dec 2015 01:39:28 +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 tB81dRRV064734; Tue, 8 Dec 2015 01:39:27 GMT (envelope-from novel@FreeBSD.org) Received: (from novel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB81dRcg064732; Tue, 8 Dec 2015 01:39:27 GMT (envelope-from novel@FreeBSD.org) Message-Id: <201512080139.tB81dRcg064732@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: novel set sender to novel@FreeBSD.org using -f From: Roman Bogorodskiy Date: Tue, 8 Dec 2015 01:39:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403246 - branches/2015Q4/mail/msmtp 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, 08 Dec 2015 01:39:28 -0000 Author: novel Date: Tue Dec 8 01:39:27 2015 New Revision: 403246 URL: https://svnweb.freebsd.org/changeset/ports/403246 Log: MFH: r402464 mail/msmtp: fix configuration for gnome password management In order to enable password management, now '--with-libsecret' option should be used instead of '--with-gnome-keyring'. So fix configure args and rename the GNOMEKEYRING option to LIBSECRET. Also modernize options usage and bump PORTREVISION due to package change. PR: 204760 (with minor edits) Submitted by: John Hein Approved by: ports-secteam (feld) Modified: branches/2015Q4/mail/msmtp/Makefile branches/2015Q4/mail/msmtp/pkg-plist Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/mail/msmtp/Makefile ============================================================================== --- branches/2015Q4/mail/msmtp/Makefile Tue Dec 8 00:34:10 2015 (r403245) +++ branches/2015Q4/mail/msmtp/Makefile Tue Dec 8 01:39:27 2015 (r403246) @@ -3,6 +3,7 @@ PORTNAME= msmtp PORTVERSION= 1.6.2 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= SF @@ -17,78 +18,52 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INFO= msmtp -OPTIONS_DEFINE= GSASL NLS IDN GNOMEKEYRING MSMTPQ +OPTIONS_DEFINE= DOCS GSASL NLS IDN LIBSECRET MSMTPQ OPTIONS_RADIO= TLS OPTIONS_RADIO_TLS= GNUTLS OPENSSL OPTIONS_DEFAULT= MSMTPQ OPENSSL +OPTIONS_SUB= yes GSASL_DESC= GSASL support +LIBSECRET_DESC= GNOME password management MSMTPQ_DESC= Install offline messaging scripts -.include - -.if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls -CONFIGURE_ARGS+= --with-ssl=gnutls -.elif ${PORT_OPTIONS:MOPENSSL} -USE_OPENSSL= yes -CONFIGURE_ARGS+= --with-ssl=openssl -CONFIGURE_ENV+= libssl_CFLAGS="-I${OPENSSLINC}" \ +GSASL_CONFIGURE_WITH= libgsasl +GSASL_LIB_DEPENDS= libgsasl.so:${PORTSDIR}/security/gsasl +IDN_CONFIGURE_WITH= libidn +IDN_LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn +LIBSECRET_CONFIGURE_WITH= libsecret +LIBSECRET_LIB_DEPENDS= libsecret-1.so:${PORTSDIR}/security/libsecret +MSMTPQ_PORTDOCS= README.msmtpq +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext + +GNUTLS_CONFIGURE_ON= --with-ssl=gnutls +GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls +OPENSSL_VARS= USE_OPENSSL=yes +OPENSSL_CONFIGURE_ON= --with-ssl=openssl +OPENSSL_CONFIGURE_ENV= libssl_CFLAGS="-I${OPENSSLINC}" \ libssl_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" -.else -CONFIGURE_ARGS+= --with-ssl=no -.endif - -.if ${PORT_OPTIONS:MGNUTLS} || ${PORT_OPTIONS:MOPENSSL} -RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss -.endif - -.if ${PORT_OPTIONS:MGSASL} -LIB_DEPENDS+= libgsasl.so:${PORTSDIR}/security/gsasl -CONFIGURE_ARGS+= --with-libgsasl -.else -CONFIGURE_ARGS+= --without-libgsasl -.endif +CERTSFILE= ${LOCALBASE}/share/certs/ca-root-nss.crt -.if ${PORT_OPTIONS:MIDN} -LIB_DEPENDS+= libidn.so:${PORTSDIR}/dns/libidn -CONFIGURE_ARGS+= --with-libidn -.else -CONFIGURE_ARGS+= --without-libidn -.endif - -.if ${PORT_OPTIONS:MGNOMEKEYRING} -CONFIGURE_ARGS+= --with-gnome-keyring -LIB_DEPENDS+= libgnome-keyring.so:${PORTSDIR}/security/gnome-keyring -.else -CONFIGURE_ARGS+= --without-gnome-keyring -.endif +.include -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+= --enable-nls -PLIST_SUB+= NLS="" +.if ${PORT_OPTIONS:MGNUTLS} || ${PORT_OPTIONS:MOPENSSL} +RUN_DEPENDS+= ${CERTSFILE}:${PORTSDIR}/security/ca_root_nss .else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " +CONFIGURE_ARGS+= --with-ssl=no .endif -.include - post-extract: - @${REINPLACE_CMD} -e 's|/etc/ssl/certs/ca\\-certificates.crt|${LOCALBASE}/share/certs/ca\\-root\\-nss.crt|' \ + @${REINPLACE_CMD} -e 's|/etc/ssl/certs/ca\\-certificates.crt|${CERTSFILE}|' \ ${WRKSRC}/doc/msmtp.1 .if ${PORT_OPTIONS:MMSMTPQ} -PLIST_SUB+= MSMTPQ="" - -post-install: +post-stage: ${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/msmtp-queue ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/msmtpq ${STAGEDIR}${PREFIX}/bin - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/scripts/msmtpq/README.msmtpq ${STAGEDIR}${DOCSDIR} -.else -PLIST_SUB+= MSMTPQ="@comment " + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/README.msmtpq ${STAGEDIR}${DOCSDIR} .endif -.include +.include Modified: branches/2015Q4/mail/msmtp/pkg-plist ============================================================================== --- branches/2015Q4/mail/msmtp/pkg-plist Tue Dec 8 00:34:10 2015 (r403245) +++ branches/2015Q4/mail/msmtp/pkg-plist Tue Dec 8 01:39:27 2015 (r403246) @@ -2,5 +2,4 @@ bin/msmtp man/man1/msmtp.1.gz %%MSMTPQ%%bin/msmtp-queue %%MSMTPQ%%bin/msmtpq -%%MSMTPQ%%%%DOCSDIR%%/README.msmtpq %%NLS%%share/locale/de/LC_MESSAGES/msmtp.mo From owner-svn-ports-branches@freebsd.org Tue Dec 8 14:26:05 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 BE8A49D3574; Tue, 8 Dec 2015 14:26:05 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 71ECB1D7D; Tue, 8 Dec 2015 14:26:05 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB8EQ4lk017225; Tue, 8 Dec 2015 14:26:04 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB8EQ4CD017223; Tue, 8 Dec 2015 14:26:04 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201512081426.tB8EQ4CD017223@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Tue, 8 Dec 2015 14:26:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403272 - branches/2015Q4/www/lighttpd 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, 08 Dec 2015 14:26:05 -0000 Author: garga Date: Tue Dec 8 14:26:04 2015 New Revision: 403272 URL: https://svnweb.freebsd.org/changeset/ports/403272 Log: MFH: r403264 Update www/lighttpd to to 1.4.38 Released sooner due to issue #2670 [1] [1] http://redmine.lighttpd.net/issues/2670 PR: 205087 Approved by: ports-secteam (feld), pkubaj@riseup.net (maintainer) Obtained from: pfSense Sponsored by: Rubicon Communications (Netgate) Modified: branches/2015Q4/www/lighttpd/Makefile branches/2015Q4/www/lighttpd/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/www/lighttpd/Makefile ============================================================================== --- branches/2015Q4/www/lighttpd/Makefile Tue Dec 8 14:05:47 2015 (r403271) +++ branches/2015Q4/www/lighttpd/Makefile Tue Dec 8 14:26:04 2015 (r403272) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= lighttpd -PORTVERSION= 1.4.37 +PORTVERSION= 1.4.38 CATEGORIES?= www MASTER_SITES?= http://download.lighttpd.net/lighttpd/releases-1.4.x/ Modified: branches/2015Q4/www/lighttpd/distinfo ============================================================================== --- branches/2015Q4/www/lighttpd/distinfo Tue Dec 8 14:05:47 2015 (r403271) +++ branches/2015Q4/www/lighttpd/distinfo Tue Dec 8 14:26:04 2015 (r403272) @@ -1,5 +1,5 @@ -SHA256 (lighttpd-1.4.37.tar.xz) = 804e6f60567ca1da2b3927f92b7e9332b93aca9560f282ca135b86b7558979bd -SIZE (lighttpd-1.4.37.tar.xz) = 574020 +SHA256 (lighttpd-1.4.38.tar.xz) = 4912568b7befcf3f552ca4668bd7f38cd85f42a22944359d00816ec27eb1e504 +SIZE (lighttpd-1.4.38.tar.xz) = 578452 SHA256 (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch.gz) = d7c3704d5253c4f3c18459f89059063b311e50096cd2c38fc982cec683c32e61 SIZE (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch.gz) = 44695 SHA256 (lighttpd-1.4.26_mod_geoip.patch.gz) = db43cc0ed7c808b5eed3185d97346e70dea0f1ef4fa9ed436d08e4faff7f97e7 From owner-svn-ports-branches@freebsd.org Tue Dec 8 17:44:37 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 3C5C29D40BC; Tue, 8 Dec 2015 17:44:37 +0000 (UTC) (envelope-from truckman@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 152A41387; Tue, 8 Dec 2015 17:44:37 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB8HiaWx088908; Tue, 8 Dec 2015 17:44:36 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB8HiaBQ088907; Tue, 8 Dec 2015 17:44:36 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201512081744.tB8HiaBQ088907@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Tue, 8 Dec 2015 17:44:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403317 - in branches/2015Q4/devel/libxs: . 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, 08 Dec 2015 17:44:37 -0000 Author: truckman Date: Tue Dec 8 17:44:35 2015 New Revision: 403317 URL: https://svnweb.freebsd.org/changeset/ports/403317 Log: MFH: r403247 Remove USE_GCC=yes from devel/libxs and always build with the base compiler. There is a defect in the libc++ header files bundled with clang < 3.6 that broke the libxs build. Because of this breakage, USE_GCC=yes was added to the port Makefile in r330486. Unfortunately that breaks dns/dnstable in two different ways. Dnstable itself is pure-C code, but it links to two different libraries that contain C++ code, libxs and archivers/snappy, the latter of which is built with the base c++ compiler. * On FreeBSD 9, snappy is generally built with g++ 4.2 from base and linked to libstdc++ in base, whereas libxs is built with g++ from ports and linked to libstdc++ from ports. When building dnstable, the linker seems to load libsnappy first, which brings in libstdc++ from base. This seems to work fine with ports gcc 4.8 or older, but when the default ports version is upgraded to 4.9, the linker fails with the error: "/usr/local/lib/libxs.so.2: undefined reference to `std::__throw_out_of_range_fmt(char const*, ...)@GLIBCXX_3.4.20'" * On FreeBSD >= 10 where clang is the base compiler and snappy is linked to libc++, the build succeeds but the resulting executables will fail at runtime because they link to both libc++ from base and libstdc++ from ports. When building libxs on FreeBSD 10 with clang 3.4, the build error is: CXX libxs_la-io_thread.lo --- libxs_la-encoder.lo --- In file included from encoder.cpp:23: In file included from ./encoder.hpp:28: In file included from /usr/include/c++/v1/algorithm:626: /usr/include/c++/v1/utility:254:9: error: field has incomplete type 'xs::io_thread_t::timer_info_t' _T2 second; ^ Patching the code to work around the build failure does not look possible, so instead, fix the problem in a rather hackish way when compiling with clang < 3.6 and using its bundled c++ headers: * Make a local copy of the two defective header files. * Apply the upstream change to those files from "Allow declaration of map and multimap iterator with incomplete mapped type. Patch from eugenis" * Add the directory containing the updated header files to the CPPFLAGS. This fix is not needed when building with base clang on FreeBSD 9 because it uses the stdc++ headers. PR: 204461 PR: 204400 Approved by: vg (maintainer) Approved by: ports-secteam (feld) Sponsored by: Farsight Security, Inc. Added: branches/2015Q4/devel/libxs/files/ - copied from r403247, head/devel/libxs/files/ Modified: branches/2015Q4/devel/libxs/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/devel/libxs/Makefile ============================================================================== --- branches/2015Q4/devel/libxs/Makefile Tue Dec 8 17:35:19 2015 (r403316) +++ branches/2015Q4/devel/libxs/Makefile Tue Dec 8 17:44:35 2015 (r403317) @@ -3,7 +3,7 @@ PORTNAME= libxs PORTVERSION= 1.2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= http://download.crossroads.io/ @@ -13,9 +13,8 @@ COMMENT= Open source lightweight messagi LICENSE= GPLv3 GNU_CONFIGURE= yes -USES= pathfix pkgconfig libtool +USES= compiler:features pathfix pkgconfig libtool USE_LDCONFIG= yes -USE_GCC= yes OPTIONS_DEFINE= DEBUG DOCS PLUGINS ZMQ EXTERNAL_DESC= PGM extension from ports @@ -26,7 +25,21 @@ OPTIONS_RADIO= PGM OPTIONS_RADIO_PGM= INTERNAL EXTERNAL OPTIONS_DEFAULT=PLUGINS -.include +.include + +.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 36 && \ + !${COMPILER_FEATURES:Mlibstdc++} +# Allow declaration of map and multimap iterator with incomplete mapped type +# by applying upstream change r231119 to a copy of our local c++ headers. +# This fix is not needed for clang 3.4 on 9.3 which uses libstdc++. +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-map +CPPFLAGS+= -I${WRKSRC}/map-fix + +post-extract: + ${MKDIR} ${WRKSRC}/map-fix + ${CP} /usr/include/c++/v1/__tree /usr/include/c++/v1/map \ + ${WRKSRC}/map-fix/. +.endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug @@ -75,4 +88,4 @@ pre-configure: ${WRKSRC}/configure .endif -.include +.include From owner-svn-ports-branches@freebsd.org Tue Dec 8 18:18:53 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 8C7299D4000; Tue, 8 Dec 2015 18:18:53 +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 677CC1CCD; Tue, 8 Dec 2015 18:18:53 +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 tB8IIq4Y099487; Tue, 8 Dec 2015 18:18:52 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB8IIpeL099474; Tue, 8 Dec 2015 18:18:51 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201512081818.tB8IIpeL099474@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Tue, 8 Dec 2015 18:18:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403330 - in branches/2015Q4/graphics: entangle evas_generic_loaders-raw gthumb libkdcraw-kde4 libraw luminance luminance-qt5 nomacs openimageio oyranos shotwell 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, 08 Dec 2015 18:18:53 -0000 Author: rakuco Date: Tue Dec 8 18:18:51 2015 New Revision: 403330 URL: https://svnweb.freebsd.org/changeset/ports/403330 Log: MFH: r402228 r403193 I did not originally intend to backport r402228, but the LibRaw CVE fixes only apply on top of 0.17 releases (the API and the code in 0.16.x is too different). r402228: - Update graphics/libraw to 0.17.0 - While here, minor port cleanup, switch to options helpers - Bump PORTREVISIONs of consumers as soversion has changed PR: 204553 Submitted by: graham@menhennitt.com.au r403193: Update to 0.17.1. This is a small update that fixes two security vulnerabilities, CVE-2015-8366 and CVE-2015-8367. Security: db04bf07-9cc8-11e5-8c2b-c335fa8985d7 Security: 6bc6eed2-9cca-11e5-8c2b-c335fa8985d7 Approved by: portmgr (erwin), ports-secteam (feld) Modified: branches/2015Q4/graphics/entangle/Makefile branches/2015Q4/graphics/evas_generic_loaders-raw/Makefile branches/2015Q4/graphics/gthumb/Makefile branches/2015Q4/graphics/libkdcraw-kde4/Makefile branches/2015Q4/graphics/libraw/Makefile branches/2015Q4/graphics/libraw/distinfo branches/2015Q4/graphics/libraw/pkg-plist branches/2015Q4/graphics/luminance-qt5/Makefile branches/2015Q4/graphics/luminance/Makefile branches/2015Q4/graphics/nomacs/Makefile branches/2015Q4/graphics/openimageio/Makefile branches/2015Q4/graphics/oyranos/Makefile branches/2015Q4/graphics/shotwell/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/graphics/entangle/Makefile ============================================================================== --- branches/2015Q4/graphics/entangle/Makefile Tue Dec 8 18:18:29 2015 (r403329) +++ branches/2015Q4/graphics/entangle/Makefile Tue Dec 8 18:18:51 2015 (r403330) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= entangle -DISTVERSION= 0.7.0 -PORTREVISION= 2 +PORTVERSION= 0.7.0 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://entangle-photo.org/download/sources/ Modified: branches/2015Q4/graphics/evas_generic_loaders-raw/Makefile ============================================================================== --- branches/2015Q4/graphics/evas_generic_loaders-raw/Makefile Tue Dec 8 18:18:29 2015 (r403329) +++ branches/2015Q4/graphics/evas_generic_loaders-raw/Makefile Tue Dec 8 18:18:51 2015 (r403330) @@ -3,6 +3,7 @@ PORTNAME= raw PORTVERSION= 1.15.0 +PORTREVISION= 1 CATEGORIES= graphics enlightenment MASTER_SITES= http://download.enlightenment.org/rel/libs/${PKGNAMEPREFIX:S/-//}/ PKGNAMEPREFIX= evas_generic_loaders- Modified: branches/2015Q4/graphics/gthumb/Makefile ============================================================================== --- branches/2015Q4/graphics/gthumb/Makefile Tue Dec 8 18:18:29 2015 (r403329) +++ branches/2015Q4/graphics/gthumb/Makefile Tue Dec 8 18:18:51 2015 (r403330) @@ -4,6 +4,7 @@ PORTNAME= gthumb PORTVERSION= 3.4.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= GNOME DIST_SUBDIR= gnome3 Modified: branches/2015Q4/graphics/libkdcraw-kde4/Makefile ============================================================================== --- branches/2015Q4/graphics/libkdcraw-kde4/Makefile Tue Dec 8 18:18:29 2015 (r403329) +++ branches/2015Q4/graphics/libkdcraw-kde4/Makefile Tue Dec 8 18:18:51 2015 (r403330) @@ -3,7 +3,7 @@ PORTNAME= libkdcraw PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} Modified: branches/2015Q4/graphics/libraw/Makefile ============================================================================== --- branches/2015Q4/graphics/libraw/Makefile Tue Dec 8 18:18:29 2015 (r403329) +++ branches/2015Q4/graphics/libraw/Makefile Tue Dec 8 18:18:51 2015 (r403330) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libraw -PORTVERSION= 0.16.2 -PORTREVISION= 1 +PORTVERSION= 0.17.1 CATEGORIES= graphics MASTER_SITES= http://www.libraw.org/data/ DISTNAME= LibRaw-${PORTVERSION} @@ -22,6 +21,9 @@ CONFIGURE_ARGS= --disable-examples --dis CFLAGS+= -fPIC INSTALL_TARGET= install-strip +PORTDOCS= * +PORTEXAMPLES= * + OPTIONS_DEFINE= DEMOSAIC_PACK_GPL2 DEMOSAIC_PACK_GPL3 DOCS EXAMPLES LCMS2 \ OPTIMIZED_CFLAGS OPENMP OPTIONS_DEFAULT= LCMS2 @@ -60,23 +62,17 @@ LICENSE= GPLv3 LICENSE_COMB= single .endif -PORTDOCS= * -PORTEXAMPLES= * +post-patch: + @${REINPLACE_CMD} -e "s/-lstdc++//g" ${WRKSRC}/configure -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && \ ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} -.endif -.if ${PORT_OPTIONS:MEXAMPLES} +post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/samples && \ ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} -.endif - -post-patch: - @${REINPLACE_CMD} -e "s/-lstdc++//g" ${WRKSRC}/configure .include Modified: branches/2015Q4/graphics/libraw/distinfo ============================================================================== --- branches/2015Q4/graphics/libraw/distinfo Tue Dec 8 18:18:29 2015 (r403329) +++ branches/2015Q4/graphics/libraw/distinfo Tue Dec 8 18:18:51 2015 (r403330) @@ -1,6 +1,6 @@ -SHA256 (LibRaw-0.16.2.tar.gz) = 6344e355f7c23f13e266844b36265d5f624237ba5a62dc901c7b91b510a84187 -SIZE (LibRaw-0.16.2.tar.gz) = 1476575 -SHA256 (LibRaw-demosaic-pack-GPL2-0.16.2.tar.gz) = 2218f08d59866e7852938356c197b96a6f47d0b9221a261280e010540477e77b -SIZE (LibRaw-demosaic-pack-GPL2-0.16.2.tar.gz) = 32652 -SHA256 (LibRaw-demosaic-pack-GPL3-0.16.2.tar.gz) = 749b5baa3a4f1f5c4ea4169b9293b02b0d2a0714aa01729327f23f82621c9735 -SIZE (LibRaw-demosaic-pack-GPL3-0.16.2.tar.gz) = 39457 +SHA256 (LibRaw-0.17.1.tar.gz) = e599651a4cc37e00cfc2d2b56be87c3a4e4dae2c360b680fe9ab3f93d07cdea1 +SIZE (LibRaw-0.17.1.tar.gz) = 1472341 +SHA256 (LibRaw-demosaic-pack-GPL2-0.17.1.tar.gz) = 2e9f72873a6db319aca5be5bc4d426e3063e2c33f66438e89720c3b48bef0678 +SIZE (LibRaw-demosaic-pack-GPL2-0.17.1.tar.gz) = 30989 +SHA256 (LibRaw-demosaic-pack-GPL3-0.17.1.tar.gz) = 442b3e8de4664e539cbcdd437a7b6cd167e07c0fcf76f07b50d16657f18ff962 +SIZE (LibRaw-demosaic-pack-GPL3-0.17.1.tar.gz) = 38230 Modified: branches/2015Q4/graphics/libraw/pkg-plist ============================================================================== --- branches/2015Q4/graphics/libraw/pkg-plist Tue Dec 8 18:18:29 2015 (r403329) +++ branches/2015Q4/graphics/libraw/pkg-plist Tue Dec 8 18:18:51 2015 (r403330) @@ -7,11 +7,11 @@ include/libraw/libraw_types.h include/libraw/libraw_version.h lib/libraw.a lib/libraw.so -lib/libraw.so.10 -lib/libraw.so.10.0.0 +lib/libraw.so.15 +lib/libraw.so.15.0.0 lib/libraw_r.a lib/libraw_r.so -lib/libraw_r.so.10 -lib/libraw_r.so.10.0.0 +lib/libraw_r.so.15 +lib/libraw_r.so.15.0.0 libdata/pkgconfig/libraw.pc libdata/pkgconfig/libraw_r.pc Modified: branches/2015Q4/graphics/luminance-qt5/Makefile ============================================================================== --- branches/2015Q4/graphics/luminance-qt5/Makefile Tue Dec 8 18:18:29 2015 (r403329) +++ branches/2015Q4/graphics/luminance-qt5/Makefile Tue Dec 8 18:18:51 2015 (r403330) @@ -3,7 +3,7 @@ PORTNAME= luminance-hdr DISTVERSION= 2.4.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION} PKGNAMESUFFIX= -qt5 Modified: branches/2015Q4/graphics/luminance/Makefile ============================================================================== --- branches/2015Q4/graphics/luminance/Makefile Tue Dec 8 18:18:29 2015 (r403329) +++ branches/2015Q4/graphics/luminance/Makefile Tue Dec 8 18:18:51 2015 (r403330) @@ -3,7 +3,7 @@ PORTNAME= luminance-hdr DISTVERSION= 2.3.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION} Modified: branches/2015Q4/graphics/nomacs/Makefile ============================================================================== --- branches/2015Q4/graphics/nomacs/Makefile Tue Dec 8 18:18:29 2015 (r403329) +++ branches/2015Q4/graphics/nomacs/Makefile Tue Dec 8 18:18:51 2015 (r403330) @@ -2,7 +2,7 @@ PORTNAME= nomacs PORTVERSION= 2.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/nomacs/nomacs-${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source Modified: branches/2015Q4/graphics/openimageio/Makefile ============================================================================== --- branches/2015Q4/graphics/openimageio/Makefile Tue Dec 8 18:18:29 2015 (r403329) +++ branches/2015Q4/graphics/openimageio/Makefile Tue Dec 8 18:18:51 2015 (r403330) @@ -4,7 +4,7 @@ PORTNAME= openimageio PORTVERSION= 1.5.18 DISTVERSIONPREFIX= Release- -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz Modified: branches/2015Q4/graphics/oyranos/Makefile ============================================================================== --- branches/2015Q4/graphics/oyranos/Makefile Tue Dec 8 18:18:29 2015 (r403329) +++ branches/2015Q4/graphics/oyranos/Makefile Tue Dec 8 18:18:51 2015 (r403330) @@ -2,7 +2,7 @@ PORTNAME= oyranos PORTVERSION= 0.9.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/Oyranos/Oyranos%20${PORTVERSION:C|(.*)\.[0-9]*$|\1|} Modified: branches/2015Q4/graphics/shotwell/Makefile ============================================================================== --- branches/2015Q4/graphics/shotwell/Makefile Tue Dec 8 18:18:29 2015 (r403329) +++ branches/2015Q4/graphics/shotwell/Makefile Tue Dec 8 18:18:51 2015 (r403330) @@ -3,7 +3,7 @@ PORTNAME= shotwell PORTVERSION= 0.22.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics gnome MASTER_SITES= GNOME/sources/shotwell/${PORTVERSION:R} From owner-svn-ports-branches@freebsd.org Tue Dec 8 19:33: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 890889D58E3; Tue, 8 Dec 2015 19:33:58 +0000 (UTC) (envelope-from antoine@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 567D1194C; Tue, 8 Dec 2015 19:33:58 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB8JXvGq023800; Tue, 8 Dec 2015 19:33:57 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB8JXvdu023799; Tue, 8 Dec 2015 19:33:57 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201512081933.tB8JXvdu023799@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Tue, 8 Dec 2015 19:33:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403344 - branches/2015Q4/graphics/png 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, 08 Dec 2015 19:33:58 -0000 Author: antoine Date: Tue Dec 8 19:33:57 2015 New Revision: 403344 URL: https://svnweb.freebsd.org/changeset/ports/403344 Log: MFH: r403332 Do not fail the build if regression tests do not pass, there seems to be a regression on big endian archs between versions 1.6.19 and 1.6.20 (reported upstream) PR: 205125 Modified: branches/2015Q4/graphics/png/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/graphics/png/Makefile ============================================================================== --- branches/2015Q4/graphics/png/Makefile Tue Dec 8 19:29:14 2015 (r403343) +++ branches/2015Q4/graphics/png/Makefile Tue Dec 8 19:33:57 2015 (r403344) @@ -30,15 +30,14 @@ PNGTEST_DESC=Enable Regression Test (rec PATCHFILES= ${DISTNAME}-apng.patch.gz .endif +# Do not fail until https://sourceforge.net/p/libpng/bugs/243/ is fixed .if ${PORT_OPTIONS:MPNGTEST} post-build: (cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} test; then \ - if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \ - ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ - (${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ - fi; \ - ${FALSE}; \ - fi) + if [ -f ${WRKSRC}/test-suite.log ]; then \ + ${CAT} ${WRKSRC}/test-suite.log ; \ + fi; \ + fi) .endif .include From owner-svn-ports-branches@freebsd.org Tue Dec 8 19:45: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 92C009D40D8; Tue, 8 Dec 2015 19:45:22 +0000 (UTC) (envelope-from kwm@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 6C95513C0; Tue, 8 Dec 2015 19:45:22 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB8JjL10026878; Tue, 8 Dec 2015 19:45:21 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB8JjL61026875; Tue, 8 Dec 2015 19:45:21 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201512081945.tB8JjL61026875@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Tue, 8 Dec 2015 19:45:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403345 - branches/2015Q4/www/linux-c6-flashplugin11 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, 08 Dec 2015 19:45:22 -0000 Author: kwm Date: Tue Dec 8 19:45:21 2015 New Revision: 403345 URL: https://svnweb.freebsd.org/changeset/ports/403345 Log: MFH: r403342 Update flash plugin to 11.2r202.554. Approved by: portmgr (erwin@) Submitted by: xmj@ Security: c8842a84-9ddd-11e5-8c2f-c485083ca99c Modified: branches/2015Q4/www/linux-c6-flashplugin11/Makefile branches/2015Q4/www/linux-c6-flashplugin11/distinfo.i686 branches/2015Q4/www/linux-c6-flashplugin11/distinfo.x86_64 Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/www/linux-c6-flashplugin11/Makefile ============================================================================== --- branches/2015Q4/www/linux-c6-flashplugin11/Makefile Tue Dec 8 19:33:57 2015 (r403344) +++ branches/2015Q4/www/linux-c6-flashplugin11/Makefile Tue Dec 8 19:45:21 2015 (r403345) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flashplugin -PORTVERSION= 11.2r202.548 +PORTVERSION= 11.2r202.554 CATEGORIES= www multimedia linux MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \ LOCAL/nox:suplib Modified: branches/2015Q4/www/linux-c6-flashplugin11/distinfo.i686 ============================================================================== --- branches/2015Q4/www/linux-c6-flashplugin11/distinfo.i686 Tue Dec 8 19:33:57 2015 (r403344) +++ branches/2015Q4/www/linux-c6-flashplugin11/distinfo.i686 Tue Dec 8 19:45:21 2015 (r403345) @@ -1,4 +1,4 @@ -SHA256 (flashplugin/11.2r202.548/install_flash_player_11_linux.i386.tar.gz) = 88efdfbed760994383a815c78c8c2d5eaad2abc56557f54bd15f167c0b291294 -SIZE (flashplugin/11.2r202.548/install_flash_player_11_linux.i386.tar.gz) = 6955598 -SHA256 (flashplugin/11.2r202.548/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf -SIZE (flashplugin/11.2r202.548/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 +SHA256 (flashplugin/11.2r202.554/install_flash_player_11_linux.i386.tar.gz) = dfdfbb529238b966b25776691d0d3c277f30ff35469c4a495fd8d0f2a9a146a8 +SIZE (flashplugin/11.2r202.554/install_flash_player_11_linux.i386.tar.gz) = 6963199 +SHA256 (flashplugin/11.2r202.554/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf +SIZE (flashplugin/11.2r202.554/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 Modified: branches/2015Q4/www/linux-c6-flashplugin11/distinfo.x86_64 ============================================================================== --- branches/2015Q4/www/linux-c6-flashplugin11/distinfo.x86_64 Tue Dec 8 19:33:57 2015 (r403344) +++ branches/2015Q4/www/linux-c6-flashplugin11/distinfo.x86_64 Tue Dec 8 19:45:21 2015 (r403345) @@ -1,4 +1,4 @@ -SHA256 (flashplugin/11.2r202.548/install_flash_player_11_linux.i386.tar.gz) = 88efdfbed760994383a815c78c8c2d5eaad2abc56557f54bd15f167c0b291294 -SIZE (flashplugin/11.2r202.548/install_flash_player_11_linux.i386.tar.gz) = 6955598 -SHA256 (flashplugin/11.2r202.548/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf -SIZE (flashplugin/11.2r202.548/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 +SHA256 (flashplugin/11.2r202.554/install_flash_player_11_linux.i386.tar.gz) = dfdfbb529238b966b25776691d0d3c277f30ff35469c4a495fd8d0f2a9a146a8 +SIZE (flashplugin/11.2r202.554/install_flash_player_11_linux.i386.tar.gz) = 6963199 +SHA256 (flashplugin/11.2r202.554/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf +SIZE (flashplugin/11.2r202.554/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 From owner-svn-ports-branches@freebsd.org Tue Dec 8 23:48:14 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 B93699D59E9; Tue, 8 Dec 2015 23:48:14 +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 73EE3105E; Tue, 8 Dec 2015 23:48:14 +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 tB8NmDgD010756; Tue, 8 Dec 2015 23:48:13 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB8NmDvx010754; Tue, 8 Dec 2015 23:48:13 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201512082348.tB8NmDvx010754@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Tue, 8 Dec 2015 23:48:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403350 - in branches/2015Q4/print/a2ps: . 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, 08 Dec 2015 23:48:14 -0000 Author: junovitch Date: Tue Dec 8 23:48:13 2015 New Revision: 403350 URL: https://svnweb.freebsd.org/changeset/ports/403350 Log: print/a2ps: multiple fixes - fix for malicious crafted a2ps prologue files [1] - fix whitespaces in patch - bump PORTREVISION Submitted by: feld [1] Approved by: ports-secteam (feld) Security: CVE-2015-8107 Security: https://vuxml.FreeBSD.org/freebsd/e359051d-90bd-11e5-bd18-002590263bf5.html Added: branches/2015Q4/print/a2ps/files/patch-output.c - copied, changed from r401780, head/print/a2ps/files/patch-output.c Modified: branches/2015Q4/print/a2ps/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/print/a2ps/Makefile ============================================================================== --- branches/2015Q4/print/a2ps/Makefile Tue Dec 8 23:08:11 2015 (r403349) +++ branches/2015Q4/print/a2ps/Makefile Tue Dec 8 23:48:13 2015 (r403350) @@ -3,7 +3,7 @@ PORTNAME= a2ps PORTVERSION= 4.13b -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= print MASTER_SITES= GNU LOCAL/hrs/a2ps/:i18n Copied and modified: branches/2015Q4/print/a2ps/files/patch-output.c (from r401780, head/print/a2ps/files/patch-output.c) ============================================================================== --- head/print/a2ps/files/patch-output.c Mon Nov 16 18:38:56 2015 (r401780, copy source) +++ branches/2015Q4/print/a2ps/files/patch-output.c Tue Dec 8 23:48:13 2015 (r403350) @@ -1,13 +1,13 @@ Fix for CVE-2015-8107 http://www.openwall.com/lists/oss-security/2015/11/16/4 ---- lib/output.c.orig 2015-11-16 15:29:38 UTC -+++ lib/output.c -@@ -525,7 +525,7 @@ output_file (struct output * out, a2ps_j - expand_user_string (job, FIRST_FILE (job), - (const uchar *) "Expand: requirement", - (const uchar *) token)); -- output (dest, expansion); -+ output (dest, "%s", expansion); - continue; +--- lib/output.c.orig 1999-08-31 19:42:41.000000000 +0200 ++++ lib/output.c 2015-11-18 07:08:31.672864000 +0100 +@@ -525,7 +525,7 @@ + expand_user_string (job, FIRST_FILE (job), + (const uchar *) "Expand: requirement", + (const uchar *) token)); +- output (dest, expansion); ++ output (dest, "%s", expansion); + continue; } - + From owner-svn-ports-branches@freebsd.org Wed Dec 9 12:06:51 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 655AB9D592C; Wed, 9 Dec 2015 12:06:51 +0000 (UTC) (envelope-from osa@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 3E83F1B67; Wed, 9 Dec 2015 12:06:51 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB9C6oI9057293; Wed, 9 Dec 2015 12:06:50 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB9C6nDr057285; Wed, 9 Dec 2015 12:06:49 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201512091206.tB9C6nDr057285@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Wed, 9 Dec 2015 12:06:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403377 - in branches/2015Q4/www: nginx nginx-devel nginx-devel/files nginx/files rubygem-passenger 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, 09 Dec 2015 12:06:51 -0000 Author: osa Date: Wed Dec 9 12:06:49 2015 New Revision: 403377 URL: https://svnweb.freebsd.org/changeset/ports/403377 Log: Security update to 5.0.22: o) www/rubygem-passenger; o) third-party passenger modules for www/nginx and www/nginx-devel. Please note: third-party passenger module is disabled by default for www/nginx and www/nginx-devel ports. Security: CVE-2015-7519 PR: 205104 Approved by: ports-secteam Modified: branches/2015Q4/www/nginx-devel/Makefile branches/2015Q4/www/nginx-devel/distinfo branches/2015Q4/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb branches/2015Q4/www/nginx/Makefile branches/2015Q4/www/nginx/distinfo branches/2015Q4/www/nginx/files/extra-patch-passenger-build-nginx.rb branches/2015Q4/www/rubygem-passenger/Makefile branches/2015Q4/www/rubygem-passenger/distinfo Modified: branches/2015Q4/www/nginx-devel/Makefile ============================================================================== --- branches/2015Q4/www/nginx-devel/Makefile Wed Dec 9 11:57:16 2015 (r403376) +++ branches/2015Q4/www/nginx-devel/Makefile Wed Dec 9 12:06:49 2015 (r403377) @@ -701,7 +701,7 @@ CONFIGURE_ARGS+=--without-http_rewrite_m .endif .if ${PORT_OPTIONS:MPASSENGER} -PASSENGER_VERSION= 5.0.20 +PASSENGER_VERSION= 5.0.22 MASTER_SITES+= http://s3.amazonaws.com/phusion-passenger/releases/:passenger DISTFILES+= passenger-${PASSENGER_VERSION}.tar.gz:passenger CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/src/nginx_module Modified: branches/2015Q4/www/nginx-devel/distinfo ============================================================================== --- branches/2015Q4/www/nginx-devel/distinfo Wed Dec 9 11:57:16 2015 (r403376) +++ branches/2015Q4/www/nginx-devel/distinfo Wed Dec 9 12:06:49 2015 (r403377) @@ -28,8 +28,8 @@ SHA256 (modsecurity-2.9.0.tar.gz) = e2bb SIZE (modsecurity-2.9.0.tar.gz) = 4246467 SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d9c5df9e09af1e1023bc8e04bbbbe953e67461b893b8240e82ca52ef SIZE (naxsi-core-0.50.tgz) = 49809 -SHA256 (passenger-5.0.20.tar.gz) = a5b35780beb7ecd39d18375acab3e4fa1a2e104b7a324f41a1f89c99e7b8b04c -SIZE (passenger-5.0.20.tar.gz) = 5307200 +SHA256 (passenger-5.0.22.tar.gz) = 0dfefb780ff134e6dd9352886f1086b980777adf27a98507ebfed648938b628f +SIZE (passenger-5.0.22.tar.gz) = 5412739 SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76 SIZE (nginx-sflow-module-0.9.7.tar.gz) = 27614 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1 Modified: branches/2015Q4/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb ============================================================================== --- branches/2015Q4/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb Wed Dec 9 11:57:16 2015 (r403376) +++ branches/2015Q4/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb Wed Dec 9 12:06:49 2015 (r403377) @@ -1,5 +1,5 @@ ---- ../passenger-5.0.20/build/nginx.rb.orig 2013-10-27 02:00:00.000000000 +0400 -+++ ../passenger-5.0.20/build/nginx.rb 2015-09-26 02:05:27.664684000 +0300 +--- ../passenger-5.0.22/build/nginx.rb.orig 2013-10-27 02:00:00.000000000 +0400 ++++ ../passenger-5.0.22/build/nginx.rb 2015-09-26 02:05:27.664684000 +0300 @@ -32,6 +32,7 @@ desc "Build Nginx support files" task :nginx => [ Modified: branches/2015Q4/www/nginx/Makefile ============================================================================== --- branches/2015Q4/www/nginx/Makefile Wed Dec 9 11:57:16 2015 (r403376) +++ branches/2015Q4/www/nginx/Makefile Wed Dec 9 12:06:49 2015 (r403377) @@ -687,7 +687,7 @@ CONFIGURE_ARGS+=--without-http_rewrite_m .endif .if ${PORT_OPTIONS:MPASSENGER} -PASSENGER_VERSION= 5.0.20 +PASSENGER_VERSION= 5.0.22 MASTER_SITES+= http://s3.amazonaws.com/phusion-passenger/releases/:passenger DISTFILES+= passenger-${PASSENGER_VERSION}.tar.gz:passenger CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/src/nginx_module Modified: branches/2015Q4/www/nginx/distinfo ============================================================================== --- branches/2015Q4/www/nginx/distinfo Wed Dec 9 11:57:16 2015 (r403376) +++ branches/2015Q4/www/nginx/distinfo Wed Dec 9 12:06:49 2015 (r403377) @@ -28,8 +28,8 @@ SHA256 (modsecurity-2.9.0.tar.gz) = e2bb SIZE (modsecurity-2.9.0.tar.gz) = 4246467 SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d9c5df9e09af1e1023bc8e04bbbbe953e67461b893b8240e82ca52ef SIZE (naxsi-core-0.50.tgz) = 49809 -SHA256 (passenger-5.0.20.tar.gz) = a5b35780beb7ecd39d18375acab3e4fa1a2e104b7a324f41a1f89c99e7b8b04c -SIZE (passenger-5.0.20.tar.gz) = 5307200 +SHA256 (passenger-5.0.22.tar.gz) = 0dfefb780ff134e6dd9352886f1086b980777adf27a98507ebfed648938b628f +SIZE (passenger-5.0.22.tar.gz) = 5412739 SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76 SIZE (nginx-sflow-module-0.9.7.tar.gz) = 27614 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1 Modified: branches/2015Q4/www/nginx/files/extra-patch-passenger-build-nginx.rb ============================================================================== --- branches/2015Q4/www/nginx/files/extra-patch-passenger-build-nginx.rb Wed Dec 9 11:57:16 2015 (r403376) +++ branches/2015Q4/www/nginx/files/extra-patch-passenger-build-nginx.rb Wed Dec 9 12:06:49 2015 (r403377) @@ -1,5 +1,5 @@ ---- ../passenger-5.0.20/build/nginx.rb.orig 2013-10-27 02:00:00.000000000 +0400 -+++ ../passenger-5.0.20/build/nginx.rb 2015-09-26 02:05:27.664684000 +0300 +--- ../passenger-5.0.22/build/nginx.rb.orig 2013-10-27 02:00:00.000000000 +0400 ++++ ../passenger-5.0.22/build/nginx.rb 2015-09-26 02:05:27.664684000 +0300 @@ -32,6 +32,7 @@ desc "Build Nginx support files" task :nginx => [ Modified: branches/2015Q4/www/rubygem-passenger/Makefile ============================================================================== --- branches/2015Q4/www/rubygem-passenger/Makefile Wed Dec 9 11:57:16 2015 (r403376) +++ branches/2015Q4/www/rubygem-passenger/Makefile Wed Dec 9 12:06:49 2015 (r403377) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= passenger -PORTVERSION= 5.0.20 +PORTVERSION= 5.0.22 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMEPREFIX= rubygem- @@ -71,7 +71,7 @@ pre-patch: s!#{PlatformInfo.debugging_cflags}!${CFLAGS}!g; \ s!-O2!!g; \ s! -feliminate-unused-debug-symbols -feliminate-unused-debug-types!!g; \ - 229s!true!false!' \ + 230s!true!false!' \ ${WRKSRC}/build/basics.rb .if ${PORT_OPTIONS:NDEBUG} @${REINPLACE_CMD} \ Modified: branches/2015Q4/www/rubygem-passenger/distinfo ============================================================================== --- branches/2015Q4/www/rubygem-passenger/distinfo Wed Dec 9 11:57:16 2015 (r403376) +++ branches/2015Q4/www/rubygem-passenger/distinfo Wed Dec 9 12:06:49 2015 (r403377) @@ -1,2 +1,2 @@ -SHA256 (rubygem/passenger-5.0.20.gem) = b8fac856bd028dc9e0cbb1efce2dcb90c98bed8b7733b6fa0c9145813f1a4516 -SIZE (rubygem/passenger-5.0.20.gem) = 5316608 +SHA256 (rubygem/passenger-5.0.22.gem) = d64bf16176e35274201c9a96e654355573e02f2baab9b199ec99a361207fa8e3 +SIZE (rubygem/passenger-5.0.22.gem) = 5423104 From owner-svn-ports-branches@freebsd.org Wed Dec 9 14:20: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 A3D7C9D40A7; Wed, 9 Dec 2015 14:20:46 +0000 (UTC) (envelope-from erwin@mail.droso.net) Received: from mail.droso.net (sloth.droso.dk [213.167.241.82]) (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 697051D3C; Wed, 9 Dec 2015 14:20:46 +0000 (UTC) (envelope-from erwin@mail.droso.net) Received: by mail.droso.net (Postfix, from userid 1002) id 1BCFE20390; Wed, 9 Dec 2015 14:20:42 +0000 (UTC) Date: Wed, 9 Dec 2015 14:20:42 +0000 From: Erwin Lansing To: "Sergey A. Osokin" Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: Re: svn commit: r403377 - in branches/2015Q4/www: nginx nginx-devel nginx-devel/files nginx/files rubygem-passenger Message-ID: <20151209142041.GL2063@droso.dk> References: <201512091206.tB9C6nDr057285@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <201512091206.tB9C6nDr057285@repo.freebsd.org> X-Operating-System: FreeBSD/amd64 10.2-RELEASE-p7 User-Agent: Mutt/1.5.24 (2015-08-30) 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, 09 Dec 2015 14:20:46 -0000 On Wed, Dec 09, 2015 at 12:06:49PM +0000, Sergey A. Osokin wrote: > Author: osa > Date: Wed Dec 9 12:06:49 2015 > New Revision: 403377 > URL: https://svnweb.freebsd.org/changeset/ports/403377 > > Log: > Security update to 5.0.22: > Thanks! Erwin From owner-svn-ports-branches@freebsd.org Wed Dec 9 20:01:50 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 D027E9D50F0; Wed, 9 Dec 2015 20:01:50 +0000 (UTC) (envelope-from brnrd@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 A91A314D2; Wed, 9 Dec 2015 20:01:50 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB9K1nuF004994; Wed, 9 Dec 2015 20:01:49 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB9K1nLA004991; Wed, 9 Dec 2015 20:01:49 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201512092001.tB9K1nLA004991@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Wed, 9 Dec 2015 20:01:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403431 - in branches/2015Q4/databases: mariadb100-client mariadb100-server 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, 09 Dec 2015 20:01:51 -0000 Author: brnrd Date: Wed Dec 9 20:01:49 2015 New Revision: 403431 URL: https://svnweb.freebsd.org/changeset/ports/403431 Log: MFH: r401058 databases/mariadb100-server: Update to 10.0.22 * Update server and (slave) client port * Alphabetic ordering of CONFLICTS * Consistent globbing of CONFLICTS * Alphabetical ordering of USES * Add LGPL21 for MySQL client C/Java libs PR: 205159 Reviewed by: koobs (mentor) Approved by: ports-secteam (feld), koobs (mentor) Security: 851a0eea-88aa-11e5-90e7-b499baebfeaf Differential Revision: https://reviews.freebsd.org/D4100 Modified: branches/2015Q4/databases/mariadb100-client/Makefile branches/2015Q4/databases/mariadb100-server/Makefile branches/2015Q4/databases/mariadb100-server/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/databases/mariadb100-client/Makefile ============================================================================== --- branches/2015Q4/databases/mariadb100-client/Makefile Wed Dec 9 19:52:46 2015 (r403430) +++ branches/2015Q4/databases/mariadb100-client/Makefile Wed Dec 9 20:01:49 2015 (r403431) @@ -5,16 +5,18 @@ PKGNAMESUFFIX= 100-client COMMENT= Multithreaded SQL database (client) +LICENSE+= LGPL21 + MASTERDIR= ${.CURDIR}/../mariadb100-server FILESDIR= ${.CURDIR}/files PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist -CONFLICTS_INSTALL= mysql[0-9][0-9]-client-* \ - mariadb[0-46-9][0-9]-client-* \ - mariadb5.[0-46-9]-client-* \ - percona[0-9][0-9]-client-* +CONFLICTS_INSTALL= mariadb5*-client-* \ + mariadb10[1-9]-client-* \ + mysql*-client-* \ + percona*-client-* CMAKE_ARGS+= -DWITHOUT_SERVER=1 Modified: branches/2015Q4/databases/mariadb100-server/Makefile ============================================================================== --- branches/2015Q4/databases/mariadb100-server/Makefile Wed Dec 9 19:52:46 2015 (r403430) +++ branches/2015Q4/databases/mariadb100-server/Makefile Wed Dec 9 20:01:49 2015 (r403431) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.0.21 +PORTVERSION= 10.0.22 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ @@ -22,7 +22,7 @@ SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb100-client -USES= bison:build cmake execinfo gmake shebangfix cpe +USES= bison:build cmake cpe execinfo gmake shebangfix USE_LDCONFIG= ${PREFIX}/lib/mysql ${PREFIX}/lib/mysql/plugin SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source @@ -90,8 +90,9 @@ USES+= readline .else # MySQL-Server part -CONFLICTS_INSTALL= mysql*-server-* \ - mariadb[0-9][0-9]-server-* \ +CONFLICTS_INSTALL= mariadb5*-server-* \ + mariadb10[1-9]-server-* \ + mysql*-server-* \ percona*-server-* USE_MYSQL= yes Modified: branches/2015Q4/databases/mariadb100-server/distinfo ============================================================================== --- branches/2015Q4/databases/mariadb100-server/distinfo Wed Dec 9 19:52:46 2015 (r403430) +++ branches/2015Q4/databases/mariadb100-server/distinfo Wed Dec 9 20:01:49 2015 (r403431) @@ -1,2 +1,2 @@ -SHA256 (mariadb-10.0.21.tar.gz) = 4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545 -SIZE (mariadb-10.0.21.tar.gz) = 56216903 +SHA256 (mariadb-10.0.22.tar.gz) = 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b +SIZE (mariadb-10.0.22.tar.gz) = 56252325 From owner-svn-ports-branches@freebsd.org Wed Dec 9 23:36:10 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 D8E369D6651; Wed, 9 Dec 2015 23:36:10 +0000 (UTC) (envelope-from mmoll@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 B2C8C19CF; Wed, 9 Dec 2015 23:36:10 +0000 (UTC) (envelope-from mmoll@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB9Na9dm067783; Wed, 9 Dec 2015 23:36:09 GMT (envelope-from mmoll@FreeBSD.org) Received: (from mmoll@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB9Na9nF067778; Wed, 9 Dec 2015 23:36:09 GMT (envelope-from mmoll@FreeBSD.org) Message-Id: <201512092336.tB9Na9nF067778@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmoll set sender to mmoll@FreeBSD.org using -f From: Michael Moll Date: Wed, 9 Dec 2015 23:36:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403434 - in branches/2015Q4/www/redmine: . 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, 09 Dec 2015 23:36:10 -0000 Author: mmoll Date: Wed Dec 9 23:36:09 2015 New Revision: 403434 URL: https://svnweb.freebsd.org/changeset/ports/403434 Log: MFH: r403433 www/redmine: update to 2.6.9 PR: 205110 Security: CVE-2015-8346 Security: CVE-2015-8473 Security: CVE-2015-8474 Security: CVE-2015-8477 Approved by: ports-secteam (erwin) Modified: branches/2015Q4/www/redmine/Makefile branches/2015Q4/www/redmine/distinfo branches/2015Q4/www/redmine/files/extra-patch-Gemfile branches/2015Q4/www/redmine/files/patch-Gemfile branches/2015Q4/www/redmine/pkg-plist Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/www/redmine/Makefile ============================================================================== --- branches/2015Q4/www/redmine/Makefile Wed Dec 9 23:02:54 2015 (r403433) +++ branches/2015Q4/www/redmine/Makefile Wed Dec 9 23:36:09 2015 (r403434) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= redmine -PORTVERSION= 2.6.3 -PORTREVISION= 4 +PORTVERSION= 2.6.9 CATEGORIES= www MASTER_SITES= http://www.redmine.org/releases/ @@ -15,14 +14,16 @@ LICENSE= GPLv2 RUN_DEPENDS= rubygem-builder>=3.0.0:${PORTSDIR}/devel/rubygem-builder \ rubygem-bundler>=0:${PORTSDIR}/sysutils/rubygem-bundler \ rubygem-coderay>=1.0.9:${PORTSDIR}/textproc/rubygem-coderay \ - rubygem-fastercsv>=1.5.0:${PORTSDIR}/devel/rubygem-fastercsv \ rubygem-i18n>=0.7.0:${PORTSDIR}/devel/rubygem-i18n \ + rubygem-jquery-rails>=3.1.4:${PORTSDIR}/www/rubygem-jquery-rails \ + rubygem-mime-types>=0:${PORTSDIR}/misc/rubygem-mime-types \ rubygem-net-ldap>=0.3.1:${PORTSDIR}/net/rubygem-net-ldap \ rubygem-rack-openid>=0:${PORTSDIR}/www/rubygem-rack-openid \ - rubygem-rails>=3.2.16:${PORTSDIR}/www/rubygem-rails \ + rubygem-ruby-openid>=2.3.0:${PORTSDIR}/net/rubygem-ruby-openid \ + rubygem-rails>=3.2.22:${PORTSDIR}/www/rubygem-rails \ rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake \ rubygem-rbpdf>=0:${PORTSDIR}/print/rubygem-rbpdf \ - rubygem-redcarpet>=3.0:${PORTSDIR}/textproc/rubygem-redcarpet \ + rubygem-redcarpet>=3.3.2:${PORTSDIR}/textproc/rubygem-redcarpet \ rubygem-request_store>=1.1.0:${PORTSDIR}/devel/rubygem-request_store \ rubygem-rubytree>=0:${PORTSDIR}/devel/rubygem-rubytree @@ -52,7 +53,7 @@ MYSQL2_RUN_DEPENDS= rubygem-mysql2>=0:${ PASSENGER_RUN_DEPENDS= passenger-config:${PORTSDIR}/www/rubygem-passenger POSTGRESQL_RUN_DEPENDS= rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg RMAGIC_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Gemfile -RMAGIC_RUN_DEPENDS= rubygem-rmagick>=2.0.0:${PORTSDIR}/graphics/rubygem-rmagick +RMAGIC_RUN_DEPENDS= rubygem-rmagick>=2.13.4:${PORTSDIR}/graphics/rubygem-rmagick THIN_EXTRA_PATCHES= ${FILESDIR}/extra-patch-thin-Gemfile THIN_RUN_DEPENDS= thin:${PORTSDIR}/www/rubygem-thin THIN_SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} Modified: branches/2015Q4/www/redmine/distinfo ============================================================================== --- branches/2015Q4/www/redmine/distinfo Wed Dec 9 23:02:54 2015 (r403433) +++ branches/2015Q4/www/redmine/distinfo Wed Dec 9 23:36:09 2015 (r403434) @@ -1,2 +1,2 @@ -SHA256 (redmine-2.6.3.tar.gz) = 33b41b78388de338a97f39bedfb45c3c9e76794d84a99736f113281a3a3caac2 -SIZE (redmine-2.6.3.tar.gz) = 2121625 +SHA256 (redmine-2.6.9.tar.gz) = 15cafc3983e0520c3ecc6105ef33031f55b1dc2b21270d092938562b47362d4c +SIZE (redmine-2.6.9.tar.gz) = 2127454 Modified: branches/2015Q4/www/redmine/files/extra-patch-Gemfile ============================================================================== --- branches/2015Q4/www/redmine/files/extra-patch-Gemfile Wed Dec 9 23:02:54 2015 (r403433) +++ branches/2015Q4/www/redmine/files/extra-patch-Gemfile Wed Dec 9 23:36:09 2015 (r403434) @@ -9,9 +9,9 @@ - # RMagick 2 supports ruby 1.9 - # RMagick 1 would be fine for ruby 1.8 but Bundler does not support - # different requirements for the same gem on different platforms -- gem "rmagick", (RUBY_VERSION < "1.9" ? "2.13.3" : ">= 2.0.0") +- gem "rmagick", (RUBY_VERSION < "1.9" ? "2.13.3" : "~> 2.13.4") - end - # Optional Markdown support, not for JRuby group :markdown do - # TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped + gem "redcarpet", (RUBY_VERSION < "1.9" ? "~> 2.3.0" : "~> 3.3.2") Modified: branches/2015Q4/www/redmine/files/patch-Gemfile ============================================================================== --- branches/2015Q4/www/redmine/files/patch-Gemfile Wed Dec 9 23:02:54 2015 (r403433) +++ branches/2015Q4/www/redmine/files/patch-Gemfile Wed Dec 9 23:36:09 2015 (r403434) @@ -1,21 +1,23 @@ ---- Gemfile.orig 2015-05-25 16:10:44 UTC +--- Gemfile.orig 2015-12-09 20:52:29 UTC +++ Gemfile -@@ -1,24 +1,24 @@ +@@ -1,25 +1,25 @@ source 'https://rubygems.org' --gem "rails", "3.2.21" +-gem "rails", "3.2.22" +gem "rails", "~> 3.2" - gem "jquery-rails", "~> 3.1.1" + gem "rack-cache", "1.2" if RUBY_VERSION < "1.9.3" + gem "jquery-rails", "~> 3.1.4" gem "coderay", "~> 1.1.0" gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby] gem "builder", ">= 3.0.4" -gem "request_store", "1.0.5" +gem "request_store", ">= 1.0.5" gem "mime-types" - gem "rbpdf", "~> 1.18.5" +-gem "rbpdf", "~> 1.18.7" ++gem "rbpdf", ">= 1.18.7" -gem "i18n", "~> 0.6.11" -+gem "i18n", "~> 0.7.0" ++gem "i18n", ">= 0.6.11" # Optional gem for LDAP authentication group :ldap do @@ -26,20 +28,11 @@ # Optional gem for OpenID authentication group :openid do - gem "ruby-openid", "~> 2.3.0", :require => "openid" -+ gem "ruby-openid", "~> 2.7", :require => "openid" ++ gem "ruby-openid", ">= 2.3.0", :require => "openid" gem "rack-openid" end -@@ -34,7 +34,7 @@ platforms :mri, :mingw do - # Optional Markdown support, not for JRuby - group :markdown do - # TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped -- gem "redcarpet", "~> 2.3.0" -+ gem "redcarpet", "~> 3.0" - end - end - -@@ -81,23 +81,6 @@ else +@@ -82,23 +82,6 @@ else warn("Please configure your config/database.yml first") end @@ -49,14 +42,14 @@ -end - -group :test do +- gem "minitest" +- gem "test-unit", "~> 3.0" - gem "shoulda", "~> 3.3.2" - gem "shoulda-matchers", "1.4.1" - gem "mocha", "~> 1.0.0", :require => 'mocha/api' - if RUBY_VERSION >= '1.9.3' - gem "capybara" - gem "selenium-webdriver" -- # building ffi 1.9.7 fails in Ubuntu: https://github.com/ffi/ffi/issues/414 -- gem "ffi", "1.9.6" - end -end - Modified: branches/2015Q4/www/redmine/pkg-plist ============================================================================== --- branches/2015Q4/www/redmine/pkg-plist Wed Dec 9 23:02:54 2015 (r403433) +++ branches/2015Q4/www/redmine/pkg-plist Wed Dec 9 23:36:09 2015 (r403434) @@ -1370,7 +1370,7 @@ %%WWWDIR%%/public/javascripts/i18n/datepicker-vi.js %%WWWDIR%%/public/javascripts/i18n/datepicker-zh-CN.js %%WWWDIR%%/public/javascripts/i18n/datepicker-zh-TW.js -%%WWWDIR%%/public/javascripts/jquery-1.11.1-ui-1.11.0-ujs-3.1.1.js +%%WWWDIR%%/public/javascripts/jquery-1.11.1-ui-1.11.0-ujs-3.1.4.js %%WWWDIR%%/public/javascripts/jstoolbar/jstoolbar-textile.min.js %%WWWDIR%%/public/javascripts/jstoolbar/jstoolbar.js %%WWWDIR%%/public/javascripts/jstoolbar/lang/jstoolbar-ar.js From owner-svn-ports-branches@freebsd.org Thu Dec 10 06:42: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 48AE59D5C35; Thu, 10 Dec 2015 06:42:18 +0000 (UTC) (envelope-from lwhsu@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 1565D144D; Thu, 10 Dec 2015 06:42:18 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBA6gH8Y095427; Thu, 10 Dec 2015 06:42:17 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBA6gHnh095425; Thu, 10 Dec 2015 06:42:17 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201512100642.tBA6gHnh095425@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Thu, 10 Dec 2015 06:42:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403441 - branches/2015Q4/devel/jenkins 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, 10 Dec 2015 06:42:18 -0000 Author: lwhsu Date: Thu Dec 10 06:42:16 2015 New Revision: 403441 URL: https://svnweb.freebsd.org/changeset/ports/403441 Log: MFH: r403429 - Update to 1.641 Security: 23af0425-9eac-11e5-b937-00e0814cab4e Approved by: ports-secteam (feld) Modified: branches/2015Q4/devel/jenkins/Makefile branches/2015Q4/devel/jenkins/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/devel/jenkins/Makefile ============================================================================== --- branches/2015Q4/devel/jenkins/Makefile Thu Dec 10 02:40:50 2015 (r403440) +++ branches/2015Q4/devel/jenkins/Makefile Thu Dec 10 06:42:16 2015 (r403441) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jenkins -PORTVERSION= 1.638 +PORTVERSION= 1.641 CATEGORIES= devel java MASTER_SITES= http://mirrors.jenkins-ci.org/war/${PORTVERSION}/ DISTNAME= jenkins Modified: branches/2015Q4/devel/jenkins/distinfo ============================================================================== --- branches/2015Q4/devel/jenkins/distinfo Thu Dec 10 02:40:50 2015 (r403440) +++ branches/2015Q4/devel/jenkins/distinfo Thu Dec 10 06:42:16 2015 (r403441) @@ -1,2 +1,2 @@ -SHA256 (jenkins/1.638/jenkins.war) = 08d60e5f7db3cb4cb650a647dea60d4e1cb285a379bf3d3de0f62309854d7dcd -SIZE (jenkins/1.638/jenkins.war) = 63586592 +SHA256 (jenkins/1.641/jenkins.war) = f7656c38fe4e3c11b58ab506512655dd6dd3c69275de61442cfc9f9c3ebf5b93 +SIZE (jenkins/1.641/jenkins.war) = 63662610 From owner-svn-ports-branches@freebsd.org Thu Dec 10 06:44: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 11A469D5E02; Thu, 10 Dec 2015 06:44:57 +0000 (UTC) (envelope-from lwhsu@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 D43B5160F; Thu, 10 Dec 2015 06:44:56 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBA6itnk095702; Thu, 10 Dec 2015 06:44:55 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBA6itfV095700; Thu, 10 Dec 2015 06:44:55 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201512100644.tBA6itfV095700@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Thu, 10 Dec 2015 06:44:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403442 - branches/2015Q4/devel/jenkins-lts 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, 10 Dec 2015 06:44:57 -0000 Author: lwhsu Date: Thu Dec 10 06:44:55 2015 New Revision: 403442 URL: https://svnweb.freebsd.org/changeset/ports/403442 Log: MFH: r403430 - Update to 1.625.3 Approved by: swills (maintainer) Security: 23af0425-9eac-11e5-b937-00e0814cab4e Approved by: ports-secteam (feld) Modified: branches/2015Q4/devel/jenkins-lts/Makefile branches/2015Q4/devel/jenkins-lts/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/devel/jenkins-lts/Makefile ============================================================================== --- branches/2015Q4/devel/jenkins-lts/Makefile Thu Dec 10 06:42:16 2015 (r403441) +++ branches/2015Q4/devel/jenkins-lts/Makefile Thu Dec 10 06:44:55 2015 (r403442) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jenkins -PORTVERSION= 1.625.2 +PORTVERSION= 1.625.3 CATEGORIES= devel java MASTER_SITES= http://mirrors.jenkins-ci.org/war-stable/${PORTVERSION}/ PKGNAMESUFFIX= -lts Modified: branches/2015Q4/devel/jenkins-lts/distinfo ============================================================================== --- branches/2015Q4/devel/jenkins-lts/distinfo Thu Dec 10 06:42:16 2015 (r403441) +++ branches/2015Q4/devel/jenkins-lts/distinfo Thu Dec 10 06:44:55 2015 (r403442) @@ -1,2 +1,2 @@ -SHA256 (jenkins/1.625.2/jenkins.war) = ea061e63dc2970d37d5eab13aefe93f7d983a94729a8e9a89576dfa3bfed01d4 -SIZE (jenkins/1.625.2/jenkins.war) = 63305884 +SHA256 (jenkins/1.625.3/jenkins.war) = 9964b10581414b5504921dd8a717b172c07bcdf5f9d1bae50595aca07ddacf20 +SIZE (jenkins/1.625.3/jenkins.war) = 63322455 From owner-svn-ports-branches@freebsd.org Thu Dec 10 09:06:10 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 A767A9D5602; Thu, 10 Dec 2015 09:06:10 +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 61C6E1989; Thu, 10 Dec 2015 09:06:10 +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 tBA969k6038229; Thu, 10 Dec 2015 09:06:09 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBA969Uh038227; Thu, 10 Dec 2015 09:06:09 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201512100906.tBA969Uh038227@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Thu, 10 Dec 2015 09:06:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403447 - 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: Thu, 10 Dec 2015 09:06:10 -0000 Author: rene Date: Thu Dec 10 09:06:09 2015 New Revision: 403447 URL: https://svnweb.freebsd.org/changeset/ports/403447 Log: MFH: r403446 www/chromium: fix build on 9amd64, regression-tested on 10i386 Approved by: portmgr (erwin) Deleted: branches/2015Q4/www/chromium/files/patch-third_party__WebKit__Source__platform__fonts__FontPlatformData.cpp Modified: branches/2015Q4/www/chromium/files/extra-patch-clang branches/2015Q4/www/chromium/files/extra-patch-gcc Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/www/chromium/files/extra-patch-clang ============================================================================== --- branches/2015Q4/www/chromium/files/extra-patch-clang Thu Dec 10 08:37:50 2015 (r403446) +++ branches/2015Q4/www/chromium/files/extra-patch-clang Thu Dec 10 09:06:09 2015 (r403447) @@ -242,3 +242,14 @@ } bool AudioCodingImpl::RegisterReceiveCodec(AudioDecoder* receive_codec) { +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2015-10-14 22:17:57.580250000 +0200 ++++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp 2015-10-14 22:18:13.766229000 +0200 +@@ -358,7 +358,7 @@ + { + RefPtr buffer; + +- SkFontTableTag tag = WTF::bswap32(table); ++ SkFontTableTag tag = bswap32(table); + const size_t tableSize = m_typeface->getTableSize(tag); + if (tableSize) { + Vector tableBuffer(tableSize); Modified: branches/2015Q4/www/chromium/files/extra-patch-gcc ============================================================================== --- branches/2015Q4/www/chromium/files/extra-patch-gcc Thu Dec 10 08:37:50 2015 (r403446) +++ branches/2015Q4/www/chromium/files/extra-patch-gcc Thu Dec 10 09:06:09 2015 (r403447) @@ -135,3 +135,25 @@ const char* suffix, const char* mode); struct AsDOT { +--- v8/src/log-utils.h.orig 2015-10-13 21:04:45.000000000 +0200 ++++ v8/src/log-utils.h 2015-10-17 10:17:35.535561000 +0200 +@@ -5,6 +5,9 @@ + #ifndef V8_LOG_UTILS_H_ + #define V8_LOG_UTILS_H_ + ++#include ++#include ++ + #include "src/allocation.h" + #include "src/base/platform/mutex.h" + #include "src/flags.h" +--- third_party/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc.orig 2015-10-22 21:00:59.000000000 +0200 ++++ third_party/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc 2015-11-01 11:32:36.293750000 +0100 +@@ -11,6 +11,7 @@ + #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h" + + #include ++#include + #include + #include + #include From owner-svn-ports-branches@freebsd.org Sat Dec 12 03:13:25 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 43B47A1447B; Sat, 12 Dec 2015 03:13:25 +0000 (UTC) (envelope-from dryice@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 025731942; Sat, 12 Dec 2015 03:13:24 +0000 (UTC) (envelope-from dryice@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBC3DOZs013918; Sat, 12 Dec 2015 03:13:24 GMT (envelope-from dryice@FreeBSD.org) Received: (from dryice@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBC3DNQf013915; Sat, 12 Dec 2015 03:13:23 GMT (envelope-from dryice@FreeBSD.org) Message-Id: <201512120313.tBC3DNQf013915@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dryice set sender to dryice@FreeBSD.org using -f From: Dryice Dong Liu Date: Sat, 12 Dec 2015 03:13:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403581 - branches/2015Q4/sysutils/py-salt 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, 12 Dec 2015 03:13:25 -0000 Author: dryice Date: Sat Dec 12 03:13:23 2015 New Revision: 403581 URL: https://svnweb.freebsd.org/changeset/ports/403581 Log: MFH: r403109 Update to 2015.8.3 PR: 205043 Submitted by: Christer Edwards (maintainer) Approved by: portmgr (feld) Modified: branches/2015Q4/sysutils/py-salt/Makefile branches/2015Q4/sysutils/py-salt/distinfo branches/2015Q4/sysutils/py-salt/pkg-plist Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/sysutils/py-salt/Makefile ============================================================================== --- branches/2015Q4/sysutils/py-salt/Makefile Sat Dec 12 01:27:25 2015 (r403580) +++ branches/2015Q4/sysutils/py-salt/Makefile Sat Dec 12 03:13:23 2015 (r403581) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= salt -PORTVERSION= 2015.8.0 -PORTREVISION= 1 +PORTVERSION= 2015.8.3 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: branches/2015Q4/sysutils/py-salt/distinfo ============================================================================== --- branches/2015Q4/sysutils/py-salt/distinfo Sat Dec 12 01:27:25 2015 (r403580) +++ branches/2015Q4/sysutils/py-salt/distinfo Sat Dec 12 03:13:23 2015 (r403581) @@ -1,2 +1,2 @@ -SHA256 (salt-2015.8.0.tar.gz) = 71e1cb2eb1d4b30f3247f5590c00a2089190b8f9a90c9330dc9a65fae517ec9b -SIZE (salt-2015.8.0.tar.gz) = 6584668 +SHA256 (salt-2015.8.3.tar.gz) = 2e9a262789b018f3443513105c0c6ae98934c9bc105a04cf9e5c073ef706218a +SIZE (salt-2015.8.3.tar.gz) = 6757678 Modified: branches/2015Q4/sysutils/py-salt/pkg-plist ============================================================================== --- branches/2015Q4/sysutils/py-salt/pkg-plist Sat Dec 12 01:27:25 2015 (r403580) +++ branches/2015Q4/sysutils/py-salt/pkg-plist Sat Dec 12 03:13:23 2015 (r403581) @@ -311,6 +311,8 @@ %%PYTHON_SITELIBDIR%%/salt/grains/mdadm.pyc %%PYTHON_SITELIBDIR%%/salt/grains/opts.py %%PYTHON_SITELIBDIR%%/salt/grains/opts.pyc +%%PYTHON_SITELIBDIR%%/salt/grains/philips_hue.py +%%PYTHON_SITELIBDIR%%/salt/grains/philips_hue.pyc %%PYTHON_SITELIBDIR%%/salt/grains/rest_sample.py %%PYTHON_SITELIBDIR%%/salt/grains/rest_sample.pyc %%PYTHON_SITELIBDIR%%/salt/key.py @@ -721,6 +723,8 @@ %%PYTHON_SITELIBDIR%%/salt/modules/parted.pyc %%PYTHON_SITELIBDIR%%/salt/modules/pecl.py %%PYTHON_SITELIBDIR%%/salt/modules/pecl.pyc +%%PYTHON_SITELIBDIR%%/salt/modules/philips_hue.py +%%PYTHON_SITELIBDIR%%/salt/modules/philips_hue.pyc %%PYTHON_SITELIBDIR%%/salt/modules/pillar.py %%PYTHON_SITELIBDIR%%/salt/modules/pillar.pyc %%PYTHON_SITELIBDIR%%/salt/modules/pip.py @@ -1119,6 +1123,8 @@ %%PYTHON_SITELIBDIR%%/salt/proxy/__init__.pyc %%PYTHON_SITELIBDIR%%/salt/proxy/junos.py %%PYTHON_SITELIBDIR%%/salt/proxy/junos.pyc +%%PYTHON_SITELIBDIR%%/salt/proxy/philips_hue.py +%%PYTHON_SITELIBDIR%%/salt/proxy/philips_hue.pyc %%PYTHON_SITELIBDIR%%/salt/proxy/rest_sample.py %%PYTHON_SITELIBDIR%%/salt/proxy/rest_sample.pyc %%PYTHON_SITELIBDIR%%/salt/queues/__init__.py From owner-svn-ports-branches@freebsd.org Sat Dec 12 12:41: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 E9640A14130; Sat, 12 Dec 2015 12:41:58 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id DE78A1898; Sat, 12 Dec 2015 12:41:58 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from Silverstone.nc-us.unovitch.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id 538CC1437; Sat, 12 Dec 2015 12:41:58 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Date: Sat, 12 Dec 2015 07:41:57 -0500 From: Jason Unovitch To: Dryice Dong Liu Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: Re: svn commit: r403581 - branches/2015Q4/sysutils/py-salt Message-ID: <20151212124157.GB46628@Silverstone.nc-us.unovitch.com> References: <201512120313.tBC3DNQf013915@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; x-action=pgp-signed In-Reply-To: <201512120313.tBC3DNQf013915@repo.freebsd.org> User-Agent: Mutt/1.5.24 (2015-08-30) 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, 12 Dec 2015 12:41:59 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On Sat, Dec 12, 2015 at 03:13:23AM +0000, Dryice Dong Liu wrote: > Author: dryice > Date: Sat Dec 12 03:13:23 2015 > New Revision: 403581 > URL: https://svnweb.freebsd.org/changeset/ports/403581 > > Log: > MFH: r403109 > > Update to 2015.8.3 > > PR: 205043 > Submitted by: Christer Edwards (maintainer) > Approved by: portmgr (feld) Please keep in mind the implied SVN task here... neither SVN nor Tools/scripts/mfh will tell you if prior commits are actually needed to build. Here the port is failing to build after this with the following error since the prior commits were required. ===> Patching for py27-salt-2015.8.3 ===> Applying FreeBSD patches for py27-salt-2015.8.3 Ignoring previously applied (or reversed) patch. 4 out of 4 hunks ignored--saving rejects to salt/utils/__init__.py.rej => Patch patch-salt__utils____init__.py failed to apply cleanly. => Patch(es) patch-salt__grains__core.py applied cleanly. *** [do-patch] Error code 1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQF8BAEBCgBmBQJWbBYSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0NURGNTQ1OTkzQkJFMzc3OTNDQUNERUU2 RkQ0OUMzMDE2MUNBQTZFAAoJEG/UnDAWHKpukiMH/0T+1rZlaZefXSxiJA6Q5Bu1 MQCBUXEJRGkXay/WmGdI6qZ5AMc2IsUPmnxtDOEO5juDFVUtzYQBsX74GmzayBOQ EMrDJqbpxREaO05N8e3F1N5P34H8YcJLYYIsaovpB6Rs1+lIh3Pc0GHEEAN72q/M PJOXJd3viJnE8TDHTxZ3d2dNboQ3+tTni+z8F+FxxrwOgjKicatBuylk5il8qXh3 QuQek39p14Clg/51m4uIJqc8iKRB/oGaaTLOMgIWzXthaTmXZjWQX62oUrgKUULD YD6C3V1IaFL+Fdu4QndvcRG/CoST7NRQXRQK4r7jZEwSQW/8Nq0HoEFuQHAc4V8= =OAhO -----END PGP SIGNATURE----- From owner-svn-ports-branches@freebsd.org Sat Dec 12 14:42:09 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 CADFFA14EF7; Sat, 12 Dec 2015 14:42:09 +0000 (UTC) (envelope-from dryiceliu@gmail.com) Received: from mail-qg0-x22a.google.com (mail-qg0-x22a.google.com [IPv6:2607:f8b0:400d:c04::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8C8F114C9; Sat, 12 Dec 2015 14:42:09 +0000 (UTC) (envelope-from dryiceliu@gmail.com) Received: by qgew101 with SMTP id w101so15258132qge.2; Sat, 12 Dec 2015 06:42:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:in-reply-to:organization:references :user-agent:date:message-id:mime-version:content-type; bh=xdQOc2VkcTVC3vN/48Z+89iCtOVLZcp0H0wsGdKWfPo=; b=iD7gWC7u2nQ4tMvL5Z5DDjtMeBQMSeow4w1uDC42aWiWMfaO5oJJJkOyhFp3IAYZaz OkfxYCtZmeDe3d4mzU87Gy55HS9BW3iYWqdnoCelF4opx8Ppcf7nZ9LSwldQn2Momh0y 1EGZzOnXqfNigEkv98w2vygonjVsP3aZ7ZxhOqSIxZKIokvxz04ocutV6nigezymXkMp b8MwuQT70PeDNq1PC0AZmt1ku6D28yBoWi8EuRhgD5/EP7uLwjFAv6V7OTq/zOk/0nJd tJMhZSOktABL4fFpRwjAt1pcDxJKC7twPEC3Y0PC3gPqdDK0/SSJzoc2FZ2xXGeOQW0D 1I1Q== X-Received: by 10.140.102.35 with SMTP id v32mr31401659qge.72.1449931328575; Sat, 12 Dec 2015 06:42:08 -0800 (PST) Received: from Dryices-Mac-mini.local ([192.240.125.50]) by smtp.gmail.com with ESMTPSA id 2sm10297654qgi.42.2015.12.12.06.42.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Dec 2015 06:42:07 -0800 (PST) Sender: Dryice Liu From: Dryice Liu To: Jason Unovitch Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: Re: svn commit: r403581 - branches/2015Q4/sysutils/py-salt In-Reply-To: <20151212124157.GB46628@Silverstone.nc-us.unovitch.com> (Jason Unovitch's message of "Sat, 12 Dec 2015 07:41:57 -0500") Organization: FreeBSD.Org References: <201512120313.tBC3DNQf013915@repo.freebsd.org> <20151212124157.GB46628@Silverstone.nc-us.unovitch.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (darwin) Date: Sat, 12 Dec 2015 22:41:54 +0800 Message-ID: MIME-Version: 1.0 Content-Type: text/plain 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, 12 Dec 2015 14:42:09 -0000 Jason Unovitch wrote: > On Sat, Dec 12, 2015 at 03:13:23AM +0000, Dryice Dong Liu wrote: >> Author: dryice >> Date: Sat Dec 12 03:13:23 2015 >> New Revision: 403581 >> URL: https://svnweb.freebsd.org/changeset/ports/403581 >> >> Log: >> MFH: r403109 >> >> Update to 2015.8.3 >> >> PR: 205043 >> Submitted by: Christer Edwards (maintainer) >> Approved by: portmgr (feld) > > Please keep in mind the implied SVN task here... neither SVN nor > Tools/scripts/mfh will tell you if prior commits are actually needed to > build. Here the port is failing to build after this with the following > error since the prior commits were required. > > ===> Patching for py27-salt-2015.8.3 > ===> Applying FreeBSD patches for py27-salt-2015.8.3 > Ignoring previously applied (or reversed) patch. > 4 out of 4 hunks ignored--saving rejects to salt/utils/__init__.py.rej > => Patch patch-salt__utils____init__.py failed to apply cleanly. > => Patch(es) patch-salt__grains__core.py applied cleanly. > *** [do-patch] Error code 1 You are right. This is my mistake. Thanks for fixing it. Dryice From owner-svn-ports-branches@freebsd.org Sat Dec 12 14:45:26 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 45A46A14228; Sat, 12 Dec 2015 14:45:26 +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 15EEE1A87; Sat, 12 Dec 2015 14:45:26 +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 tBCEjPYV020808; Sat, 12 Dec 2015 14:45:25 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBCEjPws020807; Sat, 12 Dec 2015 14:45:25 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201512121445.tBCEjPws020807@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sat, 12 Dec 2015 14:45:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403605 - branches/2015Q4/devel/pecl-qb 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, 12 Dec 2015 14:45:26 -0000 Author: amdmi3 Date: Sat Dec 12 14:45:24 2015 New Revision: 403605 URL: https://svnweb.freebsd.org/changeset/ports/403605 Log: MFH: r403604 - Don't build with -march=native, as it may produce packages incompatible with target machines Approved by: portmgr blanket Approved by: ports-secteam blanket Modified: branches/2015Q4/devel/pecl-qb/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/devel/pecl-qb/Makefile ============================================================================== --- branches/2015Q4/devel/pecl-qb/Makefile Sat Dec 12 14:44:39 2015 (r403604) +++ branches/2015Q4/devel/pecl-qb/Makefile Sat Dec 12 14:45:24 2015 (r403605) @@ -3,6 +3,7 @@ PORTNAME= qb PORTVERSION= 2.4.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://pecl.php.net/get/ PKGNAMEPREFIX= pecl- @@ -13,7 +14,6 @@ COMMENT= PHP Accelerator designed mainly LICENSE= PHP301 -CONFIGURE_ARGS= --with-cpu=native USE_PHP= yes USE_PHPEXT= yes USES= tar:tgz From owner-svn-ports-branches@freebsd.org Sat Dec 12 17:10: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 DD28BA14F64; Sat, 12 Dec 2015 17:10:35 +0000 (UTC) (envelope-from gordon@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 B50C61935; Sat, 12 Dec 2015 17:10:35 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBCHAYaL061617; Sat, 12 Dec 2015 17:10:34 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBCHAYM9061612; Sat, 12 Dec 2015 17:10:34 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201512121710.tBCHAYM9061612@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sat, 12 Dec 2015 17:10:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403609 - branches/2015Q4/devel/p4 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, 12 Dec 2015 17:10:36 -0000 Author: gordon Date: Sat Dec 12 17:10:34 2015 New Revision: 403609 URL: https://svnweb.freebsd.org/changeset/ports/403609 Log: MFH: r403582 Update devel/p4 to 2015.1/1314399 Approved by: mat (mentor, implicit) Approved by: portmgr (erwin) Modified: branches/2015Q4/devel/p4/Makefile branches/2015Q4/devel/p4/distinfo.freebsd100x86 branches/2015Q4/devel/p4/distinfo.freebsd100x86_64 branches/2015Q4/devel/p4/distinfo.freebsd70x86 branches/2015Q4/devel/p4/distinfo.freebsd70x86_64 Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/devel/p4/Makefile ============================================================================== --- branches/2015Q4/devel/p4/Makefile Sat Dec 12 16:47:12 2015 (r403608) +++ branches/2015Q4/devel/p4/Makefile Sat Dec 12 17:10:34 2015 (r403609) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4 -PORTVERSION= 2015.1.1252202 +PORTVERSION= 2015.1.1314399 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ Modified: branches/2015Q4/devel/p4/distinfo.freebsd100x86 ============================================================================== --- branches/2015Q4/devel/p4/distinfo.freebsd100x86 Sat Dec 12 16:47:12 2015 (r403608) +++ branches/2015Q4/devel/p4/distinfo.freebsd100x86 Sat Dec 12 17:10:34 2015 (r403609) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1252202/bin.freebsd100x86/p4) = 79177ad4fbd68e90846f3a01009eb5d46d3fd2123c568c5193fc2fcf542bfd1c -SIZE (perforce/2015.1.1252202/bin.freebsd100x86/p4) = 2562676 +SHA256 (perforce/2015.1.1314399/bin.freebsd100x86/p4) = 04cd983ef267e132f7729cd1eebea27f966e319459a9448782c6ea2349a17089 +SIZE (perforce/2015.1.1314399/bin.freebsd100x86/p4) = 2562708 Modified: branches/2015Q4/devel/p4/distinfo.freebsd100x86_64 ============================================================================== --- branches/2015Q4/devel/p4/distinfo.freebsd100x86_64 Sat Dec 12 16:47:12 2015 (r403608) +++ branches/2015Q4/devel/p4/distinfo.freebsd100x86_64 Sat Dec 12 17:10:34 2015 (r403609) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1252202/bin.freebsd100x86_64/p4) = 5e4d42cd93c9ec21f9a04c6ef6dab3dc2c3801fa31247c05ef55fe77253cabc1 -SIZE (perforce/2015.1.1252202/bin.freebsd100x86_64/p4) = 2816032 +SHA256 (perforce/2015.1.1314399/bin.freebsd100x86_64/p4) = e637bd877ecc6ee9855ca354d33e1522e3573cbf7ccac337f819abf3a8c88f5c +SIZE (perforce/2015.1.1314399/bin.freebsd100x86_64/p4) = 2818912 Modified: branches/2015Q4/devel/p4/distinfo.freebsd70x86 ============================================================================== --- branches/2015Q4/devel/p4/distinfo.freebsd70x86 Sat Dec 12 16:47:12 2015 (r403608) +++ branches/2015Q4/devel/p4/distinfo.freebsd70x86 Sat Dec 12 17:10:34 2015 (r403609) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1252202/bin.freebsd70x86/p4) = 6c0316f2d4a8220e9634a1e1ddba48cc3294937f80e5086b4693d3df204d9cda -SIZE (perforce/2015.1.1252202/bin.freebsd70x86/p4) = 2634656 +SHA256 (perforce/2015.1.1314399/bin.freebsd70x86/p4) = b0a021228b7d6e3a0d50e23dd28dd45464aca38a0838c11adae1656f757f2cbc +SIZE (perforce/2015.1.1314399/bin.freebsd70x86/p4) = 2638400 Modified: branches/2015Q4/devel/p4/distinfo.freebsd70x86_64 ============================================================================== --- branches/2015Q4/devel/p4/distinfo.freebsd70x86_64 Sat Dec 12 16:47:12 2015 (r403608) +++ branches/2015Q4/devel/p4/distinfo.freebsd70x86_64 Sat Dec 12 17:10:34 2015 (r403609) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1252202/bin.freebsd70x86_64/p4) = 7fdc0bb9c8e57df97c1e932e1ac82d1c4224560db9d32d1fc4f33d47e7c86a4e -SIZE (perforce/2015.1.1252202/bin.freebsd70x86_64/p4) = 2796024 +SHA256 (perforce/2015.1.1314399/bin.freebsd70x86_64/p4) = 36d2b34282eedaf83d44d750ea79b6c02e2d0f156e25469265a5bd8e58a9a1d4 +SIZE (perforce/2015.1.1314399/bin.freebsd70x86_64/p4) = 2798936 From owner-svn-ports-branches@freebsd.org Sat Dec 12 17:10:56 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 03D52A14FB4; Sat, 12 Dec 2015 17:10:56 +0000 (UTC) (envelope-from gordon@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 D446A1A42; Sat, 12 Dec 2015 17:10:55 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBCHAsO2061804; Sat, 12 Dec 2015 17:10:54 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBCHAsJq061799; Sat, 12 Dec 2015 17:10:54 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201512121710.tBCHAsJq061799@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sat, 12 Dec 2015 17:10:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403610 - branches/2015Q4/devel/p4ftpd 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, 12 Dec 2015 17:10:56 -0000 Author: gordon Date: Sat Dec 12 17:10:54 2015 New Revision: 403610 URL: https://svnweb.freebsd.org/changeset/ports/403610 Log: MFH: r403583 Update devel/p4ftpd to 2015.1/1314399. Approved by: mat (implicit, mentor) Approved by: portmgr (erwin) Modified: branches/2015Q4/devel/p4ftpd/Makefile branches/2015Q4/devel/p4ftpd/distinfo.freebsd100x86 branches/2015Q4/devel/p4ftpd/distinfo.freebsd100x86_64 branches/2015Q4/devel/p4ftpd/distinfo.freebsd70x86 branches/2015Q4/devel/p4ftpd/distinfo.freebsd70x86_64 Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/devel/p4ftpd/Makefile ============================================================================== --- branches/2015Q4/devel/p4ftpd/Makefile Sat Dec 12 17:10:34 2015 (r403609) +++ branches/2015Q4/devel/p4ftpd/Makefile Sat Dec 12 17:10:54 2015 (r403610) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4ftpd -PORTVERSION= 2015.1.1024208 +PORTVERSION= 2015.1.1314399 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ Modified: branches/2015Q4/devel/p4ftpd/distinfo.freebsd100x86 ============================================================================== --- branches/2015Q4/devel/p4ftpd/distinfo.freebsd100x86 Sat Dec 12 17:10:34 2015 (r403609) +++ branches/2015Q4/devel/p4ftpd/distinfo.freebsd100x86 Sat Dec 12 17:10:54 2015 (r403610) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1024208/bin.freebsd100x86/p4ftpd) = f9c63fafb8bf114286a778704c16a7a5b8d6b6fc5e8201a2f75218e416c7f067 -SIZE (perforce/2015.1.1024208/bin.freebsd100x86/p4ftpd) = 2596224 +SHA256 (perforce/2015.1.1314399/bin.freebsd100x86/p4ftpd) = d90b0e993a29dd60280a97d86fb13ed1e2f7f9e59d1563d9ac51b740a9116e4d +SIZE (perforce/2015.1.1314399/bin.freebsd100x86/p4ftpd) = 2608260 Modified: branches/2015Q4/devel/p4ftpd/distinfo.freebsd100x86_64 ============================================================================== --- branches/2015Q4/devel/p4ftpd/distinfo.freebsd100x86_64 Sat Dec 12 17:10:34 2015 (r403609) +++ branches/2015Q4/devel/p4ftpd/distinfo.freebsd100x86_64 Sat Dec 12 17:10:54 2015 (r403610) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1024208/bin.freebsd100x86_64/p4ftpd) = ef79956f0e17e26e16d1b7d486e6611263cce9fa64a733b7e6976f1dbc7cfc01 -SIZE (perforce/2015.1.1024208/bin.freebsd100x86_64/p4ftpd) = 2852272 +SHA256 (perforce/2015.1.1314399/bin.freebsd100x86_64/p4ftpd) = f449248eb9d6498757a976b84a3d0f292c5a049b5e8f8b35881258b876c33995 +SIZE (perforce/2015.1.1314399/bin.freebsd100x86_64/p4ftpd) = 2864960 Modified: branches/2015Q4/devel/p4ftpd/distinfo.freebsd70x86 ============================================================================== --- branches/2015Q4/devel/p4ftpd/distinfo.freebsd70x86 Sat Dec 12 17:10:34 2015 (r403609) +++ branches/2015Q4/devel/p4ftpd/distinfo.freebsd70x86 Sat Dec 12 17:10:54 2015 (r403610) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1024208/bin.freebsd70x86/p4ftpd) = 4e13ffd9ecc6fa773917f3da73f85220e0e934d09d8fd8736b06645023cab264 -SIZE (perforce/2015.1.1024208/bin.freebsd70x86/p4ftpd) = 2671092 +SHA256 (perforce/2015.1.1314399/bin.freebsd70x86/p4ftpd) = d49255f672c5f1325ac5f28e91d425b230611fb11e95c07e7e1796f65d5f2d3e +SIZE (perforce/2015.1.1314399/bin.freebsd70x86/p4ftpd) = 2682900 Modified: branches/2015Q4/devel/p4ftpd/distinfo.freebsd70x86_64 ============================================================================== --- branches/2015Q4/devel/p4ftpd/distinfo.freebsd70x86_64 Sat Dec 12 17:10:34 2015 (r403609) +++ branches/2015Q4/devel/p4ftpd/distinfo.freebsd70x86_64 Sat Dec 12 17:10:54 2015 (r403610) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1024208/bin.freebsd70x86_64/p4ftpd) = 6fa08dda4fad1e1c0ad5b5a5d267110c509ee240bb7c611433abb5ceb46056b7 -SIZE (perforce/2015.1.1024208/bin.freebsd70x86_64/p4ftpd) = 2840144 +SHA256 (perforce/2015.1.1314399/bin.freebsd70x86_64/p4ftpd) = 8dc217e132a5d4a458bfb48ecec0d5cffbab88eb4477e7b45bbd7812e7bf481c +SIZE (perforce/2015.1.1314399/bin.freebsd70x86_64/p4ftpd) = 2851664 From owner-svn-ports-branches@freebsd.org Sat Dec 12 17:11:13 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 EF99AA1403A; Sat, 12 Dec 2015 17:11:12 +0000 (UTC) (envelope-from gordon@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 B10F81C1C; Sat, 12 Dec 2015 17:11:12 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBCHBBTI062322; Sat, 12 Dec 2015 17:11:11 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBCHBBCH062316; Sat, 12 Dec 2015 17:11:11 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201512121711.tBCHBBCH062316@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sat, 12 Dec 2015 17:11:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403611 - branches/2015Q4/devel/p4api 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, 12 Dec 2015 17:11:13 -0000 Author: gordon Date: Sat Dec 12 17:11:11 2015 New Revision: 403611 URL: https://svnweb.freebsd.org/changeset/ports/403611 Log: MFH: r403584 Update devel/p4api to 2015.1/1314399. Approved by: mat (mentor, implicit) Approved by: portmgr (erwin) Modified: branches/2015Q4/devel/p4api/Makefile branches/2015Q4/devel/p4api/distinfo.freebsd100x86 branches/2015Q4/devel/p4api/distinfo.freebsd100x86_64 branches/2015Q4/devel/p4api/distinfo.freebsd70x86 branches/2015Q4/devel/p4api/distinfo.freebsd70x86_64 Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/devel/p4api/Makefile ============================================================================== --- branches/2015Q4/devel/p4api/Makefile Sat Dec 12 17:10:54 2015 (r403610) +++ branches/2015Q4/devel/p4api/Makefile Sat Dec 12 17:11:11 2015 (r403611) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= p4api -PORTVERSION= 2015.1.1126382 +PORTVERSION= 2015.1.1314399 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/:tar \ ftp://ftp.perforce.com/perforce/${P4VERSION}/doc/manuals/p4api/:pdf Modified: branches/2015Q4/devel/p4api/distinfo.freebsd100x86 ============================================================================== --- branches/2015Q4/devel/p4api/distinfo.freebsd100x86 Sat Dec 12 17:10:54 2015 (r403610) +++ branches/2015Q4/devel/p4api/distinfo.freebsd100x86 Sat Dec 12 17:11:11 2015 (r403611) @@ -1,4 +1,4 @@ -SHA256 (perforce/2015.1.1126382/bin.freebsd100x86/p4api.tgz) = 55273d0114caef8c44ba719199b523e7b88953727d815b29fecbe9f9bd7290eb -SIZE (perforce/2015.1.1126382/bin.freebsd100x86/p4api.tgz) = 1432888 -SHA256 (perforce/2015.1.1126382/bin.freebsd100x86/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd -SIZE (perforce/2015.1.1126382/bin.freebsd100x86/p4api.pdf) = 1623596 +SHA256 (perforce/2015.1.1314399/bin.freebsd100x86/p4api.tgz) = 2626d0dc8c95fb4790f008c2d41b488460a1c4e80dc0392adcd919b87a78c0d9 +SIZE (perforce/2015.1.1314399/bin.freebsd100x86/p4api.tgz) = 1433851 +SHA256 (perforce/2015.1.1314399/bin.freebsd100x86/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd +SIZE (perforce/2015.1.1314399/bin.freebsd100x86/p4api.pdf) = 1623596 Modified: branches/2015Q4/devel/p4api/distinfo.freebsd100x86_64 ============================================================================== --- branches/2015Q4/devel/p4api/distinfo.freebsd100x86_64 Sat Dec 12 17:10:54 2015 (r403610) +++ branches/2015Q4/devel/p4api/distinfo.freebsd100x86_64 Sat Dec 12 17:11:11 2015 (r403611) @@ -1,4 +1,4 @@ -SHA256 (perforce/2015.1.1126382/bin.freebsd100x86_64/p4api.tgz) = 359708ab1aa8310eb4fb13ca2bdce5b5ac687c16090891b6c3ca2ef3b6d5ea5b -SIZE (perforce/2015.1.1126382/bin.freebsd100x86_64/p4api.tgz) = 1468585 -SHA256 (perforce/2015.1.1126382/bin.freebsd100x86_64/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd -SIZE (perforce/2015.1.1126382/bin.freebsd100x86_64/p4api.pdf) = 1623596 +SHA256 (perforce/2015.1.1314399/bin.freebsd100x86_64/p4api.tgz) = f1bf11c5ba3f202d0b0e5a9a1def5dabcf9dbcbb7fb51ca54c4baa7a6655ac96 +SIZE (perforce/2015.1.1314399/bin.freebsd100x86_64/p4api.tgz) = 1469314 +SHA256 (perforce/2015.1.1314399/bin.freebsd100x86_64/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd +SIZE (perforce/2015.1.1314399/bin.freebsd100x86_64/p4api.pdf) = 1623596 Modified: branches/2015Q4/devel/p4api/distinfo.freebsd70x86 ============================================================================== --- branches/2015Q4/devel/p4api/distinfo.freebsd70x86 Sat Dec 12 17:10:54 2015 (r403610) +++ branches/2015Q4/devel/p4api/distinfo.freebsd70x86 Sat Dec 12 17:11:11 2015 (r403611) @@ -1,4 +1,4 @@ -SHA256 (perforce/2015.1.1126382/bin.freebsd70x86/p4api.tgz) = f0d3289467083d139ffbc24af26a7e5224ca532479926ca1ec206c5e0cdf6bbb -SIZE (perforce/2015.1.1126382/bin.freebsd70x86/p4api.tgz) = 1446584 -SHA256 (perforce/2015.1.1126382/bin.freebsd70x86/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd -SIZE (perforce/2015.1.1126382/bin.freebsd70x86/p4api.pdf) = 1623596 +SHA256 (perforce/2015.1.1314399/bin.freebsd70x86/p4api.tgz) = e9029d5c1782e59505f696eadea6df6d7c681471a91473474ea66b7b92ecd814 +SIZE (perforce/2015.1.1314399/bin.freebsd70x86/p4api.tgz) = 1447306 +SHA256 (perforce/2015.1.1314399/bin.freebsd70x86/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd +SIZE (perforce/2015.1.1314399/bin.freebsd70x86/p4api.pdf) = 1623596 Modified: branches/2015Q4/devel/p4api/distinfo.freebsd70x86_64 ============================================================================== --- branches/2015Q4/devel/p4api/distinfo.freebsd70x86_64 Sat Dec 12 17:10:54 2015 (r403610) +++ branches/2015Q4/devel/p4api/distinfo.freebsd70x86_64 Sat Dec 12 17:11:11 2015 (r403611) @@ -1,4 +1,4 @@ -SHA256 (perforce/2015.1.1126382/bin.freebsd70x86_64/p4api.tgz) = 9ecc33449e024b5f98a36621923c17fb6967fc32eb1e6dd67ea774d1e4475fc3 -SIZE (perforce/2015.1.1126382/bin.freebsd70x86_64/p4api.tgz) = 1466900 -SHA256 (perforce/2015.1.1126382/bin.freebsd70x86_64/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd -SIZE (perforce/2015.1.1126382/bin.freebsd70x86_64/p4api.pdf) = 1623596 +SHA256 (perforce/2015.1.1314399/bin.freebsd70x86_64/p4api.tgz) = 2247c739c5875aa9d85056ce857c8db0a4182543fde4fc254907e5b8d401898d +SIZE (perforce/2015.1.1314399/bin.freebsd70x86_64/p4api.tgz) = 1467450 +SHA256 (perforce/2015.1.1314399/bin.freebsd70x86_64/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd +SIZE (perforce/2015.1.1314399/bin.freebsd70x86_64/p4api.pdf) = 1623596 From owner-svn-ports-branches@freebsd.org Sat Dec 12 17:11:29 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 D8360A140BF; Sat, 12 Dec 2015 17:11:29 +0000 (UTC) (envelope-from gordon@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 A49341D3D; Sat, 12 Dec 2015 17:11:29 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBCHBSx8063017; Sat, 12 Dec 2015 17:11:28 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBCHBSxL063012; Sat, 12 Dec 2015 17:11:28 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201512121711.tBCHBSxL063012@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sat, 12 Dec 2015 17:11:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403613 - branches/2015Q4/devel/p4d 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, 12 Dec 2015 17:11:30 -0000 Author: gordon Date: Sat Dec 12 17:11:28 2015 New Revision: 403613 URL: https://svnweb.freebsd.org/changeset/ports/403613 Log: MFH: r403585 Update devel/p4d to 2015.1/1314399. Approved by: mat (mentor, implicit) Approved by: portmgr (erwin) Modified: branches/2015Q4/devel/p4d/Makefile branches/2015Q4/devel/p4d/distinfo.freebsd100x86 branches/2015Q4/devel/p4d/distinfo.freebsd100x86_64 branches/2015Q4/devel/p4d/distinfo.freebsd70x86 branches/2015Q4/devel/p4d/distinfo.freebsd70x86_64 Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/devel/p4d/Makefile ============================================================================== --- branches/2015Q4/devel/p4d/Makefile Sat Dec 12 17:11:24 2015 (r403612) +++ branches/2015Q4/devel/p4d/Makefile Sat Dec 12 17:11:28 2015 (r403613) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4d -PORTVERSION= 2015.1.1256673 +PORTVERSION= 2015.1.1314399 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ Modified: branches/2015Q4/devel/p4d/distinfo.freebsd100x86 ============================================================================== --- branches/2015Q4/devel/p4d/distinfo.freebsd100x86 Sat Dec 12 17:11:24 2015 (r403612) +++ branches/2015Q4/devel/p4d/distinfo.freebsd100x86 Sat Dec 12 17:11:28 2015 (r403613) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1256673/bin.freebsd100x86/p4d) = a500c4c90db1f8a88cc2dc1a98b36c55457207780352b327a4630568c4ba8291 -SIZE (perforce/2015.1.1256673/bin.freebsd100x86/p4d) = 5226300 +SHA256 (perforce/2015.1.1314399/bin.freebsd100x86/p4d) = 26087ddf1b213f865c4e7bcc6e6bd511fc80de870188ee1eb201cf2dafdf2de6 +SIZE (perforce/2015.1.1314399/bin.freebsd100x86/p4d) = 5226524 Modified: branches/2015Q4/devel/p4d/distinfo.freebsd100x86_64 ============================================================================== --- branches/2015Q4/devel/p4d/distinfo.freebsd100x86_64 Sat Dec 12 17:11:24 2015 (r403612) +++ branches/2015Q4/devel/p4d/distinfo.freebsd100x86_64 Sat Dec 12 17:11:28 2015 (r403613) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1256673/bin.freebsd100x86_64/p4d) = 26df0e94bf7f144774eb3773c967a709446cd2b82fcfff7141899d237e24607e -SIZE (perforce/2015.1.1256673/bin.freebsd100x86_64/p4d) = 5375872 +SHA256 (perforce/2015.1.1314399/bin.freebsd100x86_64/p4d) = 0b6149f8292c1da50c2b702d98e3708ee97994cf92773adb0b3934ee353f6b01 +SIZE (perforce/2015.1.1314399/bin.freebsd100x86_64/p4d) = 5380032 Modified: branches/2015Q4/devel/p4d/distinfo.freebsd70x86 ============================================================================== --- branches/2015Q4/devel/p4d/distinfo.freebsd70x86 Sat Dec 12 17:11:24 2015 (r403612) +++ branches/2015Q4/devel/p4d/distinfo.freebsd70x86 Sat Dec 12 17:11:28 2015 (r403613) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1256673/bin.freebsd70x86/p4d) = f4aa2fe2a55014c858afaa104a0b6c53cd783c687f52fc8a6cbdc1000506dd35 -SIZE (perforce/2015.1.1256673/bin.freebsd70x86/p4d) = 5592064 +SHA256 (perforce/2015.1.1314399/bin.freebsd70x86/p4d) = 980e432b6a0d8f5e58b37e7e3f863420b59e097ed4415f09b325de23dae10b25 +SIZE (perforce/2015.1.1314399/bin.freebsd70x86/p4d) = 5592512 Modified: branches/2015Q4/devel/p4d/distinfo.freebsd70x86_64 ============================================================================== --- branches/2015Q4/devel/p4d/distinfo.freebsd70x86_64 Sat Dec 12 17:11:24 2015 (r403612) +++ branches/2015Q4/devel/p4d/distinfo.freebsd70x86_64 Sat Dec 12 17:11:28 2015 (r403613) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1256673/bin.freebsd70x86_64/p4d) = 685bdd8e0c01d8cc4ee07017b49f6ea3adb8f1c7b00a48b9e88fe7a727695fc8 -SIZE (perforce/2015.1.1256673/bin.freebsd70x86_64/p4d) = 5767648 +SHA256 (perforce/2015.1.1314399/bin.freebsd70x86_64/p4d) = e40bb691eff4c53aeb13a25e443f9761fb601a5fc302f6a1eeac6c86ede02d76 +SIZE (perforce/2015.1.1314399/bin.freebsd70x86_64/p4d) = 5770400 From owner-svn-ports-branches@freebsd.org Sat Dec 12 17:11:45 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 234E7A1410C; Sat, 12 Dec 2015 17:11:45 +0000 (UTC) (envelope-from gordon@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 F106D1F0D; Sat, 12 Dec 2015 17:11:44 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBCHBiwd065137; Sat, 12 Dec 2015 17:11:44 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBCHBhEu065131; Sat, 12 Dec 2015 17:11:43 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201512121711.tBCHBhEu065131@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sat, 12 Dec 2015 17:11:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403614 - branches/2015Q4/devel/p4p 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, 12 Dec 2015 17:11:45 -0000 Author: gordon Date: Sat Dec 12 17:11:43 2015 New Revision: 403614 URL: https://svnweb.freebsd.org/changeset/ports/403614 Log: MFH: r403586 Update devel/p4p to 2015.1/1314399. Approved by: mat (mentor, implicit) Approved by: portmgr (erwin) Modified: branches/2015Q4/devel/p4p/Makefile branches/2015Q4/devel/p4p/distinfo.freebsd100x86 branches/2015Q4/devel/p4p/distinfo.freebsd100x86_64 branches/2015Q4/devel/p4p/distinfo.freebsd70x86 branches/2015Q4/devel/p4p/distinfo.freebsd70x86_64 Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/devel/p4p/Makefile ============================================================================== --- branches/2015Q4/devel/p4p/Makefile Sat Dec 12 17:11:28 2015 (r403613) +++ branches/2015Q4/devel/p4p/Makefile Sat Dec 12 17:11:43 2015 (r403614) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4p -PORTVERSION= 2015.1.1252202 +PORTVERSION= 2015.1.1314399 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ Modified: branches/2015Q4/devel/p4p/distinfo.freebsd100x86 ============================================================================== --- branches/2015Q4/devel/p4p/distinfo.freebsd100x86 Sat Dec 12 17:11:28 2015 (r403613) +++ branches/2015Q4/devel/p4p/distinfo.freebsd100x86 Sat Dec 12 17:11:43 2015 (r403614) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1252202/bin.freebsd100x86/p4p) = a9b8d4b27c82014c7e635463e523fdaf1643a0724fdc163b850ca07bbfdce412 -SIZE (perforce/2015.1.1252202/bin.freebsd100x86/p4p) = 2362792 +SHA256 (perforce/2015.1.1314399/bin.freebsd100x86/p4p) = 9794d98f7d2deb5b5a71bd0782322356f2bbe941c926679a9b5a887b443e3d09 +SIZE (perforce/2015.1.1314399/bin.freebsd100x86/p4p) = 2366920 Modified: branches/2015Q4/devel/p4p/distinfo.freebsd100x86_64 ============================================================================== --- branches/2015Q4/devel/p4p/distinfo.freebsd100x86_64 Sat Dec 12 17:11:28 2015 (r403613) +++ branches/2015Q4/devel/p4p/distinfo.freebsd100x86_64 Sat Dec 12 17:11:43 2015 (r403614) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1252202/bin.freebsd100x86_64/p4p) = 0545cc33f05960f71a75c1c9d5388bad50e5b433862d12b504feafa47e384688 -SIZE (perforce/2015.1.1252202/bin.freebsd100x86_64/p4p) = 2628672 +SHA256 (perforce/2015.1.1314399/bin.freebsd100x86_64/p4p) = 735df6b68873f48cb0d09f6923881d43b85dde778baac7cda431446a73da0786 +SIZE (perforce/2015.1.1314399/bin.freebsd100x86_64/p4p) = 2630640 Modified: branches/2015Q4/devel/p4p/distinfo.freebsd70x86 ============================================================================== --- branches/2015Q4/devel/p4p/distinfo.freebsd70x86 Sat Dec 12 17:11:28 2015 (r403613) +++ branches/2015Q4/devel/p4p/distinfo.freebsd70x86 Sat Dec 12 17:11:43 2015 (r403614) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1252202/bin.freebsd70x86/p4p) = 94bd6157b751bcba3ba3cc300163a25e8a51cde83d77509e968ed198c42f17de -SIZE (perforce/2015.1.1252202/bin.freebsd70x86/p4p) = 2404448 +SHA256 (perforce/2015.1.1314399/bin.freebsd70x86/p4p) = a891571cd4fe1b9d256e996961e822798f5bbfab1567f49eafe2a5b9615b4f80 +SIZE (perforce/2015.1.1314399/bin.freebsd70x86/p4p) = 2405728 Modified: branches/2015Q4/devel/p4p/distinfo.freebsd70x86_64 ============================================================================== --- branches/2015Q4/devel/p4p/distinfo.freebsd70x86_64 Sat Dec 12 17:11:28 2015 (r403613) +++ branches/2015Q4/devel/p4p/distinfo.freebsd70x86_64 Sat Dec 12 17:11:43 2015 (r403614) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1252202/bin.freebsd70x86_64/p4p) = d2f652fd0baa1f495683b868310e2f74ec1642be3cb864bc6dae15500e5109ab -SIZE (perforce/2015.1.1252202/bin.freebsd70x86_64/p4p) = 2605560 +SHA256 (perforce/2015.1.1314399/bin.freebsd70x86_64/p4p) = e6bb227f9d47fde41fb2f8bace628de02b25ccfdd49c461355391b7ede312453 +SIZE (perforce/2015.1.1314399/bin.freebsd70x86_64/p4p) = 2605656 From owner-svn-ports-branches@freebsd.org Sat Dec 12 17:42:10 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 8706E9D888B; Sat, 12 Dec 2015 17:42:10 +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 4B369135A; Sat, 12 Dec 2015 17:42:10 +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 tBCHg9Yf073807; Sat, 12 Dec 2015 17:42:09 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBCHg9wU073805; Sat, 12 Dec 2015 17:42:09 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201512121742.tBCHg9wU073805@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sat, 12 Dec 2015 17:42:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403619 - in branches/2015Q4/sysutils/py-salt: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Dec 2015 17:42:10 -0000 Author: junovitch Date: Sat Dec 12 17:42:09 2015 New Revision: 403619 URL: https://svnweb.freebsd.org/changeset/ports/403619 Log: MFH: r399467, r401743 sysutils/py-salt: fix incomplete MFH prerequisites for 2015.8.3 update PR: 205043 Approved by: ports-secteam (feld) Deleted: branches/2015Q4/sysutils/py-salt/files/patch-salt__utils____init__.py Modified: branches/2015Q4/sysutils/py-salt/Makefile branches/2015Q4/sysutils/py-salt/pkg-plist Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/sysutils/py-salt/Makefile ============================================================================== --- branches/2015Q4/sysutils/py-salt/Makefile Sat Dec 12 17:31:17 2015 (r403618) +++ branches/2015Q4/sysutils/py-salt/Makefile Sat Dec 12 17:42:09 2015 (r403619) @@ -11,6 +11,7 @@ MAINTAINER= christer.edwards@gmail.com COMMENT= Distributed remote execution and configuration management system LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \ Modified: branches/2015Q4/sysutils/py-salt/pkg-plist ============================================================================== --- branches/2015Q4/sysutils/py-salt/pkg-plist Sat Dec 12 17:31:17 2015 (r403618) +++ branches/2015Q4/sysutils/py-salt/pkg-plist Sat Dec 12 17:42:09 2015 (r403619) @@ -46,6 +46,8 @@ %%PYTHON_SITELIBDIR%%/salt/beacons/load.pyc %%PYTHON_SITELIBDIR%%/salt/beacons/network_info.py %%PYTHON_SITELIBDIR%%/salt/beacons/network_info.pyc +%%PYTHON_SITELIBDIR%%/salt/beacons/proxy_example.py +%%PYTHON_SITELIBDIR%%/salt/beacons/proxy_example.pyc %%PYTHON_SITELIBDIR%%/salt/beacons/ps.py %%PYTHON_SITELIBDIR%%/salt/beacons/ps.pyc %%PYTHON_SITELIBDIR%%/salt/beacons/service.py @@ -297,6 +299,8 @@ %%PYTHON_SITELIBDIR%%/salt/fileserver/svnfs.pyc %%PYTHON_SITELIBDIR%%/salt/grains/__init__.py %%PYTHON_SITELIBDIR%%/salt/grains/__init__.pyc +%%PYTHON_SITELIBDIR%%/salt/grains/chronos.py +%%PYTHON_SITELIBDIR%%/salt/grains/chronos.pyc %%PYTHON_SITELIBDIR%%/salt/grains/core.py %%PYTHON_SITELIBDIR%%/salt/grains/core.pyc %%PYTHON_SITELIBDIR%%/salt/grains/disks.py @@ -305,8 +309,12 @@ %%PYTHON_SITELIBDIR%%/salt/grains/external_ip.pyc %%PYTHON_SITELIBDIR%%/salt/grains/extra.py %%PYTHON_SITELIBDIR%%/salt/grains/extra.pyc +%%PYTHON_SITELIBDIR%%/salt/grains/fx2.py +%%PYTHON_SITELIBDIR%%/salt/grains/fx2.pyc %%PYTHON_SITELIBDIR%%/salt/grains/junos.py %%PYTHON_SITELIBDIR%%/salt/grains/junos.pyc +%%PYTHON_SITELIBDIR%%/salt/grains/marathon.py +%%PYTHON_SITELIBDIR%%/salt/grains/marathon.pyc %%PYTHON_SITELIBDIR%%/salt/grains/mdadm.py %%PYTHON_SITELIBDIR%%/salt/grains/mdadm.pyc %%PYTHON_SITELIBDIR%%/salt/grains/opts.py @@ -415,10 +423,14 @@ %%PYTHON_SITELIBDIR%%/salt/modules/cassandra.pyc %%PYTHON_SITELIBDIR%%/salt/modules/cassandra_cql.py %%PYTHON_SITELIBDIR%%/salt/modules/cassandra_cql.pyc +%%PYTHON_SITELIBDIR%%/salt/modules/chassis.py +%%PYTHON_SITELIBDIR%%/salt/modules/chassis.pyc %%PYTHON_SITELIBDIR%%/salt/modules/chef.py %%PYTHON_SITELIBDIR%%/salt/modules/chef.pyc %%PYTHON_SITELIBDIR%%/salt/modules/chocolatey.py %%PYTHON_SITELIBDIR%%/salt/modules/chocolatey.pyc +%%PYTHON_SITELIBDIR%%/salt/modules/chronos.py +%%PYTHON_SITELIBDIR%%/salt/modules/chronos.pyc %%PYTHON_SITELIBDIR%%/salt/modules/cloud.py %%PYTHON_SITELIBDIR%%/salt/modules/cloud.pyc %%PYTHON_SITELIBDIR%%/salt/modules/cmdmod.py @@ -483,6 +495,8 @@ %%PYTHON_SITELIBDIR%%/salt/modules/dpkg.pyc %%PYTHON_SITELIBDIR%%/salt/modules/drac.py %%PYTHON_SITELIBDIR%%/salt/modules/drac.pyc +%%PYTHON_SITELIBDIR%%/salt/modules/dracr.py +%%PYTHON_SITELIBDIR%%/salt/modules/dracr.pyc %%PYTHON_SITELIBDIR%%/salt/modules/drbd.py %%PYTHON_SITELIBDIR%%/salt/modules/drbd.pyc %%PYTHON_SITELIBDIR%%/salt/modules/ebuild.py @@ -637,6 +651,8 @@ %%PYTHON_SITELIBDIR%%/salt/modules/macports.pyc %%PYTHON_SITELIBDIR%%/salt/modules/makeconf.py %%PYTHON_SITELIBDIR%%/salt/modules/makeconf.pyc +%%PYTHON_SITELIBDIR%%/salt/modules/marathon.py +%%PYTHON_SITELIBDIR%%/salt/modules/marathon.pyc %%PYTHON_SITELIBDIR%%/salt/modules/match.py %%PYTHON_SITELIBDIR%%/salt/modules/match.pyc %%PYTHON_SITELIBDIR%%/salt/modules/mdadm.py @@ -785,8 +801,6 @@ %%PYTHON_SITELIBDIR%%/salt/modules/reg.pyc %%PYTHON_SITELIBDIR%%/salt/modules/rest_package.py %%PYTHON_SITELIBDIR%%/salt/modules/rest_package.pyc -%%PYTHON_SITELIBDIR%%/salt/modules/rest_sample.py -%%PYTHON_SITELIBDIR%%/salt/modules/rest_sample.pyc %%PYTHON_SITELIBDIR%%/salt/modules/rest_service.py %%PYTHON_SITELIBDIR%%/salt/modules/rest_service.pyc %%PYTHON_SITELIBDIR%%/salt/modules/ret.py @@ -867,6 +881,10 @@ %%PYTHON_SITELIBDIR%%/salt/modules/sqlite3.pyc %%PYTHON_SITELIBDIR%%/salt/modules/ssh.py %%PYTHON_SITELIBDIR%%/salt/modules/ssh.pyc +%%PYTHON_SITELIBDIR%%/salt/modules/ssh_package.py +%%PYTHON_SITELIBDIR%%/salt/modules/ssh_package.pyc +%%PYTHON_SITELIBDIR%%/salt/modules/ssh_service.py +%%PYTHON_SITELIBDIR%%/salt/modules/ssh_service.pyc %%PYTHON_SITELIBDIR%%/salt/modules/state.py %%PYTHON_SITELIBDIR%%/salt/modules/state.pyc %%PYTHON_SITELIBDIR%%/salt/modules/status.py @@ -893,8 +911,6 @@ %%PYTHON_SITELIBDIR%%/salt/modules/system.pyc %%PYTHON_SITELIBDIR%%/salt/modules/system_profiler.py %%PYTHON_SITELIBDIR%%/salt/modules/system_profiler.pyc -%%PYTHON_SITELIBDIR%%/salt/modules/system_rest_sample.py -%%PYTHON_SITELIBDIR%%/salt/modules/system_rest_sample.pyc %%PYTHON_SITELIBDIR%%/salt/modules/systemd.py %%PYTHON_SITELIBDIR%%/salt/modules/systemd.pyc %%PYTHON_SITELIBDIR%%/salt/modules/temp.py @@ -973,6 +989,8 @@ %%PYTHON_SITELIBDIR%%/salt/modules/win_status.pyc %%PYTHON_SITELIBDIR%%/salt/modules/win_system.py %%PYTHON_SITELIBDIR%%/salt/modules/win_system.pyc +%%PYTHON_SITELIBDIR%%/salt/modules/win_task.py +%%PYTHON_SITELIBDIR%%/salt/modules/win_task.pyc %%PYTHON_SITELIBDIR%%/salt/modules/win_timezone.py %%PYTHON_SITELIBDIR%%/salt/modules/win_timezone.pyc %%PYTHON_SITELIBDIR%%/salt/modules/win_update.py @@ -1121,12 +1139,20 @@ %%PYTHON_SITELIBDIR%%/salt/pillar/virtkey.pyc %%PYTHON_SITELIBDIR%%/salt/proxy/__init__.py %%PYTHON_SITELIBDIR%%/salt/proxy/__init__.pyc +%%PYTHON_SITELIBDIR%%/salt/proxy/chronos.py +%%PYTHON_SITELIBDIR%%/salt/proxy/chronos.pyc +%%PYTHON_SITELIBDIR%%/salt/proxy/fx2.py +%%PYTHON_SITELIBDIR%%/salt/proxy/fx2.pyc %%PYTHON_SITELIBDIR%%/salt/proxy/junos.py %%PYTHON_SITELIBDIR%%/salt/proxy/junos.pyc +%%PYTHON_SITELIBDIR%%/salt/proxy/marathon.py +%%PYTHON_SITELIBDIR%%/salt/proxy/marathon.pyc %%PYTHON_SITELIBDIR%%/salt/proxy/philips_hue.py %%PYTHON_SITELIBDIR%%/salt/proxy/philips_hue.pyc %%PYTHON_SITELIBDIR%%/salt/proxy/rest_sample.py %%PYTHON_SITELIBDIR%%/salt/proxy/rest_sample.pyc +%%PYTHON_SITELIBDIR%%/salt/proxy/ssh_sample.py +%%PYTHON_SITELIBDIR%%/salt/proxy/ssh_sample.pyc %%PYTHON_SITELIBDIR%%/salt/queues/__init__.py %%PYTHON_SITELIBDIR%%/salt/queues/__init__.pyc %%PYTHON_SITELIBDIR%%/salt/queues/sqlite_queue.py @@ -1415,6 +1441,8 @@ %%PYTHON_SITELIBDIR%%/salt/states/cabal.pyc %%PYTHON_SITELIBDIR%%/salt/states/chef.py %%PYTHON_SITELIBDIR%%/salt/states/chef.pyc +%%PYTHON_SITELIBDIR%%/salt/states/chronos_job.py +%%PYTHON_SITELIBDIR%%/salt/states/chronos_job.pyc %%PYTHON_SITELIBDIR%%/salt/states/cloud.py %%PYTHON_SITELIBDIR%%/salt/states/cloud.pyc %%PYTHON_SITELIBDIR%%/salt/states/cmd.py @@ -1429,6 +1457,8 @@ %%PYTHON_SITELIBDIR%%/salt/states/ddns.pyc %%PYTHON_SITELIBDIR%%/salt/states/debconfmod.py %%PYTHON_SITELIBDIR%%/salt/states/debconfmod.pyc +%%PYTHON_SITELIBDIR%%/salt/states/dellchassis.py +%%PYTHON_SITELIBDIR%%/salt/states/dellchassis.pyc %%PYTHON_SITELIBDIR%%/salt/states/disk.py %%PYTHON_SITELIBDIR%%/salt/states/disk.pyc %%PYTHON_SITELIBDIR%%/salt/states/dockerio.py @@ -1521,6 +1551,8 @@ %%PYTHON_SITELIBDIR%%/salt/states/lxc.pyc %%PYTHON_SITELIBDIR%%/salt/states/makeconf.py %%PYTHON_SITELIBDIR%%/salt/states/makeconf.pyc +%%PYTHON_SITELIBDIR%%/salt/states/marathon_app.py +%%PYTHON_SITELIBDIR%%/salt/states/marathon_app.pyc %%PYTHON_SITELIBDIR%%/salt/states/mdadm.py %%PYTHON_SITELIBDIR%%/salt/states/mdadm.pyc %%PYTHON_SITELIBDIR%%/salt/states/memcached.py @@ -1792,6 +1824,8 @@ %%PYTHON_SITELIBDIR%%/salt/utils/cloud.pyc %%PYTHON_SITELIBDIR%%/salt/utils/compat.py %%PYTHON_SITELIBDIR%%/salt/utils/compat.pyc +%%PYTHON_SITELIBDIR%%/salt/utils/configcomparer.py +%%PYTHON_SITELIBDIR%%/salt/utils/configcomparer.pyc %%PYTHON_SITELIBDIR%%/salt/utils/context.py %%PYTHON_SITELIBDIR%%/salt/utils/context.pyc %%PYTHON_SITELIBDIR%%/salt/utils/debug.py @@ -1946,8 +1980,12 @@ %%PYTHON_SITELIBDIR%%/salt/utils/verify.pyc %%PYTHON_SITELIBDIR%%/salt/utils/virt.py %%PYTHON_SITELIBDIR%%/salt/utils/virt.pyc +%%PYTHON_SITELIBDIR%%/salt/utils/vmware.py +%%PYTHON_SITELIBDIR%%/salt/utils/vmware.pyc %%PYTHON_SITELIBDIR%%/salt/utils/vt.py %%PYTHON_SITELIBDIR%%/salt/utils/vt.pyc +%%PYTHON_SITELIBDIR%%/salt/utils/vt_helper.py +%%PYTHON_SITELIBDIR%%/salt/utils/vt_helper.pyc %%PYTHON_SITELIBDIR%%/salt/utils/winapi.py %%PYTHON_SITELIBDIR%%/salt/utils/winapi.pyc %%PYTHON_SITELIBDIR%%/salt/utils/winservice.py @@ -1980,39 +2018,6 @@ %%PYTHON_SITELIBDIR%%/salt/wheel/minions.pyc %%PYTHON_SITELIBDIR%%/salt/wheel/pillar_roots.py %%PYTHON_SITELIBDIR%%/salt/wheel/pillar_roots.pyc -@dir %%PYTHON_SITELIBDIR%%/salt -@dir %%PYTHON_SITELIBDIR%%/salt/auth -@dir %%PYTHON_SITELIBDIR%%/salt/cli -@dir %%PYTHON_SITELIBDIR%%/salt/client -@dir %%PYTHON_SITELIBDIR%%/salt/client/ssh -@dir %%PYTHON_SITELIBDIR%%/salt/client/ssh/wrapper -@dir %%PYTHON_SITELIBDIR%%/salt/cloud -@dir %%PYTHON_SITELIBDIR%%/salt/cloud/clouds -@dir %%PYTHON_SITELIBDIR%%/salt/cloud/deploy -@dir %%PYTHON_SITELIBDIR%%/salt/ext -@dir %%PYTHON_SITELIBDIR%%/salt/fileserver -@dir %%PYTHON_SITELIBDIR%%/salt/grains -@dir %%PYTHON_SITELIBDIR%%/salt/log -@dir %%PYTHON_SITELIBDIR%%/salt/log/handlers -@dir %%PYTHON_SITELIBDIR%%/salt/modules -@dir %%PYTHON_SITELIBDIR%%/salt/output -@dir %%PYTHON_SITELIBDIR%%/salt/pillar -@dir %%PYTHON_SITELIBDIR%%/salt/renderers -@dir %%PYTHON_SITELIBDIR%%/salt/returners -@dir %%PYTHON_SITELIBDIR%%/salt/roster -@dir %%PYTHON_SITELIBDIR%%/salt/runners -@dir %%PYTHON_SITELIBDIR%%/salt/search -@dir %%PYTHON_SITELIBDIR%%/salt/states -@dir %%PYTHON_SITELIBDIR%%/salt/templates -@dir %%PYTHON_SITELIBDIR%%/salt/templates/debian_ip -@dir %%PYTHON_SITELIBDIR%%/salt/templates/rh_ip -@dir %%PYTHON_SITELIBDIR%%/salt/templates/virt -@dir %%PYTHON_SITELIBDIR%%/salt/tops -@dir %%PYTHON_SITELIBDIR%%/salt/transport -@dir %%PYTHON_SITELIBDIR%%/salt/utils -@dir %%PYTHON_SITELIBDIR%%/salt/utils/decorators -@dir %%PYTHON_SITELIBDIR%%/salt/utils/validate -@dir %%PYTHON_SITELIBDIR%%/salt/wheel bin/salt bin/salt-api bin/salt-call