From owner-svn-ports-branches@freebsd.org Sun Apr 3 00:02:50 2016 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 3B721B01A43; Sun, 3 Apr 2016 00:02:50 +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 1663419FF; Sun, 3 Apr 2016 00:02:50 +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 u3302n7C091333; Sun, 3 Apr 2016 00:02:49 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3302nJQ091330; Sun, 3 Apr 2016 00:02:49 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201604030002.u3302nJQ091330@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sun, 3 Apr 2016 00:02:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412437 - in branches/2016Q2/www/squid: . 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.21 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, 03 Apr 2016 00:02:50 -0000 Author: junovitch Date: Sun Apr 3 00:02:48 2016 New Revision: 412437 URL: https://svnweb.freebsd.org/changeset/ports/412437 Log: MFH: r412410 Update to upstream version 3.5.16 PR: 208463 Submitted by: timp87@gmail.com (maintainer) Approved by: ports-secteam (with hat) Security: CVE-2016-3947 Security: CVE-2016-3948 Security: https://vuxml.FreeBSD.org/freebsd/297117ba-f92d-11e5-92ce-002590263bf5.html Modified: branches/2016Q2/www/squid/Makefile branches/2016Q2/www/squid/distinfo branches/2016Q2/www/squid/files/patch-configure Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/www/squid/Makefile ============================================================================== --- branches/2016Q2/www/squid/Makefile Sun Apr 3 00:00:26 2016 (r412436) +++ branches/2016Q2/www/squid/Makefile Sun Apr 3 00:02:48 2016 (r412437) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= squid -PORTVERSION= 3.5.15 -PORTREVISION= 2 +PORTVERSION= 3.5.16 CATEGORIES= www ipv6 MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ @@ -18,22 +17,6 @@ PATCH_SITES= http://www.squid-cache.org/ http://www1.jp.squid-cache.org/%SUBDIR%/ \ http://master.squid-cache.org/~amosjeffries/patches/:nosid PATCH_SITE_SUBDIR= Versions/v3/${PORTVERSION:R}/changesets -PATCHFILES= squid-3.5-13997.patch \ - squid-3.5-13998.patch \ - squid-3.5-13999.patch \ - squid-3.5-14000.patch \ - squid-3.5-14001.patch \ - squid-3.5-14002.patch \ - squid-3.5-14003.patch \ - squid-3.5-14004.patch \ - squid-3.5-14005.patch \ - squid-3.5-14006.patch \ - squid-3.5-14007.patch \ - squid-3.5-14008.patch \ - squid-3.5-14009.patch \ - squid-3.5-14010.patch \ - squid-3.5-14011.patch \ - squid-3.5-14012.patch MAINTAINER= timp87@gmail.com COMMENT= HTTP Caching Proxy Modified: branches/2016Q2/www/squid/distinfo ============================================================================== --- branches/2016Q2/www/squid/distinfo Sun Apr 3 00:00:26 2016 (r412436) +++ branches/2016Q2/www/squid/distinfo Sun Apr 3 00:02:48 2016 (r412437) @@ -1,34 +1,2 @@ -SHA256 (squid3.5/squid-3.5.15.tar.xz) = 9cfce3231c7b3b33816fc54414d8720a51ac5e723663e0685a8bb995b9f450d2 -SIZE (squid3.5/squid-3.5.15.tar.xz) = 2315628 -SHA256 (squid3.5/squid-3.5-13997.patch) = 43533b41af0e5d067c576de87842b85a33bac9b293c19d816fa1475324eb89fd -SIZE (squid3.5/squid-3.5-13997.patch) = 1509 -SHA256 (squid3.5/squid-3.5-13998.patch) = c53a9d3e48224b06eedb5867b248e1b1c1226deab73c7c4d9ce8f72524e91214 -SIZE (squid3.5/squid-3.5-13998.patch) = 8184 -SHA256 (squid3.5/squid-3.5-13999.patch) = 07e82e0b7f0d766de443277f1153165177c867cbc75514890f2fe4de8d43c820 -SIZE (squid3.5/squid-3.5-13999.patch) = 1585 -SHA256 (squid3.5/squid-3.5-14000.patch) = 36578a13e87150d1604b543c68b419de1c941be3f90e80fbf464f9c23139e2de -SIZE (squid3.5/squid-3.5-14000.patch) = 1676 -SHA256 (squid3.5/squid-3.5-14001.patch) = 127720c408c368070b7807092faae7980d900888f8bbaee0e2689b86573fea94 -SIZE (squid3.5/squid-3.5-14001.patch) = 14099 -SHA256 (squid3.5/squid-3.5-14002.patch) = 49c8dea344473c103fefce2b830e96fe94af14bc20640a0c244eea01ac03469d -SIZE (squid3.5/squid-3.5-14002.patch) = 2054 -SHA256 (squid3.5/squid-3.5-14003.patch) = 27ccd9aeabf4e66fbf25a914cc614c8f8020c8010e94d2b6bf499def79fce8b6 -SIZE (squid3.5/squid-3.5-14003.patch) = 1636 -SHA256 (squid3.5/squid-3.5-14004.patch) = fc515a51866d518f4ff7e57ef92f2554d2715b59f547927af63192302238690f -SIZE (squid3.5/squid-3.5-14004.patch) = 1948 -SHA256 (squid3.5/squid-3.5-14005.patch) = e7f17a11cb49742f6b535e8e4e8558e03f71335524c524f84f1ef68f71f99b93 -SIZE (squid3.5/squid-3.5-14005.patch) = 1249 -SHA256 (squid3.5/squid-3.5-14006.patch) = 88dd50a459ed68fb7c797a840f92a0ada6655b3fb92052f679088704eb1d9f32 -SIZE (squid3.5/squid-3.5-14006.patch) = 2500 -SHA256 (squid3.5/squid-3.5-14007.patch) = 1e2e14809e7ca8608300cfc3be027cd55c21fbe3084cc4568c8091adebc256c0 -SIZE (squid3.5/squid-3.5-14007.patch) = 1214 -SHA256 (squid3.5/squid-3.5-14008.patch) = 6c2f511ee33d74d1c91cae5ef0a9645facf0104067397866dd542bf3ff975255 -SIZE (squid3.5/squid-3.5-14008.patch) = 1559 -SHA256 (squid3.5/squid-3.5-14009.patch) = addc7dd78c5632b428f747eab93382195d2d4a820742afd2661ec920f1dc9a77 -SIZE (squid3.5/squid-3.5-14009.patch) = 1902 -SHA256 (squid3.5/squid-3.5-14010.patch) = bed1fb437b3f3925293d42c7032c44c7aa4e1944cc6ed17e9cc9e498a06ada7c -SIZE (squid3.5/squid-3.5-14010.patch) = 2974 -SHA256 (squid3.5/squid-3.5-14011.patch) = c87ce0edb4dcb1f0ae49fb10006009534ce1e5922a4ceb8d784386681ce4b164 -SIZE (squid3.5/squid-3.5-14011.patch) = 2400 -SHA256 (squid3.5/squid-3.5-14012.patch) = 6f749e014907150cc9692b16edcb9d9a73fdb3831c718d908bd7c48561702b3c -SIZE (squid3.5/squid-3.5-14012.patch) = 1287 +SHA256 (squid3.5/squid-3.5.16.tar.xz) = e73d821180eed8bed230f357c680c0b19f1efa51a24725e810f2b48a2079d385 +SIZE (squid3.5/squid-3.5.16.tar.xz) = 2317320 Modified: branches/2016Q2/www/squid/files/patch-configure ============================================================================== --- branches/2016Q2/www/squid/files/patch-configure Sun Apr 3 00:00:26 2016 (r412436) +++ branches/2016Q2/www/squid/files/patch-configure Sun Apr 3 00:02:48 2016 (r412437) @@ -1,23 +1,5 @@ --- configure.orig 2015-11-01 10:46:19 UTC +++ configure -@@ -27731,7 +27731,7 @@ - squid_pc_krb5_name="heimdal-gssapi" - fi - fi -- if test "x$squid_pc_krb5_name" != "x" -a "$cross_compiling" = "no"; then -+ if test "x$squid_pc_krb5_name" = "x" -a "$cross_compiling" = "no"; then - # Look for krb5-config (unless cross-compiling) - # Extract the first word of "krb5-config", so it can be a program name with args. - set dummy krb5-config; ac_word=$2 -@@ -27777,7 +27777,7 @@ - if test "x$ac_cv_path_krb5_config" != "xno" ; then - krb5confpath="`dirname $ac_cv_path_krb5_config`" - ac_heimdal="`$ac_cv_path_krb5_config --version 2>/dev/null | grep -c -i heimdal`" -- if test "x$with_heimdal_krb5" = "xyes"; then -+ if test "x$with_heimdal_krb5" = "xyes" -a $ac_heimdal = 0; then - as_fn_error $? "Could not find pkg-config or krb5-config for Heimdal Kerberos" "$LINENO" 5 - fi - else @@ -32038,7 +32040,7 @@ done ## From owner-svn-ports-branches@freebsd.org Sun Apr 3 10:42:15 2016 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 385F5B01C82; Sun, 3 Apr 2016 10:42:15 +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 05BE61440; Sun, 3 Apr 2016 10:42:14 +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 u33AgEsY083869; Sun, 3 Apr 2016 10:42:14 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u33AgEDD083868; Sun, 3 Apr 2016 10:42:14 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201604031042.u33AgEDD083868@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sun, 3 Apr 2016 10:42:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412459 - branches/2016Q2/graphics/kipi-plugins-kde4 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.21 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, 03 Apr 2016 10:42:15 -0000 Author: rakuco Date: Sun Apr 3 10:42:13 2016 New Revision: 412459 URL: https://svnweb.freebsd.org/changeset/ports/412459 Log: MFH: r412458 Fix package names in the dependencies added in r412429. This fixes errors such as: ===> kipi-plugins-4.2.0_1,1 depends on package: digikam-kde4-doc>=4.2.0 - not found that effectively broke the port after my previous commit. Approved by: portmgr blanket approval Modified: branches/2016Q2/graphics/kipi-plugins-kde4/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/graphics/kipi-plugins-kde4/Makefile ============================================================================== --- branches/2016Q2/graphics/kipi-plugins-kde4/Makefile Sun Apr 3 10:41:02 2016 (r412458) +++ branches/2016Q2/graphics/kipi-plugins-kde4/Makefile Sun Apr 3 10:42:13 2016 (r412459) @@ -28,7 +28,7 @@ ${plugin:tu}_DESC= ${${plugin}_DESC} ${plugin:tu}_RUN_DEPENDS= kipi-plugin-${plugin}>=${DIGIKAM_VER}:graphics/kipi-plugin-${plugin} .endfor -NLS_RUN_DEPENDS= digikam-kde4-l10n>=${DIGIKAM_VER}:graphics/digikam-kde4-l10n -DOCS_RUN_DEPENDS= digikam-kde4-doc>=${DIGIKAM_VER}:graphics/digikam-kde4-doc +NLS_RUN_DEPENDS= digikam-l10n>=${DIGIKAM_VER}:graphics/digikam-kde4-l10n +DOCS_RUN_DEPENDS= digikam-doc>=${DIGIKAM_VER}:graphics/digikam-kde4-doc .include From owner-svn-ports-branches@freebsd.org Sun Apr 3 13:25:49 2016 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 5AA54ADE0D0; Sun, 3 Apr 2016 13:25:49 +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 119E01C4B; Sun, 3 Apr 2016 13:25:48 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u33DPmui032420; Sun, 3 Apr 2016 13:25:48 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u33DPm5F032419; Sun, 3 Apr 2016 13:25:48 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201604031325.u33DPm5F032419@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sun, 3 Apr 2016 13:25:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412470 - branches/2016Q2/emulators/pipelight 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.21 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, 03 Apr 2016 13:25:49 -0000 Author: rakuco Date: Sun Apr 3 13:25:48 2016 New Revision: 412470 URL: https://svnweb.freebsd.org/changeset/ports/412470 Log: MFH: r412468 Re-roll pluginloader entries in distinfo. The port broke in the beginning of February when upstream uploaded a new pluginloader tarball to MASTER_SITES. Since the tarball is unversioned and only contains prebuilt Windows binaries, here's an attempt at explaining what happened (thanks to Grzegorz Junka for the investigation): - Pipelight seems to be really bad at communication. The "News" section on the website says 0.2.8 is the latest version. - The "Compile Pipelight" section says 0.2.8.1 is the latest version. - 0.2.8.2 was tagged in BitBucket in October 2015 but was never announced anywhere on the website, and the project does not seem to have a mailing list. - The pluginloader tarballs, which contain prebuilt Windows binaries for Pipelight's src/windows directory, were not updated at the time 0.2.8.2 was tagged (the SHA256 checksums match those in the 0.2.8.1 directory in MASTER_SITES). This only happened in February 2016, which broke our distinfo. Note that it is unclear why the pluginloader tarballs were not generated in October, and since those are binary blobs it is still possible that they do not correspond to their respective source files. In the future, it would be good to build those binaries with our MinGW ports instead of relying on those blobs. PR: 207210 Submitted by: Piotr Kubaj , Grzegorz Junka Approved by: ports-secteam (junovitch) Modified: branches/2016Q2/emulators/pipelight/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/emulators/pipelight/distinfo ============================================================================== --- branches/2016Q2/emulators/pipelight/distinfo Sun Apr 3 13:23:47 2016 (r412469) +++ branches/2016Q2/emulators/pipelight/distinfo Sun Apr 3 13:25:48 2016 (r412470) @@ -1,6 +1,6 @@ SHA256 (pipelight/v0.2.8.2.tar.gz) = 13ca5fb18cd68f63137a0dded5a4d0811aa78b033918a3331953903ced34decf SIZE (pipelight/v0.2.8.2.tar.gz) = 153877 -SHA256 (pipelight/pluginloader.tar.gz) = eba80a1afe6b9a4de34070dfec27d358036326c7dbd487830d0616dd33f37c4d -SIZE (pipelight/pluginloader.tar.gz) = 809672 -SHA256 (pipelight/pluginloader.tar.gz.sig) = ef5346c698c0889d28c2d28358461bfa95f7b343bd0c6c00e4ea73db07c90625 +SHA256 (pipelight/pluginloader.tar.gz) = 1a2c2a94c171152545b1b86d48392d2179ab2339826f5bd8fda81a3094c6174b +SIZE (pipelight/pluginloader.tar.gz) = 1107980 +SHA256 (pipelight/pluginloader.tar.gz.sig) = e00c657ba0a7351e08dd66e91ba3f2125c50b4e66af7a66ca1881a4038453e9c SIZE (pipelight/pluginloader.tar.gz.sig) = 543 From owner-svn-ports-branches@freebsd.org Sun Apr 3 13:44:14 2016 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 2767CADE7A1; Sun, 3 Apr 2016 13:44:14 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D26431554; Sun, 3 Apr 2016 13:44:13 +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 u33DiDRi038594; Sun, 3 Apr 2016 13:44:13 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u33DiCaD038592; Sun, 3 Apr 2016 13:44:12 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201604031344.u33DiCaD038592@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sun, 3 Apr 2016 13:44:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412473 - in branches/2016Q2/devel/pcre: . 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.21 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, 03 Apr 2016 13:44:14 -0000 Author: junovitch Date: Sun Apr 3 13:44:12 2016 New Revision: 412473 URL: https://svnweb.freebsd.org/changeset/ports/412473 Log: MFH: r412472 devel/pcre: Add patch to resolve heap overflow vulnerability PR: 208260 Reported by: Sevan Janiyan Approved by: ports-secteam (with hat) Obtained from: PCRE svn (r1636) Security: CVE-2016-1283 Security: https://vuxml.FreeBSD.org/freebsd/497b82e0-f9a0-11e5-92ce-002590263bf5.html Added: branches/2016Q2/devel/pcre/files/patch-CVE-2016-1283 - copied unchanged from r412472, head/devel/pcre/files/patch-CVE-2016-1283 Modified: branches/2016Q2/devel/pcre/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/devel/pcre/Makefile ============================================================================== --- branches/2016Q2/devel/pcre/Makefile Sun Apr 3 13:43:29 2016 (r412472) +++ branches/2016Q2/devel/pcre/Makefile Sun Apr 3 13:44:12 2016 (r412473) @@ -3,7 +3,7 @@ PORTNAME= pcre PORTVERSION= 8.38 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \ ftp://ftp.csx.cam.ac.uk/pub/software/programming/${PORTNAME}/ \ Copied: branches/2016Q2/devel/pcre/files/patch-CVE-2016-1283 (from r412472, head/devel/pcre/files/patch-CVE-2016-1283) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/devel/pcre/files/patch-CVE-2016-1283 Sun Apr 3 13:44:12 2016 (r412473, copy of r412472, head/devel/pcre/files/patch-CVE-2016-1283) @@ -0,0 +1,18 @@ +Index: pcre_compile.c +=================================================================== +--- pcre_compile.c (revision 1635) ++++ pcre_compile.c (revision 1636) +@@ -7311,7 +7311,12 @@ + so far in order to get the number. If the name is not found, leave + the value of recno as 0 for a forward reference. */ + +- else ++ /* This patch (removing "else") fixes a problem when a reference is ++ to multiple identically named nested groups from within the nest. ++ Once again, it is not the "proper" fix, and it results in an ++ over-allocation of memory. */ ++ ++ /* else */ + { + ng = cd->named_groups; + for (i = 0; i < cd->names_found; i++, ng++) From owner-svn-ports-branches@freebsd.org Sun Apr 3 14:21:57 2016 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 0D128B0047A; Sun, 3 Apr 2016 14:21:57 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C0ED51584; Sun, 3 Apr 2016 14:21:56 +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 u33ELtHg051089; Sun, 3 Apr 2016 14:21:55 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u33ELt0N051084; Sun, 3 Apr 2016 14:21:55 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201604031421.u33ELt0N051084@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sun, 3 Apr 2016 14:21:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412478 - in branches/2016Q2: converters/php55-mbstring graphics/php55-gd lang/php55 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 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, 03 Apr 2016 14:21:57 -0000 Author: junovitch Date: Sun Apr 3 14:21:55 2016 New Revision: 412478 URL: https://svnweb.freebsd.org/changeset/ports/412478 Log: MFH: r412475 lang/php55: update 5.5.33 -> 5.5.34 converters/php55-mbstring,graphics/php55-gd: chase update; drop PORTREVISION Changelog: http://www.php.net/ChangeLog-5.php#5.5.34 Approved by: ports-secteam (with hat) Security: https://vuxml.FreeBSD.org/freebsd/482d40cb-f9a3-11e5-92ce-002590263bf5.html Modified: branches/2016Q2/converters/php55-mbstring/Makefile branches/2016Q2/graphics/php55-gd/Makefile branches/2016Q2/lang/php55/Makefile branches/2016Q2/lang/php55/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/converters/php55-mbstring/Makefile ============================================================================== --- branches/2016Q2/converters/php55-mbstring/Makefile Sun Apr 3 14:20:22 2016 (r412477) +++ branches/2016Q2/converters/php55-mbstring/Makefile Sun Apr 3 14:21:55 2016 (r412478) @@ -1,7 +1,6 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= converters MASTERDIR= ${.CURDIR}/../../lang/php55 Modified: branches/2016Q2/graphics/php55-gd/Makefile ============================================================================== --- branches/2016Q2/graphics/php55-gd/Makefile Sun Apr 3 14:20:22 2016 (r412477) +++ branches/2016Q2/graphics/php55-gd/Makefile Sun Apr 3 14:21:55 2016 (r412478) @@ -1,7 +1,6 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= graphics MASTERDIR= ${.CURDIR}/../../lang/php55 Modified: branches/2016Q2/lang/php55/Makefile ============================================================================== --- branches/2016Q2/lang/php55/Makefile Sun Apr 3 14:20:22 2016 (r412477) +++ branches/2016Q2/lang/php55/Makefile Sun Apr 3 14:21:55 2016 (r412478) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php55 -PORTVERSION= 5.5.33 +PORTVERSION= 5.5.34 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions Modified: branches/2016Q2/lang/php55/distinfo ============================================================================== --- branches/2016Q2/lang/php55/distinfo Sun Apr 3 14:20:22 2016 (r412477) +++ branches/2016Q2/lang/php55/distinfo Sun Apr 3 14:21:55 2016 (r412478) @@ -1,4 +1,4 @@ -SHA256 (php-5.5.33.tar.bz2) = c490b1ed4df596b48eb68f630d89ca512945e2650840e7dace1119cc7e600aa9 -SIZE (php-5.5.33.tar.bz2) = 13686486 +SHA256 (php-5.5.34.tar.bz2) = af88884416a92619de842ad0fd23f7f7e8140efb0b9194f98a38a78781e5851c +SIZE (php-5.5.34.tar.bz2) = 13686681 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 SIZE (php-5.5.x-mail-header.patch) = 3379 From owner-svn-ports-branches@freebsd.org Sun Apr 3 14:22:36 2016 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 08A2BB005B0; Sun, 3 Apr 2016 14:22:36 +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 B21C517CE; Sun, 3 Apr 2016 14:22:35 +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 u33EMYiM051301; Sun, 3 Apr 2016 14:22:34 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u33EMYLZ051298; Sun, 3 Apr 2016 14:22:34 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201604031422.u33EMYLZ051298@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sun, 3 Apr 2016 14:22:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412479 - in branches/2016Q2: converters/php56-mbstring 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.21 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, 03 Apr 2016 14:22:36 -0000 Author: junovitch Date: Sun Apr 3 14:22:34 2016 New Revision: 412479 URL: https://svnweb.freebsd.org/changeset/ports/412479 Log: MFH: r412476 lang/php56: update 5.6.19 -> 5.6.20 converters/php56-mbstring: chase update; drop PORTREVISION Changelog: http://www.php.net/ChangeLog-5.php#5.6.20 PR: 208465 Reported by: Christian Schwarz Approved by: ports-secteam (with hat) Security: https://vuxml.FreeBSD.org/freebsd/482d40cb-f9a3-11e5-92ce-002590263bf5.html Modified: branches/2016Q2/converters/php56-mbstring/Makefile branches/2016Q2/lang/php56/Makefile branches/2016Q2/lang/php56/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/converters/php56-mbstring/Makefile ============================================================================== --- branches/2016Q2/converters/php56-mbstring/Makefile Sun Apr 3 14:21:55 2016 (r412478) +++ branches/2016Q2/converters/php56-mbstring/Makefile Sun Apr 3 14:22:34 2016 (r412479) @@ -1,7 +1,6 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= converters MASTERDIR= ${.CURDIR}/../../lang/php56 Modified: branches/2016Q2/lang/php56/Makefile ============================================================================== --- branches/2016Q2/lang/php56/Makefile Sun Apr 3 14:21:55 2016 (r412478) +++ branches/2016Q2/lang/php56/Makefile Sun Apr 3 14:22:34 2016 (r412479) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php56 -PORTVERSION= 5.6.19 +PORTVERSION= 5.6.20 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions Modified: branches/2016Q2/lang/php56/distinfo ============================================================================== --- branches/2016Q2/lang/php56/distinfo Sun Apr 3 14:21:55 2016 (r412478) +++ branches/2016Q2/lang/php56/distinfo Sun Apr 3 14:22:34 2016 (r412479) @@ -1,4 +1,4 @@ -SHA256 (php-5.6.19.tar.bz2) = 2a24a3f84971680ac0a4c71050067de4f76ee235aa4a041fae21bfa69975c168 -SIZE (php-5.6.19.tar.bz2) = 14100438 +SHA256 (php-5.6.20.tar.bz2) = 5ac7bf7caec7a79b18cf458e786fd1609ad2da771224b80bc15cc6f01b22bf1f +SIZE (php-5.6.20.tar.bz2) = 14162188 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 SIZE (php-5.5.x-mail-header.patch) = 3379 From owner-svn-ports-branches@freebsd.org Sun Apr 3 14:23:02 2016 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 2E8D5B00618; Sun, 3 Apr 2016 14:23:02 +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 F39B318CE; Sun, 3 Apr 2016 14:23:01 +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 u33EN174051486; Sun, 3 Apr 2016 14:23:01 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u33EN1rR051484; Sun, 3 Apr 2016 14:23:01 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201604031423.u33EN1rR051484@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sun, 3 Apr 2016 14:23:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412480 - branches/2016Q2/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.21 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, 03 Apr 2016 14:23:02 -0000 Author: junovitch Date: Sun Apr 3 14:23:00 2016 New Revision: 412480 URL: https://svnweb.freebsd.org/changeset/ports/412480 Log: MFH: r412477 lang/php70: update 7.0.4 -> 7.0.5 Changelog: http://www.php.net/ChangeLog-7.php#7.0.5 Approved by: ports-secteam (with hat) Security: https://vuxml.FreeBSD.org/freebsd/482d40cb-f9a3-11e5-92ce-002590263bf5.html Modified: branches/2016Q2/lang/php70/Makefile branches/2016Q2/lang/php70/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/lang/php70/Makefile ============================================================================== --- branches/2016Q2/lang/php70/Makefile Sun Apr 3 14:22:34 2016 (r412479) +++ branches/2016Q2/lang/php70/Makefile Sun Apr 3 14:23:00 2016 (r412480) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php70 -PORTVERSION= 7.0.4 +PORTVERSION= 7.0.5 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions Modified: branches/2016Q2/lang/php70/distinfo ============================================================================== --- branches/2016Q2/lang/php70/distinfo Sun Apr 3 14:22:34 2016 (r412479) +++ branches/2016Q2/lang/php70/distinfo Sun Apr 3 14:23:00 2016 (r412480) @@ -1,2 +1,2 @@ -SHA256 (php-7.0.4.tar.bz2) = a246c503709c189ba8e1e22ed2cb22abc27da43a997ff1b3318e181baf529dcc -SIZE (php-7.0.4.tar.bz2) = 14027088 +SHA256 (php-7.0.5.tar.bz2) = 2c09af7fe64537ea795f098b9b542ead407ef83f7cdc65b3787115ccbbb51de9 +SIZE (php-7.0.5.tar.bz2) = 14086522 From owner-svn-ports-branches@freebsd.org Sun Apr 3 15:02:09 2016 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 4E00DB0151E; Sun, 3 Apr 2016 15:02:09 +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 1F0AB1E40; Sun, 3 Apr 2016 15:02:09 +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 u33F28ZD063008; Sun, 3 Apr 2016 15:02:08 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u33F28eg063007; Sun, 3 Apr 2016 15:02:08 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201604031502.u33F28eg063007@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sun, 3 Apr 2016 15:02:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412482 - branches/2016Q2/security/strongswan/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.21 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, 03 Apr 2016 15:02:09 -0000 Author: junovitch Date: Sun Apr 3 15:02:08 2016 New Revision: 412482 URL: https://svnweb.freebsd.org/changeset/ports/412482 Log: MFH: r412481 security/strongswan: unbreak FreeBSD 9 builds - Add patch to include sys/endian.h header PR: 208446 Submitted by: strongswan@Nanoteq.com (maintainer) Approved by: ports-secteam (build fix blanket) Added: branches/2016Q2/security/strongswan/files/patch-src_libstrongswan_utils_utils_byteorder.h - copied unchanged from r412481, head/security/strongswan/files/patch-src_libstrongswan_utils_utils_byteorder.h Modified: Directory Properties: branches/2016Q2/ (props changed) Copied: branches/2016Q2/security/strongswan/files/patch-src_libstrongswan_utils_utils_byteorder.h (from r412481, head/security/strongswan/files/patch-src_libstrongswan_utils_utils_byteorder.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/security/strongswan/files/patch-src_libstrongswan_utils_utils_byteorder.h Sun Apr 3 15:02:08 2016 (r412482, copy of r412481, head/security/strongswan/files/patch-src_libstrongswan_utils_utils_byteorder.h) @@ -0,0 +1,13 @@ +--- src/libstrongswan/utils/utils/byteorder.h.orig 2016-03-29 06:56:52 UTC ++++ src/libstrongswan/utils/utils/byteorder.h +@@ -22,6 +22,10 @@ + #ifndef BYTEORDER_H_ + #define BYTEORDER_H_ + ++#if defined(__FreeBSD__) ++#include ++#endif ++ + /** + * Architecture independent bitfield definition helpers (at least with GCC). + * From owner-svn-ports-branches@freebsd.org Mon Apr 4 02:25:57 2016 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 60CDDB0207A; Mon, 4 Apr 2016 02:25:57 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3219B1659; Mon, 4 Apr 2016 02:25:57 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u342PuF4071694; Mon, 4 Apr 2016 02:25:56 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u342PuHq071693; Mon, 4 Apr 2016 02:25:56 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201604040225.u342PuHq071693@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Mon, 4 Apr 2016 02:25:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412496 - in branches/2016Q2/textproc: . kibana45 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.21 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, 04 Apr 2016 02:25:57 -0000 Author: junovitch Date: Mon Apr 4 02:25:56 2016 New Revision: 412496 URL: https://svnweb.freebsd.org/changeset/ports/412496 Log: MFH: r412494 New Port: textproc/kibana45 Repo copy textproc/kibana42 to textproc/kibana45: - Update PORTVERSION, PKGNAMESUFFIX, RUN_DEPENDS, pkg-plist, and distinfo for 4.5.0. Kibana is an open source (Apache Licensed), browser based analytics and search dashboard for Elasticsearch. Kibana is a snap to setup and start using. Kibana strives to be easy to get started with, while also being flexible and powerful, just like Elasticsearch. Kibana 4.5 is compatible with Elasticsearch 2.3.x. WWW: https://www.elastic.co/products/kibana MFH this addition as the textproc/elasticsearch2 in 2016Q2 is not compatible with any version of Kibana in 2016Q2. This services end users with ELK stacks on distinct hosts but not an all inclusive ELK stack on one host. Add Kibana 4.5 so end users can install the entire ELK stack from the quarterly branch. PR: 208492 Submitted by: Sergey Kozlov Approved by: ports-secteam (with hat) Added: branches/2016Q2/textproc/kibana45/ - copied from r412494, head/textproc/kibana45/ Modified: branches/2016Q2/textproc/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/textproc/Makefile ============================================================================== --- branches/2016Q2/textproc/Makefile Mon Apr 4 01:39:56 2016 (r412495) +++ branches/2016Q2/textproc/Makefile Mon Apr 4 02:25:56 2016 (r412496) @@ -364,6 +364,7 @@ SUBDIR += kibana42 SUBDIR += kibana43 SUBDIR += kibana44 + SUBDIR += kibana45 SUBDIR += kmfl-european-latin SUBDIR += kmfl-khmer SUBDIR += kmfl-sil-ezra From owner-svn-ports-branches@freebsd.org Tue Apr 5 06:57:52 2016 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 8857AB038F7; Tue, 5 Apr 2016 06:57:52 +0000 (UTC) (envelope-from dim@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 385AE1C3C; Tue, 5 Apr 2016 06:57:52 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u356vp4G091656; Tue, 5 Apr 2016 06:57:51 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u356vpgf091655; Tue, 5 Apr 2016 06:57:51 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201604050657.u356vpgf091655@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 5 Apr 2016 06:57:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412545 - branches/2016Q2/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.21 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, 05 Apr 2016 06:57:52 -0000 Author: dim (src committer) Date: Tue Apr 5 06:57:51 2016 New Revision: 412545 URL: https://svnweb.freebsd.org/changeset/ports/412545 Log: MFH: r412524 During the exp-run in bug 208158, it was found that comms/telldus-core gives errors with libc++ 3.8.0 [1]: /wrkdirs/usr/ports/comms/telldus-core/work/telldus-core-2.1.2/service/ProtocolNexa.cpp:59:8: error: call to member function 'insert' is ambiguous str.insert(0, 1, 2); // Repeat two times ~~~~^~~~~~ This is because the third argument to this std::string method is supposed to be a char, not an integer. Fix it by using '\x2' instead. [1] http://package18.nyi.freebsd.org/data/headamd64PR208158-default/2016-03-22_18h30m05s/logs/errors/telldus-core-2.1.2_1.log Approved by: portmgr (junovitch) Approved by: johan@stromnet.se (maintainer) PR: 208523 Added: branches/2016Q2/comms/telldus-core/files/patch-service-ProtocolNexa.cpp - copied unchanged from r412524, head/comms/telldus-core/files/patch-service-ProtocolNexa.cpp Modified: Directory Properties: branches/2016Q2/ (props changed) Copied: branches/2016Q2/comms/telldus-core/files/patch-service-ProtocolNexa.cpp (from r412524, head/comms/telldus-core/files/patch-service-ProtocolNexa.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/comms/telldus-core/files/patch-service-ProtocolNexa.cpp Tue Apr 5 06:57:51 2016 (r412545, copy of r412524, head/comms/telldus-core/files/patch-service-ProtocolNexa.cpp) @@ -0,0 +1,11 @@ +--- service/ProtocolNexa.cpp.orig 2014-03-31 12:30:09.000000000 +0200 ++++ service/ProtocolNexa.cpp 2016-04-04 13:32:35.124699000 +0200 +@@ -56,7 +56,7 @@ std::string ProtocolNexa::getStringForMe + // We also return the last packet so Device::doAction() doesn't + // report TELLSTICK_ERROR_METHOD_NOT_SUPPORTED + +- str.insert(0, 1, 2); // Repeat two times ++ str.insert(0, 1, '\x2'); // Repeat two times + str.insert(0, 1, 'R'); + for (int i = 0; i < 5; ++i) { + controller->send(str); From owner-svn-ports-branches@freebsd.org Tue Apr 5 18:17:25 2016 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 05C1FB03324; Tue, 5 Apr 2016 18:17:25 +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 CA9811E55; Tue, 5 Apr 2016 18:17:24 +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 u35IHOs2097758; Tue, 5 Apr 2016 18:17:24 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u35IHOoE097757; Tue, 5 Apr 2016 18:17:24 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201604051817.u35IHOoE097757@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Tue, 5 Apr 2016 18:17:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412581 - branches/2016Q2/textproc/py-sparqlwrapper 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.21 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, 05 Apr 2016 18:17:25 -0000 Author: antoine Date: Tue Apr 5 18:17:23 2016 New Revision: 412581 URL: https://svnweb.freebsd.org/changeset/ports/412581 Log: MFH: r412580 Unbreak at runtime Modified: branches/2016Q2/textproc/py-sparqlwrapper/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/textproc/py-sparqlwrapper/Makefile ============================================================================== --- branches/2016Q2/textproc/py-sparqlwrapper/Makefile Tue Apr 5 18:16:46 2016 (r412580) +++ branches/2016Q2/textproc/py-sparqlwrapper/Makefile Tue Apr 5 18:17:23 2016 (r412581) @@ -3,6 +3,7 @@ PORTNAME= sparqlwrapper PORTVERSION= 1.7.6 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,4 +16,7 @@ NO_ARCH= yes USES= python USE_PYTHON= autoplist distutils +post-patch: + @${REINPLACE_CMD} '/keepalive/d' ${WRKSRC}/requirements.txt + .include From owner-svn-ports-branches@freebsd.org Tue Apr 5 18:34:37 2016 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 7DFD5B03906; Tue, 5 Apr 2016 18:34:37 +0000 (UTC) (envelope-from adamw@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 51BFE17B7; Tue, 5 Apr 2016 18:34:37 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u35IYaZA003908; Tue, 5 Apr 2016 18:34:36 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u35IYapI003904; Tue, 5 Apr 2016 18:34:36 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201604051834.u35IYapI003904@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Tue, 5 Apr 2016 18:34:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412582 - in branches/2016Q2: . japanese/spamassassin mail/spamassassin mail/spamassassin/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.21 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, 05 Apr 2016 18:34:37 -0000 Author: adamw Date: Tue Apr 5 18:34:35 2016 New Revision: 412582 URL: https://svnweb.freebsd.org/changeset/ports/412582 Log: MFH: r412519 Fix build/test without SSLv3, and enable TLSv1.1 and TLSv1.2. This is a patch made by Debian's own Noah Meyerhans that fixes or removes the tests that choke when OpenSSL is built without SSLv3 support (and in all current versions of LibreSSL), and lets IO::Socket::SSL choose the best TLS level rather than forcing it at TLSv1. PORTREVISION bump. PR: 208225 Submitted by: Sascha Holzleiter Obtained from: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7199 Approved by: ports-secteam (feld) Added: branches/2016Q2/mail/spamassassin/files/patch-bug7199 - copied unchanged from r412519, head/mail/spamassassin/files/patch-bug7199 Modified: branches/2016Q2/UPDATING branches/2016Q2/japanese/spamassassin/Makefile branches/2016Q2/mail/spamassassin/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/UPDATING ============================================================================== --- branches/2016Q2/UPDATING Tue Apr 5 18:17:23 2016 (r412581) +++ branches/2016Q2/UPDATING Tue Apr 5 18:34:35 2016 (r412582) @@ -5,6 +5,15 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20160404: + AFFECTS: mail/spamassassin + AUTHOR: adamw@FreeBSD.org + + Support for SSLv3 has been removed from SpamAssassin, because + SSLv3 is a Bad Idea. No direct option is provided to re-enable it. + If your setup requires use of SSLv3, some instructions are available + in FreeBSD PR 208225. + 20160331: AFFECTS: security/clamav-unofficial-sigs AUTHOR: lukasz@wasikowski.net, sf@maxempire.com Modified: branches/2016Q2/japanese/spamassassin/Makefile ============================================================================== --- branches/2016Q2/japanese/spamassassin/Makefile Tue Apr 5 18:17:23 2016 (r412581) +++ branches/2016Q2/japanese/spamassassin/Makefile Tue Apr 5 18:34:35 2016 (r412582) @@ -1,7 +1,7 @@ # Created by: TAOKA Fumiyoshi # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese mail perl5 PKGNAMEPREFIX= ja- Modified: branches/2016Q2/mail/spamassassin/Makefile ============================================================================== --- branches/2016Q2/mail/spamassassin/Makefile Tue Apr 5 18:17:23 2016 (r412581) +++ branches/2016Q2/mail/spamassassin/Makefile Tue Apr 5 18:34:35 2016 (r412582) @@ -3,7 +3,7 @@ PORTNAME= spamassassin PORTVERSION= 3.4.1 -PORTREVISION?= 5 # also bump japanese/spamassassin +PORTREVISION?= 6 # also bump japanese/spamassassin CATEGORIES?= mail perl5 MASTER_SITES= APACHE/spamassassin/source CPAN/Mail DISTNAME= Mail-SpamAssassin-${PORTVERSION} Copied: branches/2016Q2/mail/spamassassin/files/patch-bug7199 (from r412519, head/mail/spamassassin/files/patch-bug7199) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/mail/spamassassin/files/patch-bug7199 Tue Apr 5 18:34:35 2016 (r412582, copy of r412519, head/mail/spamassassin/files/patch-bug7199) @@ -0,0 +1,258 @@ +--- spamc/libspamc.c.orig ++++ spamc/libspamc.c +@@ -1187,7 +1187,7 @@ int message_filter(struct transport *tp, + unsigned int throwaway; + SSL_CTX *ctx = NULL; + SSL *ssl = NULL; +- SSL_METHOD *meth; ++ const SSL_METHOD *meth; + char zlib_on = 0; + unsigned char *zlib_buf = NULL; + int zlib_bufsiz = 0; +@@ -1213,11 +1213,7 @@ int message_filter(struct transport *tp, + if (flags & SPAMC_USE_SSL) { + #ifdef SPAMC_SSL + SSLeay_add_ssl_algorithms(); +- if (flags & SPAMC_TLSV1) { +- meth = TLSv1_client_method(); +- } else { +- meth = SSLv3_client_method(); /* default */ +- } ++ meth = SSLv23_client_method(); + SSL_load_error_strings(); + ctx = SSL_CTX_new(meth); + #else +@@ -1596,7 +1592,7 @@ int message_tell(struct transport *tp, c + int failureval; + SSL_CTX *ctx = NULL; + SSL *ssl = NULL; +- SSL_METHOD *meth; ++ const SSL_METHOD *meth; + + assert(tp != NULL); + assert(m != NULL); +@@ -1604,7 +1600,7 @@ int message_tell(struct transport *tp, c + if (flags & SPAMC_USE_SSL) { + #ifdef SPAMC_SSL + SSLeay_add_ssl_algorithms(); +- meth = SSLv3_client_method(); ++ meth = SSLv23_client_method(); + SSL_load_error_strings(); + ctx = SSL_CTX_new(meth); + #else +--- spamc/spamc.c.orig ++++ spamc/spamc.c +@@ -368,16 +368,11 @@ read_args(int argc, char **argv, + case 'S': + { + flags |= SPAMC_USE_SSL; +- if (!spamc_optarg || (strcmp(spamc_optarg,"sslv3") == 0)) { +- flags |= SPAMC_SSLV3; +- } +- else if (strcmp(spamc_optarg,"tlsv1") == 0) { +- flags |= SPAMC_TLSV1; +- } +- else { +- libspamc_log(flags, LOG_ERR, "Please specify a legal ssl version (%s)", spamc_optarg); +- ret = EX_USAGE; +- } ++ if(spamc_optarg) { ++ libspamc_log(flags, LOG_ERR, ++ "Explicit specification of an SSL/TLS version no longer supported."); ++ ret = EX_USAGE; ++ } + break; + } + #endif +--- spamd/spamd.raw.orig ++++ spamd/spamd.raw +@@ -409,7 +409,6 @@ GetOptions( + 'sql-config!' => \$opt{'sql-config'}, + 'ssl' => \$opt{'ssl'}, + 'ssl-port=s' => \$opt{'ssl-port'}, +- 'ssl-version=s' => \$opt{'ssl-version'}, + 'syslog-socket=s' => \$opt{'syslog-socket'}, + 'syslog|s=s' => \$opt{'syslog'}, + 'log-timestamp-fmt:s' => \$opt{'log-timestamp-fmt'}, +@@ -744,11 +743,6 @@ if ( defined $ENV{'HOME'} ) { + + # Do whitelist later in tmp dir. Side effect: this will be done as -u user. + +-my $sslversion = $opt{'ssl-version'} || 'sslv3'; +-if ($sslversion !~ /^(?:sslv3|tlsv1)$/) { +- die "spamd: invalid ssl-version: $opt{'ssl-version'}\n"; +-} +- + $opt{'server-key'} ||= "$LOCAL_RULES_DIR/certs/server-key.pem"; + $opt{'server-cert'} ||= "$LOCAL_RULES_DIR/certs/server-cert.pem"; + +@@ -899,9 +893,8 @@ sub compose_listen_info_string { + $socket_info->{ip_addr}, $socket_info->{port})); + + } elsif ($socket->isa('IO::Socket::SSL')) { +- push(@listeninfo, sprintf("SSL [%s]:%s, ssl version %s", +- $socket_info->{ip_addr}, $socket_info->{port}, +- $opt{'ssl-version'}||'sslv3')); ++ push(@listeninfo, sprintf("SSL [%r]:%s", $socket_info->{ip_addr}, ++ $socket_info->{port})); + } + } + +@@ -1072,7 +1065,6 @@ sub server_sock_setup_inet { + $sockopt{V6Only} = 1 if $io_socket_module_name eq 'IO::Socket::IP' + && IO::Socket::IP->VERSION >= 0.09; + %sockopt = (%sockopt, ( +- SSL_version => $sslversion, + SSL_verify_mode => 0x00, + SSL_key_file => $opt{'server-key'}, + SSL_cert_file => $opt{'server-cert'}, +@@ -1093,7 +1085,8 @@ sub server_sock_setup_inet { + if (!$server_inet) { + $diag = sprintf("could not create %s socket on [%s]:%s: %s", + $ssl ? 'IO::Socket::SSL' : $io_socket_module_name, +- $adr, $port, $!); ++ $adr, $port, $ssl && $IO::Socket::SSL::SSL_ERROR ? ++ "$!,$IO::Socket::SSL::SSL_ERROR" : $!); + push(@diag_fail, $diag); + } else { + $diag = sprintf("created %s socket on [%s]:%s", +@@ -3238,7 +3231,6 @@ Options: + -H [dir], --helper-home-dir[=dir] Specify a different HOME directory + --ssl Enable SSL on TCP connections + --ssl-port port Override --port setting for SSL connections +- --ssl-version sslversion Specify SSL protocol version to use + --server-key keyfile Specify an SSL keyfile + --server-cert certfile Specify an SSL certificate + --socketpath=path Listen on a given UNIX domain socket +@@ -3727,14 +3719,6 @@ Optionally specifies the port number for + SSL connections (default: whatever --port uses). See B<--ssl> for + more details. + +-=item B<--ssl-version>=I +- +-Specify the SSL protocol version to use, one of B or B. +-The default, B, is the most flexible, accepting a SSLv3 or +-higher hello handshake, then negotiating use of SSLv3 or TLSv1 +-protocol if the client can accept it. Specifying B<--ssl-version> +-implies B<--ssl>. +- + =item B<--server-key> I + + Specify the SSL key file to use for SSL connections. +--- spamc/spamc.pod.orig ++++ spamc/spamc.pod +@@ -177,12 +177,10 @@ The default is 1 time (ie. one attempt a + Sleep for I seconds between failed spamd filtering attempts. + The default is 1 second. + +-=item B<-S>, B<--ssl>, B<--ssl>=I ++=item B<-S>, B<--ssl>, B<--ssl> + + If spamc was built with support for SSL, encrypt data to and from the + spamd process with SSL; spamd must support SSL as well. +-I specifies the SSL protocol version to use, either +-C, or C. The default, is C. + + =item B<-t> I, B<--timeout>=I + +--- t/spamd_ssl_tls.t.orig ++++ t/spamd_ssl_tls.t +@@ -1,28 +0,0 @@ +-#!/usr/bin/perl +- +-use lib '.'; use lib 't'; +-use SATest; sa_t_init("spamd_ssl_tls"); +-use Test; plan tests => (($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE) ? 0 : 9); +- +-exit if ($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE); +- +-# --------------------------------------------------------------------------- +- +-%patterns = ( +- +-q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', +-q{ Subject: There yours for FREE!}, 'subj', +-q{ X-Spam-Status: Yes, score=}, 'status', +-q{ X-Spam-Flag: YES}, 'flag', +-q{ X-Spam-Level: **********}, 'stars', +-q{ TEST_ENDSNUMS}, 'endsinnums', +-q{ TEST_NOREALNAME}, 'noreal', +-q{ This must be the very last line}, 'lastline', +- +- +-); +- +-ok (sdrun ("-L --ssl --ssl-version=tlsv1 --server-key data/etc/testhost.key --server-cert data/etc/testhost.cert", +- "--ssl=tlsv1 < data/spam/001", +- \&patterns_run_cb)); +-ok_all_patterns(); +--- t/spamd_ssl_v3.t.orig ++++ t/spamd_ssl_v3.t +@@ -1,28 +0,0 @@ +-#!/usr/bin/perl +- +-use lib '.'; use lib 't'; +-use SATest; sa_t_init("spamd_sslv3"); +-use Test; plan tests => (($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE) ? 0 : 9); +- +-exit if ($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE); +- +-# --------------------------------------------------------------------------- +- +-%patterns = ( +- +-q{ Return-Path: sb55sb55@yahoo.com}, 'firstline', +-q{ Subject: There yours for FREE!}, 'subj', +-q{ X-Spam-Status: Yes, score=}, 'status', +-q{ X-Spam-Flag: YES}, 'flag', +-q{ X-Spam-Level: **********}, 'stars', +-q{ TEST_ENDSNUMS}, 'endsinnums', +-q{ TEST_NOREALNAME}, 'noreal', +-q{ This must be the very last line}, 'lastline', +- +- +-); +- +-ok (sdrun ("-L --ssl --ssl-version=sslv3 --server-key data/etc/testhost.key --server-cert data/etc/testhost.cert", +- "--ssl=sslv3 < data/spam/001", +- \&patterns_run_cb)); +-ok_all_patterns(); +--- t/spamd_ssl_accept_fail.t.orig ++++ t/spamd_ssl_accept_fail.t +@@ -23,9 +23,9 @@ q{ This must be the very last line}, 'la + + ); + +-ok (start_spamd ("-L --ssl --ssl-version=sslv3 --server-key data/etc/testhost.key --server-cert data/etc/testhost.cert")); ++ok (start_spamd ("-L --ssl --server-key data/etc/testhost.key --server-cert data/etc/testhost.cert")); + ok (spamcrun ("< data/spam/001", \&patterns_run_cb)); +-ok (spamcrun ("--ssl=sslv3 < data/spam/001", \&patterns_run_cb)); ++ok (spamcrun ("--ssl < data/spam/001", \&patterns_run_cb)); + ok (stop_spamd ()); + + ok_all_patterns(); +--- t/spamd_ssl.t.orig ++++ t/spamd_ssl.t +@@ -2,10 +2,7 @@ + + use lib '.'; use lib 't'; + use SATest; sa_t_init("spamd_ssl"); +-use Test; plan tests => (($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE) ? 0 : 9), +- onfail => sub { +- warn "\n\nNote: This may not be a SpamAssassin bug, as some platforms require that you" . +- "\nspecify a protocol in spamc --ssl option, and possibly in spamd --ssl-version.\n\n" }; ++use Test; plan tests => (($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE) ? 0 : 9); + + exit if ($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE); + +--- MANIFEST.orig ++++ MANIFEST +@@ -513,8 +513,6 @@ t/spamd_report_ifspam.t + t/spamd_sql_prefs.t + t/spamd_ssl.t + t/spamd_ssl_accept_fail.t +-t/spamd_ssl_tls.t +-t/spamd_ssl_v3.t + t/spamd_stop.t + t/spamd_symbols.t + t/spamd_syslog.t From owner-svn-ports-branches@freebsd.org Wed Apr 6 07:03:45 2016 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 0D473B065F6; Wed, 6 Apr 2016 07:03:45 +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 BFCBB1BF5; Wed, 6 Apr 2016 07:03:44 +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 u3673hqe031465; Wed, 6 Apr 2016 07:03:43 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3673hTi031460; Wed, 6 Apr 2016 07:03:43 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201604060703.u3673hTi031460@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Wed, 6 Apr 2016 07:03:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412605 - in branches/2016Q2/security/openvas-manager: . 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.21 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, 06 Apr 2016 07:03:45 -0000 Author: tijl Date: Wed Apr 6 07:03:43 2016 New Revision: 412605 URL: https://svnweb.freebsd.org/changeset/ports/412605 Log: MFH: r412585 Port stat(1) calls in several scripts. PR: 208556 Submitted by: kwinkelman@mcclatchy.com Approved by: ports-secteam (junovitch) Added: branches/2016Q2/security/openvas-manager/files/patch-tools+greenbone-certdata-sync.in - copied unchanged from r412585, head/security/openvas-manager/files/patch-tools+greenbone-certdata-sync.in branches/2016Q2/security/openvas-manager/files/patch-tools+greenbone-scapdata-sync.in - copied unchanged from r412585, head/security/openvas-manager/files/patch-tools+greenbone-scapdata-sync.in branches/2016Q2/security/openvas-manager/files/patch-tools+openvas-certdata-sync.in - copied unchanged from r412585, head/security/openvas-manager/files/patch-tools+openvas-certdata-sync.in branches/2016Q2/security/openvas-manager/files/patch-tools+openvas-scapdata-sync.in - copied unchanged from r412585, head/security/openvas-manager/files/patch-tools+openvas-scapdata-sync.in Modified: branches/2016Q2/security/openvas-manager/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/security/openvas-manager/Makefile ============================================================================== --- branches/2016Q2/security/openvas-manager/Makefile Wed Apr 6 06:14:31 2016 (r412604) +++ branches/2016Q2/security/openvas-manager/Makefile Wed Apr 6 07:03:43 2016 (r412605) @@ -2,7 +2,7 @@ PORTNAME= openvas-manager PORTVERSION= 6.0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://wald.intevation.org/frs/download.php/2295/ Copied: branches/2016Q2/security/openvas-manager/files/patch-tools+greenbone-certdata-sync.in (from r412585, head/security/openvas-manager/files/patch-tools+greenbone-certdata-sync.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/security/openvas-manager/files/patch-tools+greenbone-certdata-sync.in Wed Apr 6 07:03:43 2016 (r412605, copy of r412585, head/security/openvas-manager/files/patch-tools+greenbone-certdata-sync.in) @@ -0,0 +1,29 @@ +--- tools/greenbone-certdata-sync.in.orig 2015-12-08 07:09:31 UTC ++++ tools/greenbone-certdata-sync.in +@@ -643,7 +643,7 @@ update_cert_db() { + then + for certfile in `ls $CERT_DIR/CB-K*.xml` + do +- filedate=`stat -c "%Y" $certfile | cut -d " " -f 1 | tr -d "-"` ++ filedate=`stat -f "%m" $certfile | cut -d " " -f 1 | tr -d "-"` + filedate=$(( $filedate - ( $filedate % 60 ) )) + if [ $filedate -gt $DB_LASTUPDATE ] + then +@@ -677,7 +677,7 @@ update_cert_db() { + then + for certfile in `ls $CERT_DIR/dfn-cert-*.xml` + do +- filedate=`stat -c "%Y" $certfile | cut -d " " -f 1 | tr -d "-"` ++ filedate=`stat -f "%m" $certfile | cut -d " " -f 1 | tr -d "-"` + filedate=$(( $filedate - ( $filedate % 60 ) )) + if [ $filedate -gt $DB_LASTUPDATE ] + then +@@ -886,7 +886,7 @@ then + exit 1 + fi + +-if [ $(id -u) -ne $(stat -c %u $CERT_DB) ] ++if [ $(id -u) -ne $(stat -f %u $CERT_DB) ] + then + log_err "Not synchronizing or updating the database since the current user is not the owner of the database." + echo "Not synchronizing or updating the database since the current user is not the owner of the database." Copied: branches/2016Q2/security/openvas-manager/files/patch-tools+greenbone-scapdata-sync.in (from r412585, head/security/openvas-manager/files/patch-tools+greenbone-scapdata-sync.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/security/openvas-manager/files/patch-tools+greenbone-scapdata-sync.in Wed Apr 6 07:03:43 2016 (r412605, copy of r412585, head/security/openvas-manager/files/patch-tools+greenbone-scapdata-sync.in) @@ -0,0 +1,60 @@ +--- tools/greenbone-scapdata-sync.in.orig 2015-12-08 07:09:31 UTC ++++ tools/greenbone-scapdata-sync.in +@@ -962,7 +962,7 @@ update_scap_db_private () { + then + for ovalfile in $oval_files_sorted_private + do +- filedate=`stat -c "%Y" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` ++ filedate=`stat -f "%m" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` + filedate=$(( $filedate - ( $filedate % 60 ) )) + if [ $filedate -gt $DB_LASTUPDATE ] || [ 1 = "$REBUILD_OVAL" ] + then +@@ -1090,12 +1090,12 @@ update_scap_db() { + CPEBASE="$SCAP_DIR/official-cpe-dictionary_v2.2.xml" + if [ -e $CPEBASE ] + then +- filedate=`stat -c "%Y" "$CPEBASE" | cut -d " " -f 1 | tr -d "-"` ++ filedate=`stat -f "%m" "$CPEBASE" | cut -d " " -f 1 | tr -d "-"` + filedate=$(( $filedate - ( $filedate % 60 ) )) + if [ $filedate -gt $DB_LASTUPDATE ] + then + log_info "Updating CPEs" +- filesize=`stat -c "%s" "$CPEBASE"` ++ filesize=`stat -f "%z" "$CPEBASE"` + if [ "0" -ne "$SPLIT_PART_SIZE" ] && [ "$filesize" -gt $(($SPLIT_PART_SIZE * 1024)) ] + then + log_info "File is larger than ${SPLIT_PART_SIZE}k. Splitting into multiple parts" +@@ -1152,13 +1152,13 @@ update_scap_db() { + then + for cvefile in `ls $SCAP_DIR/nvdcve-2.0-*.xml` + do +- filedate=`stat -c "%Y" "$cvefile" | cut -d " " -f 1 | tr -d "-"` ++ filedate=`stat -f "%m" "$cvefile" | cut -d " " -f 1 | tr -d "-"` + filedate=$(( $filedate - ( $filedate % 60 ) )) + if [ $filedate -gt $DB_LASTUPDATE ] + then + log_info "Updating $cvefile" + +- filesize=`stat -c "%s" "$cvefile"` ++ filesize=`stat -f "%z" "$cvefile"` + if [ "0" -ne "$SPLIT_PART_SIZE" ] && [ "$filesize" -gt $(($SPLIT_PART_SIZE * 1024)) ] + then + log_info "File is larger than ${SPLIT_PART_SIZE}k. Splitting into multiple parts" +@@ -1228,7 +1228,7 @@ update_scap_db() { + + for ovalfile in $oval_files_sorted + do +- filedate=`stat -c "%Y" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` ++ filedate=`stat -f "%m" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` + filedate=$(( $filedate - ( $filedate % 60 ) )) + if [ $filedate -gt $DB_LASTUPDATE ] || [ 1 = "$REBUILD_OVAL" ] + then +@@ -1469,7 +1469,7 @@ then + exit 1 + fi + +-if [ $(id -u) -ne $(stat -c %u $SCAP_DB) ] ++if [ $(id -u) -ne $(stat -f %u $SCAP_DB) ] + then + log_err "Not synchronizing or updating the database since the current user is not the owner of the database." + echo "Not synchronizing or updating the database since the current user is not the owner of the database." Copied: branches/2016Q2/security/openvas-manager/files/patch-tools+openvas-certdata-sync.in (from r412585, head/security/openvas-manager/files/patch-tools+openvas-certdata-sync.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/security/openvas-manager/files/patch-tools+openvas-certdata-sync.in Wed Apr 6 07:03:43 2016 (r412605, copy of r412585, head/security/openvas-manager/files/patch-tools+openvas-certdata-sync.in) @@ -0,0 +1,20 @@ +--- tools/openvas-certdata-sync.in.orig 2015-08-03 05:52:10 UTC ++++ tools/openvas-certdata-sync.in +@@ -575,7 +575,7 @@ update_sec_db () { + then + for certfile in `ls $CERT_DIR/CB-K*.xml` + do +- filedate=`stat -c "%Y" $certfile | cut -d " " -f 1 | tr -d "-"` ++ filedate=`stat -f "%m" $certfile | cut -d " " -f 1 | tr -d "-"` + filedate=$(( $filedate - ( $filedate % 60 ) )) + if [ $filedate -gt $DB_LASTUPDATE ] + then +@@ -610,7 +610,7 @@ update_sec_db () { + then + for certfile in `ls $CERT_DIR/dfn-cert-*.xml` + do +- filedate=`stat -c "%Y" $certfile | cut -d " " -f 1 | tr -d "-"` ++ filedate=`stat -f "%m" $certfile | cut -d " " -f 1 | tr -d "-"` + filedate=$(( $filedate - ( $filedate % 60 ) )) + if [ $filedate -gt $DB_LASTUPDATE ] + then Copied: branches/2016Q2/security/openvas-manager/files/patch-tools+openvas-scapdata-sync.in (from r412585, head/security/openvas-manager/files/patch-tools+openvas-scapdata-sync.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/security/openvas-manager/files/patch-tools+openvas-scapdata-sync.in Wed Apr 6 07:03:43 2016 (r412605, copy of r412585, head/security/openvas-manager/files/patch-tools+openvas-scapdata-sync.in) @@ -0,0 +1,52 @@ +--- tools/openvas-scapdata-sync.in.orig 2015-08-03 05:52:10 UTC ++++ tools/openvas-scapdata-sync.in +@@ -885,7 +885,7 @@ update_sec_db_private () { + then + for ovalfile in $oval_files_sorted_private + do +- filedate=`stat -c "%Y" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` ++ filedate=`stat -f "%m" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` + filedate=$(( $filedate - ( $filedate % 60 ) )) + if [ $filedate -gt $DB_LASTUPDATE ] || [ 1 = "$REBUILD_OVAL" ] + then +@@ -1012,13 +1012,13 @@ update_sec_db () { + CPEBASE="$SCAP_DIR/official-cpe-dictionary_v2.2.xml" + if [ -e $CPEBASE ] + then +- filedate=`stat -c "%Y" "$CPEBASE" | cut -d " " -f 1 | tr -d "-"` ++ filedate=`stat -f "%m" "$CPEBASE" | cut -d " " -f 1 | tr -d "-"` + filedate=$(( $filedate - ( $filedate % 60 ) )) + if [ $filedate -gt $DB_LASTUPDATE ] + then + echo "[i] Updating CPEs" + +- filesize=`stat -c "%s" "$CPEBASE"` ++ filesize=`stat -f "%z" "$CPEBASE"` + if [ "0" -ne "$SPLIT_PART_SIZE" ] && [ "$filesize" -gt $(($SPLIT_PART_SIZE * 1024)) ] + then + echo "[i] File is larger than ${SPLIT_PART_SIZE}k. Splitting into multiple parts" +@@ -1075,13 +1075,13 @@ update_sec_db () { + then + for cvefile in `ls $SCAP_DIR/nvdcve-2.0-*.xml` + do +- filedate=`stat -c "%Y" "$cvefile" | cut -d " " -f 1 | tr -d "-"` ++ filedate=`stat -f "%m" "$cvefile" | cut -d " " -f 1 | tr -d "-"` + filedate=$(( $filedate - ( $filedate % 60 ) )) + if [ $filedate -gt $DB_LASTUPDATE ] + then + echo "[i] Updating $cvefile" + +- filesize=`stat -c "%s" "$cvefile"` ++ filesize=`stat -f "%z" "$cvefile"` + if [ "0" -ne "$SPLIT_PART_SIZE" ] && [ "$filesize" -gt $(($SPLIT_PART_SIZE * 1024)) ] + then + echo "[i] File is larger than ${SPLIT_PART_SIZE}k. Splitting into multiple parts" +@@ -1151,7 +1151,7 @@ update_sec_db () { + + for ovalfile in $oval_files_sorted + do +- filedate=`stat -c "%Y" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` ++ filedate=`stat -f "%m" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` + filedate=$(( $filedate - ( $filedate % 60 ) )) + if [ $filedate -gt $DB_LASTUPDATE ] || [ 1 = "$REBUILD_OVAL" ] + then From owner-svn-ports-branches@freebsd.org Wed Apr 6 07:14:54 2016 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 8A6E8B06992; Wed, 6 Apr 2016 07:14:54 +0000 (UTC) (envelope-from bapt@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 5811814EC; Wed, 6 Apr 2016 07:14:54 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u367ErmH035174; Wed, 6 Apr 2016 07:14:53 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u367Er1w035171; Wed, 6 Apr 2016 07:14:53 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201604060714.u367Er1w035171@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 6 Apr 2016 07:14:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412611 - branches/2016Q2/ports-mgmt/pkg 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.21 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, 06 Apr 2016 07:14:54 -0000 Author: bapt Date: Wed Apr 6 07:14:53 2016 New Revision: 412611 URL: https://svnweb.freebsd.org/changeset/ports/412611 Log: MFH: r412608 Update to 1.7.2 Changes: - Update libucl to latest version which fixes an issue with empty pkg.conf (regression test added) - pkg install on an already installed package returns 0 again this regression was introduced when fixing pkg lock (regression test added) Approved by: bapt (with portmgr hat) Modified: branches/2016Q2/ports-mgmt/pkg/Makefile branches/2016Q2/ports-mgmt/pkg/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/ports-mgmt/pkg/Makefile ============================================================================== --- branches/2016Q2/ports-mgmt/pkg/Makefile Wed Apr 6 07:11:55 2016 (r412610) +++ branches/2016Q2/ports-mgmt/pkg/Makefile Wed Apr 6 07:14:53 2016 (r412611) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.7.1 +DISTVERSION= 1.7.2 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt MASTER_SITES= \ Modified: branches/2016Q2/ports-mgmt/pkg/distinfo ============================================================================== --- branches/2016Q2/ports-mgmt/pkg/distinfo Wed Apr 6 07:11:55 2016 (r412610) +++ branches/2016Q2/ports-mgmt/pkg/distinfo Wed Apr 6 07:14:53 2016 (r412611) @@ -1,2 +1,2 @@ -SHA256 (pkg-1.7.1.tar.xz) = c82f668ea6f25d253a5485ed28ba3b54e019a53decf5a1dc7736e45613f1202d -SIZE (pkg-1.7.1.tar.xz) = 1943816 +SHA256 (pkg-1.7.2.tar.xz) = 02dfbed839ec3f11c6e9727f72230bea59869eaa299feeeab3669dac8a347c1d +SIZE (pkg-1.7.2.tar.xz) = 1913944 From owner-svn-ports-branches@freebsd.org Wed Apr 6 21:21:33 2016 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 13C66B06095; Wed, 6 Apr 2016 21:21:33 +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 D04FD162B; Wed, 6 Apr 2016 21:21:32 +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 u36LLVPk093445; Wed, 6 Apr 2016 21:21:31 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u36LLVnA093444; Wed, 6 Apr 2016 21:21:31 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201604062121.u36LLVnA093444@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 6 Apr 2016 21:21:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412647 - branches/2016Q2/devel/elixir-timex-interval 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.21 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, 06 Apr 2016 21:21:33 -0000 Author: antoine Date: Wed Apr 6 21:21:31 2016 New Revision: 412647 URL: https://svnweb.freebsd.org/changeset/ports/412647 Log: MFH: r412646 Mark BROKEN: fails to build == Compilation error on file lib/datetime.ex == ** (ArgumentError) argument error (stdlib) :ets.lookup(:tzdata_current_release, :release_version) lib/tzdata/release_reader.ex:41: Tzdata.ReleaseReader.current_release_from_table/0 lib/tzdata/release_reader.ex:13: Tzdata.ReleaseReader.simple_lookup/1 lib/tzdata/release_reader.ex:5: Tzdata.ReleaseReader.zone_list/0 lib/tzdata/release_reader.ex:22: Tzdata.ReleaseReader.periods_for_zone_or_link/1 lib/tzdata.ex:137: Tzdata.periods/1 lib/tzdata.ex:216: Tzdata.periods_for_time/3 lib/timezone/timezone.ex:193: Timex.Timezone.resolve/3 Reported by: pkg-fallout Modified: branches/2016Q2/devel/elixir-timex-interval/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/devel/elixir-timex-interval/Makefile ============================================================================== --- branches/2016Q2/devel/elixir-timex-interval/Makefile Wed Apr 6 21:20:27 2016 (r412646) +++ branches/2016Q2/devel/elixir-timex-interval/Makefile Wed Apr 6 21:21:31 2016 (r412647) @@ -10,6 +10,8 @@ COMMENT= Date/time interval library for LICENSE= APACHE20 +BROKEN= fails to build + USES= elixir USE_GITHUB= yes GH_ACCOUNT= atabary From owner-svn-ports-branches@freebsd.org Thu Apr 7 14:43:42 2016 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 7FC6AB06442; Thu, 7 Apr 2016 14:43:42 +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 3950F159B; Thu, 7 Apr 2016 14:43:42 +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 u37EhfnV009632; Thu, 7 Apr 2016 14:43:41 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u37EhfRn009631; Thu, 7 Apr 2016 14:43:41 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201604071443.u37EhfRn009631@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 7 Apr 2016 14:43:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412668 - branches/2016Q2/lang/rust 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.21 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, 07 Apr 2016 14:43:42 -0000 Author: jbeich Date: Thu Apr 7 14:43:41 2016 New Revision: 412668 URL: https://svnweb.freebsd.org/changeset/ports/412668 Log: MFH: r412657 lang/rust: unbreak non-poudriere build after r412305 gmake[1]: Leaving directory '/wrkdirs/usr/ports/lang/rust/work/rustc-1.7.0' sed: /wrkdirs/usr/ports/lang/rust/work/stage/usr/local/lib/rustlib/manifest-rust-std-x86_64-unknown-: No such file or directory *** Error code 1 PR: 208527 Pointy hat: jbeich Tested by: Marko Cupać , pilot513@gmail.com Approved by: riggs (maintainer) Approved by: ports-secteam (feld) Modified: branches/2016Q2/lang/rust/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/lang/rust/Makefile ============================================================================== --- branches/2016Q2/lang/rust/Makefile Thu Apr 7 14:39:14 2016 (r412667) +++ branches/2016Q2/lang/rust/Makefile Thu Apr 7 14:43:41 2016 (r412668) @@ -124,13 +124,13 @@ post-patch: # new ones. Otherwise, the staging directory is polluted with unneeded # files. pre-install: -.for f in manifest-rustc manifest-rust-std-${RUST_TARGET} - @if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/${f}; then \ + @for f in manifest-rustc manifest-rust-std-${RUST_TARGET}; do \ + if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/$$f; then \ ${SED} -E -e 's,^(dir|file:),${STAGEDIR},' \ - < ${STAGEDIR}${PREFIX}/lib/rustlib/${f} \ + < ${STAGEDIR}${PREFIX}/lib/rustlib/$$f \ | ${XARGS} ${RM}; \ - fi -.endfor + fi; \ + done @${RM} \ ${STAGEDIR}${PREFIX}/lib/rustlib/components \ ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc \ @@ -139,11 +139,11 @@ pre-install: ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh post-install: -.for f in manifest-rustc manifest-rust-std-${RUST_TARGET} - @${REINPLACE_CMD} -e 's|${STAGEDIR}||' \ - ${STAGEDIR}${PREFIX}/lib/rustlib/${f} - @${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/${f}.bak -.endfor + @for f in manifest-rustc manifest-rust-std-${RUST_TARGET}; do \ + ${REINPLACE_CMD} -e 's|${STAGEDIR}||' \ + ${STAGEDIR}${PREFIX}/lib/rustlib/$$f; \ + ${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/$$f.bak; \ + done @${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/install.log @${STRIP_CMD} \ ${STAGEDIR}${PREFIX}/bin/rustc \ From owner-svn-ports-branches@freebsd.org Fri Apr 8 01:26:04 2016 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 7C177B08323; Fri, 8 Apr 2016 01:26: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 328811088; Fri, 8 Apr 2016 01:26: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 u381Q3Hd006074; Fri, 8 Apr 2016 01:26:03 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u381Q356006072; Fri, 8 Apr 2016 01:26:03 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201604080126.u381Q356006072@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 8 Apr 2016 01:26:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412706 - branches/2016Q2/devel/android-tools-adb 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.21 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, 08 Apr 2016 01:26:04 -0000 Author: jbeich Date: Fri Apr 8 01:26:03 2016 New Revision: 412706 URL: https://svnweb.freebsd.org/changeset/ports/412706 Log: MFH: r412656 devel/android-tools-adb: update to 6.0.1.r24 Changes: https://android.googlesource.com/platform/system/core/+log/android-6.0.0_r26..android-6.0.1_r24/adb Approved by: ports-secteam (junovitch) Modified: branches/2016Q2/devel/android-tools-adb/Makefile branches/2016Q2/devel/android-tools-adb/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/devel/android-tools-adb/Makefile ============================================================================== --- branches/2016Q2/devel/android-tools-adb/Makefile Fri Apr 8 01:18:03 2016 (r412705) +++ branches/2016Q2/devel/android-tools-adb/Makefile Fri Apr 8 01:26:03 2016 (r412706) @@ -2,7 +2,7 @@ PORTNAME= android-tools-adb DISTVERSIONPREFIX= android- -DISTVERSION?= 6.0.0_r26 +DISTVERSION?= 6.0.1_r24 PORTREVISION?= 0 CATEGORIES= devel @@ -19,7 +19,7 @@ GH_PROJECT= platform_system_core .ifdef DISTVERSIONSUFFIX GH_REVISION= ${DISTVERSIONSUFFIX:S/-g//} # snapshot .else -GH_REVISION= f7f765fd62bf # generated by: make update-revision +GH_REVISION= 2a288d0f331c # generated by: make update-revision .endif CONFLICTS_INSTALL?= ${PORTNAME}-devel-* Modified: branches/2016Q2/devel/android-tools-adb/distinfo ============================================================================== --- branches/2016Q2/devel/android-tools-adb/distinfo Fri Apr 8 01:18:03 2016 (r412705) +++ branches/2016Q2/devel/android-tools-adb/distinfo Fri Apr 8 01:26:03 2016 (r412706) @@ -1,4 +1,4 @@ -SHA256 (android-platform_system_core-android-6.0.0_r26_GH0.tar.gz) = 75c3135b44874e1a6d6b98cf7fc2c7513f77bd41b0302cd1f8d0a5a9ade46a36 -SIZE (android-platform_system_core-android-6.0.0_r26_GH0.tar.gz) = 1182157 +SHA256 (android-platform_system_core-android-6.0.1_r24_GH0.tar.gz) = f335756cc7f2ad3b6870dee7fb4641fd97df0a4d51c89bd508dce34802815b1e +SIZE (android-platform_system_core-android-6.0.1_r24_GH0.tar.gz) = 1184987 SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948 From owner-svn-ports-branches@freebsd.org Sat Apr 9 10:22:24 2016 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 91B02B09349; Sat, 9 Apr 2016 10:22:24 +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 483BF1FAD; Sat, 9 Apr 2016 10:22:24 +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 u39AMNmM010663; Sat, 9 Apr 2016 10:22:23 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u39AMNcN010662; Sat, 9 Apr 2016 10:22:23 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201604091022.u39AMNcN010662@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 9 Apr 2016 10:22:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412804 - branches/2016Q2/multimedia/vdr/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.21 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, 09 Apr 2016 10:22:24 -0000 Author: riggs Date: Sat Apr 9 10:22:23 2016 New Revision: 412804 URL: https://svnweb.freebsd.org/changeset/ports/412804 Log: MFH: r412803 Fix build with libc++ 3.8.0 PR: 208468 Submitted by: dim Approved by: ports-secteam (build fix blanket) Added: branches/2016Q2/multimedia/vdr/files/patch-abs-types.diff - copied unchanged from r412803, head/multimedia/vdr/files/patch-abs-types.diff Modified: Directory Properties: branches/2016Q2/ (props changed) Copied: branches/2016Q2/multimedia/vdr/files/patch-abs-types.diff (from r412803, head/multimedia/vdr/files/patch-abs-types.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/multimedia/vdr/files/patch-abs-types.diff Sat Apr 9 10:22:23 2016 (r412804, copy of r412803, head/multimedia/vdr/files/patch-abs-types.diff) @@ -0,0 +1,27 @@ +--- dvbdevice.c.orig ++++ dvbdevice.c +@@ -766,7 +766,7 @@ bool cDvbTuner::SetFrontend(void) + CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt)); + CHECK(ioctl(fd_frontend, FE_SET_TONE, tone)); + } +- frequency = abs(frequency); // Allow for C-band, where the frequency is less than the LOF ++ frequency = abs((int)frequency); // Allow for C-band, where the frequency is less than the LOF + + // DVB-S/DVB-S2 (common parts) + SETCMD(DTV_FREQUENCY, frequency * 1000UL); +--- remux.c.orig 2012-03-02 11:56:49.000000000 +0100 ++++ remux.c 2016-04-02 19:05:34.753289000 +0200 +@@ -890,11 +943,11 @@ int cFrameDetector::Analyze(const uchar + uint32_t Delta = ptsValues[0]; + // determine frame info: + if (isVideo) { +- if (abs(Delta - 3600) <= 1) ++ if (abs((int)Delta - 3600) <= 1) + framesPerSecond = 25.0; + else if (Delta % 3003 == 0) + framesPerSecond = 30.0 / 1.001; +- else if (abs(Delta - 1800) <= 1) { ++ else if (abs((int)Delta - 1800) <= 1) { + if (numFrames > 50) { + // this is a "best guess": if there are more than 50 frames between two I-frames, we assume each "frame" actually contains a "field", so two "fields" make one "frame" + framesPerSecond = 25.0; From owner-svn-ports-branches@freebsd.org Sat Apr 9 12:21:16 2016 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 1DE52B09269; Sat, 9 Apr 2016 12:21:16 +0000 (UTC) (envelope-from wg@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 D515D131C; Sat, 9 Apr 2016 12:21:15 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u39CLFY3046842; Sat, 9 Apr 2016 12:21:15 GMT (envelope-from wg@FreeBSD.org) Received: (from wg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u39CLEWB046840; Sat, 9 Apr 2016 12:21:14 GMT (envelope-from wg@FreeBSD.org) Message-Id: <201604091221.u39CLEWB046840@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wg set sender to wg@FreeBSD.org using -f From: William Grzybowski Date: Sat, 9 Apr 2016 12:21:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412808 - branches/2016Q2/sysutils/ipfs-go 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.21 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, 09 Apr 2016 12:21:16 -0000 Author: wg Date: Sat Apr 9 12:21:14 2016 New Revision: 412808 URL: https://svnweb.freebsd.org/changeset/ports/412808 Log: MFH: r412774 sysutils/ipfs-go: update to 0.3.10 - Unbreak build Approved by: ports-secteam (delphij) Modified: branches/2016Q2/sysutils/ipfs-go/Makefile branches/2016Q2/sysutils/ipfs-go/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/sysutils/ipfs-go/Makefile ============================================================================== --- branches/2016Q2/sysutils/ipfs-go/Makefile Sat Apr 9 11:50:33 2016 (r412807) +++ branches/2016Q2/sysutils/ipfs-go/Makefile Sat Apr 9 12:21:14 2016 (r412808) @@ -1,15 +1,13 @@ # $FreeBSD$ PORTNAME= ipfs-go -PORTVERSION= 0.3.9 +PORTVERSION= 0.3.10 DISTVERSIONPREFIX= v CATEGORIES= sysutils MAINTAINER= wg@FreeBSD.org COMMENT= IPFS implementation in Go -BROKEN= fails to build - BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go USES= gmake @@ -35,11 +33,16 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- # Prepare for possible extra modules in future post-extract: @${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} -.for src in CHANGELOG.md Dockerfile Godeps LICENSE Makefile README.md assets bin blocks blockservice circle.yml cmd commands core dev dev.md diagnostics doc.go docs exchange fuse importer ipnsfs merkledag metrics misc namesys notifications p2p path pin repo routing tar test thirdparty tour unixfs updates util vendor +.for src in CHANGELOG.md Dockerfile Godeps LICENSE Makefile README.md assets bin blocks blockservice circle.yml cmd commands contribute.md core dev.md diagnostics doc.go docs exchange fuse importer ipnsfs merkledag metrics misc namesys notifications p2p package.json path pin repo routing tar test thirdparty tour unixfs updates util vendor ${MV} ${WRKSRC}/${src} \ ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} .endfor +post-patch: + ${GREP} -R github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log ${WRKSRC} 2>/dev/null | \ + cut -d':' -f1 | \ + while read gosrc; do sed -i.bak 's#github.com/ipfs/go-ipfs/vendor/##g' $$gosrc; done + do-build: cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} build Modified: branches/2016Q2/sysutils/ipfs-go/distinfo ============================================================================== --- branches/2016Q2/sysutils/ipfs-go/distinfo Sat Apr 9 11:50:33 2016 (r412807) +++ branches/2016Q2/sysutils/ipfs-go/distinfo Sat Apr 9 12:21:14 2016 (r412808) @@ -1,2 +1,2 @@ -SHA256 (ipfs-go-ipfs-v0.3.9_GH0.tar.gz) = 74c8cac25f7ef0c5702fe7b59421b2072169ae357d393990c16cc7caccccbc73 -SIZE (ipfs-go-ipfs-v0.3.9_GH0.tar.gz) = 2791618 +SHA256 (ipfs-go-ipfs-v0.3.10_GH0.tar.gz) = 5f3e465ed0b37e1886ea71bd89586faf5968048be18e8105b7ca908376865edc +SIZE (ipfs-go-ipfs-v0.3.10_GH0.tar.gz) = 3047589 From owner-svn-ports-branches@freebsd.org Sat Apr 9 20:12:36 2016 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 A12F6B09FED; Sat, 9 Apr 2016 20:12:36 +0000 (UTC) (envelope-from cmt@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 6051B195D; Sat, 9 Apr 2016 20:12:36 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u39KCZG1095917; Sat, 9 Apr 2016 20:12:35 GMT (envelope-from cmt@FreeBSD.org) Received: (from cmt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u39KCZ2I095912; Sat, 9 Apr 2016 20:12:35 GMT (envelope-from cmt@FreeBSD.org) Message-Id: <201604092012.u39KCZ2I095912@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cmt set sender to cmt@FreeBSD.org using -f From: Christoph Moench-Tegeder Date: Sat, 9 Apr 2016 20:12:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412869 - in branches/2016Q2/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.21 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, 09 Apr 2016 20:12:36 -0000 Author: cmt Date: Sat Apr 9 20:12:34 2016 New Revision: 412869 URL: https://svnweb.freebsd.org/changeset/ports/412869 Log: MFH: r412868 Update chromium to 49.0.2623.112 while here, unbreak build on FreeBSD 9 Approved by: rene (mentor) Approved by: portmgr (junovitch) Added: branches/2016Q2/www/chromium/files/patch-third_party__webrtc__base__ifaddrs_converter.h - copied unchanged from r412868, head/www/chromium/files/patch-third_party__webrtc__base__ifaddrs_converter.h Modified: branches/2016Q2/www/chromium/Makefile branches/2016Q2/www/chromium/distinfo branches/2016Q2/www/chromium/files/extra-patch-gcc branches/2016Q2/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/www/chromium/Makefile ============================================================================== --- branches/2016Q2/www/chromium/Makefile Sat Apr 9 19:53:29 2016 (r412868) +++ branches/2016Q2/www/chromium/Makefile Sat Apr 9 20:12:34 2016 (r412869) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 49.0.2623.110 -PORTREVISION= 1 +PORTVERSION= 49.0.2623.112 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 @@ -57,8 +56,19 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/l xdg-open:devel/xdg-utils ONLY_FOR_ARCHS= i386 amd64 -USES= bison compiler:c++14-lang cpe desktop-file-utils execinfo jpeg \ +USES= bison cpe desktop-file-utils execinfo jpeg \ ninja perl5 pkgconfig python:2,build shebangfix tar:xz +# chromium requires a recent compiler (C++11 capable, but clang 3.4 is +# not able to build chromium. OTOH clang36 on FreeBSD 9.3 cannot build +# chromium as the libc++ includes are not up to the task. USES flags +# have to be set before bsd.ports.pre.mk and thereby cannot depend on +# bsd.ports.pre.mk's variables, so I'm using a hack here. +.if exists(/usr/lib/libc++.a) +USES+= compiler:c++14-lang +.else +USES+= compiler:c++11-lib +.endif + CPE_VENDOR= google CPE_PRODUCT= chrome USE_PERL5= build Modified: branches/2016Q2/www/chromium/distinfo ============================================================================== --- branches/2016Q2/www/chromium/distinfo Sat Apr 9 19:53:29 2016 (r412868) +++ branches/2016Q2/www/chromium/distinfo Sat Apr 9 20:12:34 2016 (r412869) @@ -1,4 +1,4 @@ -SHA256 (chromium-49.0.2623.110.tar.xz) = 41840925d3769555ce4ebd780ee0dc6789ffae27b1684006c9b543bcaa35bbd2 -SIZE (chromium-49.0.2623.110.tar.xz) = 520407796 -SHA256 (chromium-49.0.2623.110-testdata.tar.xz) = 5a3d3a920a780caa685e6667a41489a756f3847095bcaf202b9d0b1bec566328 -SIZE (chromium-49.0.2623.110-testdata.tar.xz) = 117576612 +SHA256 (chromium-49.0.2623.112.tar.xz) = 443b6d5f0d07f336783e700edc4ecae96769e105d0f8553e98fefae747302cf0 +SIZE (chromium-49.0.2623.112.tar.xz) = 520397552 +SHA256 (chromium-49.0.2623.112-testdata.tar.xz) = 2822d6ebfdab23b018aeba78bfb448be68c3ac6de3fed7fe649500c4341abe49 +SIZE (chromium-49.0.2623.112-testdata.tar.xz) = 117571488 Modified: branches/2016Q2/www/chromium/files/extra-patch-gcc ============================================================================== --- branches/2016Q2/www/chromium/files/extra-patch-gcc Sat Apr 9 19:53:29 2016 (r412868) +++ branches/2016Q2/www/chromium/files/extra-patch-gcc Sat Apr 9 20:12:34 2016 (r412869) @@ -157,3 +157,71 @@ #include #include #include +--- ui/gfx/color_utils.cc.orig 2016-04-06 20:35:19.306577518 +0200 ++++ ui/gfx/color_utils.cc 2016-04-06 20:35:49.282575724 +0200 +@@ -235,9 +235,9 @@ + b += (255.0 - b) * ((shift.l - 0.5) * 2.0); + } + return SkColorSetARGB(alpha, +- static_cast(std::round(r)), +- static_cast(std::round(g)), +- static_cast(std::round(b))); ++ static_cast(round(r)), ++ static_cast(round(g)), ++ static_cast(round(b))); + } + + void BuildLumaHistogram(const SkBitmap& bitmap, int histogram[256]) { +--- media/filters/audio_clock.cc.orig 2016-04-07 11:55:00.678817033 +0200 ++++ media/filters/audio_clock.cc 2016-04-07 11:55:28.152814716 +0200 +@@ -121,7 +121,7 @@ + } + + return base::TimeDelta::FromMicroseconds( +- std::round(frames_until_timestamp * microseconds_per_frame_)); ++ round(frames_until_timestamp * microseconds_per_frame_)); + } + + void AudioClock::ContiguousAudioDataBufferedForTesting( +--- media/filters/audio_clock.h.orig 2016-04-08 14:22:02.833940146 +0200 ++++ media/filters/audio_clock.h 2016-04-08 14:22:14.433876920 +0200 +@@ -92,11 +92,11 @@ + // 1000 + 500 + 250 = 1750 ms. + base::TimeDelta front_timestamp() const { + return base::TimeDelta::FromMicroseconds( +- std::round(front_timestamp_micros_)); ++ round(front_timestamp_micros_)); + } + base::TimeDelta back_timestamp() const { + return base::TimeDelta::FromMicroseconds( +- std::round(back_timestamp_micros_)); ++ round(back_timestamp_micros_)); + } + + // Returns the amount of wall time until |timestamp| will be played by the +--- content/browser/web_contents/web_contents_impl.cc.orig 2016-04-08 15:44:21.989537858 +0200 ++++ content/browser/web_contents/web_contents_impl.cc 2016-04-08 15:44:44.574535099 +0200 +@@ -1597,7 +1597,7 @@ + // Count only integer cumulative scrolls as zoom events; this handles + // smooth scroll and regular scroll device behavior. + zoom_scroll_remainder_ += event.wheelTicksY; +- int whole_zoom_scroll_remainder_ = std::lround(zoom_scroll_remainder_); ++ int whole_zoom_scroll_remainder_ = lround(zoom_scroll_remainder_); + zoom_scroll_remainder_ -= whole_zoom_scroll_remainder_; + if (whole_zoom_scroll_remainder_ != 0) { + delegate_->ContentsZoomChange(whole_zoom_scroll_remainder_ > 0); +--- chrome/browser/ui/views/frame/browser_root_view.cc.orig 2016-04-08 17:23:19.749128496 +0200 ++++ chrome/browser/ui/views/frame/browser_root_view.cc 2016-04-08 17:23:30.609126494 +0200 +@@ -139,10 +139,10 @@ + + // Number of integer scroll events that have passed in each direction. + int whole_scroll_amount_x = +- std::lround(static_cast(scroll_remainder_x_) / ++ lround(static_cast(scroll_remainder_x_) / + ui::MouseWheelEvent::kWheelDelta); + int whole_scroll_amount_y = +- std::lround(static_cast(scroll_remainder_y_) / ++ lround(static_cast(scroll_remainder_y_) / + ui::MouseWheelEvent::kWheelDelta); + + // Adjust the remainder such that any whole scrolls we have taken action Copied: branches/2016Q2/www/chromium/files/patch-third_party__webrtc__base__ifaddrs_converter.h (from r412868, head/www/chromium/files/patch-third_party__webrtc__base__ifaddrs_converter.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/www/chromium/files/patch-third_party__webrtc__base__ifaddrs_converter.h Sat Apr 9 20:12:34 2016 (r412869, copy of r412868, head/www/chromium/files/patch-third_party__webrtc__base__ifaddrs_converter.h) @@ -0,0 +1,11 @@ +--- third_party/webrtc/base/ifaddrs_converter.h.orig 2016-04-02 20:56:46.173477407 +0200 ++++ third_party/webrtc/base/ifaddrs_converter.h 2016-04-02 20:57:11.910537987 +0200 +@@ -14,6 +14,8 @@ + #if defined(WEBRTC_ANDROID) + #include "webrtc/base/ifaddrs-android.h" + #else ++#include ++#include + #include + #endif // WEBRTC_ANDROID + Modified: branches/2016Q2/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h ============================================================================== --- branches/2016Q2/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h Sat Apr 9 19:53:29 2016 (r412868) +++ branches/2016Q2/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h Sat Apr 9 20:12:34 2016 (r412869) @@ -1,10 +1,11 @@ --- third_party/webrtc/base/ipaddress.h.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/base/ipaddress.h -@@ -17,6 +17,9 @@ +@@ -17,6 +17,10 @@ #include #include #endif +#if defined(WEBRTC_BSD) ++#include +#include +#endif #if defined(WEBRTC_WIN) From owner-svn-ports-branches@freebsd.org Sat Apr 9 23:17:19 2016 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 9BB05B09B26; Sat, 9 Apr 2016 23:17:19 +0000 (UTC) (envelope-from bapt@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 6CA6113D9; Sat, 9 Apr 2016 23:17:19 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u39NHIsB050759; Sat, 9 Apr 2016 23:17:18 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u39NHIIa050757; Sat, 9 Apr 2016 23:17:18 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201604092317.u39NHIIa050757@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 9 Apr 2016 23:17:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412875 - in branches/2016Q2/net-mgmt: zabbix2-agent zabbix22-agent 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.21 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, 09 Apr 2016 23:17:19 -0000 Author: bapt Date: Sat Apr 9 23:17:18 2016 New Revision: 412875 URL: https://svnweb.freebsd.org/changeset/ports/412875 Log: MFH: r412874 Fix IPV6 option Bump portrevision Approved by: bapt (portmgr) Modified: branches/2016Q2/net-mgmt/zabbix2-agent/Makefile branches/2016Q2/net-mgmt/zabbix22-agent/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/net-mgmt/zabbix2-agent/Makefile ============================================================================== --- branches/2016Q2/net-mgmt/zabbix2-agent/Makefile Sat Apr 9 23:12:39 2016 (r412874) +++ branches/2016Q2/net-mgmt/zabbix2-agent/Makefile Sat Apr 9 23:17:18 2016 (r412875) @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= zabbix2 +PORTREVISION= 1 PKGNAMESUFFIX= -agent CATEGORIES= net-mgmt @@ -12,5 +13,4 @@ PLIST= ${PKGDIR}/pkg-plist.agent OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT= IPV6 -.include .include "${MASTERDIR}/Makefile" Modified: branches/2016Q2/net-mgmt/zabbix22-agent/Makefile ============================================================================== --- branches/2016Q2/net-mgmt/zabbix22-agent/Makefile Sat Apr 9 23:12:39 2016 (r412874) +++ branches/2016Q2/net-mgmt/zabbix22-agent/Makefile Sat Apr 9 23:17:18 2016 (r412875) @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= zabbix22 +PORTREVISION= 1 CATEGORIES= net-mgmt PKGNAMESUFFIX= -agent @@ -12,5 +13,4 @@ PLIST= ${PKGDIR}/pkg-plist.agent OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT= IPV6 -.include .include "${MASTERDIR}/Makefile" From owner-svn-ports-branches@freebsd.org Sat Apr 9 23:47:24 2016 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 6500BB0A1EC; Sat, 9 Apr 2016 23:47:24 +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 36CD71DA3; Sat, 9 Apr 2016 23:47:24 +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 u39NlNCP059807; Sat, 9 Apr 2016 23:47:23 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u39NlNsC059806; Sat, 9 Apr 2016 23:47:23 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201604092347.u39NlNsC059806@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sat, 9 Apr 2016 23:47:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412876 - branches/2016Q2/net-im/mikutter 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.21 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, 09 Apr 2016 23:47:24 -0000 Author: junovitch Date: Sat Apr 9 23:47:23 2016 New Revision: 412876 URL: https://svnweb.freebsd.org/changeset/ports/412876 Log: MFH: r412848 - Add missing RUN_DEPENDS PR: 208650 Submitted by: Koichiro IWAO Approved by: ports-secteam (with hat) Modified: branches/2016Q2/net-im/mikutter/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/net-im/mikutter/Makefile ============================================================================== --- branches/2016Q2/net-im/mikutter/Makefile Sat Apr 9 23:17:18 2016 (r412875) +++ branches/2016Q2/net-im/mikutter/Makefile Sat Apr 9 23:47:23 2016 (r412876) @@ -3,6 +3,7 @@ PORTNAME= mikutter PORTVERSION= 3.3.8 +PORTREVISION= 1 CATEGORIES= net-im ruby MASTER_SITES= http://mikutter.hachune.net/bin/ \ LOCAL/tota/${PORTNAME} @@ -20,10 +21,13 @@ RUN_DEPENDS= rubygem-gtk2>=3.0.7:x11-too rubygem-delayer>=0.0.2:devel/rubygem-delayer \ rubygem-delayer-deferred>=1.0.3:devel/rubygem-delayer-deferred \ rubygem-gettext>=3.0.9:devel/rubygem-gettext \ + rubygem-httpclient>=2.7.1:www/rubygem-httpclient \ rubygem-instance_storage>=1.0.0:devel/rubygem-instance_storage \ rubygem-json_pure>=1.8.3:devel/rubygem-json_pure \ rubygem-locale>=2.1.1:devel/rubygem-locale \ rubygem-memoist>=0.14.0:devel/rubygem-memoist \ + rubygem-moneta>=0.7:devel/rubygem-moneta \ + rubygem-nokogiri>=1.6.7:textproc/rubygem-nokogiri \ rubygem-oauth>=0.4.7:net/rubygem-oauth \ rubygem-pluggaloid>=1.0.2:devel/rubygem-pluggaloid \ rubygem-ruby-hmac>=0.4.0:security/rubygem-ruby-hmac \