From owner-svn-ports-branches@freebsd.org Sun Jan 15 02:18:12 2017 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 D7251CA5867; Sun, 15 Jan 2017 02:18:12 +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 97B28183D; Sun, 15 Jan 2017 02:18:12 +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 v0F2IBAe091835; Sun, 15 Jan 2017 02:18:11 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0F2IAwq091823; Sun, 15 Jan 2017 02:18:10 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201701150218.v0F2IAwq091823@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sun, 15 Jan 2017 02:18:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431507 - in branches/2017Q1: chinese/wordpress-zh_CN chinese/wordpress-zh_TW german/wordpress japanese/wordpress russian/wordpress www/wordpress 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.23 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, 15 Jan 2017 02:18:12 -0000 Author: junovitch Date: Sun Jan 15 02:18:10 2017 New Revision: 431507 URL: https://svnweb.freebsd.org/changeset/ports/431507 Log: MFH: r431483 Update to 4.7.1 Changes: https://wordpress.org/news/2017/01/wordpress-4-7-1-security-and-maintenance-release/ PR: 216059 Submitted by: Jochen Neumeister (maintainer) Security: CVE-2017-5487 Security: CVE-2017-5488 Security: CVE-2017-5489 Security: CVE-2017-5490 Security: CVE-2017-5491 Security: CVE-2017-5492 Security: CVE-2017-5493 Security: https://vuxml.FreeBSD.org/freebsd/b180d1fb-dac6-11e6-ae1b-002590263bf5.htm Approved by: ports-secteam (with hat) Modified: branches/2017Q1/chinese/wordpress-zh_CN/Makefile branches/2017Q1/chinese/wordpress-zh_CN/distinfo branches/2017Q1/chinese/wordpress-zh_TW/Makefile branches/2017Q1/chinese/wordpress-zh_TW/distinfo branches/2017Q1/german/wordpress/Makefile branches/2017Q1/german/wordpress/distinfo branches/2017Q1/japanese/wordpress/Makefile branches/2017Q1/japanese/wordpress/distinfo branches/2017Q1/russian/wordpress/Makefile branches/2017Q1/russian/wordpress/distinfo branches/2017Q1/www/wordpress/Makefile branches/2017Q1/www/wordpress/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/chinese/wordpress-zh_CN/Makefile ============================================================================== --- branches/2017Q1/chinese/wordpress-zh_CN/Makefile Sun Jan 15 02:16:21 2017 (r431506) +++ branches/2017Q1/chinese/wordpress-zh_CN/Makefile Sun Jan 15 02:18:10 2017 (r431507) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7 +PORTVERSION= 4.7.1 DISTVERSIONSUFFIX= -zh_CN CATEGORIES= chinese www MASTER_SITES= http://cn.wordpress.org/ Modified: branches/2017Q1/chinese/wordpress-zh_CN/distinfo ============================================================================== --- branches/2017Q1/chinese/wordpress-zh_CN/distinfo Sun Jan 15 02:16:21 2017 (r431506) +++ branches/2017Q1/chinese/wordpress-zh_CN/distinfo Sun Jan 15 02:18:10 2017 (r431507) @@ -1,3 +1,3 @@ -TIMESTAMP = 1481647381 -SHA256 (wordpress-4.7-zh_CN.tar.gz) = 3ef69eebc9a5c7ce5658ea75842d2b41e61fee0a016fe1e970fad73fdf7c976e -SIZE (wordpress-4.7-zh_CN.tar.gz) = 8479240 +TIMESTAMP = 1484377056 +SHA256 (wordpress-4.7.1-zh_CN.tar.gz) = 99805d8099b34a4abb9cea66fe93418cf5b98f40e2f3284b84886ed75d2d3aea +SIZE (wordpress-4.7.1-zh_CN.tar.gz) = 8489566 Modified: branches/2017Q1/chinese/wordpress-zh_TW/Makefile ============================================================================== --- branches/2017Q1/chinese/wordpress-zh_TW/Makefile Sun Jan 15 02:16:21 2017 (r431506) +++ branches/2017Q1/chinese/wordpress-zh_TW/Makefile Sun Jan 15 02:18:10 2017 (r431507) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7 +PORTVERSION= 4.7.1 DISTVERSIONSUFFIX= -zh_TW CATEGORIES= chinese www MASTER_SITES= http://tw.wordpress.org/ Modified: branches/2017Q1/chinese/wordpress-zh_TW/distinfo ============================================================================== --- branches/2017Q1/chinese/wordpress-zh_TW/distinfo Sun Jan 15 02:16:21 2017 (r431506) +++ branches/2017Q1/chinese/wordpress-zh_TW/distinfo Sun Jan 15 02:18:10 2017 (r431507) @@ -1,3 +1,3 @@ -TIMESTAMP = 1481118620 -SHA256 (wordpress-4.7-zh_TW.tar.gz) = 528ae59bf9ed9b7688cd4673e47e7242692fb567434d226c7afdb963a7e5e1de -SIZE (wordpress-4.7-zh_TW.tar.gz) = 8452109 +TIMESTAMP = 1484390635 +SHA256 (wordpress-4.7.1-zh_TW.tar.gz) = 1f4ae5f6a8bbc6007b2b9d53d6942f9fe6c160a67689073de25ec259cf196cb0 +SIZE (wordpress-4.7.1-zh_TW.tar.gz) = 8466467 Modified: branches/2017Q1/german/wordpress/Makefile ============================================================================== --- branches/2017Q1/german/wordpress/Makefile Sun Jan 15 02:16:21 2017 (r431506) +++ branches/2017Q1/german/wordpress/Makefile Sun Jan 15 02:18:10 2017 (r431507) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7 +PORTVERSION= 4.7.1 DISTVERSIONSUFFIX= -de_DE CATEGORIES= german www MASTER_SITES= http://de.wordpress.org/ Modified: branches/2017Q1/german/wordpress/distinfo ============================================================================== --- branches/2017Q1/german/wordpress/distinfo Sun Jan 15 02:16:21 2017 (r431506) +++ branches/2017Q1/german/wordpress/distinfo Sun Jan 15 02:18:10 2017 (r431507) @@ -1,3 +1,3 @@ -TIMESTAMP = 1481118419 -SHA256 (wordpress-4.7-de_DE.tar.gz) = 39949e90a24427535a1cb256d05ee6df7669826243f01dde996f1cebb33a64ff -SIZE (wordpress-4.7-de_DE.tar.gz) = 8471043 +TIMESTAMP = 1484377441 +SHA256 (wordpress-4.7.1-de_DE.tar.gz) = 00b19e8900385546eed0e7c53eaa3f728dec60570e5c51fa520c7dced14058d5 +SIZE (wordpress-4.7.1-de_DE.tar.gz) = 8478219 Modified: branches/2017Q1/japanese/wordpress/Makefile ============================================================================== --- branches/2017Q1/japanese/wordpress/Makefile Sun Jan 15 02:16:21 2017 (r431506) +++ branches/2017Q1/japanese/wordpress/Makefile Sun Jan 15 02:18:10 2017 (r431507) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7 +PORTVERSION= 4.7.1 DISTVERSIONSUFFIX= -ja CATEGORIES= japanese www MASTER_SITES= http://ja.wordpress.org/ Modified: branches/2017Q1/japanese/wordpress/distinfo ============================================================================== --- branches/2017Q1/japanese/wordpress/distinfo Sun Jan 15 02:16:21 2017 (r431506) +++ branches/2017Q1/japanese/wordpress/distinfo Sun Jan 15 02:18:10 2017 (r431507) @@ -1,3 +1,3 @@ -TIMESTAMP = 1481118915 -SHA256 (wordpress-4.7-ja.tar.gz) = 5a1c873046e50b059705a7c7957d56a59077ef3a703c207abf1401052602aad8 -SIZE (wordpress-4.7-ja.tar.gz) = 8488132 +TIMESTAMP = 1484377339 +SHA256 (wordpress-4.7.1-ja.tar.gz) = ff3acaf550deb3cab7a134951d5faa6cb641bacfbba07d5ddffeb6d7cb42fc2a +SIZE (wordpress-4.7.1-ja.tar.gz) = 8480453 Modified: branches/2017Q1/russian/wordpress/Makefile ============================================================================== --- branches/2017Q1/russian/wordpress/Makefile Sun Jan 15 02:16:21 2017 (r431506) +++ branches/2017Q1/russian/wordpress/Makefile Sun Jan 15 02:18:10 2017 (r431507) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7 +PORTVERSION= 4.7.1 DISTVERSIONSUFFIX= -ru_RU CATEGORIES= russian www MASTER_SITES= http://ru.wordpress.org/ Modified: branches/2017Q1/russian/wordpress/distinfo ============================================================================== --- branches/2017Q1/russian/wordpress/distinfo Sun Jan 15 02:16:21 2017 (r431506) +++ branches/2017Q1/russian/wordpress/distinfo Sun Jan 15 02:18:10 2017 (r431507) @@ -1,3 +1,3 @@ -TIMESTAMP = 1481647350 -SHA256 (wordpress-4.7-ru_RU.tar.gz) = 70e89422e56b06f1cdecd50a30a8c1cf70d341e72057c3707fbdd182edaa1cb9 -SIZE (wordpress-4.7-ru_RU.tar.gz) = 8509085 +TIMESTAMP = 1484377818 +SHA256 (wordpress-4.7.1-ru_RU.tar.gz) = 8ef03e691e45e473c5b53bd0fa2c67a701ec4012a70d6b2b051c6afed061d409 +SIZE (wordpress-4.7.1-ru_RU.tar.gz) = 8514608 Modified: branches/2017Q1/www/wordpress/Makefile ============================================================================== --- branches/2017Q1/www/wordpress/Makefile Sun Jan 15 02:16:21 2017 (r431506) +++ branches/2017Q1/www/wordpress/Makefile Sun Jan 15 02:18:10 2017 (r431507) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7 +PORTVERSION= 4.7.1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://wordpress.org/ Modified: branches/2017Q1/www/wordpress/distinfo ============================================================================== --- branches/2017Q1/www/wordpress/distinfo Sun Jan 15 02:16:21 2017 (r431506) +++ branches/2017Q1/www/wordpress/distinfo Sun Jan 15 02:18:10 2017 (r431507) @@ -1,3 +1,3 @@ -TIMESTAMP = 1481101948 -SHA256 (wordpress-4.7.tar.gz) = 7eae27ff70716dae2d2ba58280f2832fd70a208c9cdaf29ab36ac789c14d6977 -SIZE (wordpress-4.7.tar.gz) = 7993186 +TIMESTAMP = 1484374342 +SHA256 (wordpress-4.7.1.tar.gz) = 171252eed21e31becb5d52fa3d3ef7ba2b41f0fedd1a412afc5ad937da5317f6 +SIZE (wordpress-4.7.1.tar.gz) = 7998661 From owner-svn-ports-branches@freebsd.org Sun Jan 15 02:48:21 2017 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 BCF03CAE892; Sun, 15 Jan 2017 02:48:21 +0000 (UTC) (envelope-from ler@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 7D7251A16; Sun, 15 Jan 2017 02:48:21 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0F2mK5K004762; Sun, 15 Jan 2017 02:48:20 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0F2mJd8004752; Sun, 15 Jan 2017 02:48:19 GMT (envelope-from ler@FreeBSD.org) Message-Id: <201701150248.v0F2mJd8004752@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Sun, 15 Jan 2017 02:48:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431511 - in branches/2017Q1: archivers/zip astro/xearth devel/t1lib mail/dovecot2-pigeonhole mail/dovecot2-pigeonhole/files net-mgmt/iog sysutils/lsof textproc/pecl-xdiff www/joomla3 x... 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.23 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, 15 Jan 2017 02:48:21 -0000 Author: ler Date: Sun Jan 15 02:48:19 2017 New Revision: 431511 URL: https://svnweb.freebsd.org/changeset/ports/431511 Log: MFH: r431147 r431488 Update MAINTAINER on my ports (and created by line) to my @FreeBSD.org email Differential Revision: https://reviews.freebsd.org/D9125 mail/dovecot2-pigeonhole: lib-sieve: Fixed handling of an early explicit keep during multiscript execution. Applies to LDA/LMTP context in general, not only when sieve_before/sieve_after are used. Action side-effects and the message snapshot would be lost at the final stage where the implicit keep is evaluated. This happened because the keep action itself is not actually executed, but rather its presence is noted to determine whether more scripts need to be executed. So, when finally execution of the actual keep action is due, i.e. when there are no more scripts in the sequence, it overrides the explicit keep from the last script. This didn't take the side-effects and message snapshot into account. Obtained from: https://github.com/dovecot/pigeonhole/commit/772485538302957ebada484b6eedec57136bc737 Differential Revision: https://reviews.freebsd.org/D9177 Merging r431147 to pick up the maintainer change as well. Approved by: ports-secteam (junovitch), adamw (mentor) Added: branches/2017Q1/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c - copied unchanged from r431488, head/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c Modified: branches/2017Q1/archivers/zip/Makefile branches/2017Q1/astro/xearth/Makefile branches/2017Q1/devel/t1lib/Makefile branches/2017Q1/mail/dovecot2-pigeonhole/Makefile branches/2017Q1/net-mgmt/iog/Makefile branches/2017Q1/sysutils/lsof/Makefile branches/2017Q1/textproc/pecl-xdiff/Makefile branches/2017Q1/www/joomla3/Makefile branches/2017Q1/x11/xdialog/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/archivers/zip/Makefile ============================================================================== --- branches/2017Q1/archivers/zip/Makefile Sun Jan 15 02:39:28 2017 (r431510) +++ branches/2017Q1/archivers/zip/Makefile Sun Jan 15 02:48:19 2017 (r431511) @@ -8,7 +8,7 @@ CATEGORIES= archivers MASTER_SITES= SF/info${PORTNAME}/Zip%203.x%20%28latest%29/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Create/update ZIP files compatible with PKZIP # License is BSD-based, but not identical, so install with documentation Modified: branches/2017Q1/astro/xearth/Makefile ============================================================================== --- branches/2017Q1/astro/xearth/Makefile Sun Jan 15 02:39:28 2017 (r431510) +++ branches/2017Q1/astro/xearth/Makefile Sun Jan 15 02:48:19 2017 (r431511) @@ -6,7 +6,7 @@ PORTVERSION= 1.2 CATEGORIES= astro geography MASTER_SITES= LOCAL/madpilot/xearth -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Set the root window to the image of earth USE_XORG= x11 xext sm ice xt Modified: branches/2017Q1/devel/t1lib/Makefile ============================================================================== --- branches/2017Q1/devel/t1lib/Makefile Sun Jan 15 02:39:28 2017 (r431510) +++ branches/2017Q1/devel/t1lib/Makefile Sun Jan 15 02:48:19 2017 (r431511) @@ -8,7 +8,7 @@ PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= SUNSITE/libs/graphics/ -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Type 1 font rasterization library for Unix/X11 LICENSE= LGPL20 Modified: branches/2017Q1/mail/dovecot2-pigeonhole/Makefile ============================================================================== --- branches/2017Q1/mail/dovecot2-pigeonhole/Makefile Sun Jan 15 02:39:28 2017 (r431510) +++ branches/2017Q1/mail/dovecot2-pigeonhole/Makefile Sun Jan 15 02:48:19 2017 (r431511) @@ -3,12 +3,12 @@ PORTNAME= dovecot-pigeonhole PORTVERSION= 0.4.16 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/ DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION} -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Sieve plugin for the Dovecot 'deliver' LDA and LMTP LICENSE= LGPL21 Copied: branches/2017Q1/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c (from r431488, head/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c Sun Jan 15 02:48:19 2017 (r431511, copy of r431488, head/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c) @@ -0,0 +1,87 @@ +--- src/lib-sieve/sieve-result.c.orig 2016-10-20 22:48:08 UTC ++++ src/lib-sieve/sieve-result.c +@@ -928,7 +928,7 @@ static int _sieve_result_implicit_keep + (struct sieve_result *result, bool rollback) + { + const struct sieve_action_exec_env *aenv = &result->action_env; +- struct sieve_result_action *rac; ++ struct sieve_result_action *rac, *kac; + int status = SIEVE_EXEC_OK; + struct sieve_result_side_effect *rsef, *rsef_first = NULL; + void *tr_context = NULL; +@@ -937,38 +937,54 @@ static int _sieve_result_implicit_keep + if ( (aenv->flags & SIEVE_EXECUTE_FLAG_DEFER_KEEP) != 0 ) + return SIEVE_EXEC_OK; + +- if ( rollback ) { ++ if ( rollback ) + act_keep = result->failure_action; +- act_keep.mail = NULL; +- } else { ++ else + act_keep = result->keep_action; +- act_keep.mail = sieve_message_get_mail(aenv->msgctx); +- } ++ act_keep.mail = NULL; + + /* If keep is a non-action, return right away */ + if ( act_keep.def == NULL ) + return SIEVE_EXEC_OK; + +- /* Scan for execution of keep-equal actions */ +- rac = result->first_action; +- while ( rac != NULL ) { +- if ( rac->action.def == act_keep.def && act_keep.def->equals != NULL && +- act_keep.def->equals(aenv->scriptenv, NULL, &rac->action) && +- rac->action.executed ) +- return SIEVE_EXEC_OK; +- +- rac = rac->next; ++ /* Scan for deferred keep */ ++ kac = result->last_action; ++ while ( kac != NULL && kac->action.executed ) { ++ if ( kac->keep && kac->action.def == NULL ) ++ break; ++ kac = kac->prev; + } + +- /* Apply any implicit side effects if applicable */ +- if ( !rollback && hash_table_is_created(result->action_contexts) ) { +- struct sieve_result_action_context *actctx; ++ if (kac == NULL) { ++ if ( !rollback ) ++ act_keep.mail = sieve_message_get_mail(aenv->msgctx); + +- /* Check for implicit side effects to keep action */ +- actctx = hash_table_lookup(result->action_contexts, act_keep.def); ++ /* Scan for execution of keep-equal actions */ ++ rac = result->first_action; ++ while ( rac != NULL ) { ++ if ( rac->action.def == act_keep.def && act_keep.def->equals != NULL && ++ act_keep.def->equals(aenv->scriptenv, NULL, &rac->action) && ++ rac->action.executed ) ++ return SIEVE_EXEC_OK; + +- if ( actctx != NULL && actctx->seffects != NULL ) +- rsef_first = actctx->seffects->first_effect; ++ rac = rac->next; ++ } ++ ++ /* Apply any implicit side effects if applicable */ ++ if ( !rollback && hash_table_is_created(result->action_contexts) ) { ++ struct sieve_result_action_context *actctx; ++ ++ /* Check for implicit side effects to keep action */ ++ actctx = hash_table_lookup(result->action_contexts, act_keep.def); ++ ++ if ( actctx != NULL && actctx->seffects != NULL ) ++ rsef_first = actctx->seffects->first_effect; ++ } ++ } else if ( !rollback ) { ++ act_keep.location = kac->action.location; ++ act_keep.mail = kac->action.mail; ++ if ( kac->seffects != NULL ) ++ rsef_first = kac->seffects->first_effect; + } + + /* Start keep action */ Modified: branches/2017Q1/net-mgmt/iog/Makefile ============================================================================== --- branches/2017Q1/net-mgmt/iog/Makefile Sun Jan 15 02:39:28 2017 (r431510) +++ branches/2017Q1/net-mgmt/iog/Makefile Sun Jan 15 02:48:19 2017 (r431511) @@ -1,4 +1,4 @@ -# Created by: Larry Rosenman +# Created by: Larry Rosenman # $FreeBSD$ PORTNAME= iog Modified: branches/2017Q1/sysutils/lsof/Makefile ============================================================================== --- branches/2017Q1/sysutils/lsof/Makefile Sun Jan 15 02:39:28 2017 (r431510) +++ branches/2017Q1/sysutils/lsof/Makefile Sun Jan 15 02:48:19 2017 (r431511) @@ -22,7 +22,7 @@ MASTER_SITES= http://ftp.cerias.purdue.e ftp://ftp.tau.ac.il/pub/unix/admin/ DISTNAME= ${PORTNAME}_${DISTVERSION}${DISTNAME_SUFFIX} -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Lists information about open files (similar to fstat(1)) LICENSE=lsof Modified: branches/2017Q1/textproc/pecl-xdiff/Makefile ============================================================================== --- branches/2017Q1/textproc/pecl-xdiff/Makefile Sun Jan 15 02:39:28 2017 (r431510) +++ branches/2017Q1/textproc/pecl-xdiff/Makefile Sun Jan 15 02:48:19 2017 (r431511) @@ -1,4 +1,4 @@ -# Created by: Larry Rosenman +# Created by: Larry Rosenman # $FreeBSD$ PORTNAME= xdiff Modified: branches/2017Q1/www/joomla3/Makefile ============================================================================== --- branches/2017Q1/www/joomla3/Makefile Sun Jan 15 02:39:28 2017 (r431510) +++ branches/2017Q1/www/joomla3/Makefile Sun Jan 15 02:48:19 2017 (r431511) @@ -6,7 +6,7 @@ PORTVERSION= 3.6.5 CATEGORIES= www PKGNAMESUFFIX= 3 -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Dynamic web content management system (CMS) LICENSE= GPLv2 Modified: branches/2017Q1/x11/xdialog/Makefile ============================================================================== --- branches/2017Q1/x11/xdialog/Makefile Sun Jan 15 02:39:28 2017 (r431510) +++ branches/2017Q1/x11/xdialog/Makefile Sun Jan 15 02:48:19 2017 (r431511) @@ -8,7 +8,7 @@ CATEGORIES= x11 MASTER_SITES= http://xdialog.free.fr/ DISTNAME= ${PORTNAME:S/x/X/}-${PORTVERSION} -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Drop in replacement for the "dialog" or "cdialog" programs LICENSE= GPLv2 From owner-svn-ports-branches@freebsd.org Sun Jan 15 10:39:56 2017 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 B1E2FCA5F7D; Sun, 15 Jan 2017 10:39:56 +0000 (UTC) (envelope-from tijl@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 8B7B7136E; Sun, 15 Jan 2017 10:39:56 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0FAdtOX099027; Sun, 15 Jan 2017 10:39:55 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0FAdt9w099020; Sun, 15 Jan 2017 10:39:55 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201701151039.v0FAdt9w099020@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sun, 15 Jan 2017 10:39:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431543 - in branches/2017Q1/emulators: linux_base-c6 linux_base-c7 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.23 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, 15 Jan 2017 10:39:56 -0000 Author: tijl Date: Sun Jan 15 10:39:54 2017 New Revision: 431543 URL: https://svnweb.freebsd.org/changeset/ports/431543 Log: MFH: r431465 Don't use @dir for directories that may have filesystems mounted. It may not be possible to change their mode and timestamp like @dir tries to do. PR: 215769 Approved by: ports-secteam (junovitch) Modified: branches/2017Q1/emulators/linux_base-c6/Makefile branches/2017Q1/emulators/linux_base-c6/pkg-plist.i386 branches/2017Q1/emulators/linux_base-c6/pkg-plist.x86_64 branches/2017Q1/emulators/linux_base-c7/Makefile branches/2017Q1/emulators/linux_base-c7/pkg-plist.i386 branches/2017Q1/emulators/linux_base-c7/pkg-plist.x86_64 Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/emulators/linux_base-c6/Makefile ============================================================================== --- branches/2017Q1/emulators/linux_base-c6/Makefile Sun Jan 15 09:55:07 2017 (r431542) +++ branches/2017Q1/emulators/linux_base-c6/Makefile Sun Jan 15 10:39:54 2017 (r431543) @@ -3,7 +3,7 @@ PORTNAME= c6 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= emulators linux PKGNAMEPREFIX= linux_base- Modified: branches/2017Q1/emulators/linux_base-c6/pkg-plist.i386 ============================================================================== --- branches/2017Q1/emulators/linux_base-c6/pkg-plist.i386 Sun Jan 15 09:55:07 2017 (r431542) +++ branches/2017Q1/emulators/linux_base-c6/pkg-plist.i386 Sun Jan 15 10:39:54 2017 (r431543) @@ -2345,7 +2345,7 @@ usr/share/man/man8/wipefs.8.gz usr/tmp @rmtry var/cache/ldconfig/aux-cache var/mail -@dir dev/shm +@dir dev @dir etc/X11/applnk @dir etc/X11/fontpath.d @dir etc/blkid @@ -2363,10 +2363,8 @@ var/mail @dir lib/tls @dir mnt @dir opt -@dir(,,555) proc @dir selinux @dir srv -@dir(,,555) sys @dir usr/etc @dir usr/games @dir usr/lib/X11 @@ -2904,4 +2902,12 @@ var/mail @dir var/spool/mail @dir var/yp @dir %%LINUXBASE%% +@comment These directories may have filesystems mounted and then it may not be +@comment possible to change their mode and timestamp like @dir tries to do. +@postexec mkdir -p %D/dev/shm +@postunexec rmdir %D/dev/shm 2>/dev/null || true +@postexec mkdir -p %D/proc +@postunexec rmdir %D/proc 2>/dev/null || true +@postexec mkdir -p %D/sys +@postunexec rmdir %D/sys 2>/dev/null || true @postexec %D/sbin/ldconfig Modified: branches/2017Q1/emulators/linux_base-c6/pkg-plist.x86_64 ============================================================================== --- branches/2017Q1/emulators/linux_base-c6/pkg-plist.x86_64 Sun Jan 15 09:55:07 2017 (r431542) +++ branches/2017Q1/emulators/linux_base-c6/pkg-plist.x86_64 Sun Jan 15 10:39:54 2017 (r431543) @@ -2772,7 +2772,7 @@ usr/share/man/man8/x86_64.8.gz usr/tmp @rmtry var/cache/ldconfig/aux-cache var/mail -@dir dev/shm +@dir dev @dir etc/X11/applnk @dir etc/X11/fontpath.d @dir etc/blkid @@ -2792,10 +2792,8 @@ var/mail @dir lib64/tls @dir mnt @dir opt -@dir(,,555) proc @dir selinux @dir srv -@dir(,,555) sys @dir usr/etc @dir usr/games @dir usr/lib/games @@ -3343,4 +3341,12 @@ var/mail @dir var/spool/mail @dir var/yp @dir %%LINUXBASE%% +@comment These directories may have filesystems mounted and then it may not be +@comment possible to change their mode and timestamp like @dir tries to do. +@postexec mkdir -p %D/dev/shm +@postunexec rmdir %D/dev/shm 2>/dev/null || true +@postexec mkdir -p %D/proc +@postunexec rmdir %D/proc 2>/dev/null || true +@postexec mkdir -p %D/sys +@postunexec rmdir %D/sys 2>/dev/null || true @postexec %D/sbin/ldconfig Modified: branches/2017Q1/emulators/linux_base-c7/Makefile ============================================================================== --- branches/2017Q1/emulators/linux_base-c7/Makefile Sun Jan 15 09:55:07 2017 (r431542) +++ branches/2017Q1/emulators/linux_base-c7/Makefile Sun Jan 15 10:39:54 2017 (r431543) @@ -2,7 +2,7 @@ PORTNAME= c7 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators linux PKGNAMEPREFIX= linux_base- EXTRACT_ONLY= ${DISTFILES:N*.src.rpm*:Nfilesystem-*} Modified: branches/2017Q1/emulators/linux_base-c7/pkg-plist.i386 ============================================================================== --- branches/2017Q1/emulators/linux_base-c7/pkg-plist.i386 Sun Jan 15 09:55:07 2017 (r431542) +++ branches/2017Q1/emulators/linux_base-c7/pkg-plist.i386 Sun Jan 15 10:39:54 2017 (r431543) @@ -2572,7 +2572,7 @@ usr/tmp @rmtry var/cache/ldconfig/aux-cache var/db/Makefile var/mail -@dir dev/shm +@dir dev @dir etc/X11/applnk @dir etc/X11/fontpath.d @dir etc/bash_completion.d @@ -2589,9 +2589,7 @@ var/mail @dir etc/xinetd.d @dir mnt @dir opt -@dir(,,555) proc @dir srv -@dir(,,555) sys @dir usr/etc @dir usr/games @dir usr/include @@ -3135,4 +3133,12 @@ var/mail @dir var/spool/mail @dir var/yp @dir %%LINUXBASE%% +@comment These directories may have filesystems mounted and then it may not be +@comment possible to change their mode and timestamp like @dir tries to do. +@postexec mkdir -p %D/dev/shm +@postunexec rmdir %D/dev/shm 2>/dev/null || true +@postexec mkdir -p %D/proc +@postunexec rmdir %D/proc 2>/dev/null || true +@postexec mkdir -p %D/sys +@postunexec rmdir %D/sys 2>/dev/null || true @postexec %D/usr/sbin/ldconfig Modified: branches/2017Q1/emulators/linux_base-c7/pkg-plist.x86_64 ============================================================================== --- branches/2017Q1/emulators/linux_base-c7/pkg-plist.x86_64 Sun Jan 15 09:55:07 2017 (r431542) +++ branches/2017Q1/emulators/linux_base-c7/pkg-plist.x86_64 Sun Jan 15 10:39:54 2017 (r431543) @@ -3022,7 +3022,7 @@ usr/tmp var/db/Makefile @rmtry var/cache/ldconfig/aux-cache var/mail -@dir dev/shm +@dir dev @dir etc/X11/applnk @dir etc/X11/fontpath.d @dir etc/bash_completion.d @@ -3039,9 +3039,7 @@ var/mail @dir etc/xinetd.d @dir mnt @dir opt -@dir(,,555) proc @dir srv -@dir(,,555) sys @dir usr/etc @dir usr/games @dir usr/include @@ -3591,4 +3589,12 @@ var/mail @dir var/spool/mail @dir var/yp @dir %%LINUXBASE%% +@comment These directories may have filesystems mounted and then it may not be +@comment possible to change their mode and timestamp like @dir tries to do. +@postexec mkdir -p %D/dev/shm +@postunexec rmdir %D/dev/shm 2>/dev/null || true +@postexec mkdir -p %D/proc +@postunexec rmdir %D/proc 2>/dev/null || true +@postexec mkdir -p %D/sys +@postunexec rmdir %D/sys 2>/dev/null || true @postexec %D/usr/sbin/ldconfig From owner-svn-ports-branches@freebsd.org Sun Jan 15 11:29:28 2017 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 332BCCB01D2; Sun, 15 Jan 2017 11:29:28 +0000 (UTC) (envelope-from riggs@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 0DC191AFF; Sun, 15 Jan 2017 11:29:27 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0FBTRjO019462; Sun, 15 Jan 2017 11:29:27 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0FBTRei019459; Sun, 15 Jan 2017 11:29:27 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201701151129.v0FBTRei019459@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 15 Jan 2017 11:29:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431546 - branches/2017Q1/multimedia/mplayer 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.23 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, 15 Jan 2017 11:29:28 -0000 Author: riggs Date: Sun Jan 15 11:29:26 2017 New Revision: 431546 URL: https://svnweb.freebsd.org/changeset/ports/431546 Log: MFH: r431457 Convert GUI and SKINS to OPTION helpers; fix dependency: GUI implies ASS PR: 216030 Reported by: rjk@wintek.com Approved by: ports-secteam (junovitch) Modified: branches/2017Q1/multimedia/mplayer/Makefile branches/2017Q1/multimedia/mplayer/Makefile.optvars branches/2017Q1/multimedia/mplayer/pkg-plist Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/multimedia/mplayer/Makefile ============================================================================== --- branches/2017Q1/multimedia/mplayer/Makefile Sun Jan 15 11:27:00 2017 (r431545) +++ branches/2017Q1/multimedia/mplayer/Makefile Sun Jan 15 11:29:26 2017 (r431546) @@ -46,6 +46,8 @@ CONFLICTS= mplayer2-2.* CONFFILES= example.conf input.conf menu.conf dvb-menu.conf USES+= iconv pkgconfig +OPTIONS_SUB= yes + .include "${.CURDIR}/../../multimedia/mplayer/Makefile.optvars" .include @@ -63,20 +65,6 @@ CONFIGURE_ARGS+= --disable-arts \ --disable-musepack \ --disable-theora -.if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11} -PLIST_SUB+= GMPLAYER="" -DESKTOP_ENTRIES= "MPlayer" "High performance media player" "mplayer" "gmplayer" "" false -.if ${PORT_OPTIONS:MSKINS} -RUN_DEPENDS+= mplayer-skins>=0:multimedia/mplayer-skins -.endif - -USE_GNOME+= gtk20 -CONFIGURE_ARGS+= --enable-gui - -.else -PLIST_SUB+= GMPLAYER="@comment " -.endif #GUI && X11 - .if ${PORT_OPTIONS:MX11} USE_XORG= x11 xext xproto xscrnsaver .if ${PORT_OPTIONS:MXVIDEO} Modified: branches/2017Q1/multimedia/mplayer/Makefile.optvars ============================================================================== --- branches/2017Q1/multimedia/mplayer/Makefile.optvars Sun Jan 15 11:27:00 2017 (r431545) +++ branches/2017Q1/multimedia/mplayer/Makefile.optvars Sun Jan 15 11:29:26 2017 (r431546) @@ -52,6 +52,11 @@ GNUTLS_CONFIGURE_OFF= --disable-gnutls GSM_LIB_DEPENDS= libgsm.so:audio/gsm GSM_CONFIGURE_OFF= --disable-libgsm +GUI_CONFIGURE_ENABLE= gui +GUI_USE= GNOME=gtk20 +GUI_DESKTOP_ENTRIES= "MPlayer" "High performance media player" "mplayer" "gmplayer" "" false +GUI_IMPLIES= ASS X11 + IPV6_CATEGORIES= ipv6 IPV6_CONFIGURE_OFF= --disable-inet6 @@ -104,6 +109,9 @@ SDL_CONFIGURE_OFF= --disable-sdl SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CONFIGURE_OFF= --disable-sndio +SKINS_RUN_DEPENDS= mplayer-skins>=0:multimedia/mplayer-skins +SKINS_IMPLIES= GUI + SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient SMB_CONFIGURE_OFF= --disable-smb Modified: branches/2017Q1/multimedia/mplayer/pkg-plist ============================================================================== --- branches/2017Q1/multimedia/mplayer/pkg-plist Sun Jan 15 11:27:00 2017 (r431545) +++ branches/2017Q1/multimedia/mplayer/pkg-plist Sun Jan 15 11:29:26 2017 (r431546) @@ -1,8 +1,8 @@ bin/mplayer man/man1/mplayer.1.gz -%%GMPLAYER%%bin/gmplayer -%%GMPLAYER%%man/man1/gmplayer.1.gz -%%GMPLAYER%%share/pixmaps/mplayer.png +%%GUI%%bin/gmplayer +%%GUI%%man/man1/gmplayer.1.gz +%%GUI%%share/pixmaps/mplayer.png %%DATADIR%%/examples/etc/example.conf %%DATADIR%%/examples/etc/input.conf %%DATADIR%%/examples/etc/menu.conf From owner-svn-ports-branches@freebsd.org Sun Jan 15 11:36:32 2017 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 A0947CB05BE; Sun, 15 Jan 2017 11:36:32 +0000 (UTC) (envelope-from riggs@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 7C0D810DF; Sun, 15 Jan 2017 11:36:32 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0FBaVuL023847; Sun, 15 Jan 2017 11:36:31 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0FBaVVq023845; Sun, 15 Jan 2017 11:36:31 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201701151136.v0FBaVVq023845@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 15 Jan 2017 11:36:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431549 - branches/2017Q1/multimedia/mplayer 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.23 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, 15 Jan 2017 11:36:32 -0000 Author: riggs Date: Sun Jan 15 11:36:31 2017 New Revision: 431549 URL: https://svnweb.freebsd.org/changeset/ports/431549 Log: MFH: r431464 Convert remaining X-related OPTIONs to option helpers + deps via IMPLIES Approved by: ports-secteam (junovitch) Modified: branches/2017Q1/multimedia/mplayer/Makefile branches/2017Q1/multimedia/mplayer/Makefile.optvars Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/multimedia/mplayer/Makefile ============================================================================== --- branches/2017Q1/multimedia/mplayer/Makefile Sun Jan 15 11:33:38 2017 (r431548) +++ branches/2017Q1/multimedia/mplayer/Makefile Sun Jan 15 11:36:31 2017 (r431549) @@ -49,7 +49,7 @@ USES+= iconv pkgconfig OPTIONS_SUB= yes .include "${.CURDIR}/../../multimedia/mplayer/Makefile.optvars" -.include +.include CONFIGURE_ARGS+= --disable-arts \ --disable-directfb \ @@ -65,42 +65,6 @@ CONFIGURE_ARGS+= --disable-arts \ --disable-musepack \ --disable-theora -.if ${PORT_OPTIONS:MX11} -USE_XORG= x11 xext xproto xscrnsaver -.if ${PORT_OPTIONS:MXVIDEO} -USE_XORG+= xv -.else -CONFIGURE_ARGS+=--disable-xv -.endif -.if ${PORT_OPTIONS:MX11DGA} -USE_XORG+= xxf86dga -.else -CONFIGURE_ARGS+=--disable-dga1 --disable-dga2 -.endif -.if ${PORT_OPTIONS:MOPENGL} -USE_GL+= gl -.else -CONFIGURE_ARGS+=--disable-gl -.endif -.if ${PORT_OPTIONS:MXINERAMA} -USE_XORG+= xinerama xineramaproto -.else -CONFIGURE_ARGS+=--disable-xinerama -.endif -.if ${PORT_OPTIONS:MX11VM} -USE_XORG+= xxf86vm -.else -CONFIGURE_ARGS+=--disable-vm -.endif -.if ${PORT_OPTIONS:MXVMC} -USE_XORG+= xvmc -CONFIGURE_ARGS+=--enable-xvmc --with-xvmclib=XvMCW -.endif -.else #X11 -CONFIGURE_ARGS+=--disable-x11 -.endif - -.include .include "${.CURDIR}/../../multimedia/mplayer/Makefile.options" BROKEN_armv6= Fails to compile: Error: garbage following instruction -- vmov s16,SCALE Modified: branches/2017Q1/multimedia/mplayer/Makefile.optvars ============================================================================== --- branches/2017Q1/multimedia/mplayer/Makefile.optvars Sun Jan 15 11:33:38 2017 (r431548) +++ branches/2017Q1/multimedia/mplayer/Makefile.optvars Sun Jan 15 11:36:31 2017 (r431549) @@ -81,6 +81,10 @@ NAS_CONFIGURE_OFF= --disable-nas OPENAL_USES= openal:soft OPENAL_CONFIGURE_OFF= --disable-openal +OPENGL_USE= GL=gl +OPENGL_CONFIGURE_OFF= --disable-gl +OPENGL_IMPLIES= X11 + OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15 OPENJPEG_CONFIGURE_OFF= --disable-libopenjpeg @@ -138,8 +142,31 @@ VDPAU_CONFIGURE_OFF= --disable-vdpau VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx VPX_CONFIGURE_OFF= --disable-libvpx-lavc +X11_USE= XORG=x11,xext,xproto,xscrnsaver +X11_CONFIGURE_OFF= --disable-x11 + +X11DGA_USE= XORG=xxf86dga +X11DGA_CONFIGURE_OFF= --disable-dga1 --disable-dga2 +X11DGA_IMPLIES= X11 + +X11VM_USE= XORG=xxf86vm +X11VM_CONFIGURE_OFF= --disable-vm +X11VM_IMPLIES= X11 + X264_LIB_DEPENDS= libx264.so:multimedia/libx264 X264_CONFIGURE_OFF= --disable-x264 +XINERAMA_USE= XORG=xinerama,xineramaproto +XINERAMA_CONFIGURE_OFF= --disable-xinerama +XINERAMA_IMPLIES= X11 + XVID_LIB_DEPENDS= libxvidcore.so:multimedia/xvid XVID_CONFIGURE_OFF= --disable-xvid + +XVIDEO_USE= XORG=xv +XVIDEO_CONFIGURE_OFF= --disable-xv +XVIDEO_IMPLIES= X11 + +XVMC_USE= XORG=xvmc +XVMC_CONFIGURE_ON= --enable-xvmc --with-xvmclib=XvMCW +XVMC_IMPLIES= X11 From owner-svn-ports-branches@freebsd.org Sun Jan 15 13:20:26 2017 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 4B4FECB132B; Sun, 15 Jan 2017 13:20:26 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2694E1ADE; Sun, 15 Jan 2017 13:20:26 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0FDKPjJ065267; Sun, 15 Jan 2017 13:20:25 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0FDKOkl065261; Sun, 15 Jan 2017 13:20:24 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201701151320.v0FDKOkl065261@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sun, 15 Jan 2017 13:20:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431558 - in branches/2017Q1/graphics/rawtherapee: . 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.23 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, 15 Jan 2017 13:20:26 -0000 Author: mandree Date: Sun Jan 15 13:20:24 2017 New Revision: 431558 URL: https://svnweb.freebsd.org/changeset/ports/431558 Log: MFH: r430611 r431493 Upgrade CPU flags to use SSE2 by default on i386. Reported by: Ingo Weyrich Further cleanup, 11-RELEASE build fixes. Prune unused dependencies via -Wl,--as-needed. Build with as few requirements as works for 10.3-RELEASE and 11.0-RELEASE, i386 and amd64. This should use the base CC on anything but 10.3-RELEASE amd64, where we use GCC 4.9 for OpenMP support. Specifically, 11.0-RELEASE compilations do *not* work with GCC 4.9 and the result fails with SIGBUS with apparent bogus SSE code generation and misalignment. Fix sound theme support via libcanberra (change Linux ifdefs to !Apple ifdefs). Apply -DPROC_TARGET_NUMBER="1" (i. e. build an executable with generic tuning) only when building packages and unless -march is in CFLAGS. USE_GNOME upgraded from gtkmm20 to gtkm24, and add devel/openmp as requisite on amd64 (rather than implicit clang or gcc libs), bumping PORTREVISION. Silence cmake developer warnings, and be sure to export linker flags to cmake (so it finds -lomp in its configuration phase) [-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW] Cleanups: leverage USES=localbase, and drop/avoid duplicate definitions and dead code from the Makefile and support for unsupported older FreeBSD releases. Based in part on v0.3 patch of... PR: 215675 Submitted by: jbeich@ Approved by: ports-secteam (junovitch@) Added: branches/2017Q1/graphics/rawtherapee/files/patch-rtengine_dcraw.cc - copied unchanged from r431493, head/graphics/rawtherapee/files/patch-rtengine_dcraw.cc branches/2017Q1/graphics/rawtherapee/files/patch-rtgui_soundman.cc - copied unchanged from r431493, head/graphics/rawtherapee/files/patch-rtgui_soundman.cc Deleted: branches/2017Q1/graphics/rawtherapee/files/patch-CMakeLists.txt branches/2017Q1/graphics/rawtherapee/files/patch-rtengine_improcfun.h branches/2017Q1/graphics/rawtherapee/files/rawtherapee.in Modified: branches/2017Q1/graphics/rawtherapee/Makefile branches/2017Q1/graphics/rawtherapee/files/patch-rtengine_safegtk.cc (contents, props changed) branches/2017Q1/graphics/rawtherapee/pkg-message Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/graphics/rawtherapee/Makefile ============================================================================== --- branches/2017Q1/graphics/rawtherapee/Makefile Sun Jan 15 13:13:31 2017 (r431557) +++ branches/2017Q1/graphics/rawtherapee/Makefile Sun Jan 15 13:20:24 2017 (r431558) @@ -3,7 +3,7 @@ PORTNAME= rawtherapee PORTVERSION= 4.2 -PORTREVISION= 4 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://rawtherapee.com/shared/source/ @@ -12,39 +12,43 @@ COMMENT= Powerful RAW image processing a LICENSE= GPLv3 -LIB_DEPENDS= libgtkmm-2.4.so:x11-toolkits/gtkmm24 \ +LIB_DEPENDS= libcanberra-gtk.so:audio/libcanberra \ + libexpat.so:textproc/expat2 \ + libfftw3.so:math/fftw3 \ + libfftw3f.so:math/fftw3-float \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ libiptcdata.so:graphics/libiptcdata \ liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png \ - libtiff.so:graphics/tiff \ libsigc-2.0.so:devel/libsigc++20 \ - libfftw3.so:math/fftw3 \ - libfftw3f.so:math/fftw3-float \ - libcanberra-gtk3.so:audio/libcanberra-gtk3 + libtiff.so:graphics/tiff -USES= cmake:outsource compiler:gcc-c++11-lib desktop-file-utils dos2unix \ - jpeg pkgconfig tar:xz +USES= cmake:outsource desktop-file-utils dos2unix \ + jpeg localbase:ldflags pkgconfig tar:xz DOS2UNIX_REGEX= .*\.(cc|h) -USE_GNOME= gtk20 glib20 +LDFLAGS+= -Wl,--as-needed # fontconfig, freetype, gettext, libX11 +USE_GNOME= gtkmm24 USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include -fPIC CXXFLAGS+= -I${LOCALBASE}/include -fPIC -LDFLAGS+= -lpthread -L${LOCALBASE}/lib -CONFIGURE_ENV= CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS:C|-Wl,-rpath=${_GCC_RUNTIME}||:C|-L${_GCC_RUNTIME}||}" +LDFLAGS+= -lpthread CMAKE_ARGS+= -DDOCDIR="${DOCSDIR}" \ -DCREDITSDIR="${DOCSDIR}" \ -DLICENCEDIR="${DOCSDIR}" \ -DDESKTOPDIR="${DESKTOPDIR}" \ -DDATADIR="${DATADIR}" \ - -DCMAKE_C_FLAGS="${CFLAGS:C|-Wl,-rpath=${_GCC_RUNTIME}||:C|-L${_GCC_RUNTIME}||}" \ - -DCMAKE_CXX_FLAGS="${CXXFLAGS:C|-Wl,-rpath=${_GCC_RUNTIME}||:C|-L${_GCC_RUNTIME}||}" \ - -DCACHE_NAME_SUFFIX="4.1" -SUB_FILES= rawtherapee -SUB_LIST= RTDIR="${RTDIR}" + -DCACHE_NAME_SUFFIX="4.1" \ + -Wno-dev \ + -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW +# 3.4.x: CMAKE_EXE_LINKER_FLAGS is not passed to TRY_COMPILE by default +# any more. The CMP0056 policy must be explicitly set to NEW to ensure +# linker flags are passed. Else -lomp is not found with clang. +# See: https://cmake.org/cmake/help/v3.4/policy/CMP0056.html + INSTALLS_ICONS= yes -.if defined(PACKAGE_BUILDING) +.if defined(PACKAGE_BUILDING) && empty(CFLAGS:M-march*) CMAKE_ARGS+= -DPROC_TARGET_NUMBER="1" .endif @@ -52,31 +56,41 @@ RTDIR= ${PREFIX}/libdata/${PORTNAME} OPTIONS_DEFINE= OPTIMIZED_CFLAGS OPENMP OPTIONS_DEFAULT= OPTIMIZED_CFLAGS OPENMP -OPENMP_DESC= Enable multicore processing using OpenMP -OPTIMIZED_CFLAGS_DESC= Use extra compiler optimizations (requires SSE support) +OPENMP_DESC= Enable multicore processing using OpenMP (amd64) +OPTIMIZED_CFLAGS_DESC= Use extra compiler optimizations (requires SSE2 support) OPENMP_CMAKE_BOOL= OPTION_OMP -.include +OPTIMIZED_CFLAGS_CFLAGS= -O3 -funroll-loops \ + ${OPTIMIZED_CFLAGS_CFLAGS_${CHOSEN_COMPILER_TYPE}} +OPTIMIZED_CFLAGS_CFLAGS_gcc= -fexpensive-optimizations + +.include # ------------------------------------------------------------------- +# -.if ${ARCH} == "amd64" || ${ARCH} == "i386" -.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -CFLAGS+= -O3 -fexpensive-optimizations \ - -funroll-loops -msse -CXXFLAGS+= -O3 \ - -funroll-loops -msse +.if !empty(PORT_OPTIONS:MOPENMP) && ${ARCH} == "amd64" +LIB_DEPENDS+= libomp.so.0:devel/openmp +OPENMP_FLAGS= -lm -lomp +LDFLAGS+= ${OPENMP_FLAGS} +.if ${OSVERSION} < 1100101 +# clang 3.4 doesn't support OpenMP, +# OTOH gcc 4.9 doesn't generate usable code on FreeBSD 11. +USES+= compiler:gcc-c++11-lib +.endif .endif + +.if defined(WITH_DEBUG) +CMAKE_BUILD_TYPE= RelWithDebInfo +STRIP= .endif # ------------------------------------------------------------------- +.include + post-patch: - @${REINPLACE_CMD} -e 's###g' \ - ${WRKSRC}/rtgui/darkframe.h \ - ${WRKSRC}/rtgui/flatfield.h \ - ${WRKSRC}/rtgui/icmpanel.h @${REINPLACE_CMD} -e 's#DESTINATION "$${CMAKE_INSTALL_PREFIX}/share/man/man1"#DESTINATION "${MANPREFIX}/man/man1/"#' \ ${WRKSRC}/CMakeLists.txt ${RM} ${WRKSRC}/rtengine/dcraw.patch \ Copied: branches/2017Q1/graphics/rawtherapee/files/patch-rtengine_dcraw.cc (from r431493, head/graphics/rawtherapee/files/patch-rtengine_dcraw.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/graphics/rawtherapee/files/patch-rtengine_dcraw.cc Sun Jan 15 13:20:24 2017 (r431558, copy of r431493, head/graphics/rawtherapee/files/patch-rtengine_dcraw.cc) @@ -0,0 +1,12 @@ +--- rtengine/dcraw.cc.orig 2017-01-14 17:35:19 UTC ++++ rtengine/dcraw.cc +@@ -8726,7 +8726,8 @@ static void decodeFPDeltaRow(Bytef * src + dst[col*3 + 2] = src[col + realTileWidth*2]; + } + } else { +- if (((union { uint32_t x; uint8_t c; }){1}).c) { ++ union X { uint32_t x; uint8_t c; }; ++ if (((union X){1}).c) { + for (size_t col = 0; col < tileWidth; ++col) { + for (size_t byte = 0; byte < bytesps; ++byte) + dst[col*bytesps + byte] = src[col + realTileWidth*(bytesps-byte-1)]; // Little endian Modified: branches/2017Q1/graphics/rawtherapee/files/patch-rtengine_safegtk.cc ============================================================================== --- branches/2017Q1/graphics/rawtherapee/files/patch-rtengine_safegtk.cc Sun Jan 15 13:13:31 2017 (r431557) +++ branches/2017Q1/graphics/rawtherapee/files/patch-rtengine_safegtk.cc Sun Jan 15 13:20:24 2017 (r431558) @@ -1,6 +1,6 @@ ---- ./rtengine/safegtk.cc.orig 2012-01-31 05:00:05.000000000 +0400 -+++ ./rtengine/safegtk.cc 2012-03-29 19:31:25.000000000 +0400 -@@ -98,7 +98,7 @@ +--- rtengine/safegtk.cc.orig 2017-01-14 17:35:18 UTC ++++ rtengine/safegtk.cc +@@ -184,7 +184,7 @@ void safe_build_file_list (Glib::RefPtr< Glib::RefPtr dirList; if (dir) { SAFE_ENUMERATOR_CODE_START @@ -9,7 +9,7 @@ SAFE_ENUMERATOR_CODE_END; } } -@@ -113,7 +113,7 @@ +@@ -199,7 +199,7 @@ void safe_build_file_list (Glib::RefPtr< if (dir) { if (!extensions) { SAFE_ENUMERATOR_CODE_START @@ -18,25 +18,25 @@ SAFE_ENUMERATOR_CODE_END; } else { -@@ -124,7 +124,7 @@ +@@ -210,7 +210,7 @@ void safe_build_file_list (Glib::RefPtr< SAFE_ENUMERATOR_CODE_START // convert the current filename to lowercase in a new ustring - Glib::ustring fname = Glib::ustring(info->get_name()).lowercase(); + Glib::ustring fname = Glib::ustring(info->get_display_name()).lowercase(); - int pos = fname.find_last_of('.'); - if (pos > -1 && pos < (fname.length()-1)) { -@@ -135,7 +135,7 @@ + size_t pos = fname.find_last_of('.'); + if (pos < (fname.length()-1)) { +@@ -221,7 +221,7 @@ void safe_build_file_list (Glib::RefPtr< // look out if it has one of the retained extensions - for (unsigned int i=0; iget_name())); + names.push_back (Glib::build_filename (directory, info->get_display_name())); break; } } -@@ -156,7 +156,7 @@ +@@ -242,7 +242,7 @@ void safe_build_subdir_list (Glib::RefPt SAFE_ENUMERATOR_CODE_START if (info->get_file_type() == Gio::FILE_TYPE_DIRECTORY && (!info->is_hidden() || add_hidden)) Copied: branches/2017Q1/graphics/rawtherapee/files/patch-rtgui_soundman.cc (from r431493, head/graphics/rawtherapee/files/patch-rtgui_soundman.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/graphics/rawtherapee/files/patch-rtgui_soundman.cc Sun Jan 15 13:20:24 2017 (r431558, copy of r431493, head/graphics/rawtherapee/files/patch-rtgui_soundman.cc) @@ -0,0 +1,22 @@ +--- rtgui/soundman.cc.orig 2017-01-14 17:35:19 UTC ++++ rtgui/soundman.cc +@@ -24,9 +24,7 @@ + #ifdef WIN32 + #include + #include +-#endif +- +-#ifdef __linux__ ++#elif !defined(__APPLE__) + #include + #endif + +@@ -65,7 +63,7 @@ void SoundManager::playSoundAsync(const + wchar_t *wfilename = (wchar_t*)g_utf8_to_utf16 (sound.c_str(), -1, NULL, NULL, NULL); + PlaySoundW(wfilename, NULL, sndParam); + g_free( wfilename ); +-#elif defined(__linux__) ++#elif !defined(__APPLE__) + ca_context_play(ca_gtk_context_get(), 0, CA_PROP_EVENT_ID, sound.c_str(), CA_PROP_MEDIA_FILENAME, sound.c_str(), NULL); + #endif + } Modified: branches/2017Q1/graphics/rawtherapee/pkg-message ============================================================================== --- branches/2017Q1/graphics/rawtherapee/pkg-message Sun Jan 15 13:13:31 2017 (r431557) +++ branches/2017Q1/graphics/rawtherapee/pkg-message Sun Jan 15 13:20:24 2017 (r431558) @@ -10,4 +10,3 @@ remove older cache directories. Also, after configurations have been moved to the new version's directory, older $HOME/.config/RawTherapee* directories may be removed. ====================================================================== - From owner-svn-ports-branches@freebsd.org Sun Jan 15 15:09:03 2017 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 477C8CB17E3; Sun, 15 Jan 2017 15:09:03 +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 F19871EF6; Sun, 15 Jan 2017 15:09:02 +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 v0FF92wO011258; Sun, 15 Jan 2017 15:09:02 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0FF92Rg011256; Sun, 15 Jan 2017 15:09:02 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201701151509.v0FF92Rg011256@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sun, 15 Jan 2017 15:09:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431569 - branches/2017Q1/lang/groovy 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.23 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, 15 Jan 2017 15:09:03 -0000 Author: junovitch Date: Sun Jan 15 15:09:01 2017 New Revision: 431569 URL: https://svnweb.freebsd.org/changeset/ports/431569 Log: MFH: r431568 lang/groovy: update 2.4.7 -> 2.4.8 Security: CVE-2016-6814 Security: https://vuxml.FreeBSD.org/freebsd/4af92a40-db33-11e6-ae1b-002590263bf5.html Approved by: ports-secteam (with hat) Modified: branches/2017Q1/lang/groovy/Makefile branches/2017Q1/lang/groovy/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/lang/groovy/Makefile ============================================================================== --- branches/2017Q1/lang/groovy/Makefile Sun Jan 15 15:08:27 2017 (r431568) +++ branches/2017Q1/lang/groovy/Makefile Sun Jan 15 15:09:01 2017 (r431569) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= groovy -DISTVERSION= 2.4.7 +DISTVERSION= 2.4.8 CATEGORIES= lang java MASTER_SITES= http://dl.bintray.com/groovy/maven/ DISTFILES= apache-groovy-binary-${PORTVERSION}${EXTRACT_SUFX} Modified: branches/2017Q1/lang/groovy/distinfo ============================================================================== --- branches/2017Q1/lang/groovy/distinfo Sun Jan 15 15:08:27 2017 (r431568) +++ branches/2017Q1/lang/groovy/distinfo Sun Jan 15 15:09:01 2017 (r431569) @@ -1,5 +1,5 @@ -TIMESTAMP = 1465436088 -SHA256 (apache-groovy-binary-2.4.7.zip) = 438dd6098252647e88ff12ac5737d0d0f7e16a8e4e42e8be3e05a4c43abefbd5 -SIZE (apache-groovy-binary-2.4.7.zip) = 36420543 -SHA256 (apache-groovy-docs-2.4.7.zip) = 85e99940195bc7cf8be7bd6396e59fd5bf4747b13c202a77a2e649df6d1fbb6d -SIZE (apache-groovy-docs-2.4.7.zip) = 14755408 +TIMESTAMP = 1484445555 +SHA256 (apache-groovy-binary-2.4.8.zip) = 668a65ea17037371a1952cca5f42ebc03329e15d3619aacb4c7dd5f4b39a8dfd +SIZE (apache-groovy-binary-2.4.8.zip) = 36448216 +SHA256 (apache-groovy-docs-2.4.8.zip) = 6bb9148d146bae88af0afc1d7580f37cadb08c9ab01639b4a9781a10c75f6022 +SIZE (apache-groovy-docs-2.4.8.zip) = 15225887 From owner-svn-ports-branches@freebsd.org Sun Jan 15 15:32:31 2017 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 A8FBFCB1099; Sun, 15 Jan 2017 15:32:31 +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 6153416D7; Sun, 15 Jan 2017 15:32:31 +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 v0FFWUDC024822; Sun, 15 Jan 2017 15:32:30 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0FFWUEb024817; Sun, 15 Jan 2017 15:32:30 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201701151532.v0FFWUEb024817@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sun, 15 Jan 2017 15:32:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431584 - branches/2017Q1/sysutils/iocage 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.23 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, 15 Jan 2017 15:32:31 -0000 Author: junovitch Date: Sun Jan 15 15:32:30 2017 New Revision: 431584 URL: https://svnweb.freebsd.org/changeset/ports/431584 Log: MFH: r431556 r431557 sysutils/iocage: unbreak fetch - update GH_ACCOUNT and GH_PROJECT after repository change - update pkg-descr information and WWW Approved by: ports-secteam (blanket) Modified: branches/2017Q1/sysutils/iocage/Makefile branches/2017Q1/sysutils/iocage/distinfo branches/2017Q1/sysutils/iocage/pkg-descr Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/sysutils/iocage/Makefile ============================================================================== --- branches/2017Q1/sysutils/iocage/Makefile Sun Jan 15 15:28:27 2017 (r431583) +++ branches/2017Q1/sysutils/iocage/Makefile Sun Jan 15 15:32:30 2017 (r431584) @@ -13,6 +13,8 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes +GH_ACCOUNT= ${PORTNAME} +GH_PROJECT= iocage_legacy NO_BUILD= yes NO_ARCH= yes Modified: branches/2017Q1/sysutils/iocage/distinfo ============================================================================== --- branches/2017Q1/sysutils/iocage/distinfo Sun Jan 15 15:28:27 2017 (r431583) +++ branches/2017Q1/sysutils/iocage/distinfo Sun Jan 15 15:32:30 2017 (r431584) @@ -1,3 +1,3 @@ -TIMESTAMP = 1471860114 -SHA256 (iocage-iocage-v1.7.6_GH0.tar.gz) = ac39198eee4a067b7c0c10f4914aa24aa68198aa0bbf3251d572f20869d483c8 -SIZE (iocage-iocage-v1.7.6_GH0.tar.gz) = 297443 +TIMESTAMP = 1484481883 +SHA256 (iocage-iocage_legacy-v1.7.6_GH0.tar.gz) = 4ff333c198d7c8a8a77c70797aae54dfc08063c712bf476862c4875f3e468788 +SIZE (iocage-iocage_legacy-v1.7.6_GH0.tar.gz) = 297472 Modified: branches/2017Q1/sysutils/iocage/pkg-descr ============================================================================== --- branches/2017Q1/sysutils/iocage/pkg-descr Sun Jan 15 15:28:27 2017 (r431583) +++ branches/2017Q1/sysutils/iocage/pkg-descr Sun Jan 15 15:32:30 2017 (r431584) @@ -5,4 +5,7 @@ FreeBSD operating system has to offer. It is geared for ease of use with a simple and easy to understand command syntax. -WWW: https://github.com/iocage/iocage +This version of iocage is now deprecated in favor of +Python based version in sysutils/py-iocage. + +WWW: https://github.com/iocage/iocage_legacy From owner-svn-ports-branches@freebsd.org Sun Jan 15 15:34:44 2017 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 8B8BBCB1123; Sun, 15 Jan 2017 15:34:44 +0000 (UTC) (envelope-from ler@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 566EE1827; Sun, 15 Jan 2017 15:34:44 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0FFYhvS025120; Sun, 15 Jan 2017 15:34:43 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0FFYh8P025118; Sun, 15 Jan 2017 15:34:43 GMT (envelope-from ler@FreeBSD.org) Message-Id: <201701151534.v0FFYh8P025118@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Sun, 15 Jan 2017 15:34:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431585 - branches/2017Q1/sysutils/lsof 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.23 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, 15 Jan 2017 15:34:44 -0000 Author: ler Date: Sun Jan 15 15:34:43 2017 New Revision: 431585 URL: https://svnweb.freebsd.org/changeset/ports/431585 Log: MFH: r431492 r431583 Fix sysutils/lsof on arm. This fixes the case where ARM_NARCH and ARM_NMMUS are 0, since the lsof(1) sources get hacky access to kernel structures. PR: 216065 Submitted by: samm os2 kiev ua Obtained from: Vic Abell (author) Approved by: ports-secteam (blanket), adamw (mentor) Modified: branches/2017Q1/sysutils/lsof/Makefile branches/2017Q1/sysutils/lsof/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/sysutils/lsof/Makefile ============================================================================== --- branches/2017Q1/sysutils/lsof/Makefile Sun Jan 15 15:32:30 2017 (r431584) +++ branches/2017Q1/sysutils/lsof/Makefile Sun Jan 15 15:34:43 2017 (r431585) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= lsof -DISTVERSION= 4.90G +DISTVERSION= 4.90I PORTEPOCH= 8 CATEGORIES= sysutils MASTER_SITES= http://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/ \ Modified: branches/2017Q1/sysutils/lsof/distinfo ============================================================================== --- branches/2017Q1/sysutils/lsof/distinfo Sun Jan 15 15:32:30 2017 (r431584) +++ branches/2017Q1/sysutils/lsof/distinfo Sun Jan 15 15:34:43 2017 (r431585) @@ -1,3 +1,3 @@ -TIMESTAMP = 1474579688 -SHA256 (lsof_4.90G.freebsd.tar.bz2) = 17b679285bf7e34bfd999d1443b0e8c7668c695138b7ab36ed36a83d8036c58a -SIZE (lsof_4.90G.freebsd.tar.bz2) = 487776 +TIMESTAMP = 1484467800 +SHA256 (lsof_4.90I.freebsd.tar.bz2) = 063f1275d7aff331962bcb02629f7d8ac3c603266a805ea1b05321da9184e351 +SIZE (lsof_4.90I.freebsd.tar.bz2) = 487912 From owner-svn-ports-branches@freebsd.org Sun Jan 15 15:42:39 2017 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 2DE52CB140D; Sun, 15 Jan 2017 15:42:39 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E6E1C1D52; Sun, 15 Jan 2017 15:42:38 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0FFgcFS029465; Sun, 15 Jan 2017 15:42:38 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0FFgbEX029460; Sun, 15 Jan 2017 15:42:37 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201701151542.v0FFgbEX029460@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 15 Jan 2017 15:42:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431586 - in branches/2017Q1: archivers/liborange archivers/unshield games/openmw 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.23 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, 15 Jan 2017 15:42:39 -0000 Author: sunpoet Date: Sun Jan 15 15:42:37 2017 New Revision: 431586 URL: https://svnweb.freebsd.org/changeset/ports/431586 Log: MFH: r431574 Update to 1.4.1 - Bump PORTREVISION for archivers/unshield shlib change Changes: https://github.com/twogood/unshield/releases Approved by: ports-secteam (junovitch) Modified: branches/2017Q1/archivers/liborange/Makefile branches/2017Q1/archivers/unshield/Makefile branches/2017Q1/archivers/unshield/distinfo branches/2017Q1/archivers/unshield/pkg-plist branches/2017Q1/games/openmw/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/archivers/liborange/Makefile ============================================================================== --- branches/2017Q1/archivers/liborange/Makefile Sun Jan 15 15:34:43 2017 (r431585) +++ branches/2017Q1/archivers/liborange/Makefile Sun Jan 15 15:42:37 2017 (r431586) @@ -3,7 +3,7 @@ PORTNAME= liborange PORTVERSION= 0.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= archivers MASTER_SITES= SF/synce/Orange/${PORTVERSION} Modified: branches/2017Q1/archivers/unshield/Makefile ============================================================================== --- branches/2017Q1/archivers/unshield/Makefile Sun Jan 15 15:34:43 2017 (r431585) +++ branches/2017Q1/archivers/unshield/Makefile Sun Jan 15 15:42:37 2017 (r431586) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= unshield -PORTVERSION= 1.4 +PORTVERSION= 1.4.1 CATEGORIES= archivers MAINTAINER= sunpoet@FreeBSD.org Modified: branches/2017Q1/archivers/unshield/distinfo ============================================================================== --- branches/2017Q1/archivers/unshield/distinfo Sun Jan 15 15:34:43 2017 (r431585) +++ branches/2017Q1/archivers/unshield/distinfo Sun Jan 15 15:42:37 2017 (r431586) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483256014 -SHA256 (twogood-unshield-1.4_GH0.tar.gz) = 8ae91961212193a7d3d7973c1c9464f3cd1967c179d6099feb1bb193912f8231 -SIZE (twogood-unshield-1.4_GH0.tar.gz) = 37199 +TIMESTAMP = 1484485663 +SHA256 (twogood-unshield-1.4.1_GH0.tar.gz) = f84c0f29028f7162fe6e97c2b1e7f2886eedbda76f94f357fa2ab0362ebfe635 +SIZE (twogood-unshield-1.4.1_GH0.tar.gz) = 46009 Modified: branches/2017Q1/archivers/unshield/pkg-plist ============================================================================== --- branches/2017Q1/archivers/unshield/pkg-plist Sun Jan 15 15:34:43 2017 (r431585) +++ branches/2017Q1/archivers/unshield/pkg-plist Sun Jan 15 15:42:37 2017 (r431586) @@ -1,6 +1,7 @@ bin/unshield include/libunshield.h lib/libunshield.so -lib/libunshield.so.1.4 +lib/libunshield.so.0 +lib/libunshield.so.0.0.0 libdata/pkgconfig/libunshield.pc man/man1/unshield.1.gz Modified: branches/2017Q1/games/openmw/Makefile ============================================================================== --- branches/2017Q1/games/openmw/Makefile Sun Jan 15 15:34:43 2017 (r431585) +++ branches/2017Q1/games/openmw/Makefile Sun Jan 15 15:42:37 2017 (r431586) @@ -4,7 +4,7 @@ PORTNAME= openmw PORTVERSION= 0.41.0 DISTVERSIONPREFIX= openmw- -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MAINTAINER= t@tobik.me From owner-svn-ports-branches@freebsd.org Sun Jan 15 18:24:22 2017 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 85E31CB1639; Sun, 15 Jan 2017 18:24:22 +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 5417F138A; Sun, 15 Jan 2017 18:24:22 +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 v0FIOLIE094538; Sun, 15 Jan 2017 18:24:21 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0FIOLTs094537; Sun, 15 Jan 2017 18:24:21 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201701151824.v0FIOLTs094537@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 15 Jan 2017 18:24:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431594 - branches/2017Q1/textproc/UCD 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.23 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, 15 Jan 2017 18:24:22 -0000 Author: antoine Date: Sun Jan 15 18:24:21 2017 New Revision: 431594 URL: https://svnweb.freebsd.org/changeset/ports/431594 Log: MFH: r431593 Fix checksum after copyright.html was updated (2016 -> 2017) Modified: branches/2017Q1/textproc/UCD/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/textproc/UCD/distinfo ============================================================================== --- branches/2017Q1/textproc/UCD/distinfo Sun Jan 15 18:23:41 2017 (r431593) +++ branches/2017Q1/textproc/UCD/distinfo Sun Jan 15 18:24:21 2017 (r431594) @@ -1,5 +1,5 @@ -TIMESTAMP = 1480192452 +TIMESTAMP = 1484504270 SHA256 (UCD-9.0.0/UCD.zip) = df9e028425816fd5117eaea7173704056f88f7cd030681e457c6f3827f9390ec SIZE (UCD-9.0.0/UCD.zip) = 5655592 -SHA256 (UCD-9.0.0/copyright.html) = de57d1cc3cee5a514557ea6e79a09eea5324ac777b9e802bbb6d1da9cca9cd6d +SHA256 (UCD-9.0.0/copyright.html) = 9e3e8cfd23e3856941d3aaccf96736fdd16d1e55359b8a0a4ba745f0f5296c3d SIZE (UCD-9.0.0/copyright.html) = 16571 From owner-svn-ports-branches@freebsd.org Sun Jan 15 20:25:32 2017 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 8265ECB149F; Sun, 15 Jan 2017 20:25:32 +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 4AB6E1E8F; Sun, 15 Jan 2017 20:25:32 +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 v0FKPVmF043682; Sun, 15 Jan 2017 20:25:31 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0FKPTHW043659; Sun, 15 Jan 2017 20:25:29 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201701152025.v0FKPTHW043659@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 15 Jan 2017 20:25:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431598 - in branches/2017Q1/databases: mariadb100-client mariadb100-client/files mariadb100-server mariadb100-server/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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, 15 Jan 2017 20:25:32 -0000 Author: brnrd Date: Sun Jan 15 20:25:29 2017 New Revision: 431598 URL: https://svnweb.freebsd.org/changeset/ports/431598 Log: MFH: r431497 databases/mariadb100-server: Update to 10.0.29 - Update to 10.0.29 - Update mariadb100-client - Update patches - Regen patches with makepatch - Pet portlint - Add MROONGA liblz4 dependency - Fix MROONGA liblz4 linking - rm erroneously installed files PR: 197232, 204014, 215901 Security: 22373c43-d728-11e6-a9a5-b499baebfeaf Approved by: ports-secteam (junovitch) Added: branches/2017Q1/databases/mariadb100-client/files/patch-include_my__compare.h - copied unchanged from r431497, head/databases/mariadb100-client/files/patch-include_my__compare.h branches/2017Q1/databases/mariadb100-client/files/patch-mysys_my__default.c - copied unchanged from r431497, head/databases/mariadb100-client/files/patch-mysys_my__default.c branches/2017Q1/databases/mariadb100-client/files/patch-scripts_mysql__config.sh - copied unchanged from r431497, head/databases/mariadb100-client/files/patch-scripts_mysql__config.sh Deleted: branches/2017Q1/databases/mariadb100-client/files/patch-include_my_compare.h branches/2017Q1/databases/mariadb100-client/files/patch-mysys_my_default.c branches/2017Q1/databases/mariadb100-client/files/patch-scripts_mysql_config.sh branches/2017Q1/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt Modified: branches/2017Q1/databases/mariadb100-client/Makefile branches/2017Q1/databases/mariadb100-client/files/patch-CMakeLists.txt branches/2017Q1/databases/mariadb100-client/files/patch-client_CMakeLists.txt branches/2017Q1/databases/mariadb100-client/files/patch-extra_CMakeLists.txt branches/2017Q1/databases/mariadb100-client/files/patch-include_CMakeLists.txt branches/2017Q1/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt branches/2017Q1/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt branches/2017Q1/databases/mariadb100-client/files/patch-man_CMakeLists.txt branches/2017Q1/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt branches/2017Q1/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt branches/2017Q1/databases/mariadb100-client/files/patch-sql_CMakeLists.txt branches/2017Q1/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt branches/2017Q1/databases/mariadb100-server/Makefile branches/2017Q1/databases/mariadb100-server/distinfo branches/2017Q1/databases/mariadb100-server/files/patch-extra_CMakeLists.txt branches/2017Q1/databases/mariadb100-server/files/patch-mysys_my__default.c branches/2017Q1/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh branches/2017Q1/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt branches/2017Q1/databases/mariadb100-server/pkg-plist Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/databases/mariadb100-client/Makefile ============================================================================== --- branches/2017Q1/databases/mariadb100-client/Makefile Sun Jan 15 19:03:51 2017 (r431597) +++ branches/2017Q1/databases/mariadb100-client/Makefile Sun Jan 15 20:25:29 2017 (r431598) @@ -21,6 +21,7 @@ CLIENT_ONLY= yes post-install: ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 + ${RM} ${STAGEDIR}${PREFIX}/bin/mysqld_safe_helper ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private .include "${MASTERDIR}/Makefile" Modified: branches/2017Q1/databases/mariadb100-client/files/patch-CMakeLists.txt ============================================================================== --- branches/2017Q1/databases/mariadb100-client/files/patch-CMakeLists.txt Sun Jan 15 19:03:51 2017 (r431597) +++ branches/2017Q1/databases/mariadb100-client/files/patch-CMakeLists.txt Sun Jan 15 20:25:29 2017 (r431598) @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig 2015-08-05 20:11:27.000000000 +0200 -+++ CMakeLists.txt 2015-08-07 12:05:52.895578945 +0200 +--- CMakeLists.txt.orig 2017-01-12 01:45:16 UTC ++++ CMakeLists.txt @@ -405,9 +405,9 @@ ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) @@ -11,7 +11,7 @@ IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(sql) -@@ -425,6 +426,7 @@ IF(NOT WITHOUT_SERVER) +@@ -425,6 +425,7 @@ IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(internal) ENDIF() ENDIF() @@ -19,7 +19,7 @@ IF(UNIX) ADD_SUBDIRECTORY(man) -@@ -480,6 +482,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL +@@ -480,6 +481,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) @@ -27,7 +27,7 @@ INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT COMPONENT Readme) -@@ -490,6 +493,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP +@@ -490,6 +492,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ENDIF() Modified: branches/2017Q1/databases/mariadb100-client/files/patch-client_CMakeLists.txt ============================================================================== --- branches/2017Q1/databases/mariadb100-client/files/patch-client_CMakeLists.txt Sun Jan 15 19:03:51 2017 (r431597) +++ branches/2017Q1/databases/mariadb100-client/files/patch-client_CMakeLists.txt Sun Jan 15 20:25:29 2017 (r431598) @@ -1,6 +1,6 @@ ---- client/CMakeLists.txt.orig 2014-08-09 00:13:48.000000000 +0200 -+++ client/CMakeLists.txt 2014-09-05 22:40:26.210338712 +0200 -@@ -38,11 +38,12 @@ +--- client/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC ++++ client/CMakeLists.txt +@@ -38,11 +38,12 @@ IF(UNIX) SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) ENDIF(UNIX) @@ -14,8 +14,8 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -53,21 +54,25 @@ - MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) +@@ -54,21 +55,25 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim + SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) +IF(FALSE) @@ -41,7 +41,7 @@ MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") -@@ -79,10 +84,12 @@ +@@ -80,10 +85,12 @@ IF(WIN32) ENDIF(WIN32) # async_example is just a code example, do not install it. Modified: branches/2017Q1/databases/mariadb100-client/files/patch-extra_CMakeLists.txt ============================================================================== --- branches/2017Q1/databases/mariadb100-client/files/patch-extra_CMakeLists.txt Sun Jan 15 19:03:51 2017 (r431597) +++ branches/2017Q1/databases/mariadb100-client/files/patch-extra_CMakeLists.txt Sun Jan 15 20:25:29 2017 (r431598) @@ -1,6 +1,6 @@ ---- extra/CMakeLists.txt.orig 2015-01-25 16:21:40.000000000 +0100 -+++ extra/CMakeLists.txt 2015-01-29 20:20:56.846047266 +0100 -@@ -54,6 +54,7 @@ +--- extra/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC ++++ extra/CMakeLists.txt +@@ -54,6 +54,7 @@ ADD_CUSTOM_TARGET(GenError DEPENDS ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) @@ -8,7 +8,7 @@ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) TARGET_LINK_LIBRARIES(my_print_defaults mysys) -@@ -74,9 +75,12 @@ +@@ -74,9 +75,12 @@ ENDIF() MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) TARGET_LINK_LIBRARIES(replace mysys) @@ -21,7 +21,7 @@ MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) TARGET_LINK_LIBRARIES(mysql_waitpid mysys) -@@ -97,7 +101,9 @@ +@@ -100,7 +104,9 @@ ENDIF() ../storage/innobase/page/page0zip.cc ) Modified: branches/2017Q1/databases/mariadb100-client/files/patch-include_CMakeLists.txt ============================================================================== --- branches/2017Q1/databases/mariadb100-client/files/patch-include_CMakeLists.txt Sun Jan 15 19:03:51 2017 (r431597) +++ branches/2017Q1/databases/mariadb100-client/files/patch-include_CMakeLists.txt Sun Jan 15 20:25:29 2017 (r431598) @@ -1,6 +1,6 @@ ---- include/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 -+++ include/CMakeLists.txt 2012-12-23 00:48:29.000000000 +0200 -@@ -58,13 +58,18 @@ +--- include/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC ++++ include/CMakeLists.txt +@@ -66,16 +66,21 @@ INSTALL(FILES ${HEADERS} DESTINATION ${I FOREACH(f ${HEADERS_GEN_CONFIGURE}) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) ENDFOREACH(f) @@ -20,3 +20,6 @@ PATTERN mysql EXCLUDE REGEX "\\./(${EXCL_RE}$)" EXCLUDE) +ENDIF() + + INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development + FILES_MATCHING PATTERN "*.h" Copied: branches/2017Q1/databases/mariadb100-client/files/patch-include_my__compare.h (from r431497, head/databases/mariadb100-client/files/patch-include_my__compare.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/databases/mariadb100-client/files/patch-include_my__compare.h Sun Jan 15 20:25:29 2017 (r431598, copy of r431497, head/databases/mariadb100-client/files/patch-include_my__compare.h) @@ -0,0 +1,11 @@ +--- include/my_compare.h.orig 2017-01-12 01:45:16 UTC ++++ include/my_compare.h +@@ -40,7 +40,7 @@ extern "C" { + But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. + */ + +-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ ++#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ + #define HA_MAX_KEY_SEG 32 /* Max segments for key */ + + #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) Modified: branches/2017Q1/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt ============================================================================== --- branches/2017Q1/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt Sun Jan 15 19:03:51 2017 (r431597) +++ branches/2017Q1/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt Sun Jan 15 20:25:29 2017 (r431598) @@ -1,6 +1,6 @@ ---- libmysql/CMakeLists.txt.orig 2014-09-24 22:29:47 UTC +--- libmysql/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC +++ libmysql/CMakeLists.txt -@@ -437,6 +437,8 @@ IF(NOT DISABLE_SHARED) +@@ -479,6 +479,8 @@ IF(NOT DISABLE_SHARED) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") Modified: branches/2017Q1/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt ============================================================================== --- branches/2017Q1/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt Sun Jan 15 19:03:51 2017 (r431597) +++ branches/2017Q1/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt Sun Jan 15 20:25:29 2017 (r431598) @@ -1,6 +1,6 @@ ---- libservices/CMakeLists.txt.orig 2014-08-09 00:13:47.000000000 +0200 -+++ libservices/CMakeLists.txt 2014-09-05 22:29:05.110415834 +0200 -@@ -29,4 +29,6 @@ +--- libservices/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC ++++ libservices/CMakeLists.txt +@@ -29,4 +29,6 @@ SET(MYSQLSERVICES_SOURCES logger_service.c) ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) Modified: branches/2017Q1/databases/mariadb100-client/files/patch-man_CMakeLists.txt ============================================================================== --- branches/2017Q1/databases/mariadb100-client/files/patch-man_CMakeLists.txt Sun Jan 15 19:03:51 2017 (r431597) +++ branches/2017Q1/databases/mariadb100-client/files/patch-man_CMakeLists.txt Sun Jan 15 20:25:29 2017 (r431598) @@ -1,6 +1,6 @@ ---- man/CMakeLists.txt.orig 2012-12-22 21:30:12.000000000 +0200 -+++ man/CMakeLists.txt 2012-12-22 21:30:54.000000000 +0200 -@@ -30,9 +30,13 @@ +--- man/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC ++++ man/CMakeLists.txt +@@ -32,9 +32,13 @@ SET(MAN1_DEVEL mysql_config.1) SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1 mysqltest_embedded.1 mysql_client_test_embedded.1) Copied: branches/2017Q1/databases/mariadb100-client/files/patch-mysys_my__default.c (from r431497, head/databases/mariadb100-client/files/patch-mysys_my__default.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/databases/mariadb100-client/files/patch-mysys_my__default.c Sun Jan 15 20:25:29 2017 (r431598, copy of r431497, head/databases/mariadb100-client/files/patch-mysys_my__default.c) @@ -0,0 +1,52 @@ +--- mysys/my_default.c.orig 2017-01-12 01:45:18 UTC ++++ mysys/my_default.c +@@ -786,7 +786,7 @@ static int search_default_file_with_ext( + { + MY_STAT stat_info; + if (!my_stat(name,&stat_info,MYF(0))) +- return 1; ++ return 0; + /* + Ignore world-writable regular files. + This is mainly done to protect us to not read a file created by +@@ -804,6 +804,14 @@ static int search_default_file_with_ext( + if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) + return 1; /* Ignore wrong files */ + ++ if (strstr(name, "/etc") == name) ++ { ++ fprintf(stderr, ++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", ++ name,name); ++ goto err; ++ } ++ + while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) + { + line++; +@@ -1068,7 +1076,8 @@ void my_print_default_files(const char * + if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ + *end++= '.'; + strxmov(end, conf_file, *ext, " ", NullS); +- fputs(name, stdout); ++ if (strstr(name, "/etc") != name) ++ fputs(name, stdout); + } + } + } +@@ -1229,13 +1238,10 @@ static const char **init_default_directo + + #else + +-#if defined(DEFAULT_SYSCONFDIR) +- if (DEFAULT_SYSCONFDIR[0]) +- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); +-#else + errors += add_directory(alloc, "/etc/", dirs); + errors += add_directory(alloc, "/etc/mysql/", dirs); +-#endif /* DEFAULT_SYSCONFDIR */ ++ errors += add_directory(alloc, "/usr/local/etc/", dirs); ++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); + + #endif + Modified: branches/2017Q1/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt ============================================================================== --- branches/2017Q1/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt Sun Jan 15 19:03:51 2017 (r431597) +++ branches/2017Q1/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt Sun Jan 15 20:25:29 2017 (r431598) @@ -1,6 +1,6 @@ ---- pcre/CMakeLists.txt.orig 2014-08-09 00:13:36.000000000 +0200 -+++ pcre/CMakeLists.txt 2014-09-05 20:08:49.090972949 +0200 -@@ -513,6 +513,8 @@ +--- pcre/CMakeLists.txt.orig 2017-01-12 01:45:18 UTC ++++ pcre/CMakeLists.txt +@@ -509,6 +509,8 @@ IF(PCRE_SHOW_REPORT) MESSAGE(STATUS "") ENDIF(PCRE_SHOW_REPORT) Modified: branches/2017Q1/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt ============================================================================== --- branches/2017Q1/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt Sun Jan 15 19:03:51 2017 (r431597) +++ branches/2017Q1/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt Sun Jan 15 20:25:29 2017 (r431598) @@ -1,6 +1,6 @@ ---- scripts/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 -+++ scripts/CMakeLists.txt 2014-09-05 22:33:01.060378167 +0200 -@@ -72,6 +72,7 @@ +--- scripts/CMakeLists.txt.orig 2017-01-12 01:45:19 UTC ++++ scripts/CMakeLists.txt +@@ -73,6 +73,7 @@ IF(UNIX) ) ENDIF() @@ -8,7 +8,7 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql -@@ -81,6 +82,7 @@ +@@ -82,6 +83,7 @@ INSTALL(FILES ${FIX_PRIVILEGES_SQL} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server ) @@ -16,7 +16,7 @@ # TCMalloc hacks IF(MALLOC_LIB) -@@ -140,6 +142,7 @@ +@@ -134,6 +136,7 @@ ENDIF() SET(HOSTNAME "hostname") SET(MYSQLD_USER "mysql") @@ -24,7 +24,7 @@ # Required for mysqlbug until autotools are deprecated, once done remove these # and expand default cmake variables SET(CC ${CMAKE_C_COMPILER}) -@@ -180,6 +183,7 @@ +@@ -168,6 +171,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI DESTINATION ${INSTALL_BINDIR} COMPONENT Server ) @@ -32,7 +32,7 @@ ENDIF(UNIX) -@@ -204,6 +208,7 @@ +@@ -192,6 +196,7 @@ ELSE() SET(localstatedir ${MYSQL_DATADIR}) ENDIF() @@ -40,7 +40,7 @@ IF(UNIX) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) -@@ -219,6 +224,7 @@ +@@ -207,6 +212,7 @@ INSTALL_SCRIPT( COMPONENT Server ) ENDIF() @@ -48,7 +48,7 @@ SET(prefix "${CMAKE_INSTALL_PREFIX}") IF(INSTALL_SYSCONFDIR) -@@ -281,6 +287,8 @@ +@@ -269,6 +275,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) ENDIF() @@ -57,7 +57,7 @@ ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -339,18 +347,8 @@ +@@ -327,18 +335,8 @@ ELSE() SET(BIN_SCRIPTS msql2mysql mysql_config Copied: branches/2017Q1/databases/mariadb100-client/files/patch-scripts_mysql__config.sh (from r431497, head/databases/mariadb100-client/files/patch-scripts_mysql__config.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/databases/mariadb100-client/files/patch-scripts_mysql__config.sh Sun Jan 15 20:25:29 2017 (r431598, copy of r431497, head/databases/mariadb100-client/files/patch-scripts_mysql__config.sh) @@ -0,0 +1,14 @@ +--- scripts/mysql_config.sh.orig 2017-01-14 21:33:31 UTC ++++ scripts/mysql_config.sh +@@ -109,8 +109,11 @@ fi + # We intentionally add a space to the beginning and end of lib strings, simplifies replace later + libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" + libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " ++libs="$libs -L%%LOCALBASE%%/lib " + libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " ++libs_r="$libs_r -L%%LOCALBASE%%/lib " + embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " ++embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " + + if [ -r "$pkglibdir/libmygcc.a" ]; then + # When linking against the static library with a different version of GCC Modified: branches/2017Q1/databases/mariadb100-client/files/patch-sql_CMakeLists.txt ============================================================================== --- branches/2017Q1/databases/mariadb100-client/files/patch-sql_CMakeLists.txt Sun Jan 15 19:03:51 2017 (r431597) +++ branches/2017Q1/databases/mariadb100-client/files/patch-sql_CMakeLists.txt Sun Jan 15 20:25:29 2017 (r431598) @@ -1,6 +1,6 @@ ---- sql/CMakeLists.txt.orig 2014-09-05 22:49:59.808332000 +0200 -+++ sql/CMakeLists.txt 2014-09-05 22:50:18.768326206 +0200 -@@ -226,9 +226,9 @@ +--- sql/CMakeLists.txt.orig 2017-01-12 01:45:19 UTC ++++ sql/CMakeLists.txt +@@ -247,9 +247,9 @@ RUN_BISON( ) # Gen_lex_hash Modified: branches/2017Q1/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt ============================================================================== --- branches/2017Q1/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt Sun Jan 15 19:03:51 2017 (r431597) +++ branches/2017Q1/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt Sun Jan 15 20:25:29 2017 (r431598) @@ -1,6 +1,6 @@ ---- support-files/CMakeLists.txt.orig 2014-06-13 13:36:52.080474738 +0300 -+++ support-files/CMakeLists.txt 2014-06-13 13:50:59.537282325 +0300 -@@ -41,15 +41,18 @@ +--- support-files/CMakeLists.txt.orig 2017-01-12 01:45:23 UTC ++++ support-files/CMakeLists.txt +@@ -41,15 +41,18 @@ ELSE() SET(inst_location ${INSTALL_SUPPORTFILESDIR}) ENDIF() @@ -19,9 +19,9 @@ FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -67,8 +70,10 @@ +@@ -69,8 +72,10 @@ IF(UNIX) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) - INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles) + ADD_SUBDIRECTORY(SELinux) ENDIF() + ENDIF() @@ -30,7 +30,7 @@ CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) -@@ -92,6 +97,7 @@ +@@ -94,6 +99,7 @@ IF(UNIX) DESTINATION ${inst_location} COMPONENT SupportFiles PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) @@ -38,7 +38,7 @@ IF (INSTALL_SYSCONFDIR) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d -@@ -101,6 +107,7 @@ +@@ -103,6 +109,7 @@ IF(UNIX) RENAME mysql COMPONENT SupportFiles PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) Modified: branches/2017Q1/databases/mariadb100-server/Makefile ============================================================================== --- branches/2017Q1/databases/mariadb100-server/Makefile Sun Jan 15 19:03:51 2017 (r431597) +++ branches/2017Q1/databases/mariadb100-server/Makefile Sun Jan 15 20:25:29 2017 (r431598) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.0.27 -PORTREVISION= 3 +PORTVERSION= 10.0.29 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ @@ -18,6 +17,7 @@ MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 +#LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_NAME_PerconaFT= PerconaFT patents license LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept @@ -117,6 +117,7 @@ ${ENGINE}_CMAKE_OFF= -DWITHOUT_${ENGI MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h MROONGA_CMAKE_OFF= -DWITHOUT_MROONGA=1 +MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4 OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy # Currently OQGraph does not build using clang. @@ -132,9 +133,10 @@ post-install: # These are "client" components, so there should be a switch that # prevents them from being installed but it's unknown right now . for f in bin/msql2mysql bin/mysql_config bin/mysql_find_rows \ - bin/mysqlaccess COPYING.AGPLv3 COPYING.GPLv2 + bin/mysqlaccess COPYING.AGPLv3 COPYING.GPLv2 share/aclocal/mysql.m4 ${RM} ${STAGEDIR}${PREFIX}/${f} . endfor + ${RM} -r ${STAGEDIR}${DATADIR}/SELinux .endif .include @@ -146,8 +148,8 @@ CMAKE_ARGS+= -DWITH_JEMALLOC="no" .endif .if ${PORT_OPTIONS:MTOKUDB} -NOT_FOR_ARCHS= i386 -NOT_FOR_ARCHS_REASON= TokuDB not supported on 32-bit platforms, see \ +NOT_FOR_ARCHS= i386 +NOT_FOR_ARCHS_REASON= TokuDB not supported on 32-bit platforms, see \ https://github.com/percona/PerconaFT/blob/master/README.md .endif @@ -169,4 +171,8 @@ post-patch: ${MV} ${WRKSRC}/storage/tokudb ${WRKSRC}/skip-tokudb .endif +post-configure-MROONGA-on: + ${REINPLACE_CMD} 's|-llz4|-L${LOCALBASE}/lib -llz4|' \ + ${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt + .include Modified: branches/2017Q1/databases/mariadb100-server/distinfo ============================================================================== --- branches/2017Q1/databases/mariadb100-server/distinfo Sun Jan 15 19:03:51 2017 (r431597) +++ branches/2017Q1/databases/mariadb100-server/distinfo Sun Jan 15 20:25:29 2017 (r431598) @@ -1,3 +1,3 @@ -TIMESTAMP = 1472465827 -SHA256 (mariadb-10.0.27.tar.gz) = bdf3a0c25aa2bc7a22a47e994eb7c8aa782624810eb3156038cc62bc9085c0cd -SIZE (mariadb-10.0.27.tar.gz) = 63258508 +TIMESTAMP = 1484413888 +SHA256 (mariadb-10.0.29.tar.gz) = f5f8da646f7df4b1fb21adb8d2b15e6dfbe1964ceb8cea53207d580a464350f4 +SIZE (mariadb-10.0.29.tar.gz) = 63385696 Modified: branches/2017Q1/databases/mariadb100-server/files/patch-extra_CMakeLists.txt ============================================================================== --- branches/2017Q1/databases/mariadb100-server/files/patch-extra_CMakeLists.txt Sun Jan 15 19:03:51 2017 (r431597) +++ branches/2017Q1/databases/mariadb100-server/files/patch-extra_CMakeLists.txt Sun Jan 15 20:25:29 2017 (r431598) @@ -1,14 +1,13 @@ ---- extra/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC +--- extra/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC +++ extra/CMakeLists.txt -@@ -78,9 +78,11 @@ IF(UNIX) +@@ -78,8 +78,10 @@ IF(UNIX) MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) TARGET_LINK_LIBRARIES(mysql_waitpid mysys) - ENDIF() +ENDIF() - - # Add path to the InnoDB headers + MYSQL_ADD_EXECUTABLE(mysqld_safe_helper mysqld_safe_helper.c COMPONENT Server) + TARGET_LINK_LIBRARIES(mysqld_safe_helper mysys) Modified: branches/2017Q1/databases/mariadb100-server/files/patch-mysys_my__default.c ============================================================================== --- branches/2017Q1/databases/mariadb100-server/files/patch-mysys_my__default.c Sun Jan 15 19:03:51 2017 (r431597) +++ branches/2017Q1/databases/mariadb100-server/files/patch-mysys_my__default.c Sun Jan 15 20:25:29 2017 (r431598) @@ -1,15 +1,6 @@ ---- mysys/my_default.c.orig 2015-06-17 14:54:12 UTC +--- mysys/my_default.c.orig 2017-01-12 01:45:18 UTC +++ mysys/my_default.c -@@ -90,7 +90,7 @@ static my_bool defaults_already_read= FA - - /* Which directories are searched for options (and in which order) */ - --#define MAX_DEFAULT_DIRS 6 -+#define MAX_DEFAULT_DIRS 7 - #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ - static const char **default_directories = NULL; - -@@ -785,7 +785,7 @@ static int search_default_file_with_ext( +@@ -786,7 +786,7 @@ static int search_default_file_with_ext( { MY_STAT stat_info; if (!my_stat(name,&stat_info,MYF(0))) @@ -18,22 +9,22 @@ /* Ignore world-writable regular files. This is mainly done to protect us to not read a file created by -@@ -803,6 +803,14 @@ static int search_default_file_with_ext( +@@ -804,6 +804,14 @@ static int search_default_file_with_ext( if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) return 1; /* Ignore wrong files */ + if (strstr(name, "/etc") == name) + { + fprintf(stderr, -+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", -+ name,name); ++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", ++ name,name); + goto err; + } + while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) { line++; -@@ -1067,7 +1075,8 @@ void my_print_default_files(const char * +@@ -1068,7 +1076,8 @@ void my_print_default_files(const char * if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ *end++= '.'; strxmov(end, conf_file, *ext, " ", NullS); @@ -43,7 +34,7 @@ } } } -@@ -1223,13 +1232,10 @@ static const char **init_default_directo +@@ -1229,13 +1238,10 @@ static const char **init_default_directo #else Modified: branches/2017Q1/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh ============================================================================== --- branches/2017Q1/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh Sun Jan 15 19:03:51 2017 (r431597) +++ branches/2017Q1/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh Sun Jan 15 20:25:29 2017 (r431598) @@ -1,6 +1,6 @@ ---- scripts/mysqld_safe.sh.orig 2015-06-17 14:54:12 UTC +--- scripts/mysqld_safe.sh.orig 2017-01-14 17:25:20 UTC +++ scripts/mysqld_safe.sh -@@ -445,10 +445,10 @@ fi +@@ -469,10 +469,10 @@ fi if test -z "$MYSQL_HOME" then @@ -13,12 +13,12 @@ $DATADIR/my.cnf IGNORING $DATADIR/my.cnf" -@@ -457,7 +457,7 @@ IGNORING $DATADIR/my.cnf" +@@ -481,7 +481,7 @@ IGNORING $DATADIR/my.cnf" then log_error "WARNING: Found $DATADIR/my.cnf The data directory is a deprecated location for my.cnf, please move it to -$MY_BASEDIR_VERSION/my.cnf" +$MY_BASEDIR_VERSION/etc/my.cnf" + unsafe_my_cnf=1 MYSQL_HOME=$DATADIR else - MYSQL_HOME=$MY_BASEDIR_VERSION Modified: branches/2017Q1/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt ============================================================================== --- branches/2017Q1/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt Sun Jan 15 19:03:51 2017 (r431597) +++ branches/2017Q1/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt Sun Jan 15 20:25:29 2017 (r431598) @@ -1,6 +1,6 @@ ---- storage/tokudb/PerconaFT/ft/CMakeLists.txt.orig 2016-02-17 21:59:56.000000000 +0100 -+++ storage/tokudb/PerconaFT/ft/CMakeLists.txt 2016-02-21 20:51:12.317052693 +0100 -@@ -84,8 +84,8 @@ set_target_properties(ft_static PROPERTI +--- storage/tokudb/PerconaFT/ft/CMakeLists.txt.orig 2017-01-12 01:45:22 UTC ++++ storage/tokudb/PerconaFT/ft/CMakeLists.txt +@@ -85,8 +85,8 @@ set_target_properties(ft_static PROPERTI maybe_add_gcov_to_libraries(ft ft_static) ## depend on other generated targets Modified: branches/2017Q1/databases/mariadb100-server/pkg-plist ============================================================================== --- branches/2017Q1/databases/mariadb100-server/pkg-plist Sun Jan 15 19:03:51 2017 (r431597) +++ branches/2017Q1/databases/mariadb100-server/pkg-plist Sun Jan 15 20:25:29 2017 (r431598) @@ -24,6 +24,7 @@ bin/mysql_zap bin/mysqlbug bin/mysqld_multi bin/mysqld_safe +bin/mysqld_safe_helper bin/mysqldumpslow bin/mysqlhotcopy bin/mysqltest From owner-svn-ports-branches@freebsd.org Mon Jan 16 10:21:53 2017 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 83287CAFE19; Mon, 16 Jan 2017 10:21:53 +0000 (UTC) (envelope-from tijl@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 388F41AFA; Mon, 16 Jan 2017 10:21:53 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0GALq0f085436; Mon, 16 Jan 2017 10:21:52 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0GALqSR085435; Mon, 16 Jan 2017 10:21:52 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201701161021.v0GALqSR085435@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Mon, 16 Jan 2017 10:21:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431623 - branches/2017Q1/security/gnutls/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.23 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, 16 Jan 2017 10:21:53 -0000 Author: tijl Date: Mon Jan 16 10:21:52 2017 New Revision: 431623 URL: https://svnweb.freebsd.org/changeset/ports/431623 Log: MFH: r431622 Make atomic operations explicit to support old gcc. PR: 216122 Approved by: ports-secteam (build fix blanket) Added: branches/2017Q1/security/gnutls/files/patch-lib-random.c - copied unchanged from r431622, head/security/gnutls/files/patch-lib-random.c Modified: Directory Properties: branches/2017Q1/ (props changed) Copied: branches/2017Q1/security/gnutls/files/patch-lib-random.c (from r431622, head/security/gnutls/files/patch-lib-random.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/security/gnutls/files/patch-lib-random.c Mon Jan 16 10:21:52 2017 (r431623, copy of r431622, head/security/gnutls/files/patch-lib-random.c) @@ -0,0 +1,53 @@ +--- lib/random.c.orig 2017-01-08 09:27:28 UTC ++++ lib/random.c +@@ -33,24 +33,24 @@ void *gnutls_rnd_ctx; + GNUTLS_STATIC_MUTEX(gnutls_rnd_init_mutex); + + #ifdef HAVE_STDATOMIC_H +-static atomic_uint rnd_initialized = 0; ++static atomic_uint rnd_initialized = ATOMIC_VAR_INIT(0); + + inline static int _gnutls_rnd_init(void) + { +- if (unlikely(!rnd_initialized)) { ++ if (unlikely(!atomic_load(&rnd_initialized))) { + if (_gnutls_rnd_ops.init == NULL) { +- rnd_initialized = 1; ++ atomic_store(&rnd_initialized, 1); + return 0; + } + + GNUTLS_STATIC_MUTEX_LOCK(gnutls_rnd_init_mutex); +- if (!rnd_initialized) { ++ if (!atomic_load(&rnd_initialized)) { + if (_gnutls_rnd_ops.init(&gnutls_rnd_ctx) < 0) { + gnutls_assert(); + GNUTLS_STATIC_MUTEX_UNLOCK(gnutls_rnd_init_mutex); + return GNUTLS_E_RANDOM_FAILED; + } +- rnd_initialized = 1; ++ atomic_store(&rnd_initialized, 1); + } + GNUTLS_STATIC_MUTEX_UNLOCK(gnutls_rnd_init_mutex); + } +@@ -107,10 +107,10 @@ int _gnutls_rnd_preinit(void) + + void _gnutls_rnd_deinit(void) + { +- if (rnd_initialized && _gnutls_rnd_ops.deinit != NULL) { ++ if (atomic_load(&rnd_initialized) && _gnutls_rnd_ops.deinit != NULL) { + _gnutls_rnd_ops.deinit(gnutls_rnd_ctx); + } +- rnd_initialized = 0; ++ atomic_store(&rnd_initialized, 0); + + _rnd_system_entropy_deinit(); + +@@ -162,6 +162,6 @@ int gnutls_rnd(gnutls_rnd_level_t level, + **/ + void gnutls_rnd_refresh(void) + { +- if (rnd_initialized && _gnutls_rnd_ops.rnd_refresh) ++ if (atomic_load(&rnd_initialized) && _gnutls_rnd_ops.rnd_refresh) + _gnutls_rnd_ops.rnd_refresh(gnutls_rnd_ctx); + } From owner-svn-ports-branches@freebsd.org Mon Jan 16 11:57:39 2017 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 C7555CB2CAB; Mon, 16 Jan 2017 11:57:39 +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 9744813C5; Mon, 16 Jan 2017 11:57:39 +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 v0GBvc6a022492; Mon, 16 Jan 2017 11:57:38 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0GBvc43022490; Mon, 16 Jan 2017 11:57:38 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201701161157.v0GBvc43022490@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 16 Jan 2017 11:57:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431630 - branches/2017Q1/devel/py-jsmin 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.23 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, 16 Jan 2017 11:57:39 -0000 Author: amdmi3 Date: Mon Jan 16 11:57:38 2017 New Revision: 431630 URL: https://svnweb.freebsd.org/changeset/ports/431630 Log: MFH: r431625 - Update to 2.2.1 (bugfix release) - Add LICENSE_FILE PR: 215991 Submitted by: vlad-fbsd@acheronmedia.com (maintainer) Approved by: ports-secteam (with hat) Modified: branches/2017Q1/devel/py-jsmin/Makefile branches/2017Q1/devel/py-jsmin/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/devel/py-jsmin/Makefile ============================================================================== --- branches/2017Q1/devel/py-jsmin/Makefile Mon Jan 16 11:55:04 2017 (r431629) +++ branches/2017Q1/devel/py-jsmin/Makefile Mon Jan 16 11:57:38 2017 (r431630) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= jsmin -PORTVERSION= 2.2.0 +PORTVERSION= 2.2.1 CATEGORIES= devel www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,6 +11,7 @@ MAINTAINER= vlad-fbsd@acheronmedia.com COMMENT= JavaScript minifier written in Python LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt USES= python USE_PYTHON= distutils autoplist Modified: branches/2017Q1/devel/py-jsmin/distinfo ============================================================================== --- branches/2017Q1/devel/py-jsmin/distinfo Mon Jan 16 11:55:04 2017 (r431629) +++ branches/2017Q1/devel/py-jsmin/distinfo Mon Jan 16 11:57:38 2017 (r431630) @@ -1,2 +1,3 @@ -SHA256 (jsmin-2.2.0.tar.gz) = 8e7f19bc2cc467bccd02322dc0a6065d06a038e311f2531af1a33b410afea081 -SIZE (jsmin-2.2.0.tar.gz) = 12409 +TIMESTAMP = 1484190386 +SHA256 (jsmin-2.2.1.tar.gz) = df7fe41d6de1df42cb5dcfdefe1d7285b584ec6f2a714f6c05f6e6dbacff7f71 +SIZE (jsmin-2.2.1.tar.gz) = 12542 From owner-svn-ports-branches@freebsd.org Mon Jan 16 13:47:34 2017 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 56172CB2CC2; Mon, 16 Jan 2017 13:47:34 +0000 (UTC) (envelope-from robak@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 192911C0A; Mon, 16 Jan 2017 13:47:34 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0GDlX7V068822; Mon, 16 Jan 2017 13:47:33 GMT (envelope-from robak@FreeBSD.org) Received: (from robak@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0GDlWq5068817; Mon, 16 Jan 2017 13:47:32 GMT (envelope-from robak@FreeBSD.org) Message-Id: <201701161347.v0GDlWq5068817@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: robak set sender to robak@FreeBSD.org using -f From: Bartek Rutkowski Date: Mon, 16 Jan 2017 13:47:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431646 - in branches/2017Q1/cad/openvsp: . 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.23 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, 16 Jan 2017 13:47:34 -0000 Author: robak Date: Mon Jan 16 13:47:32 2017 New Revision: 431646 URL: https://svnweb.freebsd.org/changeset/ports/431646 Log: MFH: r431182 cad/openvsp: update 3.9.1 -> 3.10.0 PR: 215951 Submitted by: Fernando Apesteguia (maintainer) Approved by: ports-secteam Added: branches/2017Q1/cad/openvsp/files/patch-src_vsp__graphic_src_Scene.cpp - copied unchanged from r431182, head/cad/openvsp/files/patch-src_vsp__graphic_src_Scene.cpp branches/2017Q1/cad/openvsp/files/patch-src_vsp__graphic_src_Shader.cpp - copied unchanged from r431182, head/cad/openvsp/files/patch-src_vsp__graphic_src_Shader.cpp branches/2017Q1/cad/openvsp/files/patch-src_vsp__graphic_src_VBO.cpp - copied unchanged from r431182, head/cad/openvsp/files/patch-src_vsp__graphic_src_VBO.cpp Modified: branches/2017Q1/cad/openvsp/Makefile branches/2017Q1/cad/openvsp/distinfo branches/2017Q1/cad/openvsp/files/patch-Libraries_cmake_External__CMinpack.cmake Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/cad/openvsp/Makefile ============================================================================== --- branches/2017Q1/cad/openvsp/Makefile Mon Jan 16 13:38:38 2017 (r431645) +++ branches/2017Q1/cad/openvsp/Makefile Mon Jan 16 13:47:32 2017 (r431646) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= openvsp -PORTVERSION= 3.9.1 +PORTVERSION= 3.10.0 DISTVERSIONPREFIX= ${GH_PROJECT}_ -PORTREVISION= 2 CATEGORIES= cad MAINTAINER= fernando.apesteguia@gmail.com Modified: branches/2017Q1/cad/openvsp/distinfo ============================================================================== --- branches/2017Q1/cad/openvsp/distinfo Mon Jan 16 13:38:38 2017 (r431645) +++ branches/2017Q1/cad/openvsp/distinfo Mon Jan 16 13:47:32 2017 (r431646) @@ -1,3 +1,3 @@ -TIMESTAMP = 1473160974 -SHA256 (OpenVSP-OpenVSP-OpenVSP_3.9.1_GH0.tar.gz) = 3c9607a4f1574a6a2c85acc1f3c5e20e392f1ad7f9e8fbebd3cfd548a97a65fa -SIZE (OpenVSP-OpenVSP-OpenVSP_3.9.1_GH0.tar.gz) = 32752113 +TIMESTAMP = 1483863781 +SHA256 (OpenVSP-OpenVSP-OpenVSP_3.10.0_GH0.tar.gz) = 936cd87d59d07ebc8a3bb38d7d20604b37da138b5140ea092f776eb3a519bda4 +SIZE (OpenVSP-OpenVSP-OpenVSP_3.10.0_GH0.tar.gz) = 33961116 Modified: branches/2017Q1/cad/openvsp/files/patch-Libraries_cmake_External__CMinpack.cmake ============================================================================== --- branches/2017Q1/cad/openvsp/files/patch-Libraries_cmake_External__CMinpack.cmake Mon Jan 16 13:38:38 2017 (r431645) +++ branches/2017Q1/cad/openvsp/files/patch-Libraries_cmake_External__CMinpack.cmake Mon Jan 16 13:47:32 2017 (r431646) @@ -1,4 +1,4 @@ ---- Libraries/cmake/External_CMinpack.cmake.orig 2016-08-21 15:22:39 UTC +--- Libraries/cmake/External_CMinpack.cmake.orig 2017-01-08 05:14:57 UTC +++ Libraries/cmake/External_CMinpack.cmake @@ -1,3 +1,6 @@ +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lm -fPIC") Copied: branches/2017Q1/cad/openvsp/files/patch-src_vsp__graphic_src_Scene.cpp (from r431182, head/cad/openvsp/files/patch-src_vsp__graphic_src_Scene.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/cad/openvsp/files/patch-src_vsp__graphic_src_Scene.cpp Mon Jan 16 13:47:32 2017 (r431646, copy of r431182, head/cad/openvsp/files/patch-src_vsp__graphic_src_Scene.cpp) @@ -0,0 +1,11 @@ +$FreeBSD$ +--- src/vsp_graphic/src/Scene.cpp.orig 2017-01-09 21:50:15 UTC ++++ src/vsp_graphic/src/Scene.cpp +@@ -15,6 +15,7 @@ + #include "ByteOperationUtil.h" + + #include ++#include + + namespace VSPGraphic + { Copied: branches/2017Q1/cad/openvsp/files/patch-src_vsp__graphic_src_Shader.cpp (from r431182, head/cad/openvsp/files/patch-src_vsp__graphic_src_Shader.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/cad/openvsp/files/patch-src_vsp__graphic_src_Shader.cpp Mon Jan 16 13:47:32 2017 (r431646, copy of r431182, head/cad/openvsp/files/patch-src_vsp__graphic_src_Shader.cpp) @@ -0,0 +1,10 @@ +$FreeBSD$ +--- src/vsp_graphic/src/Shader.cpp.orig 2017-01-08 05:14:57 UTC ++++ src/vsp_graphic/src/Shader.cpp +@@ -1,5 +1,6 @@ + #include + #include ++#include + + #include "Shader.h" + Copied: branches/2017Q1/cad/openvsp/files/patch-src_vsp__graphic_src_VBO.cpp (from r431182, head/cad/openvsp/files/patch-src_vsp__graphic_src_VBO.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/cad/openvsp/files/patch-src_vsp__graphic_src_VBO.cpp Mon Jan 16 13:47:32 2017 (r431646, copy of r431182, head/cad/openvsp/files/patch-src_vsp__graphic_src_VBO.cpp) @@ -0,0 +1,11 @@ +$FreeBSD$ +--- src/vsp_graphic/src/VBO.cpp.orig 2017-01-08 05:14:57 UTC ++++ src/vsp_graphic/src/VBO.cpp +@@ -1,6 +1,7 @@ + #include + #include + #include ++#include + + #include "VBO.h" + From owner-svn-ports-branches@freebsd.org Mon Jan 16 23:44:22 2017 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 E5C2ACB2C71; Mon, 16 Jan 2017 23:44:22 +0000 (UTC) (envelope-from jhale@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 BDA491356; Mon, 16 Jan 2017 23:44:22 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0GNiLQN022388; Mon, 16 Jan 2017 23:44:21 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0GNiLj4022385; Mon, 16 Jan 2017 23:44:21 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201701162344.v0GNiLj4022385@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Mon, 16 Jan 2017 23:44:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431714 - in branches/2017Q1/sysutils/fusefs-rar2fs: . 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.23 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, 16 Jan 2017 23:44:23 -0000 Author: jhale Date: Mon Jan 16 23:44:21 2017 New Revision: 431714 URL: https://svnweb.freebsd.org/changeset/ports/431714 Log: MFH: r431712 Update to 1.23.1 Unbreak fetch (project moved to Github) Take maintainership for now PR: 214277 (based on) Submitted by: Niclas Approved by: ports-secteam (blanket) Added: branches/2017Q1/sysutils/fusefs-rar2fs/files/ - copied from r431712, head/sysutils/fusefs-rar2fs/files/ Modified: branches/2017Q1/sysutils/fusefs-rar2fs/Makefile branches/2017Q1/sysutils/fusefs-rar2fs/distinfo branches/2017Q1/sysutils/fusefs-rar2fs/pkg-descr Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/sysutils/fusefs-rar2fs/Makefile ============================================================================== --- branches/2017Q1/sysutils/fusefs-rar2fs/Makefile Mon Jan 16 23:44:02 2017 (r431713) +++ branches/2017Q1/sysutils/fusefs-rar2fs/Makefile Mon Jan 16 23:44:21 2017 (r431714) @@ -2,37 +2,41 @@ # $FreeBSD$ PORTNAME= rar2fs -PORTVERSION= 1.15.1 -PORTREVISION= 1 +PORTVERSION= 1.23.1 +DISTVERSIONPREFIX= v CATEGORIES= sysutils -MASTER_SITES= GOOGLE_CODE:rar2fs http://www.rarlab.com/rar/:unrarsrc PKGNAMEPREFIX= fusefs- -DISTFILES= rar2fs-1.15.1.tar.gz:rar2fs unrarsrc-4.2.4.tar.gz:unrarsrc -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jhale@FreeBSD.org COMMENT= Mount rar archives as filesystem -LICENSE= GPLv3 +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= Unfetchable (google code has gone away) +LIB_DEPENDS= libunrar.so.5:${LIBUNRAR_PORT} +BUILD_DEPENDS= ${NONEXISTENT}:${LIBUNRAR_PORT}:patch -LIB_DEPENDS= libunrar.so:archivers/libunrar4 +USE_GITHUB= yes +GH_ACCOUNT= hasse69 + +USES= autoreconf execinfo gmake fuse GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fuse-lib=${LOCALBASE}/lib \ - --with-fuse=${LOCALBASE}/include/fuse \ - --with-unrar=${WRKDIR}/unrar \ - --with-unrar-lib=${LOCALBASE}/lib + --with-fuse=${LOCALBASE}/include/fuse \ + --with-unrar=`${MAKE} -C ${PORTSDIR}/${LIBUNRAR_PORT} -VWRKSRC` \ + --with-unrar-lib=${LOCALBASE}/lib +CONFIGURE_ENV= LIBUNRAR_PKG=${LIBUNRAR_PKG} + +PLIST_FILES= bin/${PORTNAME} \ + bin/mkr2i \ + man/man1/rar2fs.1.gz -PLIST_FILES= bin/${PORTNAME} man/man1/rar2fs.1.gz -USES= execinfo fuse gmake +LIBUNRAR_PORT= archivers/libunrar5 +LIBUNRAR_PKG= ${LIBUNRAR_PORT:S|archivers/||} post-patch: - @${REINPLACE_CMD} -e 's/-lstdc++/-lexecinfo/' -e '/_LINK =/s/CC/CXX/' \ - ${WRKSRC}/Makefile.in - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/rar2fs.1 ${STAGEDIR}${PREFIX}/man/man1 + @${REINPLACE_CMD} -e 's|-lstdc++||g' -e '/rar2fs_LINK =/s|CC|CXX|' \ + ${WRKSRC}/Makefile.am .include Modified: branches/2017Q1/sysutils/fusefs-rar2fs/distinfo ============================================================================== --- branches/2017Q1/sysutils/fusefs-rar2fs/distinfo Mon Jan 16 23:44:02 2017 (r431713) +++ branches/2017Q1/sysutils/fusefs-rar2fs/distinfo Mon Jan 16 23:44:21 2017 (r431714) @@ -1,4 +1,3 @@ -SHA256 (rar2fs-1.15.1.tar.gz) = 1ae1df5b8eda3d954740010e931e16342957a8b6cd41676a017fc9bbcd900973 -SIZE (rar2fs-1.15.1.tar.gz) = 205577 -SHA256 (unrarsrc-4.2.4.tar.gz) = 9432bf798e5f7123f3060f37b75b7c07f36f0091305f46473dcae9154f8cd686 -SIZE (unrarsrc-4.2.4.tar.gz) = 164641 +TIMESTAMP = 1483210781 +SHA256 (hasse69-rar2fs-v1.23.1_GH0.tar.gz) = 2dab03c8c58379b0ddda798ca909ac48bf0445b2400eee706c91c3efe28caf4c +SIZE (hasse69-rar2fs-v1.23.1_GH0.tar.gz) = 126375 Modified: branches/2017Q1/sysutils/fusefs-rar2fs/pkg-descr ============================================================================== --- branches/2017Q1/sysutils/fusefs-rar2fs/pkg-descr Mon Jan 16 23:44:02 2017 (r431713) +++ branches/2017Q1/sysutils/fusefs-rar2fs/pkg-descr Mon Jan 16 23:44:21 2017 (r431714) @@ -6,4 +6,4 @@ Both compressed and non-compressed archi full media seek support (aka. indexing) is only available for non-compressed plaintext archives. -WWW: http://code.google.com/p/rar2fs/ +WWW: http://hasse69.github.io/rar2fs/ From owner-svn-ports-branches@freebsd.org Tue Jan 17 01:32:54 2017 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 9E3F8CB2C9D; Tue, 17 Jan 2017 01:32:54 +0000 (UTC) (envelope-from ler@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 5383D1ECB; Tue, 17 Jan 2017 01:32:54 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0H1Wr6s066889; Tue, 17 Jan 2017 01:32:53 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0H1Wr2b066887; Tue, 17 Jan 2017 01:32:53 GMT (envelope-from ler@FreeBSD.org) Message-Id: <201701170132.v0H1Wr2b066887@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Tue, 17 Jan 2017 01:32:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431716 - branches/2017Q1/sysutils/rundeck 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.23 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, 17 Jan 2017 01:32:54 -0000 Author: ler Date: Tue Jan 17 01:32:53 2017 New Revision: 431716 URL: https://svnweb.freebsd.org/changeset/ports/431716 Log: MFH: r431715 Change ownership of rundeck/server/lib et al. Address poudriere issues bump PORTREVISION MFH because to allow running out of the box, as it fails with the directories root-owned PR: 202732 Submitted by: Mark C Ballew (ballew sublinear net) Differential Revision: https://reviews.freebsd.org/D9205 Approved by: ports-secteam (blanket), adamw (mentor) Added: branches/2017Q1/sysutils/rundeck/pkg-plist - copied unchanged from r431715, head/sysutils/rundeck/pkg-plist Modified: branches/2017Q1/sysutils/rundeck/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/sysutils/rundeck/Makefile ============================================================================== --- branches/2017Q1/sysutils/rundeck/Makefile Tue Jan 17 01:22:13 2017 (r431715) +++ branches/2017Q1/sysutils/rundeck/Makefile Tue Jan 17 01:32:53 2017 (r431716) @@ -2,6 +2,7 @@ PORTNAME= rundeck PORTVERSION= 2.3.2 +PORTREVISION= 1 CATEGORIES= sysutils java MASTER_SITES= http://dl.bintray.com/rundeck/rundeck-maven/ DISTNAME= rundeck-launcher-${PORTVERSION} @@ -15,10 +16,10 @@ LICENSE= APACHE20 USE_JAVA= yes JAVA_VERSION= 1.6+ +NO_ARCH= yes NO_BUILD= yes -PLIST_FILES= rundeck/server/lib/.keep \ - share/rundeck/rundeck-launcher.jar +PLIST_SUB= RUNDECK_USER=${RUNDECK_USER} RUNDECK_GROUP=${RUNDECK_GROUP} USE_RC_SUBR= rundeck RUNDECK_HOME= ${PREFIX}/rundeck @@ -38,8 +39,7 @@ SUB_LIST+= RUNDECK_HOME=${RUNDECK_HOME} RUNDECK_LOG_FILE=${RUNDECK_LOG_FILE} do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${RUNDECK_HOME}/server/lib - ${TOUCH} ${STAGEDIR}${RUNDECK_HOME}/server/lib/.keep + @${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${RUNDECK_HOME}/server/lib ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \ ${STAGEDIR}${DATADIR}/rundeck-launcher${EXTRACT_SUFX} Copied: branches/2017Q1/sysutils/rundeck/pkg-plist (from r431715, head/sysutils/rundeck/pkg-plist) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/sysutils/rundeck/pkg-plist Tue Jan 17 01:32:53 2017 (r431716, copy of r431715, head/sysutils/rundeck/pkg-plist) @@ -0,0 +1,3 @@ +%%DATADIR%%/rundeck-launcher.jar +@dir(%%RUNDECK_USER%%,%%RUNDESK_GROUP%%,755) rundeck/server/lib +@dir(%%RUNDECK_USER%%,%%RUNDESK_GROUP%%,755) rundeck/server From owner-svn-ports-branches@freebsd.org Tue Jan 17 02:07:48 2017 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 0DEEDCB3444; Tue, 17 Jan 2017 02:07:48 +0000 (UTC) (envelope-from ler@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 D40511ED8; Tue, 17 Jan 2017 02:07:47 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0H27lIc080111; Tue, 17 Jan 2017 02:07:47 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0H27lBF080110; Tue, 17 Jan 2017 02:07:47 GMT (envelope-from ler@FreeBSD.org) Message-Id: <201701170207.v0H27lBF080110@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Tue, 17 Jan 2017 02:07:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431718 - branches/2017Q1/sysutils/rundeck 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.23 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, 17 Jan 2017 02:07:48 -0000 Author: ler Date: Tue Jan 17 02:07:46 2017 New Revision: 431718 URL: https://svnweb.freebsd.org/changeset/ports/431718 Log: MFH: r431717 Corect pkg-plist %%RUNDESK_GROUP%% -> %%RUNDECK_GROUP%% Approved by: ports-secteam (blanket), adamw (mentor) Modified: branches/2017Q1/sysutils/rundeck/pkg-plist Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/sysutils/rundeck/pkg-plist ============================================================================== --- branches/2017Q1/sysutils/rundeck/pkg-plist Tue Jan 17 02:06:23 2017 (r431717) +++ branches/2017Q1/sysutils/rundeck/pkg-plist Tue Jan 17 02:07:46 2017 (r431718) @@ -1,3 +1,3 @@ %%DATADIR%%/rundeck-launcher.jar -@dir(%%RUNDECK_USER%%,%%RUNDESK_GROUP%%,755) rundeck/server/lib -@dir(%%RUNDECK_USER%%,%%RUNDESK_GROUP%%,755) rundeck/server +@dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%,755) rundeck/server/lib +@dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%,755) rundeck/server From owner-svn-ports-branches@freebsd.org Tue Jan 17 03:18:54 2017 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 02820CB351F; Tue, 17 Jan 2017 03:18:54 +0000 (UTC) (envelope-from cy@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 C859113CB; Tue, 17 Jan 2017 03:18:53 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0H3IqVi009108; Tue, 17 Jan 2017 03:18:52 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0H3Iq3e009106; Tue, 17 Jan 2017 03:18:52 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201701170318.v0H3Iq3e009106@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Tue, 17 Jan 2017 03:18:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431719 - branches/2017Q1/security/sudo 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.23 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, 17 Jan 2017 03:18:54 -0000 Author: cy Date: Tue Jan 17 03:18:52 2017 New Revision: 431719 URL: https://svnweb.freebsd.org/changeset/ports/431719 Log: MFH: r431645 Update 1.8.19p1 --> 1.8.19p2. Major changes between sudo 1.8.19p2 and 1.8.19p1: * Fixed a crash in visudo introduced in sudo 1.8.9 when an IP address or network is used in a host-based Defaults entry. Bug #766 * Added a missing check for the ignore_iolog_errors flag when the sudoers plugin generates the I/O log file path name. * Fixed a typo in sudo's vsyslog() replacement that resulted in garbage being logged to syslog. Approved by: maintainer (garga) Approved by: portmgr (junovitch) Differential Revision: D9181 Modified: branches/2017Q1/security/sudo/Makefile branches/2017Q1/security/sudo/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/security/sudo/Makefile ============================================================================== --- branches/2017Q1/security/sudo/Makefile Tue Jan 17 02:07:46 2017 (r431718) +++ branches/2017Q1/security/sudo/Makefile Tue Jan 17 03:18:52 2017 (r431719) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sudo -PORTVERSION= 1.8.19p1 +PORTVERSION= 1.8.19p2 CATEGORIES= security MASTER_SITES= SUDO Modified: branches/2017Q1/security/sudo/distinfo ============================================================================== --- branches/2017Q1/security/sudo/distinfo Tue Jan 17 02:07:46 2017 (r431718) +++ branches/2017Q1/security/sudo/distinfo Tue Jan 17 03:18:52 2017 (r431719) @@ -1,3 +1,3 @@ -TIMESTAMP = 1482256266 -SHA256 (sudo-1.8.19p1.tar.gz) = b8afb1cf8736b6c61f171f2bf4b174818d9e00e92ef73da55fabcd01286ffc92 -SIZE (sudo-1.8.19p1.tar.gz) = 2860124 +TIMESTAMP = 1484415267 +SHA256 (sudo-1.8.19p2.tar.gz) = 237e18e67c2ad59ecacfa4b7707198b09fcf84914621585a9bc670dcc31a52e0 +SIZE (sudo-1.8.19p2.tar.gz) = 2861855 From owner-svn-ports-branches@freebsd.org Tue Jan 17 06:29:13 2017 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 BD827CB4CDB; Tue, 17 Jan 2017 06:29:13 +0000 (UTC) (envelope-from riggs@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 7DE2015E4; Tue, 17 Jan 2017 06:29:13 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0H6TClb085546; Tue, 17 Jan 2017 06:29:12 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0H6TCik085545; Tue, 17 Jan 2017 06:29:12 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201701170629.v0H6TCik085545@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Tue, 17 Jan 2017 06:29:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431720 - branches/2017Q1/audio/musicpd 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.23 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, 17 Jan 2017 06:29:13 -0000 Author: riggs Date: Tue Jan 17 06:29:12 2017 New Revision: 431720 URL: https://svnweb.freebsd.org/changeset/ports/431720 Log: Fix link error with libwrap on stable, update maintainer Approved by: ports-secteam (junovitch) Modified: branches/2017Q1/audio/musicpd/Makefile Modified: branches/2017Q1/audio/musicpd/Makefile ============================================================================== --- branches/2017Q1/audio/musicpd/Makefile Tue Jan 17 03:18:52 2017 (r431719) +++ branches/2017Q1/audio/musicpd/Makefile Tue Jan 17 06:29:12 2017 (r431720) @@ -2,12 +2,12 @@ PORTNAME= musicpd PORTVERSION= 0.19.15 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= audio ipv6 MASTER_SITES= http://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} -MAINTAINER= crees@FreeBSD.org +MAINTAINER= riggs@FreeBSD.org COMMENT= Remote-controllable music daemon LICENSE= GPLv2 @@ -20,7 +20,8 @@ GNU_CONFIGURE= yes USE_GNOME= glib20 USE_RC_SUBR= ${PORTNAME} -CONFIGURE_ARGS+=--disable-alsa --disable-systemd-daemon --disable-roar +CONFIGURE_ARGS+=--disable-alsa --disable-systemd-daemon --disable-roar \ + --disable-libwrap CFLAGS+= -I${PREFIX}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/sidplay/builders From owner-svn-ports-branches@freebsd.org Tue Jan 17 10:12:54 2017 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 B750DCB265F; Tue, 17 Jan 2017 10:12:54 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5B80910CF; Tue, 17 Jan 2017 10:12:54 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0HACrLt079003; Tue, 17 Jan 2017 10:12:53 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0HACpVO078979; Tue, 17 Jan 2017 10:12:51 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201701171012.v0HACpVO078979@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Tue, 17 Jan 2017 10:12:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431727 - in branches/2017Q1/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.23 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, 17 Jan 2017 10:12:54 -0000 Author: cpm Date: Tue Jan 17 10:12:50 2017 New Revision: 431727 URL: https://svnweb.freebsd.org/changeset/ports/431727 Log: MFH: r431706 www/chromium: update to 55.0.2883.87 Reviewed by: rene Security: https://www.vuxml.org/freebsd/603fe0a1-bb26-11e6-8e5a-3065ec8fd3ec.html Approved by: ports-secteam (junovitch) Added: branches/2017Q1/www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc - copied unchanged from r431706, head/www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc - copied unchanged from r431706, head/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc - copied unchanged from r431706, head/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc branches/2017Q1/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc - copied unchanged from r431706, head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc branches/2017Q1/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc - copied unchanged from r431706, head/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc branches/2017Q1/www/chromium/files/patch-chrome_browser_renderer_context_menu_render__view__context__menu.cc - copied unchanged from r431706, head/www/chromium/files/patch-chrome_browser_renderer_context_menu_render__view__context__menu.cc branches/2017Q1/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc - copied unchanged from r431706, head/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc branches/2017Q1/www/chromium/files/patch-content_browser_memory__memory__monitor.cc - copied unchanged from r431706, head/www/chromium/files/patch-content_browser_memory__memory__monitor.cc branches/2017Q1/www/chromium/files/patch-content_browser_memory__memory__monitor__linux.cc - copied unchanged from r431706, head/www/chromium/files/patch-content_browser_memory__memory__monitor__linux.cc branches/2017Q1/www/chromium/files/patch-content_gpu__in__process__gpu__thread.cc - copied unchanged from r431706, head/www/chromium/files/patch-content_gpu__in__process__gpu__thread.cc branches/2017Q1/www/chromium/files/patch-device_geolocation_location__arbitrator.cc - copied unchanged from r431706, head/www/chromium/files/patch-device_geolocation_location__arbitrator.cc branches/2017Q1/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor.cc - copied unchanged from r431706, head/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor.cc branches/2017Q1/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor__linux.cc - copied unchanged from r431706, head/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor__linux.cc branches/2017Q1/www/chromium/files/patch-extensions_browser_api_networking_private_networking__private__event__router__factory.cc - copied unchanged from r431706, head/www/chromium/files/patch-extensions_browser_api_networking_private_networking__private__event__router__factory.cc branches/2017Q1/www/chromium/files/patch-gpu_ipc_service__gpu__init.cc - copied unchanged from r431706, head/www/chromium/files/patch-gpu_ipc_service__gpu__init.cc branches/2017Q1/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc - copied unchanged from r431706, head/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc branches/2017Q1/www/chromium/files/patch-net_tools_get_server_time_get__server__time.cc - copied unchanged from r431706, head/www/chromium/files/patch-net_tools_get_server_time_get__server__time.cc branches/2017Q1/www/chromium/files/patch-net_udp_udp__socket__posix.cc - copied unchanged from r431706, head/www/chromium/files/patch-net_udp_udp__socket__posix.cc branches/2017Q1/www/chromium/files/patch-net_url_request_url__request__context__builder.cc - copied unchanged from r431706, head/www/chromium/files/patch-net_url_request_url__request__context__builder.cc branches/2017Q1/www/chromium/files/patch-services_ui_BUILD.gn - copied unchanged from r431706, head/www/chromium/files/patch-services_ui_BUILD.gn branches/2017Q1/www/chromium/files/patch-services_ui_ime_BUILD.gn - copied unchanged from r431706, head/www/chromium/files/patch-services_ui_ime_BUILD.gn branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn - copied unchanged from r431706, head/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn - copied unchanged from r431706, head/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn branches/2017Q1/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h - copied unchanged from r431706, head/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h branches/2017Q1/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py - copied unchanged from r431706, head/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py branches/2017Q1/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc - copied unchanged from r431706, head/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc Deleted: branches/2017Q1/www/chromium/files/extra-patch-gcc branches/2017Q1/www/chromium/files/patch-base_strings_safe__sprintf.cc branches/2017Q1/www/chromium/files/patch-chrome_browser_media_webrtc__log__uploader.cc branches/2017Q1/www/chromium/files/patch-chrome_common_extensions_api_schemas.gni branches/2017Q1/www/chromium/files/patch-chrome_common_variations_BUILD.gn branches/2017Q1/www/chromium/files/patch-components_autofill_core_browser_form__structure.cc branches/2017Q1/www/chromium/files/patch-content_browser_download_base__file__linux.cc branches/2017Q1/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__device__client.cc branches/2017Q1/www/chromium/files/patch-content_browser_time__zone__monitor.cc branches/2017Q1/www/chromium/files/patch-content_browser_time__zone__monitor__linux.cc branches/2017Q1/www/chromium/files/patch-device_geolocation_location__arbitrator__impl.cc branches/2017Q1/www/chromium/files/patch-extensions_browser_BUILD.gn branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_core_BUILD.gn branches/2017Q1/www/chromium/files/patch-third__party_cython_rules.gni branches/2017Q1/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_generate__gyp.py branches/2017Q1/www/chromium/files/patch-third__party_pdfium_core_fxcrt_include_fx__system.h branches/2017Q1/www/chromium/files/patch-tools_gn_gn__unittests.isolate branches/2017Q1/www/chromium/files/patch-ui_app__list_app__list__menu.cc Modified: branches/2017Q1/www/chromium/Makefile branches/2017Q1/www/chromium/distinfo branches/2017Q1/www/chromium/files/extra-patch-clang branches/2017Q1/www/chromium/files/patch-BUILD.gn branches/2017Q1/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc branches/2017Q1/www/chromium/files/patch-build_config_compiler_BUILD.gn branches/2017Q1/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni branches/2017Q1/www/chromium/files/patch-chrome_browser_BUILD.gn branches/2017Q1/www/chromium/files/patch-chrome_browser_about__flags.cc branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_BUILD.gn branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc branches/2017Q1/www/chromium/files/patch-chrome_common_pref__names.h branches/2017Q1/www/chromium/files/patch-chrome_test_BUILD.gn branches/2017Q1/www/chromium/files/patch-components_BUILD.gn branches/2017Q1/www/chromium/files/patch-components_metrics_BUILD.gn branches/2017Q1/www/chromium/files/patch-components_storage__monitor_BUILD.gn branches/2017Q1/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc branches/2017Q1/www/chromium/files/patch-content_browser_BUILD.gn branches/2017Q1/www/chromium/files/patch-content_browser_browser__main__loop.cc branches/2017Q1/www/chromium/files/patch-content_browser_child__process__launcher.cc branches/2017Q1/www/chromium/files/patch-content_browser_download_base__file.cc branches/2017Q1/www/chromium/files/patch-content_gpu_gpu__main.cc branches/2017Q1/www/chromium/files/patch-content_test_BUILD.gn branches/2017Q1/www/chromium/files/patch-gpu_ipc_service_BUILD.gn branches/2017Q1/www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn branches/2017Q1/www/chromium/files/patch-mojo_BUILD.gn branches/2017Q1/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_text_TextBreakIterator.cpp branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h branches/2017Q1/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp branches/2017Q1/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn branches/2017Q1/www/chromium/files/patch-ui_gl_BUILD.gn branches/2017Q1/www/chromium/files/patch-ui_views_BUILD.gn branches/2017Q1/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc branches/2017Q1/www/chromium/files/patch-ui_webui_resources_js_icon.js branches/2017Q1/www/chromium/files/patch-v8_BUILD.gn branches/2017Q1/www/chromium/pkg-plist Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/www/chromium/Makefile ============================================================================== --- branches/2017Q1/www/chromium/Makefile Tue Jan 17 10:11:16 2017 (r431726) +++ branches/2017Q1/www/chromium/Makefile Tue Jan 17 10:12:50 2017 (r431727) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 54.0.2840.100 -PORTREVISION= 1 +PORTVERSION= 55.0.2883.87 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 @@ -14,11 +13,12 @@ COMMENT= Google web browser based on Web LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi -BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:devel/gperf \ - bash:shells/bash \ +BUILD_DEPENDS= bash:shells/bash \ + clang39:devel/llvm39 \ python:lang/python \ - yasm:devel/yasm \ flock:sysutils/flock \ + gperf:devel/gperf \ + yasm:devel/yasm \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ @@ -61,7 +61,7 @@ USES= compiler bison cpe desktop-file-u CPE_VENDOR= google CPE_PRODUCT= chrome USE_PERL5= build -USE_XORG= scrnsaverproto x11 xcomposite xcursor xext xdamage xfixes xi \ +USE_XORG= scrnsaverproto x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xproto xrandr xrender xscrnsaver xtst USE_GNOME= atk glib20 gtk20 dconf libxslt libxml2 MAKE_ARGS= -C out/${BUILDTYPE} @@ -71,13 +71,12 @@ INSTALLS_ICONS= yes # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn) # -# Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all the variables. +# Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables. # Some parts don't have use_system_* flag, and can be turned on/off by using # replace_gn_files.py script, some parts just turned on/off for target host # OS "target_os == is_bsd", like libusb, libpci. -GN_ARGS+= \ +GN_ARGS+= is_clang=true \ clang_use_chrome_plugins=false \ - enable_hevc_demuxing=true \ enable_media_router=true \ enable_nacl=false \ enable_remoting=false \ @@ -104,12 +103,15 @@ GN_ARGS+= google_api_key="AIzaSyBsp9n41J SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" -OPTIONS_DEFINE= ALSA CODECS GCONF PULSEAUDIO TEST KERBEROS DEBUG DRIVER +OPTIONS_DEFINE= CODECS GCONF KERBEROS DRIVER CODECS_DESC= Compile and enable patented codecs like H.264 DRIVER_DESC= Install chromedriver +OPTIONS_GROUP= AUDIO TESTS +OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO +OPTIONS_GROUP_TESTS= DEBUG TEST -OPTIONS_DEFAULT= ALSA CODECS GCONF KERBEROS -OPTIONS_SUB= yes +OPTIONS_DEFAULT= CODECS GCONF KERBEROS ALSA PULSEAUDIO +OPTIONS_SUB= yes GCONF_USE= GNOME=gconf2 ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib @@ -130,9 +132,27 @@ GN_ARGS+= use_alsa=false .if ${PORT_OPTIONS:MCODECS} GN_ARGS+= ffmpeg_branding="Chrome" GN_ARGS+= proprietary_codecs=true +GN_ARGS+= enable_hevc_demuxing=true .else GN_ARGS+= ffmpeg_branding="Chromium" GN_ARGS+= proprietary_codecs=false +GN_ARGS+= enable_hevc_demuxing=false +.endif + +DEBUG_MAKE_ENV= V=1 +.if ${PORT_OPTIONS:MDEBUG} +BUILDTYPE= Debug +GN_ARGS+= is_debug=true +GN_BOOTSTRAP_FLAGS+= --debug +#GN_ARGS+= is_component_build=true +.else +BUILDTYPE= Release +.if ${ARCH} == amd64 +GN_ARGS+= use_lld=true # harder, better, faster, stronger +.endif +GN_ARGS+= is_debug=false +GN_ARGS+= symbol_level=0 +GN_ARGS+= remove_webcore_debug_symbols=true .endif .if ${PORT_OPTIONS:MGCONF} @@ -141,6 +161,12 @@ GN_ARGS+= use_gconf=true GN_ARGS+= use_gconf=false .endif +.if ${PORT_OPTIONS:MKERBEROS} +GN_ARGS+= use_kerberos=true +.else +GN_ARGS+= use_kerberos=false +.endif + .if ${PORT_OPTIONS:MPULSEAUDIO} GN_ARGS+= use_pulseaudio=true .else @@ -152,55 +178,29 @@ GN_ARGS+= use_pulseaudio=false ALL_TARGET+= ${TEST_TARGETS} .endif -DEBUG_MAKE_ENV= V=1 -.if ${PORT_OPTIONS:MDEBUG} -BUILDTYPE= Debug -GN_ARGS+= is_debug=true -GN_BOOTSTRAP_FLAGS+= --debug -#GN_ARGS+= is_component_build = true -.else -BUILDTYPE= Release -.if ${ARCH} == amd64 -GN_ARGS+= use_lld=true # harder, better, faster, stronger -.endif -GN_ARGS+= is_debug=false -GN_ARGS+= symbol_level=0 -GN_ARGS+= remove_webcore_debug_symbols=true -.endif - -MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ - GPERF="${LOCALBASE}/bin/gperf" - .include -.if ${CHOSEN_COMPILER_TYPE} == gcc -GN_ARGS+= gcc_version=${CXX:S/g++//} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gcc -.else -BUILD_DEPENDS+= clang39:devel/llvm39 CC= clang39 CXX= clang++39 -# /usr/local/include unlike gcc isn't clang's default +#optionally set AR, LD, NM, READELF ? + +# TODO: -isystem, would be just as ugly as this approach, but more reliably +# build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set. MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include -GN_ARGS+= is_clang=true +# TODO: move this big extra to small ones EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang -.endif .if ${OPSYS} == FreeBSD -.if ${OSVERSION} < 1100508 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old -.else -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new -.endif - .if ${OSVERSION} < 1100000 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10 .endif -.endif -.if ! ${PORT_OPTIONS:MKERBEROS} -GN_ARGS+= use_kerberos=true +.if ${OSVERSION} < 1200017 || (${OSVERSION} >= 1100507 && ${OSVERSION} < 1200000) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old +.else +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new +.endif .endif pre-everything:: @@ -228,7 +228,8 @@ pre-configure: do-configure: # GN generator bootstrapping and generating ninja files - cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} ${PYTHON_CMD} \ + cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} LD=${CXX} \ + READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \ ./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS} cd ${WRKSRC} && ${SETENV} ./out/${BUILDTYPE}/gn \ gen --args='${GN_ARGS}' out/${BUILDTYPE} Modified: branches/2017Q1/www/chromium/distinfo ============================================================================== --- branches/2017Q1/www/chromium/distinfo Tue Jan 17 10:11:16 2017 (r431726) +++ branches/2017Q1/www/chromium/distinfo Tue Jan 17 10:12:50 2017 (r431727) @@ -1,5 +1,5 @@ -TIMESTAMP = 1478859835 -SHA256 (chromium-54.0.2840.100.tar.xz) = e2e7f54a780c93ec2e933af09e1126837e6cf940b57213d39f36d58df10c89df -SIZE (chromium-54.0.2840.100.tar.xz) = 479762112 -SHA256 (chromium-54.0.2840.100-testdata.tar.xz) = 44319fea6de4dbb1f6d0bbeeec633b69b7064f53a54893df5b720935a6d27460 -SIZE (chromium-54.0.2840.100-testdata.tar.xz) = 123519620 +TIMESTAMP = 1481977811 +SHA256 (chromium-55.0.2883.87.tar.xz) = e81bd3140d9c84dfee04d9a94686dfe6a20ae79475d84f17154c5536dcb81a58 +SIZE (chromium-55.0.2883.87.tar.xz) = 511249724 +SHA256 (chromium-55.0.2883.87-testdata.tar.xz) = 24ee31dfe7c665cfce5e6e826d2864292585f5b95dd5ead235d0edf89f2f38c0 +SIZE (chromium-55.0.2883.87-testdata.tar.xz) = 124466280 Modified: branches/2017Q1/www/chromium/files/extra-patch-clang ============================================================================== --- branches/2017Q1/www/chromium/files/extra-patch-clang Tue Jan 17 10:11:16 2017 (r431726) +++ branches/2017Q1/www/chromium/files/extra-patch-clang Tue Jan 17 10:12:50 2017 (r431727) @@ -52,17 +52,6 @@ } // Helper function to verify the most common test expectations. ---- components/sync_sessions/synced_session_tracker.cc.orig 2016-01-21 13:04:41.772845558 +0100 -+++ components/sync_sessions/synced_session_tracker.cc 2016-01-21 13:05:17.652842509 +0100 -@@ -286,7 +286,7 @@ - } - DCHECK(window_ptr); - DCHECK_EQ(window_ptr->window_id.id(), window_id); -- DCHECK_EQ(reinterpret_cast(NULL), -+ DCHECK_EQ(static_cast(NULL), - GetSession(session_tag)->windows[window_id]); - GetSession(session_tag)->windows[window_id] = window_ptr; - } --- media/audio/audio_output_proxy_unittest.cc 2015-04-15 00:18:55.000000000 +0200 +++ media/audio/audio_output_proxy_unittest.cc 2015-04-18 22:02:38.000000000 +0200 @@ -387,7 +387,7 @@ Modified: branches/2017Q1/www/chromium/files/patch-BUILD.gn ============================================================================== --- branches/2017Q1/www/chromium/files/patch-BUILD.gn Tue Jan 17 10:11:16 2017 (r431726) +++ branches/2017Q1/www/chromium/files/patch-BUILD.gn Tue Jan 17 10:12:50 2017 (r431727) @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2016-10-06 04:02:07.000000000 +0300 -+++ BUILD.gn 2016-10-13 10:32:25.742762000 +0300 -@@ -201,7 +201,7 @@ +--- BUILD.gn.orig 2016-12-01 23:02:04 UTC ++++ BUILD.gn +@@ -215,7 +215,7 @@ group("both_gn_and_gyp") { ] } @@ -9,7 +9,7 @@ deps += [ "//chrome", "//chrome/test:browser_tests", -@@ -260,7 +260,7 @@ +@@ -274,7 +274,7 @@ group("both_gn_and_gyp") { ] } @@ -18,7 +18,7 @@ # TODO(GYP): Figure out which of these should actually build on iOS, # and whether there should be other targets that are iOS-only and missing. deps += [ -@@ -300,7 +300,7 @@ +@@ -316,7 +316,7 @@ group("both_gn_and_gyp") { "//ui/touch_selection:ui_touch_selection_unittests", "//url/ipc:url_ipc_unittests", ] @@ -27,7 +27,7 @@ deps += [ "//ios:all" ] } -@@ -457,7 +457,7 @@ +@@ -474,7 +474,7 @@ group("both_gn_and_gyp") { ] } @@ -36,7 +36,7 @@ # The following are definitely linux-only. deps += [ "//chrome:manpage", -@@ -484,9 +484,16 @@ +@@ -501,9 +501,16 @@ group("both_gn_and_gyp") { # TODO(dpranke): add the linux_dump_symbols flag? deps += [ "//chrome:linux_symbols" ] } @@ -54,7 +54,7 @@ deps += [ "//base:base_i18n_perftests", "//base:base_perftests", -@@ -555,7 +562,7 @@ +@@ -574,7 +581,7 @@ group("both_gn_and_gyp") { if (enable_nacl) { deps += [ "//components/nacl/loader:nacl_loader_unittests" ] @@ -63,7 +63,7 @@ # TODO(dpranke): Figure out what platforms should actually have this. deps += [ "//components/nacl/loader:nacl_helper" ] -@@ -664,7 +671,7 @@ +@@ -688,7 +695,7 @@ group("both_gn_and_gyp") { deps += [ "//chrome/installer/mini_installer:next_version_mini_installer" ] } @@ -72,8 +72,8 @@ deps += [ "//breakpad:symupload($host_toolchain)" ] } -@@ -713,7 +720,7 @@ - deps += [ "//chrome/tools/disable_outdated_build_detector" ] +@@ -736,7 +743,7 @@ group("gn_only") { + ] } - if (is_win || is_linux) { @@ -81,7 +81,7 @@ deps += [ "//mash:all", "//media/mojo/services:media_mojo_shell_unittests", -@@ -726,7 +733,7 @@ +@@ -749,7 +756,7 @@ group("gn_only") { ] } @@ -90,7 +90,7 @@ # TODO(GYP): Figure out if any of these should be in gn_all # and figure out how cross-platform they are deps += [ -@@ -793,7 +800,7 @@ +@@ -816,7 +823,7 @@ group("gn_only") { ] if (target_cpu == "x86" || target_cpu == "x64") { @@ -99,7 +99,7 @@ deps += [ "//chrome/test:load_library_perf_tests" ] } deps += [ -@@ -801,7 +808,7 @@ +@@ -824,7 +831,7 @@ group("gn_only") { "//third_party/libjpeg_turbo:simd_asm", ] } @@ -108,7 +108,7 @@ deps += [ "//v8:v8_shell" ] } } -@@ -811,7 +818,7 @@ +@@ -834,7 +841,7 @@ group("gn_only") { } if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) || @@ -117,7 +117,7 @@ deps += [ "//testing/libfuzzer/fuzzers", "//testing/libfuzzer/tests:libfuzzer_tests", -@@ -847,7 +854,7 @@ +@@ -876,7 +883,7 @@ group("gn_only") { group("gn_mojo_targets") { testonly = true @@ -126,7 +126,7 @@ # TODO(GYP): Figure out if any of these should be in gn_all # and figure out how cross-platform they are deps = [ -@@ -872,7 +879,7 @@ +@@ -901,7 +908,7 @@ group("gn_visibility") { } } @@ -135,7 +135,7 @@ # This group includes all of the targets needed to build and test Blink, # including running the layout tests (see below). group("blink_tests") { -@@ -906,7 +913,7 @@ +@@ -935,7 +942,7 @@ if (!is_ios) { ] } @@ -144,21 +144,21 @@ deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -935,7 +942,7 @@ +@@ -961,7 +968,7 @@ group("chromium_swarm_tests") { group("chromium_builder_perf") { testonly = true - if (!is_ios && !is_android && !is_chromecast) { + if (!is_ios && !is_android && !is_chromecast && !is_bsd) { - deps = [ + data_deps = [ "//cc:cc_perftests", "//chrome/test:load_library_perf_tests", -@@ -965,7 +972,7 @@ +@@ -992,7 +999,7 @@ group("chromium_builder_perf") { "//chrome/installer/mini_installer:mini_installer", "//third_party/angle/src/tests:angle_perftests", ] - } else { + } else if (!is_bsd) { - deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] + data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] } } Modified: branches/2017Q1/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc ============================================================================== --- branches/2017Q1/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc Tue Jan 17 10:11:16 2017 (r431726) +++ branches/2017Q1/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc Tue Jan 17 10:12:50 2017 (r431727) @@ -1,9 +1,11 @@ ---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2016-08-03 22:02:10.000000000 +0300 -+++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc 2016-09-21 22:14:12.220734000 +0300 -@@ -3,17 +3,28 @@ +--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2016-12-01 23:02:05 UTC ++++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc +@@ -3,19 +3,28 @@ // found in the LICENSE file. #include "base/allocator/allocator_shim.h" +- +-#include +#include +#include +#include @@ -25,17 +27,17 @@ +void* __memalign(size_t alignment, size_t size) { + void *ret; + if (__posix_memalign(&ret, alignment, size) != 0) { -+ return nullptr; ++ return nullptr; + } else { -+ return ret; ++ return ret; + } +} -+int __posix_memalign(void **ptr, size_t alignment, size_t size); ++int __posix_memalign(void **ptr, size_t alignment, size_t size); +void __free(void* ptr); } // extern "C" namespace { -@@ -21,23 +32,27 @@ +@@ -23,23 +32,23 @@ namespace { using base::allocator::AllocatorDispatch; void* GlibcMalloc(const AllocatorDispatch*, size_t size) { @@ -58,13 +60,9 @@ + return __memalign(alignment, size); } -+/* int GlibcPosixMemalign(const AllocatorDispatch*, void** ptr, size_t alignment, size_t size) { */ -+/* return __posix_memalign(ptr, alignment, size); */ -+/* } */ -+ void GlibcFree(const AllocatorDispatch*, void* address) { - __libc_free(address); + __free(address); } - } // namespace + size_t GlibcGetSizeEstimate(const AllocatorDispatch*, void* address) { Copied: branches/2017Q1/www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc (from r431706, head/www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc Tue Jan 17 10:12:50 2017 (r431727, copy of r431706, head/www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc) @@ -0,0 +1,16 @@ +--- base/debug/scoped_thread_heap_usage.cc.orig 2016-12-12 23:57:03 UTC ++++ base/debug/scoped_thread_heap_usage.cc +@@ -14,11 +14,13 @@ + #include "base/threading/thread_local_storage.h" + #include "build/build_config.h" + ++#if !defined(OS_BSD) + #if defined(OS_MACOSX) || defined(OS_IOS) + #include + #else + #include + #endif ++#endif + + namespace base { + namespace debug { Modified: branches/2017Q1/www/chromium/files/patch-build_config_compiler_BUILD.gn ============================================================================== --- branches/2017Q1/www/chromium/files/patch-build_config_compiler_BUILD.gn Tue Jan 17 10:11:16 2017 (r431726) +++ branches/2017Q1/www/chromium/files/patch-build_config_compiler_BUILD.gn Tue Jan 17 10:12:50 2017 (r431727) @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2016-10-06 04:02:08.000000000 +0300 -+++ build/config/compiler/BUILD.gn 2016-10-24 23:25:32.101459000 +0300 -@@ -141,7 +141,7 @@ +--- build/config/compiler/BUILD.gn.orig 2016-12-01 23:02:05 UTC ++++ build/config/compiler/BUILD.gn +@@ -153,7 +153,7 @@ config("compiler") { configs += [ "//build/config/win:compiler" ] } else if (is_android) { configs += [ "//build/config/android:compiler" ] @@ -9,7 +9,7 @@ configs += [ "//build/config/linux:compiler" ] } else if (is_nacl) { configs += [ "//build/config/nacl:compiler" ] -@@ -271,7 +271,7 @@ +@@ -280,7 +280,7 @@ config("compiler") { # Linux/Android common flags setup. # --------------------------------- @@ -18,7 +18,7 @@ cflags += [ "-fPIC", "-pipe", # Use pipes for communicating between sub-processes. Faster. -@@ -376,14 +376,14 @@ +@@ -407,14 +407,14 @@ config("compiler") { # clang-cl (used if is_win) doesn't expose this flag. # Currently disabled for nacl since its toolchain lacks this flag (too old). # TODO(zforman): Once nacl's toolchain is updated, remove check. @@ -35,16 +35,16 @@ # gnu++11 instead of c++11 is needed because some code uses typeof() (a # GNU extension). # TODO(thakis): Eventually switch this to c++11 instead, -@@ -441,7 +441,7 @@ - ldflags += [ "-flto" ] +@@ -464,7 +464,7 @@ config("compiler") { + ] - # Apply a lower LTO optimization level as the default is too slow. -- if (is_linux) { -+ if (is_linux || is_bsd) { - if (use_lld) { - ldflags += [ "-Wl,--lto-O1" ] - } else { -@@ -460,7 +460,7 @@ + # Apply a lower LTO optimization level as the default is too slow. +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (use_lld) { + ldflags += [ "-Wl,--lto-O1" ] + } else { +@@ -484,7 +484,7 @@ config("compiler") { # targeting ARM, without this flag, LTO produces a .text section that is # larger than the maximum call displacement, preventing the linker from # relocating calls (http://llvm.org/PR22999). @@ -52,8 +52,8 @@ + if (is_linux || is_bsd) { ldflags += [ "-Wl,-plugin-opt,-function-sections" ] } - -@@ -738,7 +738,7 @@ + } +@@ -755,7 +755,7 @@ config("compiler_codegen") { # configs -= [ "//build/config/compiler:clang_stackrealign" ] # See https://crbug.com/556393 for details of where it must be avoided. config("clang_stackrealign") { @@ -62,7 +62,7 @@ cflags = [ # Align the stack on 16-byte boundaries, http://crbug.com/418554. "-mstack-alignment=16", -@@ -773,7 +773,7 @@ +@@ -790,7 +790,7 @@ config("runtime_library") { # smaller. if (is_win) { configs += [ "//build/config/win:runtime_library" ] @@ -71,7 +71,7 @@ configs += [ "//build/config/linux:runtime_library" ] } else if (is_ios) { configs += [ "//build/config/ios:runtime_library" ] -@@ -1032,7 +1032,7 @@ +@@ -1050,7 +1050,7 @@ config("default_warnings") { "-Wno-nonportable-include-path", # TODO(hans): https://crbug.com/637306 @@ -80,7 +80,7 @@ ] } } -@@ -1064,7 +1064,7 @@ +@@ -1082,7 +1082,7 @@ config("chromium_code") { ] if (!is_debug && !using_sanitizer && @@ -89,7 +89,7 @@ # _FORTIFY_SOURCE isn't really supported by Clang now, see # http://llvm.org/bugs/show_bug.cgi?id=16821. # It seems to work fine with Ubuntu 12 headers though, so use it in -@@ -1124,7 +1124,7 @@ +@@ -1140,7 +1140,7 @@ config("no_chromium_code") { ] } Modified: branches/2017Q1/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni ============================================================================== --- branches/2017Q1/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni Tue Jan 17 10:11:16 2017 (r431726) +++ branches/2017Q1/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni Tue Jan 17 10:12:50 2017 (r431727) @@ -1,6 +1,6 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2016-11-10 20:02:09 UTC -+++ build/toolchain/gcc_toolchain.gni -@@ -10,6 +10,11 @@ import("//build/toolchain/cc_wrapper.gni +--- build/toolchain/gcc_toolchain.gni.orig 2016-12-09 05:04:14.000000000 +0000 ++++ build/toolchain/gcc_toolchain.gni 2016-12-21 23:03:46.063519000 +0000 +@@ -11,6 +11,11 @@ import("//build/toolchain/goma.gni") import("//build/toolchain/toolchain.gni") @@ -12,7 +12,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -453,14 +458,28 @@ template("clang_toolchain") { +@@ -482,14 +487,23 @@ } gcc_toolchain(target_name) { @@ -20,12 +20,11 @@ - cc = "$prefix/clang" - cxx = "$prefix/clang++" - ld = cxx +- +- readelf = "${toolprefix}readelf" +- ar = "${toolprefix}ar" +- nm = "${toolprefix}nm" + if (is_bsd) { -+ # cc = getenv("CC") -+ # assert(cc != "", "CC env must me set with >= clang39") -+ # cxx = getenv("CXX") -+ # assert(cxx != "", "CXX env must me set with >= clang++39") -+ # ld = cxx + cc = "${toolprefix}clang39" + cxx = "${toolprefix}clang++39" + ld = cxx @@ -37,10 +36,7 @@ + cc = "$prefix/clang" + cxx = "$prefix/clang++" + ld = cxx - -- readelf = "${toolprefix}readelf" -- ar = "${toolprefix}ar" -- nm = "${toolprefix}nm" ++ + readelf = "${toolprefix}readelf" + ar = "${toolprefix}ar" + nm = "${toolprefix}nm" Modified: branches/2017Q1/www/chromium/files/patch-chrome_browser_BUILD.gn ============================================================================== --- branches/2017Q1/www/chromium/files/patch-chrome_browser_BUILD.gn Tue Jan 17 10:11:16 2017 (r431726) +++ branches/2017Q1/www/chromium/files/patch-chrome_browser_BUILD.gn Tue Jan 17 10:12:50 2017 (r431727) @@ -1,6 +1,6 @@ ---- chrome/browser/BUILD.gn.orig 2016-08-03 22:02:11.000000000 +0300 -+++ chrome/browser/BUILD.gn 2016-09-27 09:40:30.879973000 +0300 -@@ -540,7 +540,7 @@ +--- chrome/browser/BUILD.gn.orig 2016-12-01 23:02:06 UTC ++++ chrome/browser/BUILD.gn +@@ -2105,7 +2105,7 @@ split_static_library("browser") { deps += [ "//device/udev_linux" ] } @@ -9,44 +9,12 @@ deps += [ "//third_party/speech-dispatcher" ] } -@@ -730,6 +730,22 @@ - sources += rebase_path(gypi_values.chrome_browser_non_mobile_sources, - ".", - "//chrome") -+ if (is_bsd) { -+ sources -= [ -+ "media_galleries/linux/mtp_device_delegate_impl_linux.cc", -+ "media_galleries/linux/mtp_device_delegate_impl_linux.h", -+ "media_galleries/linux/mtp_device_object_enumerator.cc", -+ "media_galleries/linux/mtp_device_object_enumerator.h", -+ "media_galleries/linux/mtp_device_task_helper.cc", -+ "media_galleries/linux/mtp_device_task_helper.h", -+ "media_galleries/linux/mtp_device_task_helper_map_service.cc", -+ "media_galleries/linux/mtp_device_task_helper_map_service.h", -+ "media_galleries/linux/mtp_read_file_worker.cc", -+ "media_galleries/linux/mtp_read_file_worker.h", -+ "media_galleries/linux/snapshot_file_details.cc", -+ "media_galleries/linux/snapshot_file_details.h", -+ ] -+ } - } - - if (!is_chrome_branded) { -@@ -857,7 +873,7 @@ +@@ -3439,7 +3439,7 @@ split_static_library("browser") { } } - if (is_linux) { + if (is_linux || is_bsd) { if (use_aura) { - configs += [ "//build/config/linux/dbus" ] - deps += [ -@@ -871,7 +887,7 @@ - } - } - -- if (is_linux || is_win) { -+ if (is_linux || is_bsd || is_win) { - sources += rebase_path(gypi_values.chrome_browser_non_mac_desktop_sources, - ".", - "//chrome") + deps += [ "//build/linux:fontconfig" ] + if (use_dbus) { Modified: branches/2017Q1/www/chromium/files/patch-chrome_browser_about__flags.cc ============================================================================== --- branches/2017Q1/www/chromium/files/patch-chrome_browser_about__flags.cc Tue Jan 17 10:11:16 2017 (r431726) +++ branches/2017Q1/www/chromium/files/patch-chrome_browser_about__flags.cc Tue Jan 17 10:12:50 2017 (r431727) @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2016-05-11 19:02:13 UTC +--- chrome/browser/about_flags.cc.orig 2016-12-01 23:02:06 UTC +++ chrome/browser/about_flags.cc -@@ -673,7 +673,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -766,7 +766,7 @@ const FeatureEntry kFeatureEntries[] = { kOsLinux | kOsCrOS | kOsWin | kOsAndroid, ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSmoothScrolling, switches::kDisableSmoothScrolling)}, @@ -9,10 +9,10 @@ {"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME, IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION, // Uses the system preference on Mac (a different implementation). -@@ -1729,7 +1729,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1771,7 +1771,7 @@ const FeatureEntry kFeatureEntries[] = { IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop, - SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignExtensions)}, - #endif + FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)}, + #endif // ENABLE_EXTENSIONS -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) {"enable-input-ime-api", IDS_FLAGS_ENABLE_INPUT_IME_API_NAME, Copied: branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc (from r431706, head/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc Tue Jan 17 10:12:50 2017 (r431727, copy of r431706, head/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/extensions/api/omnibox/omnibox_api.cc.orig 2016-12-16 03:22:03.040835000 +0000 ++++ chrome/browser/extensions/api/omnibox/omnibox_api.cc 2016-12-16 03:22:24.317714000 +0000 +@@ -45,7 +45,7 @@ + // Pref key for omnibox.setDefaultSuggestion. + const char kOmniboxDefaultSuggestion[] = "omnibox_default_suggestion"; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + static const int kOmniboxIconPaddingLeft = 2; + static const int kOmniboxIconPaddingRight = 2; + #elif defined(OS_MACOSX) Copied: branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc (from r431706, head/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc Tue Jan 17 10:12:50 2017 (r431727, copy of r431706, head/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/extensions/bookmark_app_helper.cc.orig 2016-12-16 03:24:27.367808000 +0000 ++++ chrome/browser/extensions/bookmark_app_helper.cc 2016-12-16 03:24:51.798418000 +0000 +@@ -707,7 +707,7 @@ + #if !defined(OS_MACOSX) + #if !defined(USE_ASH) + web_app::ShortcutLocations creation_locations; +-#if defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + creation_locations.on_desktop = true; + #else + creation_locations.on_desktop = false; Modified: branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc ============================================================================== --- branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc Tue Jan 17 10:11:16 2017 (r431726) +++ branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc Tue Jan 17 10:12:50 2017 (r431727) @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2016-05-11 19:02:14 UTC -+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc -@@ -64,7 +64,7 @@ +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2016-12-01 23:02:07.000000000 +0000 ++++ chrome/browser/extensions/browser_context_keyed_service_factories.cc 2016-12-16 19:35:19.489404000 +0000 +@@ -62,7 +62,7 @@ #include "chrome/browser/chromeos/extensions/media_player_api.h" #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #include "chrome/browser/extensions/api/log_private/log_private_api.h" @@ -9,12 +9,12 @@ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif -@@ -105,7 +105,7 @@ void EnsureBrowserContextKeyedServiceFac +@@ -103,7 +103,7 @@ #if defined(OS_CHROMEOS) extensions::InputImeAPI::GetFactoryInstance(); extensions::InputMethodAPI::GetFactoryInstance(); -#elif defined(OS_LINUX) || defined(OS_WIN) -+#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) ++#elif defined(OS_LINUX) || defined(OS_WIN) && !defined(OS_BSD) extensions::InputImeAPI::GetFactoryInstance(); #endif extensions::LanguageSettingsPrivateDelegateFactory::GetInstance(); Modified: branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc ============================================================================== --- branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc Tue Jan 17 10:11:16 2017 (r431726) +++ branches/2017Q1/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc Tue Jan 17 10:12:50 2017 (r431727) @@ -1,20 +1,20 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2016-05-11 19:02:14 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2016-12-01 23:02:07 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -645,7 +645,7 @@ void ExternalProviderImpl::CreateExterna - Manifest::EXTERNAL_PREF_DOWNLOAD, - oem_extension_creation_flags))); +@@ -638,7 +638,7 @@ void ExternalProviderImpl::CreateExterna + Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD, + oem_extension_creation_flags)); } -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) if (!profile->IsLegacySupervised()) { - provider_list->push_back( - linked_ptr( -@@ -687,7 +687,7 @@ void ExternalProviderImpl::CreateExterna - bundled_extension_creation_flags))); + provider_list->push_back(base::MakeUnique( + service, +@@ -664,7 +664,7 @@ void ExternalProviderImpl::CreateExterna + bundled_extension_creation_flags)); // Define a per-user source of external extensions. -#if defined(OS_MACOSX) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) +#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) - provider_list->push_back( - linked_ptr( - new ExternalProviderImpl( + provider_list->push_back(base::MakeUnique( + service, new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS, + ExternalPrefLoader::NONE, nullptr), Copied: branches/2017Q1/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc (from r431706, head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc Tue Jan 17 10:12:50 2017 (r431727, copy of r431706, head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2016-12-01 23:02:07 UTC ++++ chrome/browser/media/webrtc/webrtc_log_uploader.cc +@@ -344,6 +344,8 @@ void WebRtcLogUploader::SetupMultipart( + const char product[] = "Chrome_Android"; + #elif defined(OS_CHROMEOS) + const char product[] = "Chrome_ChromeOS"; ++#elif defined(OS_FREEBSD) ++ const char product[] = "Chrome_FreeBSD"; + #else + #error Platform not supported. + #endif Copied: branches/2017Q1/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc (from r431706, head/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc Tue Jan 17 10:12:50 2017 (r431727, copy of r431706, head/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/net/async_dns_field_trial.cc.orig 2016-12-16 03:12:55.927001000 +0000 ++++ chrome/browser/net/async_dns_field_trial.cc 2016-12-16 03:13:16.445410000 +0000 +@@ -61,7 +61,7 @@ + } // namespace + + bool ConfigureAsyncDnsFieldTrial() { +-#if defined(OS_CHROMEOS) || defined(OS_MACOSX) ++#if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_BSD) + const bool kDefault = true; + #else + const bool kDefault = false; Copied: branches/2017Q1/www/chromium/files/patch-chrome_browser_renderer_context_menu_render__view__context__menu.cc (from r431706, head/www/chromium/files/patch-chrome_browser_renderer_context_menu_render__view__context__menu.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/chromium/files/patch-chrome_browser_renderer_context_menu_render__view__context__menu.cc Tue Jan 17 10:12:50 2017 (r431727, copy of r431706, head/www/chromium/files/patch-chrome_browser_renderer_context_menu_render__view__context__menu.cc) @@ -0,0 +1,29 @@ +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2016-12-18 00:37:45.100012000 +0100 ++++ chrome/browser/renderer_context_menu/render_view_context_menu.cc 2016-12-18 00:42:54.851203000 +0100 +@@ -1325,7 +1325,7 @@ + // 'Undo' and 'Redo' for text input with no suggestions and no text selected. + // We make an exception for OS X as context clicking will select the closest + // word. In this case both items are always shown. +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_BSD) + menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO, + IDS_CONTENT_CONTEXT_UNDO); + menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO, +@@ -1361,7 +1361,7 @@ + if (!use_spelling) + return; + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_BSD) + menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS, + IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS); + #else +@@ -1602,7 +1602,7 @@ + case IDC_CHECK_SPELLING_WHILE_TYPING: + return prefs->GetBoolean(spellcheck::prefs::kEnableSpellcheck); + +-#if !defined(OS_MACOSX) && defined(OS_POSIX) ++#if !defined(OS_MACOSX) && !defined(OS_BSD) && defined(OS_POSIX) + // TODO(suzhe): this should not be enabled for password fields. + case IDC_INPUT_METHODS_MENU: + return true; Modified: branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_BUILD.gn ============================================================================== --- branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_BUILD.gn Tue Jan 17 10:11:16 2017 (r431726) +++ branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_BUILD.gn Tue Jan 17 10:12:50 2017 (r431727) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/BUILD.gn.orig 2016-08-03 22:02:13.000000000 +0300 -+++ chrome/browser/ui/BUILD.gn 2016-09-03 00:04:02.109457000 +0300 -@@ -503,7 +503,7 @@ - "//ui/events:dom_keycode_converter", - ] +--- chrome/browser/ui/BUILD.gn.orig 2016-12-01 23:02:08 UTC ++++ chrome/browser/ui/BUILD.gn +@@ -3024,7 +3024,7 @@ split_static_library("ui") { + ] + } } - if (is_linux) { # Both desktop Linux and ChromeOS. + if (is_linux || is_bsd) { # Both desktop Linux and ChromeOS. - sources += rebase_path(gypi_values.chrome_browser_ui_linux_sources, - ".", - "//chrome") + sources += [ + "certificate_dialogs.cc", + "certificate_dialogs.h", Modified: branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc ============================================================================== --- branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc Tue Jan 17 10:11:16 2017 (r431726) +++ branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc Tue Jan 17 10:12:50 2017 (r431727) @@ -1,15 +1,15 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2016-10-06 04:02:13.000000000 +0300 -+++ chrome/browser/ui/browser_view_prefs.cc 2016-10-13 05:59:52.802478000 +0300 +--- chrome/browser/ui/browser_view_prefs.cc.orig 2016-12-01 23:02:08 UTC ++++ chrome/browser/ui/browser_view_prefs.cc @@ -10,7 +10,7 @@ #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) - #include "ui/base/x/x11_util.h" ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + #include "ui/base/x/x11_util.h" // nogncheck #endif -@@ -32,7 +32,7 @@ +@@ -32,7 +32,7 @@ void RegisterBrowserViewLocalPrefs(PrefR void RegisterBrowserViewProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { Modified: branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc ============================================================================== --- branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc Tue Jan 17 10:11:16 2017 (r431726) +++ branches/2017Q1/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc Tue Jan 17 10:12:50 2017 (r431727) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2016-05-11 19:02:16 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2016-12-01 23:02:08 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -88,7 +88,7 @@ +@@ -91,7 +91,7 @@ #include "components/user_manager/user_manager.h" #endif -#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) +#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_FREEBSD)) - #include "ui/events/devices/x11/touch_factory_x11.h" + #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif Copied: branches/2017Q1/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc (from r431706, head/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc Tue Jan 17 10:12:50 2017 (r431727, copy of r431706, head/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc) @@ -0,0 +1,14 @@ +--- chrome/common/extensions/chrome_extensions_client.cc.orig 2016-12-16 03:27:01.063936000 +0000 ++++ chrome/common/extensions/chrome_extensions_client.cc 2016-12-16 03:29:25.710522000 +0000 +@@ -103,7 +103,10 @@ + static base::LazyInstance g_client = + LAZY_INSTANCE_INITIALIZER; + +-ChromeExtensionsClient::ChromeExtensionsClient() {} ++ChromeExtensionsClient::ChromeExtensionsClient() ++ : chrome_api_permissions_(ChromeAPIPermissions()), ++ extensions_api_permissions_(ExtensionsAPIPermissions()) { ++} + + ChromeExtensionsClient::~ChromeExtensionsClient() { + } Modified: branches/2017Q1/www/chromium/files/patch-chrome_common_pref__names.h ============================================================================== --- branches/2017Q1/www/chromium/files/patch-chrome_common_pref__names.h Tue Jan 17 10:11:16 2017 (r431726) +++ branches/2017Q1/www/chromium/files/patch-chrome_common_pref__names.h Tue Jan 17 10:12:50 2017 (r431727) @@ -1,15 +1,15 @@ ---- chrome/common/pref_names.h.orig 2016-10-06 04:02:14.000000000 +0300 -+++ chrome/common/pref_names.h 2016-10-14 07:01:22.105649000 +0300 -@@ -315,7 +315,7 @@ +--- chrome/common/pref_names.h.orig 2016-12-01 23:02:09 UTC ++++ chrome/common/pref_names.h +@@ -312,7 +312,7 @@ extern const char kForceGoogleSafeSearch + extern const char kForceYouTubeRestrict[]; + extern const char kForceSessionSync[]; extern const char kAllowedDomainsForApps[]; - extern const char kLastClearBrowsingDataTime[]; - extern const char kClearBrowsingDataHistoryNoticeShownTimes[]; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -347,7 +347,7 @@ +@@ -345,7 +345,7 @@ extern const char kDefaultBrowserSetting #if defined(OS_MACOSX) extern const char kShowUpdatePromotionInfoBar[]; #endif @@ -18,7 +18,7 @@ extern const char kUseCustomChromeFrame[]; #endif extern const char kBackShortcutBubbleShownCount[]; -@@ -496,7 +496,7 @@ +@@ -493,7 +493,7 @@ extern const char kAppWindowPlacement[]; extern const char kDownloadDefaultDirectory[]; extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadDirUpgraded[]; Modified: branches/2017Q1/www/chromium/files/patch-chrome_test_BUILD.gn ============================================================================== --- branches/2017Q1/www/chromium/files/patch-chrome_test_BUILD.gn Tue Jan 17 10:11:16 2017 (r431726) +++ branches/2017Q1/www/chromium/files/patch-chrome_test_BUILD.gn Tue Jan 17 10:12:50 2017 (r431727) @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2016-10-06 04:02:14.000000000 +0300 -+++ chrome/test/BUILD.gn 2016-10-13 06:28:37.584668000 +0300 -@@ -179,7 +179,7 @@ +--- chrome/test/BUILD.gn.orig 2016-12-01 23:02:09 UTC ++++ chrome/test/BUILD.gn +@@ -179,7 +179,7 @@ static_library("test_support") { ] } @@ -9,7 +9,7 @@ public_deps += [ "//crypto:platform" ] } if (is_mac) { -@@ -383,7 +383,7 @@ +@@ -449,7 +449,7 @@ if (!is_android) { "$root_out_dir/test_page.css.mock-http-headers", "$root_out_dir/ui_test.pak", ] @@ -18,8 +18,8 @@ data += [ "$root_out_dir/chrome_100_percent.pak", "$root_out_dir/chrome_200_percent.pak", -@@ -391,7 +391,7 @@ - "$root_out_dir/locales/fr.pak", +@@ -458,7 +458,7 @@ if (!is_android) { + "$root_out_dir/resources.pak", ] } - if (is_linux) { @@ -27,16 +27,16 @@ data += [ "$root_out_dir/libppapi_tests.so" ] } -@@ -462,7 +462,7 @@ - ".", - "//chrome") +@@ -559,7 +559,7 @@ if (!is_android) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Tue Jan 17 11:52:22 2017 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 9DF72CB4F9E; Tue, 17 Jan 2017 11:52:22 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6A0D01750; Tue, 17 Jan 2017 11:52:22 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0HBqLn3020518; Tue, 17 Jan 2017 11:52:21 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0HBqL9k020517; Tue, 17 Jan 2017 11:52:21 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201701171152.v0HBqL9k020517@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Tue, 17 Jan 2017 11:52:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431729 - branches/2017Q1/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.23 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, 17 Jan 2017 11:52:22 -0000 Author: cpm Date: Tue Jan 17 11:52:21 2017 New Revision: 431729 URL: https://svnweb.freebsd.org/changeset/ports/431729 Log: MFH: r431728 - Fix conditional to correctly check Reported by: Tomoaki AOKI Approved by: ports-secteam (blanket) Modified: branches/2017Q1/www/chromium/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/www/chromium/Makefile ============================================================================== --- branches/2017Q1/www/chromium/Makefile Tue Jan 17 11:49:40 2017 (r431728) +++ branches/2017Q1/www/chromium/Makefile Tue Jan 17 11:52:21 2017 (r431729) @@ -196,10 +196,10 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10 .endif -.if ${OSVERSION} < 1200017 || (${OSVERSION} >= 1100507 && ${OSVERSION} < 1200000) -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old -.else +.if ${OSVERSION} >= 1200017 || (${OSVERSION} >= 1100508 && ${OSVERSION} <= 1200000) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new +.else +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old .endif .endif From owner-svn-ports-branches@freebsd.org Tue Jan 17 12:36:22 2017 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 3322ECB28E9; Tue, 17 Jan 2017 12:36:22 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F264B1078; Tue, 17 Jan 2017 12:36:21 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0HCaL7Z036726; Tue, 17 Jan 2017 12:36:21 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0HCaLvr036725; Tue, 17 Jan 2017 12:36:21 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201701171236.v0HCaLvr036725@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Tue, 17 Jan 2017 12:36:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431731 - branches/2017Q1/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.23 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, 17 Jan 2017 12:36:22 -0000 Author: cpm Date: Tue Jan 17 12:36:20 2017 New Revision: 431731 URL: https://svnweb.freebsd.org/changeset/ports/431731 Log: MFH: r431730 - Minor fix in OSVERSION check. The last comparison should be "< 1200000" Reported by: Tomoaki AOKI Approved by: ports-secteam (blanket) Modified: branches/2017Q1/www/chromium/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/www/chromium/Makefile ============================================================================== --- branches/2017Q1/www/chromium/Makefile Tue Jan 17 12:34:27 2017 (r431730) +++ branches/2017Q1/www/chromium/Makefile Tue Jan 17 12:36:20 2017 (r431731) @@ -196,7 +196,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10 .endif -.if ${OSVERSION} >= 1200017 || (${OSVERSION} >= 1100508 && ${OSVERSION} <= 1200000) +.if ${OSVERSION} >= 1200017 || (${OSVERSION} >= 1100508 && ${OSVERSION} < 1200000) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new .else EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old From owner-svn-ports-branches@freebsd.org Tue Jan 17 14:13:23 2017 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 F2F3ACB46C0; Tue, 17 Jan 2017 14:13:23 +0000 (UTC) (envelope-from lifanov@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 A591E1410; Tue, 17 Jan 2017 14:13:23 +0000 (UTC) (envelope-from lifanov@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0HEDM20077998; Tue, 17 Jan 2017 14:13:22 GMT (envelope-from lifanov@FreeBSD.org) Received: (from lifanov@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0HEDMeB077997; Tue, 17 Jan 2017 14:13:22 GMT (envelope-from lifanov@FreeBSD.org) Message-Id: <201701171413.v0HEDMeB077997@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lifanov set sender to lifanov@FreeBSD.org using -f From: Nikolai Lifanov Date: Tue, 17 Jan 2017 14:13:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431739 - in branches/2017Q1/sysutils/ansible: . 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.23 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, 17 Jan 2017 14:13:24 -0000 Author: lifanov Date: Tue Jan 17 14:13:22 2017 New Revision: 431739 URL: https://svnweb.freebsd.org/changeset/ports/431739 Log: MFH: r431611 fix patch for ec84ff6 PR: 216103 Submitted by: freebsd@sh0shin.org Reviewed by: matthew Approved by: matthew (mentor) Differential Revision: https://reviews.freebsd.org/D9189 Approved by: ports-secteam (junovitch) Modified: branches/2017Q1/sysutils/ansible/Makefile branches/2017Q1/sysutils/ansible/files/extra-patch-ec84ff6 Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/sysutils/ansible/Makefile ============================================================================== --- branches/2017Q1/sysutils/ansible/Makefile Tue Jan 17 13:12:41 2017 (r431738) +++ branches/2017Q1/sysutils/ansible/Makefile Tue Jan 17 14:13:22 2017 (r431739) @@ -3,7 +3,7 @@ PORTNAME= ansible PORTVERSION?= 2.2.0.0 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= sysutils python MASTER_SITES= http://releases.ansible.com/ansible/ Modified: branches/2017Q1/sysutils/ansible/files/extra-patch-ec84ff6 ============================================================================== --- branches/2017Q1/sysutils/ansible/files/extra-patch-ec84ff6 Tue Jan 17 13:12:41 2017 (r431738) +++ branches/2017Q1/sysutils/ansible/files/extra-patch-ec84ff6 Tue Jan 17 14:13:22 2017 (r431739) @@ -281,7 +281,7 @@ result = self._cached_result[sha1_hash] else: - result = self._do_template(variable, preserve_trailing_newlines=preserve_trailing_newlines, escape_backslashes=escape_backslashes, fail_on_undefined=fail_on_undefined, overrides=overrides) -+ result = self.do_template( ++ result = self._do_template( + variable, + preserve_trailing_newlines=preserve_trailing_newlines, + escape_backslashes=escape_backslashes, From owner-svn-ports-branches@freebsd.org Tue Jan 17 14:50:29 2017 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 5B965CB32E5; Tue, 17 Jan 2017 14:50:29 +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 1D57A1AC3; Tue, 17 Jan 2017 14:50:29 +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 v0HEoSiQ090957; Tue, 17 Jan 2017 14:50:28 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0HEoSAT090956; Tue, 17 Jan 2017 14:50:28 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701171450.v0HEoSAT090956@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 17 Jan 2017 14:50:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431744 - branches/2017Q1/multimedia/libvpx 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.23 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, 17 Jan 2017 14:50:29 -0000 Author: jbeich Date: Tue Jan 17 14:50:28 2017 New Revision: 431744 URL: https://svnweb.freebsd.org/changeset/ports/431744 Log: MFH: r431743 multimedia/libvpx: unbreak SHARED=off after r394231 /usr/bin/strip: '.../stage/usr/local/lib/libvpx.so.*.*.*': No such file Approved by: ports-secteam blanket Modified: branches/2017Q1/multimedia/libvpx/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/multimedia/libvpx/Makefile ============================================================================== --- branches/2017Q1/multimedia/libvpx/Makefile Tue Jan 17 14:44:51 2017 (r431743) +++ branches/2017Q1/multimedia/libvpx/Makefile Tue Jan 17 14:50:28 2017 (r431744) @@ -88,6 +88,8 @@ post-patch: post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vpx* + +post-install-SHARED-on: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libvpx.so.*.*.* .include From owner-svn-ports-branches@freebsd.org Tue Jan 17 16:49:55 2017 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 8CC30CB4C0B; Tue, 17 Jan 2017 16:49:55 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5C39D137B; Tue, 17 Jan 2017 16:49:55 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0HGnsdr040052; Tue, 17 Jan 2017 16:49:54 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0HGnsIL040051; Tue, 17 Jan 2017 16:49:54 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201701171649.v0HGnsIL040051@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 17 Jan 2017 16:49:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431754 - branches/2017Q1/net-mgmt/smokeping 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.23 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, 17 Jan 2017 16:49:55 -0000 Author: feld Date: Tue Jan 17 16:49:54 2017 New Revision: 431754 URL: https://svnweb.freebsd.org/changeset/ports/431754 Log: MFH: r431753 net-mgmt/smokeping: Allow slaves to contact master over HTTPS Differential Revision: https://reviews.freebsd.org/D9142 Approved by: ports-secteam (with hat) Modified: branches/2017Q1/net-mgmt/smokeping/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/net-mgmt/smokeping/Makefile ============================================================================== --- branches/2017Q1/net-mgmt/smokeping/Makefile Tue Jan 17 16:49:19 2017 (r431753) +++ branches/2017Q1/net-mgmt/smokeping/Makefile Tue Jan 17 16:49:54 2017 (r431754) @@ -3,7 +3,7 @@ PORTNAME= smokeping PORTVERSION= 2.6.11 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt www MASTER_SITES= http://oss.oetiker.ch/smokeping/pub/ \ http://smokeping.cs.pu.edu.tw/pub/ @@ -21,6 +21,7 @@ BUILD_DEPENDS= p5-CGI-Session>=0:www/p5- p5-IO-Pty-Easy>=0:devel/p5-IO-Pty-Easy \ p5-SNMP_Session>=0:net-mgmt/p5-SNMP_Session \ p5-libwww>=0:www/p5-libwww \ + p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \ p5-CGI>=0:www/p5-CGI \ p5-FCGI>=0:www/p5-FCGI \ p5-Config-Grammar>=0:devel/p5-Config-Grammar \ From owner-svn-ports-branches@freebsd.org Tue Jan 17 17:44:50 2017 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 88B43CB4952; Tue, 17 Jan 2017 17:44:50 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49790161E; Tue, 17 Jan 2017 17:44:50 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0HHinPf065831; Tue, 17 Jan 2017 17:44:49 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0HHinmf065829; Tue, 17 Jan 2017 17:44:49 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701171744.v0HHinmf065829@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 17 Jan 2017 17:44:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431766 - in branches/2017Q1/www: firefox seamonkey 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.23 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, 17 Jan 2017 17:44:50 -0000 Author: jbeich Date: Tue Jan 17 17:44:49 2017 New Revision: 431766 URL: https://svnweb.freebsd.org/changeset/ports/431766 Log: MFH: r431735 www/firefox: disable system soundtouch due to broken resampling PR: 215879 Reported by: Sergey Submitted by: Tobias Kortkamp (based on) Approved by: ports-secteam (feld) Modified: branches/2017Q1/www/firefox/Makefile branches/2017Q1/www/seamonkey/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/www/firefox/Makefile ============================================================================== --- branches/2017Q1/www/firefox/Makefile Tue Jan 17 17:37:21 2017 (r431765) +++ branches/2017Q1/www/firefox/Makefile Tue Jan 17 17:44:49 2017 (r431766) @@ -4,7 +4,7 @@ PORTNAME= firefox DISTVERSION= 50.1.0 DISTVERSIONSUFFIX=.source -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ @@ -16,7 +16,6 @@ COMMENT= Web browser based on the browse BUILD_DEPENDS= nspr>=4.12:devel/nspr \ nss>=3.26.2:security/nss \ libevent2>=2.0.21_2:devel/libevent2 \ - soundtouch>=1.9.0:audio/soundtouch \ harfbuzz>=1.2.6:print/harfbuzz \ graphite2>=1.3.8:graphics/graphite2 \ png>=1.6.23:graphics/png \ @@ -28,13 +27,14 @@ BUILD_DEPENDS= nspr>=4.12:devel/nspr \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip +# soundtouch>=1.9.0:audio/soundtouch \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l USE_GECKO= gecko CONFLICTS_INSTALL= firefox-esr-45.* firefox-esr-3[18].* firefox-esr-24.* MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= # empty +USE_MOZILLA= -soundtouch MOZILLA_NAME= Firefox USE_GL= gl Modified: branches/2017Q1/www/seamonkey/Makefile ============================================================================== --- branches/2017Q1/www/seamonkey/Makefile Tue Jan 17 17:37:21 2017 (r431765) +++ branches/2017Q1/www/seamonkey/Makefile Tue Jan 17 17:44:49 2017 (r431766) @@ -4,7 +4,7 @@ PORTNAME= seamonkey DISTVERSION= 2.46 MOZILLA_VER= 49 # above + 3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build9/source @@ -17,7 +17,6 @@ COMMENT= The open source, standards comp BUILD_DEPENDS= nspr>=4.12:devel/nspr \ nss>=3.25:security/nss \ libevent2>=2.0.21_2:devel/libevent2 \ - soundtouch>=1.9.0:audio/soundtouch \ harfbuzz>=1.2.6:print/harfbuzz \ graphite2>=1.3.8:graphics/graphite2 \ png>=1.6.21:graphics/png \ @@ -29,6 +28,7 @@ BUILD_DEPENDS= nspr>=4.12:devel/nspr \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip +# soundtouch>=1.9.0:audio/soundtouch \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l @@ -41,7 +41,7 @@ MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MOZ_EXTENSIONS= default MOZ_OPTIONS+= --enable-application=suite -USE_MOZILLA= # empty +USE_MOZILLA= -soundtouch MOZ_PKGCONFIG_FILES= OPTIONS_DEFINE= LDAP LIGHTNING RUST From owner-svn-ports-branches@freebsd.org Tue Jan 17 17:52:17 2017 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 A4EE3CB4D25; Tue, 17 Jan 2017 17:52:17 +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 7FB021D37; Tue, 17 Jan 2017 17:52:17 +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 v0HHqGvx069088; Tue, 17 Jan 2017 17:52:16 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0HHqGDX069084; Tue, 17 Jan 2017 17:52:16 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701171752.v0HHqGDX069084@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 17 Jan 2017 17:52:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431767 - in branches/2017Q1/multimedia/libvpx: . 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.23 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, 17 Jan 2017 17:52:17 -0000 Author: jbeich Date: Tue Jan 17 17:52:16 2017 New Revision: 431767 URL: https://svnweb.freebsd.org/changeset/ports/431767 Log: MFH: r431741 multimedia/libvpx: update 1.6.1 Changes: https://chromium.googlesource.com/webm/libvpx/+log/v1.6.0..v1.6.1 ACC report: https://people.freebsd.org/~jbeich/compat_reports/libvpx/1.6.0_to_1.6.1/compat_report.html Approved by: ports-secteam (feld) Modified: branches/2017Q1/multimedia/libvpx/Makefile branches/2017Q1/multimedia/libvpx/distinfo branches/2017Q1/multimedia/libvpx/files/patch-configure branches/2017Q1/multimedia/libvpx/pkg-plist Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/multimedia/libvpx/Makefile ============================================================================== --- branches/2017Q1/multimedia/libvpx/Makefile Tue Jan 17 17:44:49 2017 (r431766) +++ branches/2017Q1/multimedia/libvpx/Makefile Tue Jan 17 17:52:16 2017 (r431767) @@ -3,8 +3,7 @@ PORTNAME= libvpx DISTVERSIONPREFIX= v -DISTVERSION= 1.6.0 -PORTREVISION= 1 +DISTVERSION= 1.6.1 CATEGORIES= multimedia MAINTAINER= ashish@FreeBSD.org Modified: branches/2017Q1/multimedia/libvpx/distinfo ============================================================================== --- branches/2017Q1/multimedia/libvpx/distinfo Tue Jan 17 17:44:49 2017 (r431766) +++ branches/2017Q1/multimedia/libvpx/distinfo Tue Jan 17 17:52:16 2017 (r431767) @@ -1,3 +1,3 @@ -TIMESTAMP = 1475172408 -SHA256 (webmproject-libvpx-v1.6.0_GH0.tar.gz) = e2fc00c9f60c76f91a1cde16a2356e33a45b76a5a5a1370df65fd57052a4994a -SIZE (webmproject-libvpx-v1.6.0_GH0.tar.gz) = 2476097 +TIMESTAMP = 1484252847 +SHA256 (webmproject-libvpx-v1.6.1_GH0.tar.gz) = cda8bb6f0e4848c018177d3a576fa83ed96d762554d7010fe4cfb9d70c22e588 +SIZE (webmproject-libvpx-v1.6.1_GH0.tar.gz) = 2493087 Modified: branches/2017Q1/multimedia/libvpx/files/patch-configure ============================================================================== --- branches/2017Q1/multimedia/libvpx/files/patch-configure Tue Jan 17 17:44:49 2017 (r431766) +++ branches/2017Q1/multimedia/libvpx/files/patch-configure Tue Jan 17 17:52:16 2017 (r431767) @@ -11,27 +11,3 @@ all_platforms="${all_platforms} generic-gnu" # all_targets is a list of all targets that can be configured -@@ -585,15 +589,14 @@ process_toolchain() { - check_add_cflags -Wimplicit-function-declaration - check_add_cflags -Wuninitialized - check_add_cflags -Wunused-variable -- case ${CC} in -- *clang*) -- # libvpx and/or clang have issues with aliasing: -- # https://code.google.com/p/webm/issues/detail?id=603 -- # work around them until they are fixed -- check_add_cflags -fno-strict-aliasing -- ;; -- *) check_add_cflags -Wunused-but-set-variable ;; -- esac -+ if ${CC} -v 2>&1 | grep "clang version" >/dev/null; then -+ # libvpx and/or clang have issues with aliasing: -+ # https://code.google.com/p/webm/issues/detail?id=603 -+ # work around them until they are fixed -+ check_add_cflags -fno-strict-aliasing -+ else -+ check_add_cflags -Wunused-but-set-variable -+ fi - if enabled mips || [ -z "${INLINE}" ]; then - enabled extra_warnings || check_add_cflags -Wno-unused-function - else Modified: branches/2017Q1/multimedia/libvpx/pkg-plist ============================================================================== --- branches/2017Q1/multimedia/libvpx/pkg-plist Tue Jan 17 17:44:49 2017 (r431766) +++ branches/2017Q1/multimedia/libvpx/pkg-plist Tue Jan 17 17:52:16 2017 (r431767) @@ -12,6 +12,6 @@ include/vpx/vpx_integer.h lib/libvpx.a %%SHARED%%lib/libvpx.so %%SHARED%%lib/libvpx.so.4 -%%SHARED%%lib/libvpx.so.4.0 -%%SHARED%%lib/libvpx.so.4.0.0 +%%SHARED%%lib/libvpx.so.4.1 +%%SHARED%%lib/libvpx.so.4.1.0 libdata/pkgconfig/vpx.pc From owner-svn-ports-branches@freebsd.org Tue Jan 17 18:29:24 2017 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 C9366CB4E89; Tue, 17 Jan 2017 18:29:24 +0000 (UTC) (envelope-from thierry@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 A3C9417FC; Tue, 17 Jan 2017 18:29:24 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0HITN6r082711; Tue, 17 Jan 2017 18:29:23 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0HITNeK082708; Tue, 17 Jan 2017 18:29:23 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <201701171829.v0HITNeK082708@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Tue, 17 Jan 2017 18:29:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431770 - branches/2017Q1/www/tt-rss 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.23 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, 17 Jan 2017 18:29:24 -0000 Author: thierry Date: Tue Jan 17 18:29:23 2017 New Revision: 431770 URL: https://svnweb.freebsd.org/changeset/ports/431770 Log: MFH: r431689 Fix another phpmailer vulnerability. Security: CVE-2017-5223 Approved by: ports-secteam Modified: branches/2017Q1/www/tt-rss/Makefile branches/2017Q1/www/tt-rss/distinfo branches/2017Q1/www/tt-rss/pkg-plist Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/www/tt-rss/Makefile ============================================================================== --- branches/2017Q1/www/tt-rss/Makefile Tue Jan 17 18:20:28 2017 (r431769) +++ branches/2017Q1/www/tt-rss/Makefile Tue Jan 17 18:29:23 2017 (r431770) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tt-rss -PORTVERSION= 29.12.2016.04.37 +PORTVERSION= 2017.01.16 CATEGORIES= www MASTER_SITES= https://tt-rss.org/gitlab/fox/tt-rss/repository/archive${EXTRACT_SUFX}?ref=${GL_TAGNAME}#/ @@ -11,7 +11,7 @@ COMMENT= Tiny Tiny RSS: web-based news f LICENSE= GPLv2 -GL_TAGNAME= 832aa249 +GL_TAGNAME= db92edd1 NO_BUILD= yes NO_ARCH= yes Modified: branches/2017Q1/www/tt-rss/distinfo ============================================================================== --- branches/2017Q1/www/tt-rss/distinfo Tue Jan 17 18:20:28 2017 (r431769) +++ branches/2017Q1/www/tt-rss/distinfo Tue Jan 17 18:29:23 2017 (r431770) @@ -1,3 +1,3 @@ -TIMESTAMP = 1482994775 -SHA256 (tt-rss-29.12.2016.04.37.tar.bz2) = 95e75a2db200a91d3a3303c8166867c266238f4081cf93ea9be05a4b9b4249da -SIZE (tt-rss-29.12.2016.04.37.tar.bz2) = 2093062 +TIMESTAMP = 1484592330 +SHA256 (tt-rss-2017.01.16.tar.bz2) = f416b41c2885e215fb96893e89b332af72f64bd68a86bd03087e543a1f4776c0 +SIZE (tt-rss-2017.01.16.tar.bz2) = 2093648 Modified: branches/2017Q1/www/tt-rss/pkg-plist ============================================================================== --- branches/2017Q1/www/tt-rss/pkg-plist Tue Jan 17 18:20:28 2017 (r431769) +++ branches/2017Q1/www/tt-rss/pkg-plist Tue Jan 17 18:29:23 2017 (r431770) @@ -2093,12 +2093,12 @@ %%WWWDIR%%/plugins/af_comics/init.php %%WWWDIR%%/plugins/af_fsckportal/init.php %%WWWDIR%%/plugins/af_lang_detect/init.php +%%WWWDIR%%/plugins/af_lang_detect/languagedetect/data/lang.dat +%%WWWDIR%%/plugins/af_lang_detect/languagedetect/data/unicode_blocks.dat %%WWWDIR%%/plugins/af_lang_detect/languagedetect/LanguageDetect.php %%WWWDIR%%/plugins/af_lang_detect/languagedetect/Text/LanguageDetect/Exception.php %%WWWDIR%%/plugins/af_lang_detect/languagedetect/Text/LanguageDetect/ISO639.php %%WWWDIR%%/plugins/af_lang_detect/languagedetect/Text/LanguageDetect/Parser.php -%%WWWDIR%%/plugins/af_lang_detect/languagedetect/data/lang.dat -%%WWWDIR%%/plugins/af_lang_detect/languagedetect/data/unicode_blocks.dat %%WWWDIR%%/plugins/af_psql_trgm/button.png %%WWWDIR%%/plugins/af_psql_trgm/init.js %%WWWDIR%%/plugins/af_psql_trgm/init.php @@ -2148,13 +2148,15 @@ %%WWWDIR%%/plugins/search_sphinx/sphinxapi.php %%WWWDIR%%/plugins/share/init.php %%WWWDIR%%/plugins/share/notshared.png +%%WWWDIR%%/plugins/share/share_prefs.js %%WWWDIR%%/plugins/share/share.js %%WWWDIR%%/plugins/share/share.png -%%WWWDIR%%/plugins/share/share_prefs.js %%WWWDIR%%/plugins/shorten_expanded/init.css %%WWWDIR%%/plugins/shorten_expanded/init.js %%WWWDIR%%/plugins/shorten_expanded/init.php %%WWWDIR%%/plugins/swap_jk/init.php +%%WWWDIR%%/plugins/toggle_sidebar/application_side_list.png +%%WWWDIR%%/plugins/toggle_sidebar/init.php %%WWWDIR%%/plugins/vf_shared/init.php %%WWWDIR%%/plugins/vf_shared/share.png %%WWWDIR%%/prefs.php From owner-svn-ports-branches@freebsd.org Wed Jan 18 11:24:00 2017 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 474DBCB631E; Wed, 18 Jan 2017 11:24:00 +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 0800910B4; Wed, 18 Jan 2017 11:23:59 +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 v0IBNxqA094655; Wed, 18 Jan 2017 11:23:59 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0IBNx3x094653; Wed, 18 Jan 2017 11:23:59 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201701181123.v0IBNx3x094653@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Wed, 18 Jan 2017 11:23:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431787 - in branches/2017Q1/dns/powerdns: . 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.23 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, 18 Jan 2017 11:24:00 -0000 Author: junovitch Date: Wed Jan 18 11:23:58 2017 New Revision: 431787 URL: https://svnweb.freebsd.org/changeset/ports/431787 Log: MFH: r431786 dns/powerdns: update 4.0.1 -> 4.0.3 - Switch to USES=localbase while here - Remove LibreSSL patch (see https://github.com/PowerDNS/pdns/pull/4310) Changes: https://doc.powerdns.com/md/changelog/#powerdns-authoritative-server-402 https://doc.powerdns.com/md/changelog/#powerdns-authoritative-server-403 PR: 216136 Reported by: Dani Submitted by: ghostonthewire@gmail.com (original 4.0.2 patch) Approved by: Ralf van der Enden (maintainer) Approved by: ports-secteam (with hat) Security: CVE-2016-2120 Security: CVE-2016-7068 Security: CVE-2016-7072 Security: CVE-2016-7073 Security: CVE-2016-7074 Security: https://vuxml.FreeBSD.org/freebsd/e3200958-dd6c-11e6-ae1b-002590263bf5.html Deleted: branches/2017Q1/dns/powerdns/files/patch-libressl Modified: branches/2017Q1/dns/powerdns/Makefile branches/2017Q1/dns/powerdns/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/dns/powerdns/Makefile ============================================================================== --- branches/2017Q1/dns/powerdns/Makefile Wed Jan 18 11:23:10 2017 (r431786) +++ branches/2017Q1/dns/powerdns/Makefile Wed Jan 18 11:23:58 2017 (r431787) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= powerdns -PORTVERSION= 4.0.1 -PORTREVISION= 3 +PORTVERSION= 4.0.3 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ DISTNAME= pdns-${PORTVERSION} @@ -17,14 +16,12 @@ LIB_DEPENDS= libboost_serialization.so:d BROKEN_powerpc64= Does not build BROKEN_sparc64= Does not compile: error: to_string is not a member of std -USES= compiler:c++11-lib cpe gmake libtool pathfix pkgconfig ssl \ +USES= compiler:c++11-lib cpe gmake libtool localbase:ldflags pathfix pkgconfig ssl \ tar:bzip2 USE_LDCONFIG= YES USE_SUBMAKE= YES GNU_CONFIGURE= YES INSTALL_TARGET= install-strip -CXXFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-static \ --with-modules="" \ --with-dynmodules="pipe bind ${MODULES}" \ Modified: branches/2017Q1/dns/powerdns/distinfo ============================================================================== --- branches/2017Q1/dns/powerdns/distinfo Wed Jan 18 11:23:10 2017 (r431786) +++ branches/2017Q1/dns/powerdns/distinfo Wed Jan 18 11:23:58 2017 (r431787) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470038374 -SHA256 (pdns-4.0.1.tar.bz2) = d191eed4a6664430e85969f49835c59e810ecbb7b3eb506e64c6b2734091edd7 -SIZE (pdns-4.0.1.tar.bz2) = 1304788 +TIMESTAMP = 1484653707 +SHA256 (pdns-4.0.3.tar.bz2) = 60fa21550b278b41f58701af31c9f2b121badf271fb9d7642f6d35bfbea8e282 +SIZE (pdns-4.0.3.tar.bz2) = 1312299 From owner-svn-ports-branches@freebsd.org Wed Jan 18 11:25:19 2017 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 0C128CB63E1; Wed, 18 Jan 2017 11:25:19 +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 C27CC132D; Wed, 18 Jan 2017 11:25:18 +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 v0IBPHc2095151; Wed, 18 Jan 2017 11:25:17 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0IBPHm0095147; Wed, 18 Jan 2017 11:25:17 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201701181125.v0IBPHm0095147@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Wed, 18 Jan 2017 11:25:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431789 - in branches/2017Q1/dns/powerdns-recursor: . 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.23 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, 18 Jan 2017 11:25:19 -0000 Author: junovitch Date: Wed Jan 18 11:25:17 2017 New Revision: 431789 URL: https://svnweb.freebsd.org/changeset/ports/431789 Log: MFH: r431788 dns/powerdns-recursor: update 4.0.3 -> 4.0.4 Changes: https://doc.powerdns.com/md/changelog/#powerdns-recursor-404 PR: 216135 Reported by: Dani Submitted by: ghostonthewire@gmail.com Approved by: Ralf van der Enden (maintainer) Approved by: ports-secteam (with hat) Security: CVE-2016-7068 Security: CVE-2016-7073 Security: CVE-2016-7074 Security: https://vuxml.FreeBSD.org/freebsd/e3200958-dd6c-11e6-ae1b-002590263bf5.html Deleted: branches/2017Q1/dns/powerdns-recursor/files/patch-lua-recursor4.cc branches/2017Q1/dns/powerdns-recursor/files/patch-mtasker__fcontext.cc Modified: branches/2017Q1/dns/powerdns-recursor/Makefile branches/2017Q1/dns/powerdns-recursor/distinfo branches/2017Q1/dns/powerdns-recursor/files/extrapatch-setuid branches/2017Q1/dns/powerdns-recursor/files/patch-dnsname.hh Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/dns/powerdns-recursor/Makefile ============================================================================== --- branches/2017Q1/dns/powerdns-recursor/Makefile Wed Jan 18 11:24:40 2017 (r431788) +++ branches/2017Q1/dns/powerdns-recursor/Makefile Wed Jan 18 11:25:17 2017 (r431789) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= recursor -PORTVERSION= 4.0.3 -PORTREVISION= 3 +PORTVERSION= 4.0.4 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ PKGNAMEPREFIX= powerdns- Modified: branches/2017Q1/dns/powerdns-recursor/distinfo ============================================================================== --- branches/2017Q1/dns/powerdns-recursor/distinfo Wed Jan 18 11:24:40 2017 (r431788) +++ branches/2017Q1/dns/powerdns-recursor/distinfo Wed Jan 18 11:25:17 2017 (r431789) @@ -1,3 +1,3 @@ -TIMESTAMP = 1473284590 -SHA256 (pdns-recursor-4.0.3.tar.bz2) = ae9813a64d13d9ebe4b44e89e8e4e44fc438693b6ce4c3a98e4cab1af22d9627 -SIZE (pdns-recursor-4.0.3.tar.bz2) = 1045041 +TIMESTAMP = 1484621032 +SHA256 (pdns-recursor-4.0.4.tar.bz2) = 2338778f49ccd03401e65f6f4b39047890e691c8ff6d810ecee45321fb4f1e4d +SIZE (pdns-recursor-4.0.4.tar.bz2) = 1050596 Modified: branches/2017Q1/dns/powerdns-recursor/files/extrapatch-setuid ============================================================================== --- branches/2017Q1/dns/powerdns-recursor/files/extrapatch-setuid Wed Jan 18 11:24:40 2017 (r431788) +++ branches/2017Q1/dns/powerdns-recursor/files/extrapatch-setuid Wed Jan 18 11:25:17 2017 (r431789) @@ -1,8 +1,8 @@ ---- pdns_recursor.cc.orig 2010-03-06 13:10:44.000000000 +0100 -+++ pdns_recursor.cc 2010-03-07 21:13:07.000000000 +0100 -@@ -1890,8 +1890,8 @@ - ::arg().set("daemon","Operate as a daemon")="yes"; - ::arg().set("log-common-errors","If we should log rather common errors")="yes"; +--- pdns_recursor.cc.orig 2017-01-17 02:48:30 UTC ++++ pdns_recursor.cc +@@ -2969,8 +2969,8 @@ int main(int argc, char **argv) + ::arg().set("disable-syslog","Disable logging to syslog, useful when running inside a supervisor that logs stdout")="no"; + ::arg().set("log-common-errors","If we should log rather common errors")="no"; ::arg().set("chroot","switch to chroot jail")=""; - ::arg().set("setgid","If set, change group id to this gid for more security")=""; - ::arg().set("setuid","If set, change user id to this uid for more security")=""; @@ -10,4 +10,4 @@ + ::arg().set("setuid","If set, change user id to this uid for more security")="pdns_recursor"; ::arg().set("network-timeout", "Wait this nummer of milliseconds for network i/o")="1500"; ::arg().set("threads", "Launch this number of threads")="2"; - #ifdef WIN32 + ::arg().set("processes", "Launch this number of processes (EXPERIMENTAL, DO NOT CHANGE)")="1"; // if we un-experimental this, need to fix openssl rand seeding for multiple PIDs! Modified: branches/2017Q1/dns/powerdns-recursor/files/patch-dnsname.hh ============================================================================== --- branches/2017Q1/dns/powerdns-recursor/files/patch-dnsname.hh Wed Jan 18 11:24:40 2017 (r431788) +++ branches/2017Q1/dns/powerdns-recursor/files/patch-dnsname.hh Wed Jan 18 11:25:17 2017 (r431789) @@ -1,13 +1,11 @@ -https://github.com/PowerDNS/pdns/issues/2955 - ---- dnsname.hh.orig 2016-09-06 12:50:29 UTC +--- dnsname.hh.orig 2017-01-17 03:18:41 UTC +++ dnsname.hh @@ -30,7 +30,7 @@ #include // it crashes on OSX and doesn't compile on OpenBSD --#if BOOST_VERSION >= 104800 && ! defined( __APPLE__ ) && ! defined(__OpenBSD__) -+#if BOOST_VERSION >= 104800 && ! defined(_LIBCPP_VERSION) && ! defined(__OpenBSD__) +-#if BOOST_VERSION >= 105300 && ! defined( __APPLE__ ) && ! defined(__OpenBSD__) ++#if BOOST_VERSION >= 105300 && ! defined(_LIBCPP_VERSION) && ! defined(__OpenBSD__) #include #endif @@ -15,8 +13,8 @@ https://github.com/PowerDNS/pdns/issues/ inline bool canonCompare(const DNSName& rhs) const; bool slowCanonCompare(const DNSName& rhs) const; --#if BOOST_VERSION >= 104800 && ! defined( __APPLE__ ) && ! defined(__OpenBSD__) -+#if BOOST_VERSION >= 104800 && ! defined(_LIBCPP_VERSION) && ! defined(__OpenBSD__) +-#if BOOST_VERSION >= 105300 && ! defined( __APPLE__ ) && ! defined(__OpenBSD__) ++#if BOOST_VERSION >= 105300 && ! defined(_LIBCPP_VERSION) && ! defined(__OpenBSD__) typedef boost::container::string string_t; #else typedef std::string string_t; From owner-svn-ports-branches@freebsd.org Thu Jan 19 02:57:28 2017 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 66962CB725D; Thu, 19 Jan 2017 02:57:28 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 286A71568; Thu, 19 Jan 2017 02:57:28 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0J2vRir081497; Thu, 19 Jan 2017 02:57:27 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0J2vRgx081495; Thu, 19 Jan 2017 02:57:27 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201701190257.v0J2vRgx081495@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Thu, 19 Jan 2017 02:57:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431835 - in branches/2017Q1/dns/dnsdist: . 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.23 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, 19 Jan 2017 02:57:28 -0000 Author: cpm Date: Thu Jan 19 02:57:26 2017 New Revision: 431835 URL: https://svnweb.freebsd.org/changeset/ports/431835 Log: MFH: r431820 dns/dnsdist: unbreak build with clang 4.0 ext/json11/json11.cpp:153:24: error: invalid operands to binary expression ('nullptr_t' and 'nullptr_t') return m_value < static_cast *>(other)->m_value; ~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ext/json11/json11.cpp:209:5: note: in instantiation of member function 'json11::Value::less' requested here JsonNull() : Value(nullptr) {} ^ PR: 216069 Reported by: jbeich Obtained from: upstream Approved by: ports-secteam (blanket) Added: branches/2017Q1/dns/dnsdist/files/patch-ext_json11_json11.cpp - copied unchanged from r431820, head/dns/dnsdist/files/patch-ext_json11_json11.cpp Modified: branches/2017Q1/dns/dnsdist/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/dns/dnsdist/Makefile ============================================================================== --- branches/2017Q1/dns/dnsdist/Makefile Thu Jan 19 02:50:46 2017 (r431834) +++ branches/2017Q1/dns/dnsdist/Makefile Thu Jan 19 02:57:26 2017 (r431835) @@ -4,6 +4,7 @@ PORTNAME= dnsdist DISTVERSION= 1.0.0 PORTREVISION= 4 +PORTREVISION= 1 CATEGORIES= dns net MASTER_SITES= https://downloads.powerdns.com/releases/ \ LOCAL/cpm Copied: branches/2017Q1/dns/dnsdist/files/patch-ext_json11_json11.cpp (from r431820, head/dns/dnsdist/files/patch-ext_json11_json11.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/dns/dnsdist/files/patch-ext_json11_json11.cpp Thu Jan 19 02:57:26 2017 (r431835, copy of r431820, head/dns/dnsdist/files/patch-ext_json11_json11.cpp) @@ -0,0 +1,36 @@ +--- ext/json11/json11.cpp.orig 2017-01-18 02:13:48 UTC ++++ ext/json11/json11.cpp +@@ -37,11 +37,20 @@ using std::make_shared; + using std::initializer_list; + using std::move; + ++/* Helper for representing null - just a do-nothing struct, plus comparison ++ * operators so the helpers in JsonValue work. We can't use nullptr_t because ++ * it may not be orderable. ++*/ ++struct NullStruct { ++ bool operator==(NullStruct) const { return true; } ++ bool operator<(NullStruct) const { return false; } ++}; ++ + /* * * * * * * * * * * * * * * * * * * * + * Serialization + */ + +-static void dump(std::nullptr_t, string &out) { ++static void dump(NullStruct, string &out) { + out += "null"; + } + +@@ -204,9 +213,9 @@ public: + explicit JsonObject(Json::object &&value) : Value(move(value)) {} + }; + +-class JsonNull final : public Value { ++class JsonNull final : public Value { + public: +- JsonNull() : Value(nullptr) {} ++ JsonNull() : Value({}) {} + }; + + /* * * * * * * * * * * * * * * * * * * * From owner-svn-ports-branches@freebsd.org Thu Jan 19 05:06:53 2017 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 7CAA8CB57E0; Thu, 19 Jan 2017 05:06:53 +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 4A78E1A4F; Thu, 19 Jan 2017 05:06:53 +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 v0J56qaf035285; Thu, 19 Jan 2017 05:06:52 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0J56qli035283; Thu, 19 Jan 2017 05:06:52 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701190506.v0J56qli035283@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 19 Jan 2017 05:06:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431840 - branches/2017Q1/devel/git-cinnabar 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.23 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, 19 Jan 2017 05:06:53 -0000 Author: jbeich Date: Thu Jan 19 05:06:52 2017 New Revision: 431840 URL: https://svnweb.freebsd.org/changeset/ports/431840 Log: MFH: r431807 devel/git-cinnabar: update to 0.4.0 No functional changes since 0.4.0.r2.24. Changes: https://github.com/glandium/git-cinnabar/compare/84b8e6b...0.4.0 Approved by: ports-secteam (junovitch) Modified: branches/2017Q1/devel/git-cinnabar/Makefile branches/2017Q1/devel/git-cinnabar/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/devel/git-cinnabar/Makefile ============================================================================== --- branches/2017Q1/devel/git-cinnabar/Makefile Thu Jan 19 04:39:37 2017 (r431839) +++ branches/2017Q1/devel/git-cinnabar/Makefile Thu Jan 19 05:06:52 2017 (r431840) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= git-cinnabar -DISTVERSION= 0.4.0rc2-24 -DISTVERSIONSUFFIX= -g84b8e6b # release branch +DISTVERSION= 0.4.0 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org Modified: branches/2017Q1/devel/git-cinnabar/distinfo ============================================================================== --- branches/2017Q1/devel/git-cinnabar/distinfo Thu Jan 19 04:39:37 2017 (r431839) +++ branches/2017Q1/devel/git-cinnabar/distinfo Thu Jan 19 05:06:52 2017 (r431840) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483170275 -SHA256 (glandium-git-cinnabar-0.4.0rc2-24-g84b8e6b_GH0.tar.gz) = e0e05bb9a595d38836a15b0165d3a86799f5b27d47dbb271c1afeb943d033f47 -SIZE (glandium-git-cinnabar-0.4.0rc2-24-g84b8e6b_GH0.tar.gz) = 90600 +TIMESTAMP = 1484726701 +SHA256 (glandium-git-cinnabar-0.4.0_GH0.tar.gz) = 8cd9526060301aabb6749c013447053bfa1caf9c2cf5661b2a90fd5147de1f00 +SIZE (glandium-git-cinnabar-0.4.0_GH0.tar.gz) = 90603 From owner-svn-ports-branches@freebsd.org Thu Jan 19 05:09:50 2017 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 1614CCB5922; Thu, 19 Jan 2017 05:09:50 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D955D1C09; Thu, 19 Jan 2017 05:09:49 +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 v0J59mxF035554; Thu, 19 Jan 2017 05:09:48 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0J59mtY035553; Thu, 19 Jan 2017 05:09:48 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701190509.v0J59mtY035553@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 19 Jan 2017 05:09:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431841 - in branches/2017Q1/multimedia/assimp: . 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.23 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, 19 Jan 2017 05:09:50 -0000 Author: jbeich Date: Thu Jan 19 05:09:48 2017 New Revision: 431841 URL: https://svnweb.freebsd.org/changeset/ports/431841 Log: MFH: r431762 multimedia/assimp: unbreak build with clang 4.0 code/D3MFImporter.cpp:230:29: error: invalid operands to binary expression ('float (*)(const char *, const char *)' and 'nullptr_t') vertex.z = ai_strtof>(xmlReader->getAttributeValue(D3MF::XmlTag::z.c_str()), nullptr); ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PR: 216160 Approved by: Yuri Victorovich (maintainer) Approved by: ports-secteam (feld) Added: branches/2017Q1/multimedia/assimp/files/ - copied from r431762, head/multimedia/assimp/files/ Modified: branches/2017Q1/multimedia/assimp/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/multimedia/assimp/Makefile ============================================================================== --- branches/2017Q1/multimedia/assimp/Makefile Thu Jan 19 05:06:52 2017 (r431840) +++ branches/2017Q1/multimedia/assimp/Makefile Thu Jan 19 05:09:48 2017 (r431841) @@ -4,6 +4,7 @@ PORTNAME= assimp PORTVERSION= 3.3.1 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= yuri@rawbw.com From owner-svn-ports-branches@freebsd.org Thu Jan 19 05:12:04 2017 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 D032FCB59D4; Thu, 19 Jan 2017 05:12:04 +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 878961F33; Thu, 19 Jan 2017 05:12:04 +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 v0J5C31C037965; Thu, 19 Jan 2017 05:12:03 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0J5C3BN037961; Thu, 19 Jan 2017 05:12:03 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701190512.v0J5C3BN037961@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 19 Jan 2017 05:12:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431842 - in branches/2017Q1/lang: spidermonkey170 spidermonkey170/files spidermonkey24 spidermonkey24/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.23 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, 19 Jan 2017 05:12:04 -0000 Author: jbeich Date: Thu Jan 19 05:12:03 2017 New Revision: 431842 URL: https://svnweb.freebsd.org/changeset/ports/431842 Log: MFH: r431335 lang/spidermonkey170: unbreak with clang 4.0 Fix quoting failure handling in JSOP_CALLPROP and JSOP_STRING. jsopcode.cpp:6070:45: error: ordered comparison between pointer and zero ('char *' and 'int') return QuoteString(&sprinter, s, quote) >= 0; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ PR: 215861 Regressed by: https://github.com/llvm-mirror/clang/commit/4b6ad14285f3 Obtained from: upstream (only the specific fix) Approved by: portmgr blanket Approved by: ports-secteam (junovitch) Added: branches/2017Q1/lang/spidermonkey170/files/patch-bug1012971 - copied unchanged from r431335, head/lang/spidermonkey170/files/patch-bug1012971 branches/2017Q1/lang/spidermonkey24/files/patch-bug1012971 - copied unchanged from r431335, head/lang/spidermonkey24/files/patch-bug1012971 Modified: branches/2017Q1/lang/spidermonkey170/Makefile branches/2017Q1/lang/spidermonkey24/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/lang/spidermonkey170/Makefile ============================================================================== --- branches/2017Q1/lang/spidermonkey170/Makefile Thu Jan 19 05:09:48 2017 (r431841) +++ branches/2017Q1/lang/spidermonkey170/Makefile Thu Jan 19 05:12:03 2017 (r431842) @@ -3,7 +3,7 @@ PORTNAME= spidermonkey170 PORTVERSION= 17.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang MASTER_SITES= MOZILLA/js DISTNAME= mozjs${PORTVERSION} Copied: branches/2017Q1/lang/spidermonkey170/files/patch-bug1012971 (from r431335, head/lang/spidermonkey170/files/patch-bug1012971) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/lang/spidermonkey170/files/patch-bug1012971 Thu Jan 19 05:12:03 2017 (r431842, copy of r431335, head/lang/spidermonkey170/files/patch-bug1012971) @@ -0,0 +1,32 @@ +commit ad6d8397a05a +Author: Dan Gohman +Date: Thu May 22 11:15:06 2014 -0700 + + Bug 1012971 - SpiderMonkey: Fix various warnings. r=nbp +--- + js/public/RootingAPI.h | 4 +++- + js/src/configure.in | 1 + + js/src/jit/IonFrames.h | 17 ++++++++--------- + js/src/jit/MIR.h | 12 +++++------- + js/src/jit/PerfSpewer.cpp | 12 ++++++------ + js/src/jit/RegisterSets.h | 2 +- + js/src/jscntxt.h | 2 +- + js/src/jsgcinlines.h | 4 ++-- + js/src/jsopcode.cpp | 2 +- + js/src/jsscript.cpp | 6 +++--- + js/src/shell/js.cpp | 2 +- + js/src/vm/ArrayBufferObject.h | 16 ++++++++-------- + js/src/vm/TypedArrayObject.cpp | 26 +++++++++++++------------- + 13 files changed, 53 insertions(+), 53 deletions(-) + +--- jsopcode.cpp.orig 2013-02-11 22:33:23 UTC ++++ jsopcode.cpp +@@ -6067,7 +6067,7 @@ ExpressionDecompiler::write(JSString *s) + bool + ExpressionDecompiler::quote(JSString *s, uint32_t quote) + { +- return QuoteString(&sprinter, s, quote) >= 0; ++ return QuoteString(&sprinter, s, quote) != NULL; + } + + JSAtom * Modified: branches/2017Q1/lang/spidermonkey24/Makefile ============================================================================== --- branches/2017Q1/lang/spidermonkey24/Makefile Thu Jan 19 05:09:48 2017 (r431841) +++ branches/2017Q1/lang/spidermonkey24/Makefile Thu Jan 19 05:12:03 2017 (r431842) @@ -3,7 +3,7 @@ PORTNAME= spidermonkey24 PORTVERSION= 24.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= MOZILLA/js #http://people.mozilla.org/~sstangl/ Copied: branches/2017Q1/lang/spidermonkey24/files/patch-bug1012971 (from r431335, head/lang/spidermonkey24/files/patch-bug1012971) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/lang/spidermonkey24/files/patch-bug1012971 Thu Jan 19 05:12:03 2017 (r431842, copy of r431335, head/lang/spidermonkey24/files/patch-bug1012971) @@ -0,0 +1,32 @@ +commit ad6d8397a05a +Author: Dan Gohman +Date: Thu May 22 11:15:06 2014 -0700 + + Bug 1012971 - SpiderMonkey: Fix various warnings. r=nbp +--- + js/public/RootingAPI.h | 4 +++- + js/src/configure.in | 1 + + js/src/jit/IonFrames.h | 17 ++++++++--------- + js/src/jit/MIR.h | 12 +++++------- + js/src/jit/PerfSpewer.cpp | 12 ++++++------ + js/src/jit/RegisterSets.h | 2 +- + js/src/jscntxt.h | 2 +- + js/src/jsgcinlines.h | 4 ++-- + js/src/jsopcode.cpp | 2 +- + js/src/jsscript.cpp | 6 +++--- + js/src/shell/js.cpp | 2 +- + js/src/vm/ArrayBufferObject.h | 16 ++++++++-------- + js/src/vm/TypedArrayObject.cpp | 26 +++++++++++++------------- + 13 files changed, 53 insertions(+), 53 deletions(-) + +--- jsopcode.cpp.orig 2013-02-11 22:33:23 UTC ++++ jsopcode.cpp +@@ -6067,7 +6067,7 @@ ExpressionDecompiler::write(JSString *s) + bool + ExpressionDecompiler::quote(JSString *s, uint32_t quote) + { +- return QuoteString(&sprinter, s, quote) >= 0; ++ return QuoteString(&sprinter, s, quote) != NULL; + } + + JSAtom * From owner-svn-ports-branches@freebsd.org Thu Jan 19 05:13:56 2017 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 66695CB5B8D; Thu, 19 Jan 2017 05:13:56 +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 1AA4210C9; Thu, 19 Jan 2017 05:13:56 +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 v0J5DtJI039910; Thu, 19 Jan 2017 05:13:55 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0J5DtTD039908; Thu, 19 Jan 2017 05:13:55 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701190513.v0J5DtTD039908@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 19 Jan 2017 05:13:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431843 - in branches/2017Q1/lang/spidermonkey24: . 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.23 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, 19 Jan 2017 05:13:56 -0000 Author: jbeich Date: Thu Jan 19 05:13:54 2017 New Revision: 431843 URL: https://svnweb.freebsd.org/changeset/ports/431843 Log: MFH: r431816 lang/spidermonkey24: prefer pre-C++11 decltype from libc++ libc++ 4.0 started to use it within in a way incompatible with __typeof__ which broke build but upstream switched to C++11 long ago to notice -Wmacro-redefined. PR: 216010 Approved by: ports-secteam (junovitch) Added: branches/2017Q1/lang/spidermonkey24/files/patch-mfbt_Types.h - copied unchanged from r431816, head/lang/spidermonkey24/files/patch-mfbt_Types.h Modified: branches/2017Q1/lang/spidermonkey24/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/lang/spidermonkey24/Makefile ============================================================================== --- branches/2017Q1/lang/spidermonkey24/Makefile Thu Jan 19 05:12:03 2017 (r431842) +++ branches/2017Q1/lang/spidermonkey24/Makefile Thu Jan 19 05:13:54 2017 (r431843) @@ -3,7 +3,7 @@ PORTNAME= spidermonkey24 PORTVERSION= 24.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang MASTER_SITES= MOZILLA/js #http://people.mozilla.org/~sstangl/ Copied: branches/2017Q1/lang/spidermonkey24/files/patch-mfbt_Types.h (from r431816, head/lang/spidermonkey24/files/patch-mfbt_Types.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/lang/spidermonkey24/files/patch-mfbt_Types.h Thu Jan 19 05:13:54 2017 (r431843, copy of r431816, head/lang/spidermonkey24/files/patch-mfbt_Types.h) @@ -0,0 +1,12 @@ +--- ../../mfbt/Types.h.orig 2013-10-29 20:40:19 UTC ++++ ../../mfbt/Types.h +@@ -138,7 +138,9 @@ + */ + #if defined(__GNUC__) && defined(__cplusplus) && \ + !defined(__GXX_EXPERIMENTAL_CXX0X__) && __cplusplus < 201103L ++# ifndef decltype + # define decltype __typeof__ ++# endif + #endif + + #endif /* mozilla_Types_h_ */ From owner-svn-ports-branches@freebsd.org Thu Jan 19 05:18:26 2017 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 7F3D9CB5E80; Thu, 19 Jan 2017 05:18:26 +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 40FCC13B9; Thu, 19 Jan 2017 05:18:26 +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 v0J5IPrX040296; Thu, 19 Jan 2017 05:18:25 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0J5IPpi040293; Thu, 19 Jan 2017 05:18:25 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701190518.v0J5IPpi040293@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 19 Jan 2017 05:18:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431844 - in branches/2017Q1/x11-toolkits: fltk fltk-devel fltk-devel/files fltk/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.23 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, 19 Jan 2017 05:18:26 -0000 Author: jbeich Date: Thu Jan 19 05:18:24 2017 New Revision: 431844 URL: https://svnweb.freebsd.org/changeset/ports/431844 Log: MFH: r431752 r431784 x11-toolkits/fltk{,-devel}: unbreak with clang 4.0 Fl_Tree_Item.cxx:552:38: error: ordered comparison between pointer and zero ('Fl_Tree_Item *' and 'int') if ( from_parent->deparent(from) < 0 ) // deparent self from current parent ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ PR: 216046 Obtained from: upstream (branch-1.3) Approved by: portmgr blanket Approved by: ports-secteam (feld, junovitch) Added: branches/2017Q1/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx - copied unchanged from r431784, head/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx branches/2017Q1/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx - copied unchanged from r431752, head/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx Modified: branches/2017Q1/x11-toolkits/fltk-devel/Makefile branches/2017Q1/x11-toolkits/fltk/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/x11-toolkits/fltk-devel/Makefile ============================================================================== --- branches/2017Q1/x11-toolkits/fltk-devel/Makefile Thu Jan 19 05:13:54 2017 (r431843) +++ branches/2017Q1/x11-toolkits/fltk-devel/Makefile Thu Jan 19 05:18:24 2017 (r431844) @@ -3,7 +3,7 @@ PORTNAME= fltk DISTVERSION= 1.3.x-r${SNAPSHOT_VERS} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= http://fltk.org/pub/${PORTNAME}/snapshots/ PKGNAMESUFFIX= -devel Copied: branches/2017Q1/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx (from r431784, head/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx Thu Jan 19 05:18:24 2017 (r431844, copy of r431784, head/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx) @@ -0,0 +1,16 @@ +------------------------------------------------------------------------ +r10699 | greg.ercolano | 2015-04-13 16:55:27 +0000 (Mon, 13 Apr 2015) | 3 lines + +Fix return value test, as pointed out by Albrecht. + +--- src/Fl_Tree_Item.cxx.orig 2014-09-05 02:59:00 UTC ++++ src/Fl_Tree_Item.cxx +@@ -549,7 +549,7 @@ int Fl_Tree_Item::move(Fl_Tree_Item *ite + } else { // different parent? + if ( to > to_parent->children() ) // try to prevent a reparent() error + return -4; +- if ( from_parent->deparent(from) < 0 ) // deparent self from current parent ++ if ( from_parent->deparent(from) == NULL ) // deparent self from current parent + return -5; + if ( to_parent->reparent(this, to) < 0 ) { // reparent self to new parent at position 'to' + to_parent->reparent(this, 0); // failed? shouldn't happen, reparent at 0 Modified: branches/2017Q1/x11-toolkits/fltk/Makefile ============================================================================== --- branches/2017Q1/x11-toolkits/fltk/Makefile Thu Jan 19 05:13:54 2017 (r431843) +++ branches/2017Q1/x11-toolkits/fltk/Makefile Thu Jan 19 05:18:24 2017 (r431844) @@ -3,7 +3,7 @@ PORTNAME= fltk PORTVERSION= 1.3.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits MASTER_SITES= http://fltk.org/pub/${PORTNAME}/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source Copied: branches/2017Q1/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx (from r431752, head/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx Thu Jan 19 05:18:24 2017 (r431844, copy of r431752, head/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx) @@ -0,0 +1,16 @@ +------------------------------------------------------------------------ +r10699 | greg.ercolano | 2015-04-13 16:55:27 +0000 (Mon, 13 Apr 2015) | 3 lines + +Fix return value test, as pointed out by Albrecht. + +--- src/Fl_Tree_Item.cxx.orig 2014-09-05 02:59:00 UTC ++++ src/Fl_Tree_Item.cxx +@@ -549,7 +549,7 @@ int Fl_Tree_Item::move(Fl_Tree_Item *ite + } else { // different parent? + if ( to > to_parent->children() ) // try to prevent a reparent() error + return -4; +- if ( from_parent->deparent(from) < 0 ) // deparent self from current parent ++ if ( from_parent->deparent(from) == NULL ) // deparent self from current parent + return -5; + if ( to_parent->reparent(this, to) < 0 ) { // reparent self to new parent at position 'to' + to_parent->reparent(this, 0); // failed? shouldn't happen, reparent at 0 From owner-svn-ports-branches@freebsd.org Thu Jan 19 05:21:24 2017 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 833FFCB7299; Thu, 19 Jan 2017 05:21:24 +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 34E8E1805; Thu, 19 Jan 2017 05:21:24 +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 v0J5LNWM040567; Thu, 19 Jan 2017 05:21:23 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0J5LN8W040566; Thu, 19 Jan 2017 05:21:23 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701190521.v0J5LN8W040566@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 19 Jan 2017 05:21:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431845 - branches/2017Q1/comms/telldus-core/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.23 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, 19 Jan 2017 05:21:24 -0000 Author: jbeich Date: Thu Jan 19 05:21:23 2017 New Revision: 431845 URL: https://svnweb.freebsd.org/changeset/ports/431845 Log: MFH: r431828 comms/telldus-core: unbreak with clang 4.0 service/SettingsConfuse.cpp:47:13: error: ordered comparison between pointer and zero ('cfg_t *' and 'int') if (d->cfg > 0) { ~~~~~~ ^ ~ service/SettingsConfuse.cpp:50:17: error: ordered comparison between pointer and zero ('cfg_t *' and 'int') if (d->var_cfg > 0) { ~~~~~~~~~~ ^ ~ service/SettingsConfuse.cpp:61:13: error: ordered comparison between pointer and zero ('cfg_t *' and 'int') if (d->cfg > 0) { ~~~~~~ ^ ~ service/SettingsConfuse.cpp:73:13: error: ordered comparison between pointer and zero ('cfg_t *' and 'int') if (d->cfg > 0) { ~~~~~~ ^ ~ PR: 216052 Submitted by: Johan Ström (maintainer) Approved by: ports-secteam blanket Modified: branches/2017Q1/comms/telldus-core/files/patch-service-SettingsConfuse.cpp Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/comms/telldus-core/files/patch-service-SettingsConfuse.cpp ============================================================================== --- branches/2017Q1/comms/telldus-core/files/patch-service-SettingsConfuse.cpp Thu Jan 19 05:18:24 2017 (r431844) +++ branches/2017Q1/comms/telldus-core/files/patch-service-SettingsConfuse.cpp Thu Jan 19 05:21:23 2017 (r431845) @@ -9,3 +9,34 @@ cfg_t *cfg; cfg_t *var_cfg; }; +@@ -42,10 +44,10 @@ + */ + Settings::~Settings(void) { + TelldusCore::MutexLocker locker(&mutex); +- if (d->cfg > 0) { ++ if (d->cfg != 0) { + cfg_free(d->cfg); + } +- if (d->var_cfg > 0) { ++ if (d->var_cfg != 0) { + cfg_free(d->var_cfg); + } + delete d; +@@ -56,7 +58,7 @@ + */ + std::wstring Settings::getSetting(const std::wstring &strName) const { + TelldusCore::MutexLocker locker(&mutex); +- if (d->cfg > 0) { ++ if (d->cfg != 0) { + std::string setting(cfg_getstr(d->cfg, TelldusCore::wideToString(strName).c_str())); + return TelldusCore::charToWstring(setting.c_str()); + } +@@ -68,7 +70,7 @@ + */ + int Settings::getNumberOfNodes(Node node) const { + TelldusCore::MutexLocker locker(&mutex); +- if (d->cfg > 0) { ++ if (d->cfg != 0) { + if (node == Device) { + return cfg_size(d->cfg, "device"); + } else if (node == Controller) { From owner-svn-ports-branches@freebsd.org Thu Jan 19 05:23:16 2017 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 7F82CCB737F; Thu, 19 Jan 2017 05:23:16 +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 351151A10; Thu, 19 Jan 2017 05:23:16 +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 v0J5NF5o044288; Thu, 19 Jan 2017 05:23:15 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0J5NFQs044287; Thu, 19 Jan 2017 05:23:15 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701190523.v0J5NFQs044287@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 19 Jan 2017 05:23:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431846 - branches/2017Q1/www/webkit-qt4/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.23 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, 19 Jan 2017 05:23:16 -0000 Author: jbeich Date: Thu Jan 19 05:23:15 2017 New Revision: 431846 URL: https://svnweb.freebsd.org/changeset/ports/431846 Log: MFH: r431742 www/webkit-qt4: unbreak with clang 4.0 html/HTMLImageElement.cpp:77:24: error: ordered comparison between pointer and zero ('const int *' and 'int') if (optionalHeight > 0) ~~~~~~~~~~~~~~ ^ ~ PR: 216015 Regressed by: https://github.com/llvm-mirror/clang/commit/4b6ad14285f3 Obtained from: upstream (excerpt) Approved by: portmgr blanket Approved by: ports-secteam blanket Added: branches/2017Q1/www/webkit-qt4/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp - copied unchanged from r431742, head/www/webkit-qt4/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp Modified: Directory Properties: branches/2017Q1/ (props changed) Copied: branches/2017Q1/www/webkit-qt4/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp (from r431742, head/www/webkit-qt4/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/webkit-qt4/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp Thu Jan 19 05:23:15 2017 (r431846, copy of r431742, head/www/webkit-qt4/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp) @@ -0,0 +1,21 @@ +------------------------------------------------------------------------ +r113848 | abecsi@webkit.org | 2012-04-11 11:23:19 +0000 (Wed, 11 Apr 2012) | 27 lines + +Fix the build with gcc 4.7.0 +https://bugs.webkit.org/show_bug.cgi?id=83584 +[...] +* html/HTMLImageElement.cpp: +(WebCore::HTMLImageElement::createForJSConstructor): Fails because of -Werror=extra +[...] + +--- src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp.orig 2015-05-07 14:14:47 UTC ++++ src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp +@@ -74,7 +74,7 @@ PassRefPtr HTMLImageEl + RefPtr image = adoptRef(new HTMLImageElement(imgTag, document)); + if (optionalWidth) + image->setWidth(*optionalWidth); +- if (optionalHeight > 0) ++ if (optionalHeight) + image->setHeight(*optionalHeight); + return image.release(); + } From owner-svn-ports-branches@freebsd.org Thu Jan 19 05:25:17 2017 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 77989CB73DC; Thu, 19 Jan 2017 05:25:17 +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 2BCEC1B2C; Thu, 19 Jan 2017 05:25:17 +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 v0J5PGl0044550; Thu, 19 Jan 2017 05:25:16 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0J5PG57044547; Thu, 19 Jan 2017 05:25:16 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701190525.v0J5PG57044547@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 19 Jan 2017 05:25:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431847 - in branches/2017Q1/devel/qt4-linguist: . 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.23 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, 19 Jan 2017 05:25:17 -0000 Author: jbeich Date: Thu Jan 19 05:25:15 2017 New Revision: 431847 URL: https://svnweb.freebsd.org/changeset/ports/431847 Log: MFH: r431792 devel/qt4-linguist: unbreak with clang 4.0 messagemodel.cpp:186:61: error: ordered comparison between pointer and zero ('MessageItem *' and 'int') if (c->findMessage(m->text(), m->comment()) >= 0) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ PR: 216051 Submitted by: Adriaan de Groot Obtained from: upstream (Qt5) Approved by: kde (tcberner) Approved by: ports-secteam (junovitch) Differential Revision: https://reviews.freebsd.org/D9184 Added: branches/2017Q1/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp - copied unchanged from r431792, head/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp Modified: branches/2017Q1/devel/qt4-linguist/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/devel/qt4-linguist/Makefile ============================================================================== --- branches/2017Q1/devel/qt4-linguist/Makefile Thu Jan 19 05:23:15 2017 (r431846) +++ branches/2017Q1/devel/qt4-linguist/Makefile Thu Jan 19 05:25:15 2017 (r431847) @@ -3,6 +3,7 @@ PORTNAME= linguist DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Copied: branches/2017Q1/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp (from r431792, head/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp Thu Jan 19 05:25:15 2017 (r431847, copy of r431792, head/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp) @@ -0,0 +1,14 @@ +Fix bogus pointer comparison. Backport of upstream commit +https://github.com/qt/qttools/commit/7138c963f9d1258bc1b49cb4d63c3e2b7d0ccfda + +--- tools/linguist/linguist/messagemodel.cpp.orig 2015-05-07 14:14:39 UTC ++++ tools/linguist/linguist/messagemodel.cpp +@@ -183,7 +183,7 @@ static int calcMergeScore(const DataMode + if (ContextItem *c = one->findContext(oc->context())) { + for (int j = 0; j < oc->messageCount(); ++j) { + MessageItem *m = oc->messageItem(j); +- if (c->findMessage(m->text(), m->comment()) >= 0) ++ if (c->findMessage(m->text(), m->comment())) + ++inBoth; + } + } From owner-svn-ports-branches@freebsd.org Thu Jan 19 05:30:37 2017 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 A0864CB74DD; Thu, 19 Jan 2017 05:30:37 +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 558861CCB; Thu, 19 Jan 2017 05:30:37 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0J5UaVk044921; Thu, 19 Jan 2017 05:30:36 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0J5Ua0D044919; Thu, 19 Jan 2017 05:30:36 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701190530.v0J5Ua0D044919@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 19 Jan 2017 05:30:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431848 - in branches/2017Q1/java/openjdk7: . 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.23 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, 19 Jan 2017 05:30:37 -0000 Author: jbeich Date: Thu Jan 19 05:30:36 2017 New Revision: 431848 URL: https://svnweb.freebsd.org/changeset/ports/431848 Log: MFH: r431605 by glewis . Fix compilation with Clang 4.0 PR: 216016 Submitted by: jbeich@ Approved by: ports-secteam blanket Added: branches/2017Q1/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp - copied unchanged from r431605, head/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp Modified: branches/2017Q1/java/openjdk7/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/java/openjdk7/Makefile ============================================================================== --- branches/2017Q1/java/openjdk7/Makefile Thu Jan 19 05:25:15 2017 (r431847) +++ branches/2017Q1/java/openjdk7/Makefile Thu Jan 19 05:30:36 2017 (r431848) @@ -3,7 +3,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER} -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \ Copied: branches/2017Q1/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp (from r431605, head/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp Thu Jan 19 05:30:36 2017 (r431848, copy of r431605, head/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp) @@ -0,0 +1,20 @@ +--- hotspot/src/share/vm/runtime/virtualspace.cpp.orig ++++ hotspot/src/share/vm/runtime/virtualspace.cpp +@@ -524,7 +524,7 @@ ReservedHeapSpace::ReservedHeapSpace(siz + (UseCompressedOops && (Universe::narrow_oop_base() != NULL) && + Universe::narrow_oop_use_implicit_null_checks()) ? + lcm(os::vm_page_size(), alignment) : 0) { +- if (base() > 0) { ++ if (base() != NULL) { + MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); + } + +@@ -543,7 +543,7 @@ ReservedHeapSpace::ReservedHeapSpace(con + (UseCompressedOops && (Universe::narrow_oop_base() != NULL) && + Universe::narrow_oop_use_implicit_null_checks()) ? + lcm(os::vm_page_size(), prefix_align) : 0) { +- if (base() > 0) { ++ if (base() != NULL) { + MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); + } + From owner-svn-ports-branches@freebsd.org Thu Jan 19 05:33:21 2017 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 478EECB7683; Thu, 19 Jan 2017 05:33:21 +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 1BABB103D; Thu, 19 Jan 2017 05:33:21 +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 v0J5XK7U048703; Thu, 19 Jan 2017 05:33:20 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0J5XJOx048700; Thu, 19 Jan 2017 05:33:19 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701190533.v0J5XJOx048700@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 19 Jan 2017 05:33:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431849 - in branches/2017Q1/java/openjdk8: . 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.23 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, 19 Jan 2017 05:33:21 -0000 Author: jbeich Date: Thu Jan 19 05:33:19 2017 New Revision: 431849 URL: https://svnweb.freebsd.org/changeset/ports/431849 Log: MFH: r431607 by glewis . Fix compilation with Clang 4.0 PR: 216016 Submitted by: jbeich@ Approved by: ports-secteam blanket Added: branches/2017Q1/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp - copied unchanged from r431607, head/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp branches/2017Q1/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp - copied unchanged from r431607, head/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp Modified: branches/2017Q1/java/openjdk8/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/java/openjdk8/Makefile ============================================================================== --- branches/2017Q1/java/openjdk8/Makefile Thu Jan 19 05:30:36 2017 (r431848) +++ branches/2017Q1/java/openjdk8/Makefile Thu Jan 19 05:33:19 2017 (r431849) @@ -2,7 +2,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \ https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \ Copied: branches/2017Q1/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp (from r431607, head/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp Thu Jan 19 05:33:19 2017 (r431849, copy of r431607, head/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp) @@ -0,0 +1,11 @@ +--- hotspot/src/share/vm/opto/lcm.cpp.orig ++++ hotspot/src/share/vm/opto/lcm.cpp +@@ -49,7 +49,7 @@ + // Check whether val is not-null-decoded compressed oop, + // i.e. will grab into the base of the heap if it represents NULL. + static bool accesses_heap_base_zone(Node *val) { +- if (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops. ++ if (Universe::narrow_oop_base() != NULL) { // Implies UseCompressedOops. + if (val && val->is_Mach()) { + if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) { + // This assumes all Decodes with TypePtr::NotNull are matched to nodes that Copied: branches/2017Q1/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp (from r431607, head/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp Thu Jan 19 05:33:19 2017 (r431849, copy of r431607, head/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp) @@ -0,0 +1,11 @@ +--- hotspot/src/share/vm/runtime/virtualspace.cpp.orig ++++ hotspot/src/share/vm/runtime/virtualspace.cpp +@@ -342,7 +342,7 @@ ReservedHeapSpace::ReservedHeapSpace(siz + (UseCompressedOops && (Universe::narrow_oop_base() != NULL) && + Universe::narrow_oop_use_implicit_null_checks()) ? + lcm(os::vm_page_size(), alignment) : 0) { +- if (base() > 0) { ++ if (base() != NULL) { + MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); + } + From owner-svn-ports-branches@freebsd.org Thu Jan 19 05:36:26 2017 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 D89C9CB7749; Thu, 19 Jan 2017 05:36:26 +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 A7FB6118D; Thu, 19 Jan 2017 05:36:26 +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 v0J5aPSB048979; Thu, 19 Jan 2017 05:36:25 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0J5aPFI048978; Thu, 19 Jan 2017 05:36:25 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701190536.v0J5aPFI048978@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 19 Jan 2017 05:36:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431850 - branches/2017Q1/comms/rtl-sdr 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.23 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, 19 Jan 2017 05:36:27 -0000 Author: jbeich Date: Thu Jan 19 05:36:25 2017 New Revision: 431850 URL: https://svnweb.freebsd.org/changeset/ports/431850 Log: MFH: r431703 by martymac Fix build with clang 4.0 PR: 216048 Submitted by: jbeich Approved by: ports-secteam blanket Modified: branches/2017Q1/comms/rtl-sdr/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/comms/rtl-sdr/Makefile ============================================================================== --- branches/2017Q1/comms/rtl-sdr/Makefile Thu Jan 19 05:33:19 2017 (r431849) +++ branches/2017Q1/comms/rtl-sdr/Makefile Thu Jan 19 05:36:25 2017 (r431850) @@ -3,7 +3,7 @@ PORTNAME= rtl-sdr PORTVERSION= 20140210 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= comms hamradio MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \ LOCAL/martymac @@ -16,6 +16,7 @@ LICENSE= GPLv2 USES= autoreconf gmake pkgconfig libtool pathfix tar:tgz GNU_CONFIGURE= yes INSTALL_TARGET= install-strip +CFLAGS+= -fgnu89-inline CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes From owner-svn-ports-branches@freebsd.org Thu Jan 19 05:39:24 2017 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 89200CB787C; Thu, 19 Jan 2017 05:39:24 +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 5873A132F; Thu, 19 Jan 2017 05:39:24 +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 v0J5dNPv049243; Thu, 19 Jan 2017 05:39:23 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0J5dNJ4049242; Thu, 19 Jan 2017 05:39:23 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701190539.v0J5dNJ4049242@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 19 Jan 2017 05:39:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431851 - branches/2017Q1/multimedia/x265/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.23 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, 19 Jan 2017 05:39:24 -0000 Author: jbeich Date: Thu Jan 19 05:39:23 2017 New Revision: 431851 URL: https://svnweb.freebsd.org/changeset/ports/431851 Log: MFH: r431776 by mi Add a patch to avoid providing our own implementation of __rtdsc when built with clang version 4 or higher (which has its own). PR: 216162 Approved by: ports-secteam blanket Added: branches/2017Q1/multimedia/x265/files/patch-rdtsc - copied unchanged from r431776, head/multimedia/x265/files/patch-rdtsc Modified: Directory Properties: branches/2017Q1/ (props changed) Copied: branches/2017Q1/multimedia/x265/files/patch-rdtsc (from r431776, head/multimedia/x265/files/patch-rdtsc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/multimedia/x265/files/patch-rdtsc Thu Jan 19 05:39:23 2017 (r431851, copy of r431776, head/multimedia/x265/files/patch-rdtsc) @@ -0,0 +1,9 @@ +--- test/testharness.h 2016-12-23 00:57:39.000000000 -0500 ++++ test/testharness.h 2017-01-17 15:46:38.623298000 -0500 +@@ -69,5 +69,5 @@ + #elif HAVE_RDTSC + #include +-#elif defined(__GNUC__) ++#elif defined(__GNUC__) && (!defined(__clang__) || __clang_major__ < 4) + /* fallback for older GCC/MinGW */ + static inline uint32_t __rdtsc(void) From owner-svn-ports-branches@freebsd.org Thu Jan 19 14:49:52 2017 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 D750DCB8402; Thu, 19 Jan 2017 14:49:52 +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 B1F0A1FDC; Thu, 19 Jan 2017 14:49:52 +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 v0JEnpQX074891; Thu, 19 Jan 2017 14:49:51 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0JEnpAb074888; Thu, 19 Jan 2017 14:49:51 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701191449.v0JEnpAb074888@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 19 Jan 2017 14:49:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431880 - in branches/2017Q1/emulators: citra citra-qt5 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.23 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, 19 Jan 2017 14:49:52 -0000 Author: jbeich Date: Thu Jan 19 14:49:51 2017 New Revision: 431880 URL: https://svnweb.freebsd.org/changeset/ports/431880 Log: MFH: r431870 emulators/citra: update to s20170119 Changes: https://github.com/citra-emu/citra/compare/f7dd8d5e...ebe01506 Approved by: ports-secteam (feld) Modified: branches/2017Q1/emulators/citra-qt5/Makefile branches/2017Q1/emulators/citra/Makefile branches/2017Q1/emulators/citra/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/emulators/citra-qt5/Makefile ============================================================================== --- branches/2017Q1/emulators/citra-qt5/Makefile Thu Jan 19 14:29:50 2017 (r431879) +++ branches/2017Q1/emulators/citra-qt5/Makefile Thu Jan 19 14:49:51 2017 (r431880) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../citra Modified: branches/2017Q1/emulators/citra/Makefile ============================================================================== --- branches/2017Q1/emulators/citra/Makefile Thu Jan 19 14:29:50 2017 (r431879) +++ branches/2017Q1/emulators/citra/Makefile Thu Jan 19 14:49:51 2017 (r431880) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20161230 -PORTREVISION?= 1 +PORTVERSION= s20170119 +PORTREVISION?= 0 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -28,9 +28,9 @@ ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= https://github.com/MerryMage/dynarmic/issues/35 USE_GITHUB= yes -GH_TUPLE= citra-emu:${PORTNAME}:f7dd8d5e \ +GH_TUPLE= citra-emu:${PORTNAME}:ebe01506 \ citra-emu:ext-soundtouch:5274ec4:soundtouch/externals/soundtouch \ - MerryMage:dynarmic:70f4235:dynarmic/externals/dynarmic \ + MerryMage:dynarmic:3608208:dynarmic/externals/dynarmic \ fmtlib:fmt:3.0.0-146-g796beaa:fmt/externals/dynarmic/externals/fmt \ herumi:xbyak:v5.40:xbyak/externals/xbyak \ neobrain:nihstro:26a0a04:nihstro/externals/nihstro \ Modified: branches/2017Q1/emulators/citra/distinfo ============================================================================== --- branches/2017Q1/emulators/citra/distinfo Thu Jan 19 14:29:50 2017 (r431879) +++ branches/2017Q1/emulators/citra/distinfo Thu Jan 19 14:49:51 2017 (r431880) @@ -1,10 +1,10 @@ -TIMESTAMP = 1483109516 -SHA256 (citra-emu-citra-s20161230-f7dd8d5e_GH0.tar.gz) = 48945e446e13a8c28a634b41f6002acb7d5ce6b25897e8fa185ae103e2948664 -SIZE (citra-emu-citra-s20161230-f7dd8d5e_GH0.tar.gz) = 2236739 +TIMESTAMP = 1484800259 +SHA256 (citra-emu-citra-s20170119-ebe01506_GH0.tar.gz) = c244491e17669342f960162905f74699a985384afdb51986c44ba8ac4133d440 +SIZE (citra-emu-citra-s20170119-ebe01506_GH0.tar.gz) = 2240677 SHA256 (citra-emu-ext-soundtouch-5274ec4_GH0.tar.gz) = de5e101818ba38b5ea30d8cde0b2b788b53bc7c0f5d77b380b8968569872c2cb SIZE (citra-emu-ext-soundtouch-5274ec4_GH0.tar.gz) = 34535 -SHA256 (MerryMage-dynarmic-70f4235_GH0.tar.gz) = 19a6df51bd703e1710c961745c09cc582365d72eef8be1b46a30e761c37a003b -SIZE (MerryMage-dynarmic-70f4235_GH0.tar.gz) = 317153 +SHA256 (MerryMage-dynarmic-3608208_GH0.tar.gz) = 1376b8d6f91808f42a4d4a0be85f88c0b99200a704ed64b62814cb1836cb40d1 +SIZE (MerryMage-dynarmic-3608208_GH0.tar.gz) = 315933 SHA256 (fmtlib-fmt-3.0.0-146-g796beaa_GH0.tar.gz) = e5b0b3055082d9dc2b56509d8a11032fdeb3ab846feb5369591ccf58593446f9 SIZE (fmtlib-fmt-3.0.0-146-g796beaa_GH0.tar.gz) = 612701 SHA256 (herumi-xbyak-v5.40_GH0.tar.gz) = 106bbe15dc7e5d025ff98d1b5dd62a3f0a26d2569debe77fcde14852d50a66e1 From owner-svn-ports-branches@freebsd.org Thu Jan 19 20:19:31 2017 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 6DF8BCB8FF2; Thu, 19 Jan 2017 20:19:31 +0000 (UTC) (envelope-from jhale@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 489E9181D; Thu, 19 Jan 2017 20:19:31 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0JKJUrg018158; Thu, 19 Jan 2017 20:19:30 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0JKJU1w018155; Thu, 19 Jan 2017 20:19:30 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201701192019.v0JKJU1w018155@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Thu, 19 Jan 2017 20:19:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431911 - branches/2017Q1/graphics/icoutils 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.23 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, 19 Jan 2017 20:19:31 -0000 Author: jhale Date: Thu Jan 19 20:19:29 2017 New Revision: 431911 URL: https://svnweb.freebsd.org/changeset/ports/431911 Log: MFH: r431838 - Update to 0.31.1 - Fix LICENSE - Convert to USES=localbase - Convert to options helpers - Simplify install - Use pkg-plist instead of PLIST_FILES Security: 57facd35-ddf6-11e6-915d-001b3856973b Approved by: ports-secteam (feld) Added: branches/2017Q1/graphics/icoutils/pkg-plist - copied unchanged from r431838, head/graphics/icoutils/pkg-plist Modified: branches/2017Q1/graphics/icoutils/Makefile branches/2017Q1/graphics/icoutils/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/graphics/icoutils/Makefile ============================================================================== --- branches/2017Q1/graphics/icoutils/Makefile Thu Jan 19 20:09:44 2017 (r431910) +++ branches/2017Q1/graphics/icoutils/Makefile Thu Jan 19 20:19:29 2017 (r431911) @@ -2,49 +2,32 @@ # $FreeBSD$ PORTNAME= icoutils -PORTVERSION= 0.31.0 -PORTREVISION= 1 +PORTVERSION= 0.31.1 CATEGORIES= graphics MASTER_SITES= SAVANNAH MAINTAINER= ports@FreeBSD.org COMMENT= Convert/extract images in Microsoft Windows(R) icon/cursor files -LICENSE= GPLv3 +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png -USES= shebangfix tar:bzip2 +USES= localbase shebangfix tar:bzip2 SHEBANG_FILES= extresso/*.in GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-nls -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -PLIST_FILES= bin/icotool bin/wrestool \ - man/man1/icotool.1.gz man/man1/wrestool.1.gz - OPTIONS_DEFINE= RESSCRIPTS -RESSCRIPTS_DESC= Additional resource scripts written in Perl +OPTIONS_SUB= yes -.include - -.if ${PORT_OPTIONS:MRESSCRIPTS} -RUN_DEPENDS+= p5-libwww>=0:www/p5-libwww -USES+= perl5 -USE_PERL5= run -PLIST_FILES+= bin/extresso bin/genresscript \ - man/man1/extresso.1.gz man/man1/genresscript.1.gz -.endif +RESSCRIPTS_DESC= Additional resource scripts written in Perl +RESSCRIPTS_RUN_DEPENDS= p5-libwww>=0:www/p5-libwww +RESSCRIPTS_USES= perl5 +RESSCRIPTS_USE= PERL5=run -post-patch: +post-patch-RESSCRIPTS-off: @${REINPLACE_CMD} -e '/^SUBDIRS/s|extresso||' ${WRKSRC}/Makefile.in -post-install: -.if ${PORT_OPTIONS:MRESSCRIPTS} - @(cd ${WRKSRC}/extresso && ${SETENV} ${MAKE_ENV} ${MAKE} \ - ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) -.endif - .include Modified: branches/2017Q1/graphics/icoutils/distinfo ============================================================================== --- branches/2017Q1/graphics/icoutils/distinfo Thu Jan 19 20:09:44 2017 (r431910) +++ branches/2017Q1/graphics/icoutils/distinfo Thu Jan 19 20:19:29 2017 (r431911) @@ -1,2 +1,3 @@ -SHA256 (icoutils-0.31.0.tar.bz2) = a895d9d74a418d65d39a667e58ae38be79c9e726711384551d36531696f3af71 -SIZE (icoutils-0.31.0.tar.bz2) = 559836 +TIMESTAMP = 1484794814 +SHA256 (icoutils-0.31.1.tar.bz2) = 26e29d3c78f25d4cdf402501ac0414c51a9a092daebf6c9dee3b837dee693093 +SIZE (icoutils-0.31.1.tar.bz2) = 573484 Copied: branches/2017Q1/graphics/icoutils/pkg-plist (from r431838, head/graphics/icoutils/pkg-plist) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/graphics/icoutils/pkg-plist Thu Jan 19 20:19:29 2017 (r431911, copy of r431838, head/graphics/icoutils/pkg-plist) @@ -0,0 +1,8 @@ +%%RESSCRIPTS%%bin/extresso +%%RESSCRIPTS%%bin/genresscript +bin/icotool +bin/wrestool +%%RESSCRIPTS%%man/man1/extresso.1.gz +%%RESSCRIPTS%%man/man1/genresscript.1.gz +man/man1/icotool.1.gz +man/man1/wrestool.1.gz From owner-svn-ports-branches@freebsd.org Fri Jan 20 01:55:52 2017 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 CF013CB7332; Fri, 20 Jan 2017 01:55:52 +0000 (UTC) (envelope-from cperciva@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 8CB0E1502; Fri, 20 Jan 2017 01:55:52 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0K1tpSJ056437; Fri, 20 Jan 2017 01:55:51 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0K1tpus056436; Fri, 20 Jan 2017 01:55:51 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201701200155.v0K1tpus056436@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Fri, 20 Jan 2017 01:55:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431925 - in branches/2017Q1/net: . dual-dhclient 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.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jan 2017 01:55:52 -0000 Author: cperciva Date: Fri Jan 20 01:55:51 2017 New Revision: 431925 URL: https://svnweb.freebsd.org/changeset/ports/431925 Log: MFH: r431537 Add "dual dhclient" script, which can be specified as dhclient_program in rc.conf in order to launch the base system dhclient for IPv4 and the ISC dhcp client for IPv6. I'm not sure if this will be useful to anyone else, but adding this trivial port will simplify the configuration of IPv6 on Amazon EC2 instances. I hope this port becomes redundant in the future due to the base system gaining support for IPv6 DHCP. Approved by: portmgr (mat) Added: branches/2017Q1/net/dual-dhclient/ - copied from r431537, head/net/dual-dhclient/ Modified: branches/2017Q1/net/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/net/Makefile ============================================================================== --- branches/2017Q1/net/Makefile Fri Jan 20 00:17:14 2017 (r431924) +++ branches/2017Q1/net/Makefile Fri Jan 20 01:55:51 2017 (r431925) @@ -119,6 +119,7 @@ SUBDIR += dshell SUBDIR += dtcp SUBDIR += dtcpclient + SUBDIR += dual-dhclient SUBDIR += e169-stats SUBDIR += easysoap SUBDIR += echoping From owner-svn-ports-branches@freebsd.org Fri Jan 20 02:42:46 2017 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 91347CB7ECF; Fri, 20 Jan 2017 02:42:46 +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 605F91DC6; Fri, 20 Jan 2017 02:42:46 +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 v0K2gjw9076772; Fri, 20 Jan 2017 02:42:45 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0K2gjIQ076770; Fri, 20 Jan 2017 02:42:45 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201701200242.v0K2gjIQ076770@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Fri, 20 Jan 2017 02:42:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431927 - branches/2017Q1/lang/php56 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jan 2017 02:42:46 -0000 Author: junovitch Date: Fri Jan 20 02:42:45 2017 New Revision: 431927 URL: https://svnweb.freebsd.org/changeset/ports/431927 Log: MFH: r431862 Update to 5.6.30 release. Security: https://vuxml.FreeBSD.org/freebsd/709e025a-de8b-11e6-a9a5-b499baebfeaf.html Approved by: ports-secteam (with hat) Modified: branches/2017Q1/lang/php56/Makefile branches/2017Q1/lang/php56/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/lang/php56/Makefile ============================================================================== --- branches/2017Q1/lang/php56/Makefile Fri Jan 20 02:41:30 2017 (r431926) +++ branches/2017Q1/lang/php56/Makefile Fri Jan 20 02:42:45 2017 (r431927) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php56 -PORTVERSION= 5.6.29 +PORTVERSION= 5.6.30 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions Modified: branches/2017Q1/lang/php56/distinfo ============================================================================== --- branches/2017Q1/lang/php56/distinfo Fri Jan 20 02:41:30 2017 (r431926) +++ branches/2017Q1/lang/php56/distinfo Fri Jan 20 02:42:45 2017 (r431927) @@ -1,5 +1,5 @@ -TIMESTAMP = 1481346047 -SHA256 (php-5.6.29.tar.xz) = 0ff352a433f73e2c82b0d5b283b600402518569bf72a74e247f356dacbf322a7 -SIZE (php-5.6.29.tar.xz) = 12444988 +TIMESTAMP = 1484817530 +SHA256 (php-5.6.30.tar.xz) = a363185c786432f75e3c7ff956b49c3369c3f6906a6b10459f8d1ddc22f70805 +SIZE (php-5.6.30.tar.xz) = 12449696 SHA256 (php-5.5.x-mail-header.patch) = f510672c4bf2c228e4d8c7837e16a82169de82139dcf33fafce51e9e55a1b9ed SIZE (php-5.5.x-mail-header.patch) = 4426 From owner-svn-ports-branches@freebsd.org Fri Jan 20 11:46:51 2017 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 AE0BFCB986A; Fri, 20 Jan 2017 11:46:51 +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 7D8D1143A; Fri, 20 Jan 2017 11:46:51 +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 v0KBko6X003310; Fri, 20 Jan 2017 11:46:50 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0KBkoZe003309; Fri, 20 Jan 2017 11:46:50 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201701201146.v0KBkoZe003309@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Fri, 20 Jan 2017 11:46:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431948 - branches/2017Q1/devel/rbtools 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.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jan 2017 11:46:51 -0000 Author: rakuco Date: Fri Jan 20 11:46:50 2017 New Revision: 431948 URL: https://svnweb.freebsd.org/changeset/ports/431948 Log: MFH: r431947 Add a dependency on misc/py-tqdm. The dependency on tqdm was introduced in 0.7.7 but was not mentioned in the release announcement. PR: 216306 Approved by: ports-secteam (blanket approval) Modified: branches/2017Q1/devel/rbtools/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/devel/rbtools/Makefile ============================================================================== --- branches/2017Q1/devel/rbtools/Makefile Fri Jan 20 11:43:33 2017 (r431947) +++ branches/2017Q1/devel/rbtools/Makefile Fri Jan 20 11:46:50 2017 (r431948) @@ -2,6 +2,7 @@ PORTNAME= ${ORIGNAME:tl} DISTVERSION= 0.7.7 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://downloads.reviewboard.org/releases/${ORIGNAME}/${DISTVERSION:R}/ DISTNAME= ${ORIGNAME}-${DISTVERSION} @@ -12,7 +13,8 @@ COMMENT= Set of client tools to use with LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ + ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm ORIGNAME= RBTools From owner-svn-ports-branches@freebsd.org Fri Jan 20 13:05:05 2017 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 7BBC5CB7959; Fri, 20 Jan 2017 13:05:05 +0000 (UTC) (envelope-from tcberner@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 4962B142F; Fri, 20 Jan 2017 13:05:05 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0KD54xT036307; Fri, 20 Jan 2017 13:05:04 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0KD54l8036306; Fri, 20 Jan 2017 13:05:04 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201701201305.v0KD54l8036306@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Fri, 20 Jan 2017 13:05:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431955 - branches/2017Q1/devel/cmake-gui 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.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jan 2017 13:05:05 -0000 Author: tcberner Date: Fri Jan 20 13:05:04 2017 New Revision: 431955 URL: https://svnweb.freebsd.org/changeset/ports/431955 Log: MFH: r431769 r431772 Add missing LIB_DEPENDS to devel/libuv (stage-qa). Approved by: rakuco (mentor) The change in r431769 requires a PORTREVISION bump. *puts on idiot hat* Approved by: rakuco (mentor) Approved by: ports-secteam (junovitch), rakuco (mentor) Modified: branches/2017Q1/devel/cmake-gui/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/devel/cmake-gui/Makefile ============================================================================== --- branches/2017Q1/devel/cmake-gui/Makefile Fri Jan 20 13:02:33 2017 (r431954) +++ branches/2017Q1/devel/cmake-gui/Makefile Fri Jan 20 13:05:04 2017 (r431955) @@ -2,6 +2,7 @@ PORTNAME= cmake PORTVERSION= 3.7.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/ PKGNAMESUFFIX= -gui @@ -15,7 +16,8 @@ LICENSE_FILE= ${WRKSRC}/Copyright.txt BUILD_DEPENDS= sphinx-build:textproc/py-sphinx LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 \ - libjsoncpp.so:devel/jsoncpp + libjsoncpp.so:devel/jsoncpp \ + libuv.so:devel/libuv USE_QT5= core gui widgets buildtools_build qmake_build USES= cmake:run desktop-file-utils execinfo libarchive \ From owner-svn-ports-branches@freebsd.org Fri Jan 20 14:19:36 2017 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 1E745CB8FC2; Fri, 20 Jan 2017 14:19: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 D4F221D03; Fri, 20 Jan 2017 14:19:35 +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 v0KEJYWA065057; Fri, 20 Jan 2017 14:19:34 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0KEJYrQ065052; Fri, 20 Jan 2017 14:19:34 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701201419.v0KEJYrQ065052@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 20 Jan 2017 14:19:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431959 - in branches/2017Q1/www: webkit-gtk2/files webkit-gtk3/files webkit2-gtk3/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.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jan 2017 14:19:36 -0000 Author: jbeich Date: Fri Jan 20 14:19:34 2017 New Revision: 431959 URL: https://svnweb.freebsd.org/changeset/ports/431959 Log: MFH: r431958 www/webkit2-gtk3: attempt to unbreak on aarch64 ./Source/JavaScriptCore/assembler/ARM64Assembler.h:2760:2: error: "The cacheFlush support is missing on this platform." #error "The cacheFlush support is missing on this platform." ^ ./Source/JavaScriptCore/assembler/MacroAssemblerARM64.h:133:17: error: class member cannot be redeclared static bool shouldBlindForSpecificArch(uintptr_t value) { return value >= 0x00ffffff; } ^ ./Source/JavaScriptCore/assembler/MacroAssemblerARM64.h:132:17: note: previous declaration is here static bool shouldBlindForSpecificArch(uint64_t value) { return value >= 0x00ffffff; } ^ Reported by: pkg-fallout Approved by: ports-secteam blanket Added: branches/2017Q1/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h - copied unchanged from r431958, head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h branches/2017Q1/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h - copied unchanged from r431958, head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h branches/2017Q1/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h - copied unchanged from r431958, head/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h branches/2017Q1/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h - copied unchanged from r431958, head/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h branches/2017Q1/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h - copied unchanged from r431958, head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h Modified: Directory Properties: branches/2017Q1/ (props changed) Copied: branches/2017Q1/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h (from r431958, head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h Fri Jan 20 14:19:34 2017 (r431959, copy of r431958, head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) @@ -0,0 +1,11 @@ +--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig 2016-04-10 06:48:36 UTC ++++ Source/JavaScriptCore/assembler/ARM64Assembler.h +@@ -2756,6 +2756,8 @@ public: + { + #if OS(IOS) + sys_cache_control(kCacheFunctionPrepareForExecution, code, size); ++#elif OS(FREEBSD) || OS(NETBSD) ++ __clear_cache(code, reinterpret_cast(code) + size); + #else + #error "The cacheFlush support is missing on this platform." + #endif Copied: branches/2017Q1/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h (from r431958, head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h Fri Jan 20 14:19:34 2017 (r431959, copy of r431958, head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h) @@ -0,0 +1,19 @@ +------------------------------------------------------------------------ +r165961 | rgabor@webkit.org | 2014-03-20 18:03:43 +0400 (Thu, 20 Mar 2014) | 15 lines + +[...] +https://bugs.webkit.org/show_bug.cgi?id=130502 +[...] +Delete shouldBlindForSpecificArch(uintptr_t) because on ARM64 uint64_t +and uintptr_t is the same with GCC and Clang as well. + +--- Source/JavaScriptCore/assembler/MacroAssemblerARM64.h.orig 2016-04-10 06:48:36 UTC ++++ Source/JavaScriptCore/assembler/MacroAssemblerARM64.h +@@ -130,7 +130,6 @@ public: + // FIXME: Get reasonable implementations for these + static bool shouldBlindForSpecificArch(uint32_t value) { return value >= 0x00ffffff; } + static bool shouldBlindForSpecificArch(uint64_t value) { return value >= 0x00ffffff; } +- static bool shouldBlindForSpecificArch(uintptr_t value) { return value >= 0x00ffffff; } + + // Integer operations: + Copied: branches/2017Q1/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h (from r431958, head/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h Fri Jan 20 14:19:34 2017 (r431959, copy of r431958, head/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) @@ -0,0 +1,11 @@ +--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig 2016-04-10 06:48:36 UTC ++++ Source/JavaScriptCore/assembler/ARM64Assembler.h +@@ -2756,6 +2756,8 @@ public: + { + #if OS(IOS) + sys_cache_control(kCacheFunctionPrepareForExecution, code, size); ++#elif OS(FREEBSD) || OS(NETBSD) ++ __clear_cache(code, reinterpret_cast(code) + size); + #else + #error "The cacheFlush support is missing on this platform." + #endif Copied: branches/2017Q1/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h (from r431958, head/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h Fri Jan 20 14:19:34 2017 (r431959, copy of r431958, head/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h) @@ -0,0 +1,19 @@ +------------------------------------------------------------------------ +r165961 | rgabor@webkit.org | 2014-03-20 18:03:43 +0400 (Thu, 20 Mar 2014) | 15 lines + +[...] +https://bugs.webkit.org/show_bug.cgi?id=130502 +[...] +Delete shouldBlindForSpecificArch(uintptr_t) because on ARM64 uint64_t +and uintptr_t is the same with GCC and Clang as well. + +--- Source/JavaScriptCore/assembler/MacroAssemblerARM64.h.orig 2016-04-10 06:48:36 UTC ++++ Source/JavaScriptCore/assembler/MacroAssemblerARM64.h +@@ -130,7 +130,6 @@ public: + // FIXME: Get reasonable implementations for these + static bool shouldBlindForSpecificArch(uint32_t value) { return value >= 0x00ffffff; } + static bool shouldBlindForSpecificArch(uint64_t value) { return value >= 0x00ffffff; } +- static bool shouldBlindForSpecificArch(uintptr_t value) { return value >= 0x00ffffff; } + + // Integer operations: + Copied: branches/2017Q1/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h (from r431958, head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h Fri Jan 20 14:19:34 2017 (r431959, copy of r431958, head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) @@ -0,0 +1,11 @@ +--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig 2015-08-06 08:21:27 UTC ++++ Source/JavaScriptCore/assembler/ARM64Assembler.h +@@ -2862,6 +2862,8 @@ public: + { + #if OS(IOS) + sys_cache_control(kCacheFunctionPrepareForExecution, code, size); ++#elif OS(FREEBSD) || OS(NETBSD) ++ __clear_cache(code, reinterpret_cast(code) + size); + #elif OS(LINUX) + size_t page = pageSize(); + uintptr_t current = reinterpret_cast(code); From owner-svn-ports-branches@freebsd.org Fri Jan 20 14:36:21 2017 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 17DDBCB8A10; Fri, 20 Jan 2017 14:36:21 +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 DB50D1A54; Fri, 20 Jan 2017 14:36:20 +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 v0KEaJBj073104; Fri, 20 Jan 2017 14:36:19 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0KEaJuw073103; Fri, 20 Jan 2017 14:36:19 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701201436.v0KEaJuw073103@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 20 Jan 2017 14:36:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431961 - branches/2017Q1/lang/php70 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.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jan 2017 14:36:21 -0000 Author: jbeich Date: Fri Jan 20 14:36:19 2017 New Revision: 431961 URL: https://svnweb.freebsd.org/changeset/ports/431961 Log: MFH: r431960 lang/php70: temporarily hide DTRACE option on aarch64 ld: Zend/zend_dtrace.d.o.h0Xec8: Relocations in generic ELF (EM: 0) Zend/zend_dtrace.d.o.h0Xec8: error adding symbols: File in wrong format dtrace: failed to link script /wrkdirs/usr/ports/lang/php70/work/php-7.0.14/Zend/zend_dtrace.d: failed to link Zend/zend_dtrace.d.o: ld exited with status 1 dt_modtext:/usr/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c(841): DOODAD dt_modtext:/usr/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c(841): DOODAD [...] PR: 214556 Reported by: pkg-fallout Approved by: ports-secteam blanket Modified: branches/2017Q1/lang/php70/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/lang/php70/Makefile ============================================================================== --- branches/2017Q1/lang/php70/Makefile Fri Jan 20 14:31:27 2017 (r431960) +++ branches/2017Q1/lang/php70/Makefile Fri Jan 20 14:36:19 2017 (r431961) @@ -45,6 +45,8 @@ OPTIONS_SUB= yes OPTIONS_EXCLUDE_DragonFly= DTRACE OPTIONS_EXCLUDE_FreeBSD_9= DTRACE +# ld(1) fails to link probes: Relocations in generic ELF (EM: 0) +OPTIONS_EXCLUDE_aarch64= DTRACE CLI_DESC= Build CLI version CGI_DESC= Build CGI version From owner-svn-ports-branches@freebsd.org Fri Jan 20 17:34:14 2017 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 0E5D3CB8270; Fri, 20 Jan 2017 17:34:14 +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 C67E51EEB; Fri, 20 Jan 2017 17:34:13 +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 v0KHYCiV047489; Fri, 20 Jan 2017 17:34:12 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0KHYCn9047488; Fri, 20 Jan 2017 17:34:12 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701201734.v0KHYCn9047488@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 20 Jan 2017 17:34:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431974 - branches/2017Q1/databases/memcached 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.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jan 2017 17:34:14 -0000 Author: jbeich Date: Fri Jan 20 17:34:12 2017 New Revision: 431974 URL: https://svnweb.freebsd.org/changeset/ports/431974 Log: MFH: r431973 databases/memcached: temporarily hide DTRACE option on aarch64 /usr/sbin/dtrace -G -o memcached_dtrace.o -s ./memcached_dtrace.d ... dt_modtext:/usr/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c(841): DOODAD dt_modtext:/usr/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c(841): DOODAD [...] ld: memcached_dtrace.o.iRgx2j: Relocations in generic ELF (EM: 0) memcached_dtrace.o.iRgx2j: error adding symbols: File in wrong format dtrace: failed to link script ./memcached_dtrace.d: failed to link memcached_dtrace.o: ld exited with status 1 PR: 214556 Approved by: ports-secteam blanket Modified: branches/2017Q1/databases/memcached/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/databases/memcached/Makefile ============================================================================== --- branches/2017Q1/databases/memcached/Makefile Fri Jan 20 17:31:23 2017 (r431973) +++ branches/2017Q1/databases/memcached/Makefile Fri Jan 20 17:34:12 2017 (r431974) @@ -29,6 +29,8 @@ OPTIONS_EXCLUDE+= DTRACE OPTIONS_EXCLUDE_FreeBSD_9+= DTRACE OPTIONS_EXCLUDE_FreeBSD_10+= DTRACE OPTIONS_EXCLUDE_i386= DTRACE +# ld(1) fails to link probes: Relocations in generic ELF (EM: 0) +OPTIONS_EXCLUDE_aarch64= DTRACE DTRACE_DESC= Enable dtrace probes SASL_DESC= Enable SASL Authentication From owner-svn-ports-branches@freebsd.org Fri Jan 20 19:44:51 2017 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 A24B0CB9FE6; Fri, 20 Jan 2017 19:44:51 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 606C1127B; Fri, 20 Jan 2017 19:44:51 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0KJio8c002921; Fri, 20 Jan 2017 19:44:50 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0KJioN3002917; Fri, 20 Jan 2017 19:44:50 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201701201944.v0KJioN3002917@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Fri, 20 Jan 2017 19:44:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431992 - in branches/2017Q1/dns: powerdns powerdns-recursor powerdns-recursor/files powerdns/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.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jan 2017 19:44:51 -0000 Author: cpm Date: Fri Jan 20 19:44:49 2017 New Revision: 431992 URL: https://svnweb.freebsd.org/changeset/ports/431992 Log: MFH: r431990 dns/powerdns and dns/powerdns-recursor: unbreak build with clang 4.0 json11.cpp:153:24: error: invalid operands to binary expression ('nullptr_t' and 'nullptr_t') return m_value < static_cast *>(other)->m_value; ~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ json11.cpp:209:5: note: in instantiation of member function 'json11::Value::less' requested here JsonNull() : Value(nullptr) {} ^ PR: 216071 Submitted by: cpm Reported by: jbeich Reviewed by: jbeich Approved by: Ralf van der Enden (maintainer) Obtained from: upstream Approved by: ports-secteam (blanket) Added: branches/2017Q1/dns/powerdns-recursor/files/patch-ext_json11_json11.cpp - copied unchanged from r431990, head/dns/powerdns-recursor/files/patch-ext_json11_json11.cpp branches/2017Q1/dns/powerdns/files/patch-ext_json11_json11.cpp - copied unchanged from r431990, head/dns/powerdns/files/patch-ext_json11_json11.cpp Modified: branches/2017Q1/dns/powerdns-recursor/Makefile branches/2017Q1/dns/powerdns/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/dns/powerdns-recursor/Makefile ============================================================================== --- branches/2017Q1/dns/powerdns-recursor/Makefile Fri Jan 20 19:39:25 2017 (r431991) +++ branches/2017Q1/dns/powerdns-recursor/Makefile Fri Jan 20 19:44:49 2017 (r431992) @@ -3,6 +3,7 @@ PORTNAME= recursor PORTVERSION= 4.0.4 +PORTREVISION= 1 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ PKGNAMEPREFIX= powerdns- Copied: branches/2017Q1/dns/powerdns-recursor/files/patch-ext_json11_json11.cpp (from r431990, head/dns/powerdns-recursor/files/patch-ext_json11_json11.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/dns/powerdns-recursor/files/patch-ext_json11_json11.cpp Fri Jan 20 19:44:49 2017 (r431992, copy of r431990, head/dns/powerdns-recursor/files/patch-ext_json11_json11.cpp) @@ -0,0 +1,37 @@ +--- ext/json11/json11.cpp.orig 2017-01-18 18:06:37 UTC ++++ ext/json11/json11.cpp +@@ -37,11 +37,21 @@ using std::make_shared; + using std::initializer_list; + using std::move; + ++/* Helper for representing null - just a do-nothing struct, plus comparison ++ * operators so the helpers in JsonValue work. We can't use nullptr_t because ++ * it may not be orderable. ++*/ ++ ++struct NullStruct { ++ bool operator==(NullStruct) const { return true; } ++ bool operator<(NullStruct) const { return false; } ++}; ++ + /* * * * * * * * * * * * * * * * * * * * + * Serialization + */ + +-static void dump(std::nullptr_t, string &out) { ++static void dump(NullStruct, string &out) { + out += "null"; + } + +@@ -204,9 +214,9 @@ public: + explicit JsonObject(Json::object &&value) : Value(move(value)) {} + }; + +-class JsonNull final : public Value { ++class JsonNull final : public Value { + public: +- JsonNull() : Value(nullptr) {} ++ JsonNull() : Value({}) {} + }; + + /* * * * * * * * * * * * * * * * * * * * Modified: branches/2017Q1/dns/powerdns/Makefile ============================================================================== --- branches/2017Q1/dns/powerdns/Makefile Fri Jan 20 19:39:25 2017 (r431991) +++ branches/2017Q1/dns/powerdns/Makefile Fri Jan 20 19:44:49 2017 (r431992) @@ -2,6 +2,7 @@ PORTNAME= powerdns PORTVERSION= 4.0.3 +PORTREVISION= 1 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ DISTNAME= pdns-${PORTVERSION} Copied: branches/2017Q1/dns/powerdns/files/patch-ext_json11_json11.cpp (from r431990, head/dns/powerdns/files/patch-ext_json11_json11.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/dns/powerdns/files/patch-ext_json11_json11.cpp Fri Jan 20 19:44:49 2017 (r431992, copy of r431990, head/dns/powerdns/files/patch-ext_json11_json11.cpp) @@ -0,0 +1,37 @@ +--- ext/json11/json11.cpp.orig 2017-01-18 18:06:37 UTC ++++ ext/json11/json11.cpp +@@ -37,11 +37,21 @@ using std::make_shared; + using std::initializer_list; + using std::move; + ++/* Helper for representing null - just a do-nothing struct, plus comparison ++ * operators so the helpers in JsonValue work. We can't use nullptr_t because ++ * it may not be orderable. ++*/ ++ ++struct NullStruct { ++ bool operator==(NullStruct) const { return true; } ++ bool operator<(NullStruct) const { return false; } ++}; ++ + /* * * * * * * * * * * * * * * * * * * * + * Serialization + */ + +-static void dump(std::nullptr_t, string &out) { ++static void dump(NullStruct, string &out) { + out += "null"; + } + +@@ -204,9 +214,9 @@ public: + explicit JsonObject(Json::object &&value) : Value(move(value)) {} + }; + +-class JsonNull final : public Value { ++class JsonNull final : public Value { + public: +- JsonNull() : Value(nullptr) {} ++ JsonNull() : Value({}) {} + }; + + /* * * * * * * * * * * * * * * * * * * * From owner-svn-ports-branches@freebsd.org Sat Jan 21 03:25:48 2017 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 7E700CBAFA8; Sat, 21 Jan 2017 03:25:48 +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 343951CCB; Sat, 21 Jan 2017 03:25:48 +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 v0L3PljJ095710; Sat, 21 Jan 2017 03:25:47 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0L3PlpK095709; Sat, 21 Jan 2017 03:25:47 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701210325.v0L3PlpK095709@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 21 Jan 2017 03:25:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r432010 - branches/2017Q1/converters/wkhtmltopdf/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.23 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, 21 Jan 2017 03:25:48 -0000 Author: jbeich Date: Sat Jan 21 03:25:47 2017 New Revision: 432010 URL: https://svnweb.freebsd.org/changeset/ports/432010 Log: MFH: r432009 converters/wkhtmltopdf: unbreak with clang 4.0 (same as r431742) src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp:77:24: error: ordered comparison between pointer and zero ('const int *' and 'int') if (optionalHeight > 0) ~~~~~~~~~~~~~~ ^ ~ PR: 216211 Obtained from: upstream (excerpt) Approved by: portmgr blanket Approved by: ports-secteam blanket Added: branches/2017Q1/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp - copied unchanged from r432009, head/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp Modified: Directory Properties: branches/2017Q1/ (props changed) Copied: branches/2017Q1/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp (from r432009, head/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp Sat Jan 21 03:25:47 2017 (r432010, copy of r432009, head/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp) @@ -0,0 +1,21 @@ +------------------------------------------------------------------------ +r113848 | abecsi@webkit.org | 2012-04-11 11:23:19 +0000 (Wed, 11 Apr 2012) | 27 lines + +Fix the build with gcc 4.7.0 +https://bugs.webkit.org/show_bug.cgi?id=83584 +[...] +* html/HTMLImageElement.cpp: +(WebCore::HTMLImageElement::createForJSConstructor): Fails because of -Werror=extra +[...] + +--- src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp.orig 2015-05-07 14:14:47 UTC ++++ src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp +@@ -74,7 +74,7 @@ PassRefPtr HTMLImageEl + RefPtr image = adoptRef(new HTMLImageElement(imgTag, document)); + if (optionalWidth) + image->setWidth(*optionalWidth); +- if (optionalHeight > 0) ++ if (optionalHeight) + image->setHeight(*optionalHeight); + return image.release(); + } From owner-svn-ports-branches@freebsd.org Sat Jan 21 04:51:18 2017 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 35F96CBA9C8; Sat, 21 Jan 2017 04:51:18 +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 058961DD2; Sat, 21 Jan 2017 04:51:17 +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 v0L4pHxn029405; Sat, 21 Jan 2017 04:51:17 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0L4pHg2029404; Sat, 21 Jan 2017 04:51:17 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701210451.v0L4pHg2029404@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 21 Jan 2017 04:51:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r432014 - branches/2017Q1/net-im/folks 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.23 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, 21 Jan 2017 04:51:18 -0000 Author: jbeich Date: Sat Jan 21 04:51:16 2017 New Revision: 432014 URL: https://svnweb.freebsd.org/changeset/ports/432014 Log: MFH: r432012 net-im/folks: ignore warnings in system headers Pass -isystem to avoid adding -Wno-foo each time Clang bumps into an issue with a header from another port. PR: 216031 Approved by: ports-secteam blanket Modified: branches/2017Q1/net-im/folks/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/net-im/folks/Makefile ============================================================================== --- branches/2017Q1/net-im/folks/Makefile Sat Jan 21 04:40:06 2017 (r432013) +++ branches/2017Q1/net-im/folks/Makefile Sat Jan 21 04:51:16 2017 (r432014) @@ -18,12 +18,10 @@ LIB_DEPENDS= libgee-0.8.so:devel/libgee CONFLICTS= folks-0.4.[0-9]* USE_LDCONFIG= yes -USES= gettext libtool gmake pathfix pkgconfig tar:xz +USES= gettext gmake libtool localbase pathfix pkgconfig tar:xz USE_GNOME= evolutiondataserver3 intlhack introspection:build GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-bluez-backend -CPPFLAGS+= -I${LOCALBASE}/include -Wno-error=deprecated-declarations -LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.freedesktop.folks.gschema.xml From owner-svn-ports-branches@freebsd.org Sat Jan 21 12:16:02 2017 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 C5EE5CB860D; Sat, 21 Jan 2017 12:16:02 +0000 (UTC) (envelope-from tcberner@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 7B418122D; Sat, 21 Jan 2017 12:16:02 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0LCG1XK011205; Sat, 21 Jan 2017 12:16:01 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0LCG112011203; Sat, 21 Jan 2017 12:16:01 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201701211216.v0LCG112011203@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 21 Jan 2017 12:16:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r432025 - in branches/2017Q1/devel/ruby-qtruby: . 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.23 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, 21 Jan 2017 12:16:02 -0000 Author: tcberner Date: Sat Jan 21 12:16:01 2017 New Revision: 432025 URL: https://svnweb.freebsd.org/changeset/ports/432025 Log: MFH: r431952 Fix ruby-qtruby with newer clang Clang 4.0 trips on the bogus pointer comparison. As the produced code may change, bump PORTREVISION. PR: 216218 Reported by: jbeich Approved by: rakuco (mentor) PR: 216218 Approved by: ports-secteam (junovitch), rakuco (mentor) Added: branches/2017Q1/devel/ruby-qtruby/files/patch-src_qtruby.cpp - copied unchanged from r431952, head/devel/ruby-qtruby/files/patch-src_qtruby.cpp Modified: branches/2017Q1/devel/ruby-qtruby/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/devel/ruby-qtruby/Makefile ============================================================================== --- branches/2017Q1/devel/ruby-qtruby/Makefile Sat Jan 21 12:03:28 2017 (r432024) +++ branches/2017Q1/devel/ruby-qtruby/Makefile Sat Jan 21 12:16:01 2017 (r432025) @@ -2,7 +2,7 @@ PORTNAME= qtruby PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel kde kde-kde4 ruby PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} Copied: branches/2017Q1/devel/ruby-qtruby/files/patch-src_qtruby.cpp (from r431952, head/devel/ruby-qtruby/files/patch-src_qtruby.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/devel/ruby-qtruby/files/patch-src_qtruby.cpp Sat Jan 21 12:16:01 2017 (r432025, copy of r431952, head/devel/ruby-qtruby/files/patch-src_qtruby.cpp) @@ -0,0 +1,13 @@ +Fix bogus pointer comparison. + +--- src/qtruby.cpp.orig 2017-01-18 20:21:44 UTC ++++ src/qtruby.cpp +@@ -2094,7 +2094,7 @@ isObject(VALUE /*self*/, VALUE obj) + { + void * ptr = 0; + ptr = value_to_ptr(obj); +- return (ptr > 0 ? Qtrue : Qfalse); ++ return (ptr ? Qtrue : Qfalse); + } + + static VALUE From owner-svn-ports-branches@freebsd.org Sat Jan 21 12:18:26 2017 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 1F4D7CB86BF; Sat, 21 Jan 2017 12:18:26 +0000 (UTC) (envelope-from tcberner@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 D5CD81364; Sat, 21 Jan 2017 12:18:25 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0LCIO7E011495; Sat, 21 Jan 2017 12:18:24 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0LCIOTT011490; Sat, 21 Jan 2017 12:18:24 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201701211218.v0LCIOTT011490@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 21 Jan 2017 12:18:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r432026 - in branches/2017Q1/devel/py-pykde4: . 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.23 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, 21 Jan 2017 12:18:26 -0000 Author: tcberner Date: Sat Jan 21 12:18:24 2017 New Revision: 432026 URL: https://svnweb.freebsd.org/changeset/ports/432026 Log: MFH: r431949 Fix py-pykde4 against newest clang PyList_SET_ITEM() is supposed to be void, but as a macro it's an expression and has a pointer value. Clang 4.0 trips on the bogus pointer comparison; given the comparison, it should be PyList_SetItem() which returns -1 on failure. As the produced code may be changed by this, bump PORTREVISION. PR: 216253 Submitted by: Adriaan de Groot Reported by: jbeich Reviewed by: rakuco, tcberner Approved by: rakuco (mentor) Differential Revision: https://reviews.freebsd.org/D9253 PR: 216253 Approved by: ports-secteam (junovitch), rakuco (mentor) Added: branches/2017Q1/devel/py-pykde4/files/patch-sip_phonon_abstractvideodataoutput.sip - copied unchanged from r431949, head/devel/py-pykde4/files/patch-sip_phonon_abstractvideodataoutput.sip branches/2017Q1/devel/py-pykde4/files/patch-sip_solid_powermanagement.sip - copied unchanged from r431949, head/devel/py-pykde4/files/patch-sip_solid_powermanagement.sip branches/2017Q1/devel/py-pykde4/files/patch-sip_solid_predicate.sip - copied unchanged from r431949, head/devel/py-pykde4/files/patch-sip_solid_predicate.sip Modified: branches/2017Q1/devel/py-pykde4/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/devel/py-pykde4/Makefile ============================================================================== --- branches/2017Q1/devel/py-pykde4/Makefile Sat Jan 21 12:16:01 2017 (r432025) +++ branches/2017Q1/devel/py-pykde4/Makefile Sat Jan 21 12:18:24 2017 (r432026) @@ -2,7 +2,7 @@ PORTNAME= pykde4 PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel kde kde-kde4 python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Copied: branches/2017Q1/devel/py-pykde4/files/patch-sip_phonon_abstractvideodataoutput.sip (from r431949, head/devel/py-pykde4/files/patch-sip_phonon_abstractvideodataoutput.sip) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/devel/py-pykde4/files/patch-sip_phonon_abstractvideodataoutput.sip Sat Jan 21 12:18:24 2017 (r432026, copy of r431949, head/devel/py-pykde4/files/patch-sip_phonon_abstractvideodataoutput.sip) @@ -0,0 +1,16 @@ +PyList_SET_ITEM() is supposed to be void, but as a macro it's an +expression and has a pointer value. Clang 4.0 trips on the bogus +pointer comparison; given the comparison, it should be PyList_SetItem() +which returns -1 on failure. + +--- sip/phonon/abstractvideodataoutput.sip.orig 2014-08-14 20:17:11 UTC ++++ sip/phonon/abstractvideodataoutput.sip +@@ -72,7 +72,7 @@ protected: + foreach (Phonon::Experimental::VideoFrame2::Format value, set) + { + PyObject *obj = PyInt_FromLong ((long) value); +- if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0) ++ if (obj == NULL || PyList_SetItem (l, i, obj) < 0) + { + Py_DECREF(l); + Copied: branches/2017Q1/devel/py-pykde4/files/patch-sip_solid_powermanagement.sip (from r431949, head/devel/py-pykde4/files/patch-sip_solid_powermanagement.sip) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/devel/py-pykde4/files/patch-sip_solid_powermanagement.sip Sat Jan 21 12:18:24 2017 (r432026, copy of r431949, head/devel/py-pykde4/files/patch-sip_solid_powermanagement.sip) @@ -0,0 +1,13 @@ +See patch-sip_phonon_abstractvideodataoutput.sip + +--- sip/solid/powermanagement.sip.orig 2014-08-14 20:17:11 UTC ++++ sip/solid/powermanagement.sip +@@ -83,7 +83,7 @@ bool stopSuppressingS + #else + PyObject *obj = PyInt_FromLong ((long) value); + #endif +- if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0) ++ if (obj == NULL || PyList_SetItem (l, i, obj) < 0) + { + Py_DECREF(l); + Copied: branches/2017Q1/devel/py-pykde4/files/patch-sip_solid_predicate.sip (from r431949, head/devel/py-pykde4/files/patch-sip_solid_predicate.sip) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/devel/py-pykde4/files/patch-sip_solid_predicate.sip Sat Jan 21 12:18:24 2017 (r432026, copy of r431949, head/devel/py-pykde4/files/patch-sip_solid_predicate.sip) @@ -0,0 +1,13 @@ +See patch-sip_phonon_abstractvideodataoutput.sip + +--- sip/solid/predicate.sip.orig 2014-08-14 20:17:11 UTC ++++ sip/solid/predicate.sip +@@ -112,7 +112,7 @@ Py_BEGIN_ALLOW_THREADS + #else + PyObject *obj = PyInt_FromLong ((long) value); + #endif +- if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0) ++ if (obj == NULL || PyList_SetItem (l, i, obj) < 0) + { + Py_DECREF(l); + From owner-svn-ports-branches@freebsd.org Sat Jan 21 16:38:08 2017 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 2139FCBBF44; Sat, 21 Jan 2017 16:38:08 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CAE4F143C; Sat, 21 Jan 2017 16:38:07 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0LGc6jI022220; Sat, 21 Jan 2017 16:38:06 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0LGc63X022219; Sat, 21 Jan 2017 16:38:06 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201701211638.v0LGc63X022219@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 21 Jan 2017 16:38:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r432057 - branches/2017Q1/lang/python 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.23 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, 21 Jan 2017 16:38:08 -0000 Author: sunpoet Date: Sat Jan 21 16:38:06 2017 New Revision: 432057 URL: https://svnweb.freebsd.org/changeset/ports/432057 Log: MFH: r431987 Fix symbolic links of idle and pydoc - Bump PORTREVISION for package change - While I'm here: - Remove leading definite article from COMMENT - Fix indent - Add NO_ARCH PR: 216310 Submitted by: Jose M. Alcaide Approved by: ports-secteam (junovitch) Modified: branches/2017Q1/lang/python/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/lang/python/Makefile ============================================================================== --- branches/2017Q1/lang/python/Makefile Sat Jan 21 16:31:39 2017 (r432056) +++ branches/2017Q1/lang/python/Makefile Sat Jan 21 16:38:06 2017 (r432057) @@ -3,7 +3,7 @@ PORTNAME= python PORTVERSION= ${PYTHON_DEFAULT} -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 2 CATEGORIES= lang python ipv6 MASTER_SITES= # empty @@ -11,10 +11,11 @@ DISTFILES= # empty EXTRACT_ONLY= # empty MAINTAINER= python@FreeBSD.org -COMMENT= The "meta-port" for the default version of Python interpreter +COMMENT= "meta-port" for the default version of Python interpreter -USES= python:run -NO_BUILD= yes +USES= python:run +NO_ARCH= yes +NO_BUILD= yes PLIST_FILES= bin/2to3 \ bin/idle \ @@ -31,20 +32,11 @@ RUN_DEPENDS+= python3:lang/python3 .endif do-install: - ${LN} -sf python${PYTHON_MAJOR_VER} ${STAGEDIR}${PREFIX}/bin/python ${LN} -sf 2to3-${PYTHON_MAJOR_VER} ${STAGEDIR}${PREFIX}/bin/2to3 -.if ${PYTHON_MAJOR_VER} == 2 -.for file in idle pydoc +.for file in idle pydoc python ${LN} -sf ${file}${PYTHON_MAJOR_VER} ${STAGEDIR}${PREFIX}/bin/${file} .endfor -.elif ${PYTHON_MAJOR_VER} == 3 -.for file in idle pydoc - ${LN} -sf ${file}${PYTHON_MAJOR_VER}-${PYTHON_VER} \ - ${STAGEDIR}${PREFIX}/bin/${file} -.endfor -.endif - ${LN} -sf python${PYTHON_MAJOR_VER}-config \ - ${STAGEDIR}${PREFIX}/bin/python-config + ${LN} -sf python${PYTHON_MAJOR_VER}-config ${STAGEDIR}${PREFIX}/bin/python-config # Major upgrade support PORTUPGRADE_CMD= ${LOCALBASE}/sbin/portupgrade From owner-svn-ports-branches@freebsd.org Sat Jan 21 23:24:19 2017 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 7E197CBB635; Sat, 21 Jan 2017 23:24:19 +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 4D66DE14; Sat, 21 Jan 2017 23:24:19 +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 v0LNOIBv091991; Sat, 21 Jan 2017 23:24:18 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0LNOI8s091990; Sat, 21 Jan 2017 23:24:18 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701212324.v0LNOI8s091990@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 21 Jan 2017 23:24:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r432092 - branches/2017Q1/science/openbabel 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.23 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, 21 Jan 2017 23:24:19 -0000 Author: jbeich Date: Sat Jan 21 23:24:18 2017 New Revision: 432092 URL: https://svnweb.freebsd.org/changeset/ports/432092 Log: MFH: r432091 science/openbabel: unbreak with GCC >= 6 GCC defaults to C++14 since 6.0 which no longer converts istream to bool by default. Instead of fixing just downgrade to C++98. PR: 216036 Approved by: ports-secteam blanket Modified: branches/2017Q1/science/openbabel/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/science/openbabel/Makefile ============================================================================== --- branches/2017Q1/science/openbabel/Makefile Sat Jan 21 23:12:18 2017 (r432091) +++ branches/2017Q1/science/openbabel/Makefile Sat Jan 21 23:24:18 2017 (r432092) @@ -16,6 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/eige CONFLICTS_INSTALL= babel-* +USE_CXXSTD= gnu++98 USE_GNOME= libxml2 USES= cmake:outsource CMAKE_ARGS= -DBUILD_GUI=off