From owner-svn-ports-branches@freebsd.org Sun Jan 8 01:39:31 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 785DECA39F8; Sun, 8 Jan 2017 01:39:31 +0000 (UTC) (envelope-from vanilla@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 55A691ECF; Sun, 8 Jan 2017 01:39:31 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v081dUsX005192; Sun, 8 Jan 2017 01:39:30 GMT (envelope-from vanilla@FreeBSD.org) Received: (from vanilla@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v081dTHc005184; Sun, 8 Jan 2017 01:39:29 GMT (envelope-from vanilla@FreeBSD.org) Message-Id: <201701080139.v081dTHc005184@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vanilla set sender to vanilla@FreeBSD.org using -f From: "Vanilla I. Shu" Date: Sun, 8 Jan 2017 01:39:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r430852 - in branches/2017Q1/irc/irssi: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jan 2017 01:39:31 -0000 Author: vanilla Date: Sun Jan 8 01:39:29 2017 New Revision: 430852 URL: https://svnweb.freebsd.org/changeset/ports/430852 Log: MFH: r430851 Downgrade to 0.8.21. PR: 215800 Submitted by: Vladimir Krstulja Approved by: ports-secteam (feld) Added: branches/2017Q1/irc/irssi/files/patch-configure - copied unchanged from r430851, head/irc/irssi/files/patch-configure Modified: branches/2017Q1/irc/irssi/Makefile branches/2017Q1/irc/irssi/distinfo branches/2017Q1/irc/irssi/files/patch-Makefile.in branches/2017Q1/irc/irssi/files/patch-perl-Makefile branches/2017Q1/irc/irssi/files/patch-src_core_network-openssl.c branches/2017Q1/irc/irssi/pkg-plist Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/irc/irssi/Makefile ============================================================================== --- branches/2017Q1/irc/irssi/Makefile Sun Jan 8 01:37:33 2017 (r430851) +++ branches/2017Q1/irc/irssi/Makefile Sun Jan 8 01:39:29 2017 (r430852) @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= irssi -PORTVERSION= 1.0.0 +PORTVERSION= 0.8.21 +PORTEPOCH= 1 PORTREVISION?= 0 CATEGORIES?= irc MASTER_SITES= https://github.com/irssi/irssi/releases/download/${PORTVERSION}/ @@ -17,9 +18,10 @@ CONFLICTS= irssi-devel-[0-9]* zh-irssi-[ USES= gettext-runtime gmake libtool ncurses pkgconfig tar:xz GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-ncurses=${NCURSESBASE} INSTALL_TARGET= install-strip -OPTIONS_DEFINE= PERL PROXY SOCKS BOT DOCS TRUECOLOR +OPTIONS_DEFINE= PERL PROXY SOCKS IPV6 BOT DOCS TRUECOLOR OPTIONS_DEFAULT= PERL OPTIONS_SUB= yes SOCKS_DESC= Socks proxy support @@ -30,6 +32,8 @@ PERL_USES= perl5 PERL_CONFIGURE_ON= --with-perl-lib=site PERL_CONFIGURE_OFF= --with-perl=no PROXY_CONFIGURE_WITH= proxy +IPV6_CONFIGURE_ENABLE= ipv6 +IPV6_CATEGORIES= ipv6 TRUECOLOR_DESC= Truecolor (24bit) support TRUECOLOR_CONFIGURE_ENABLE= true-color Modified: branches/2017Q1/irc/irssi/distinfo ============================================================================== --- branches/2017Q1/irc/irssi/distinfo Sun Jan 8 01:37:33 2017 (r430851) +++ branches/2017Q1/irc/irssi/distinfo Sun Jan 8 01:39:29 2017 (r430852) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483672775 -SHA256 (irssi-1.0.0.tar.xz) = 6a8a3c1fc6a021a2c02a693877b2e19cbceb3eccd78fce49e44f596f4bae4fb8 -SIZE (irssi-1.0.0.tar.xz) = 1026116 +TIMESTAMP = 1483807627 +SHA256 (irssi-0.8.21.tar.xz) = e433063b8714dcf17438126902c9a9d5c97944b3185ecd0fc5ae25c4959bf35a +SIZE (irssi-0.8.21.tar.xz) = 1007524 Modified: branches/2017Q1/irc/irssi/files/patch-Makefile.in ============================================================================== --- branches/2017Q1/irc/irssi/files/patch-Makefile.in Sun Jan 8 01:37:33 2017 (r430851) +++ branches/2017Q1/irc/irssi/files/patch-Makefile.in Sun Jan 8 01:39:29 2017 (r430852) @@ -1,4 +1,4 @@ ---- Makefile.in.orig 2016-03-22 23:25:27 UTC +--- Makefile.in.orig 2017-01-03 13:25:17 UTC +++ Makefile.in @@ -408,7 +408,7 @@ BUILT_SOURCES = default-config.h default CLEANFILES = default-config.h default-theme.h Copied: branches/2017Q1/irc/irssi/files/patch-configure (from r430851, head/irc/irssi/files/patch-configure) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/irc/irssi/files/patch-configure Sun Jan 8 01:39:29 2017 (r430852, copy of r430851, head/irc/irssi/files/patch-configure) @@ -0,0 +1,19 @@ +--- configure.orig 2017-01-07 16:47:51 UTC ++++ configure +@@ -13849,12 +13849,12 @@ if test "${with_ncurses+set}" = set; the + + if $search_ncurses + then +- if test -f $withval/include/ncurses.h ++ if test -f $withval/include/ncurses/ncurses.h + then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Found ncurses on $withval/include/ncurses.h" >&5 +-$as_echo "Found ncurses on $withval/include/ncurses.h" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Found ncurses on $withval/include/ncurses/ncurses.h" >&5 ++$as_echo "Found ncurses on $withval/include/ncurses/ncurses.h" >&6; } + +- CURSES_LIBS="-L$withval/lib -lncurses" ++ CURSES_LIBS="-L$withval/lib -lncurses -ltinfo" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5 + $as_echo_n "checking for initscr in -lncurses... " >&6; } + if ${ac_cv_lib_ncurses_initscr+:} false; then : Modified: branches/2017Q1/irc/irssi/files/patch-perl-Makefile ============================================================================== --- branches/2017Q1/irc/irssi/files/patch-perl-Makefile Sun Jan 8 01:37:33 2017 (r430851) +++ branches/2017Q1/irc/irssi/files/patch-perl-Makefile Sun Jan 8 01:39:29 2017 (r430852) @@ -1,4 +1,4 @@ ---- src/perl/Makefile.am.orig 2016-03-18 12:34:38 UTC +--- src/perl/Makefile.am.orig 2017-01-03 12:47:47 UTC +++ src/perl/Makefile.am @@ -135,7 +135,7 @@ all-local: @@ -9,7 +9,7 @@ done clean-generic: ---- src/perl/Makefile.in.orig 2016-03-22 23:25:28 UTC +--- src/perl/Makefile.in.orig 2017-01-03 13:25:18 UTC +++ src/perl/Makefile.in @@ -848,7 +848,7 @@ all-local: Modified: branches/2017Q1/irc/irssi/files/patch-src_core_network-openssl.c ============================================================================== --- branches/2017Q1/irc/irssi/files/patch-src_core_network-openssl.c Sun Jan 8 01:37:33 2017 (r430851) +++ branches/2017Q1/irc/irssi/files/patch-src_core_network-openssl.c Sun Jan 8 01:39:29 2017 (r430852) @@ -1,4 +1,4 @@ ---- src/core/network-openssl.c.orig 2016-03-22 23:08:35 UTC +--- src/core/network-openssl.c.orig 2017-01-03 12:47:47 UTC +++ src/core/network-openssl.c @@ -486,6 +486,7 @@ static GIOChannel *irssi_ssl_get_iochann if (SSL_CTX_set_cipher_list(ctx, ciphers) != 1) Modified: branches/2017Q1/irc/irssi/pkg-plist ============================================================================== --- branches/2017Q1/irc/irssi/pkg-plist Sun Jan 8 01:37:33 2017 (r430851) +++ branches/2017Q1/irc/irssi/pkg-plist Sun Jan 8 01:39:29 2017 (r430852) @@ -46,8 +46,6 @@ include/irssi/src/core/session.h include/irssi/src/core/settings.h include/irssi/src/core/signals.h include/irssi/src/core/special-vars.h -include/irssi/src/core/tls.h -include/irssi/src/core/utf8.h include/irssi/src/core/window-item-def.h include/irssi/src/core/window-item-rec.h include/irssi/src/core/write-buffer.h @@ -61,7 +59,6 @@ include/irssi/src/fe-common/core/fe-exec include/irssi/src/fe-common/core/fe-messages.h include/irssi/src/fe-common/core/fe-queries.h include/irssi/src/fe-common/core/fe-recode.h -include/irssi/src/fe-common/core/fe-tls.h include/irssi/src/fe-common/core/fe-windows.h include/irssi/src/fe-common/core/formats.h include/irssi/src/fe-common/core/hilight-text.h From owner-svn-ports-branches@freebsd.org Sun Jan 8 20:36:56 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A297CCA537F; Sun, 8 Jan 2017 20:36:56 +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 7449315EF; Sun, 8 Jan 2017 20:36: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 v08KatgO067036; Sun, 8 Jan 2017 20:36:55 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v08KatFq067035; Sun, 8 Jan 2017 20:36:55 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201701082036.v08KatFq067035@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sun, 8 Jan 2017 20:36:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r430882 - branches/2017Q1/www/libwww X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jan 2017 20:36:56 -0000 Author: junovitch Date: Sun Jan 8 20:36:55 2017 New Revision: 430882 URL: https://svnweb.freebsd.org/changeset/ports/430882 Log: MFH: r430724 Update MASTER_SITES PR: 215823 Submitted by: Danilo G. Baio (maintainer) Approved by: ports-secteam (blanket) Modified: branches/2017Q1/www/libwww/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/www/libwww/Makefile ============================================================================== --- branches/2017Q1/www/libwww/Makefile Sun Jan 8 20:29:53 2017 (r430881) +++ branches/2017Q1/www/libwww/Makefile Sun Jan 8 20:36:55 2017 (r430882) @@ -5,7 +5,7 @@ PORTNAME= libwww PORTVERSION= 5.4.0 PORTREVISION= 6 CATEGORIES= www devel -MASTER_SITES= http://www.w3.org/Library/Distribution/ +MASTER_SITES= http://www.w3.org/Library/Distribution/old/ DISTNAME= w3c-${PORTNAME}-${PORTVERSION} MAINTAINER= dbaio@bsd.com.br From owner-svn-ports-branches@freebsd.org Sun Jan 8 20:52:18 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E2479CA6124; Sun, 8 Jan 2017 20:52:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A3E4810BC; Sun, 8 Jan 2017 20:52:18 +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 v08KqHvm077166; Sun, 8 Jan 2017 20:52:17 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v08KqHGD077162; Sun, 8 Jan 2017 20:52:17 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701082052.v08KqHGD077162@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 8 Jan 2017 20:52:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r430898 - in branches/2017Q1/security: ca_root_nss nss X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jan 2017 20:52:19 -0000 Author: jbeich Date: Sun Jan 8 20:52:17 2017 New Revision: 430898 URL: https://svnweb.freebsd.org/changeset/ports/430898 Log: MFH: r430854 security/nss: update to 3.28.1 Changes: https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.28.1_release_notes Approved by: ports-secteam (junovitch) Modified: branches/2017Q1/security/ca_root_nss/Makefile branches/2017Q1/security/ca_root_nss/distinfo branches/2017Q1/security/nss/Makefile branches/2017Q1/security/nss/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/security/ca_root_nss/Makefile ============================================================================== --- branches/2017Q1/security/ca_root_nss/Makefile Sun Jan 8 20:43:50 2017 (r430897) +++ branches/2017Q1/security/ca_root_nss/Makefile Sun Jan 8 20:52:17 2017 (r430898) @@ -32,7 +32,7 @@ PLIST_SUB+= CERTDIR=${CERTDIR} # !!! Please DO NOT submit patches for new version until it has !!! # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -VERSION_NSS= 3.28 +VERSION_NSS= 3.28.1 #NSS_SUFFIX= -with-ckbi-1.98 CERTDATA_TXT_PATH= nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl Modified: branches/2017Q1/security/ca_root_nss/distinfo ============================================================================== --- branches/2017Q1/security/ca_root_nss/distinfo Sun Jan 8 20:43:50 2017 (r430897) +++ branches/2017Q1/security/ca_root_nss/distinfo Sun Jan 8 20:52:17 2017 (r430898) @@ -1,3 +1,3 @@ -TIMESTAMP = 1482321387 -SHA256 (nss-3.28.tar.gz) = c79dd15f66f581c294ce0ef032119357d03fee3a0aa61be263747d84f1b33254 -SIZE (nss-3.28.tar.gz) = 7440502 +TIMESTAMP = 1483539864 +SHA256 (nss-3.28.1.tar.gz) = 58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad +SIZE (nss-3.28.1.tar.gz) = 7451477 Modified: branches/2017Q1/security/nss/Makefile ============================================================================== --- branches/2017Q1/security/nss/Makefile Sun Jan 8 20:43:50 2017 (r430897) +++ branches/2017Q1/security/nss/Makefile Sun Jan 8 20:52:17 2017 (r430898) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.28 +PORTVERSION= 3.28.1 #DISTVERSIONSUFFIX= -with-ckbi-1.98 PORTREVISION= 1 CATEGORIES= security Modified: branches/2017Q1/security/nss/distinfo ============================================================================== --- branches/2017Q1/security/nss/distinfo Sun Jan 8 20:43:50 2017 (r430897) +++ branches/2017Q1/security/nss/distinfo Sun Jan 8 20:52:17 2017 (r430898) @@ -1,3 +1,3 @@ -TIMESTAMP = 1482321387 -SHA256 (nss-3.28.tar.gz) = c79dd15f66f581c294ce0ef032119357d03fee3a0aa61be263747d84f1b33254 -SIZE (nss-3.28.tar.gz) = 7440502 +TIMESTAMP = 1483539864 +SHA256 (nss-3.28.1.tar.gz) = 58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad +SIZE (nss-3.28.1.tar.gz) = 7451477 From owner-svn-ports-branches@freebsd.org Sun Jan 8 22:54:16 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8C199CA6915; Sun, 8 Jan 2017 22:54:16 +0000 (UTC) (envelope-from woodsb02@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 5B40116DB; Sun, 8 Jan 2017 22:54:16 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v08MsFtU025666; Sun, 8 Jan 2017 22:54:15 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v08MsFbA025665; Sun, 8 Jan 2017 22:54:15 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201701082254.v08MsFbA025665@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Sun, 8 Jan 2017 22:54:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r430902 - branches/2017Q1/irc/quassel X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jan 2017 22:54:16 -0000 Author: woodsb02 Date: Sun Jan 8 22:54:15 2017 New Revision: 430902 URL: https://svnweb.freebsd.org/changeset/ports/430902 Log: MFH: r430857 irc/quassel: Fix erroneously empty value for PLIST variable This was causing the build of slave port irc/quassel-core to hang during the ports build step which generates temporary packing list, as the sed command to perform PLIST_SUB did not have a filename argument provided. Reported by: Steve Hay Approved by: ports-secteam (junovitch) Modified: branches/2017Q1/irc/quassel/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/irc/quassel/Makefile ============================================================================== --- branches/2017Q1/irc/quassel/Makefile Sun Jan 8 22:42:50 2017 (r430901) +++ branches/2017Q1/irc/quassel/Makefile Sun Jan 8 22:54:15 2017 (r430902) @@ -44,7 +44,7 @@ CORE_SUB_FILES= pkg-message CORE_VARS= use_rc_subr=quasselcore \ users=quasselcore \ groups=quasselcore \ - plist= # empty to allow core to override PLIST_FILES + plist=${NONEXISTENT} # allow core to override PLIST_FILES CORE_PLIST_FILES= bin/quasselcore MONO_DESC= Quassel standalone (monolithic binary: core+client combined) From owner-svn-ports-branches@freebsd.org Mon Jan 9 17:15:51 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C59BFCA76AE; Mon, 9 Jan 2017 17:15:51 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 865B91074; Mon, 9 Jan 2017 17:15:51 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v09HFo5I088043; Mon, 9 Jan 2017 17:15:50 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v09HFomn088040; Mon, 9 Jan 2017 17:15:50 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201701091715.v09HFomn088040@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 9 Jan 2017 17:15:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r430985 - in branches/2017Q1/www/lynx: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jan 2017 17:15:51 -0000 Author: feld Date: Mon Jan 9 17:15:50 2017 New Revision: 430985 URL: https://svnweb.freebsd.org/changeset/ports/430985 Log: MFH: r430984 www/lynx: Patch vulnerabilities PR: 215464 Security: CVE-2014-3566 Security: CVE-2016-9179 Approved by: ports-secteam (with hat) Added: branches/2017Q1/www/lynx/files/patch-CVE-2014-3566 - copied unchanged from r430984, head/www/lynx/files/patch-CVE-2014-3566 branches/2017Q1/www/lynx/files/patch-CVE-2016-9179 - copied unchanged from r430984, head/www/lynx/files/patch-CVE-2016-9179 Modified: branches/2017Q1/www/lynx/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/www/lynx/Makefile ============================================================================== --- branches/2017Q1/www/lynx/Makefile Mon Jan 9 17:15:11 2017 (r430984) +++ branches/2017Q1/www/lynx/Makefile Mon Jan 9 17:15:50 2017 (r430985) @@ -3,7 +3,7 @@ PORTNAME= lynx PORTVERSION= 2.8.8.2 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= http://invisible-mirror.net/archives/lynx/tarballs/ \ Copied: branches/2017Q1/www/lynx/files/patch-CVE-2014-3566 (from r430984, head/www/lynx/files/patch-CVE-2014-3566) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/lynx/files/patch-CVE-2014-3566 Mon Jan 9 17:15:50 2017 (r430985, copy of r430984, head/www/lynx/files/patch-CVE-2014-3566) @@ -0,0 +1,16 @@ +Disable SSLv2 and SSLv3 in lynx to "mitigate POODLE vulnerability". + +This change has been passed upstream. + +--- WWW/Library/Implementation/HTTP.c.orig 2015-02-16 12:48:34.014809453 -0800 ++++ WWW/Library/Implementation/HTTP.c 2015-02-16 12:49:09.627395954 -0800 +@@ -119,7 +119,8 @@ + #else + SSLeay_add_ssl_algorithms(); + ssl_ctx = SSL_CTX_new(SSLv23_client_method()); +- SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2); ++ /* Always disable SSLv2 & SSLv3 to "mitigate POODLE vulnerability". */ ++ SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); + #ifdef SSL_OP_NO_COMPRESSION + SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_COMPRESSION); + #endif Copied: branches/2017Q1/www/lynx/files/patch-CVE-2016-9179 (from r430984, head/www/lynx/files/patch-CVE-2016-9179) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/lynx/files/patch-CVE-2016-9179 Mon Jan 9 17:15:50 2017 (r430985, copy of r430984, head/www/lynx/files/patch-CVE-2016-9179) @@ -0,0 +1,85 @@ +Fix for CVE-2016-9179 +See: +http://lists.nongnu.org/archive/html/lynx-dev/2016-11/msg00018.html + +Re-engineered the upstream patch, which was only released +for the unstable lynx2.8.9. Removed the at_sign, and made sure that +the user id is correctly stripped of all non valid inputs. + +--- WWW/Library/Implementation/HTTCP.c_orig 2016-12-01 15:07:39.487753520 +0000 ++++ WWW/Library/Implementation/HTTCP.c 2016-12-01 15:10:20.291328282 +0000 +@@ -1792,7 +1792,6 @@ + int status = 0; + char *line = NULL; + char *p1 = NULL; +- char *at_sign = NULL; + char *host = NULL; + + #ifdef INET6 +@@ -1814,14 +1813,8 @@ + * Get node name and optional port number. + */ + p1 = HTParse(url, "", PARSE_HOST); +- if ((at_sign = StrChr(p1, '@')) != NULL) { +- /* +- * If there's an @ then use the stuff after it as a hostname. +- */ +- StrAllocCopy(host, (at_sign + 1)); +- } else { + StrAllocCopy(host, p1); +- } ++ strip_userid(host, FALSE); + FREE(p1); + + HTSprintf0(&line, "%s%s", WWW_FIND_MESSAGE, host); +--- WWW/Library/Implementation/HTTP.c_orig 2016-12-01 15:13:24.171404704 +0000 ++++ WWW/Library/Implementation/HTTP.c 2016-12-01 15:19:59.699276204 +0000 +@@ -426,7 +426,7 @@ + /* + * Strip any username from the given string so we retain only the host. + */ +-static void strip_userid(char *host) ++void strip_userid(char *host, int parse_only) + { + char *p1 = host; + char *p2 = StrChr(host, '@'); +@@ -439,7 +439,8 @@ + + CTRACE((tfp, "parsed:%s\n", fake)); + HTSprintf0(&msg, gettext("Address contains a username: %s"), host); +- HTAlert(msg); ++ if (msg !=0 && !parse_only) ++ HTAlert(msg); + FREE(msg); + } + while ((*p1++ = *p2++) != '\0') { +@@ -1081,7 +1082,7 @@ + char *host = NULL; + + if ((host = HTParse(anAnchor->address, "", PARSE_HOST)) != NULL) { +- strip_userid(host); ++ strip_userid(host, TRUE); + HTBprintf(&command, "Host: %s%c%c", host, CR, LF); + FREE(host); + } +--- WWW/Library/Implementation/HTUtils.h_orig 2016-12-01 15:21:38.919699987 +0000 ++++ WWW/Library/Implementation/HTUtils.h 2016-12-01 15:22:57.870511104 +0000 +@@ -801,6 +801,8 @@ + + extern FILE *TraceFP(void); + ++ extern void strip_userid(char *host, int warn); ++ + #ifdef USE_SSL + extern SSL *HTGetSSLHandle(void); + extern void HTSSLInitPRNG(void); +--- src/LYUtils.c_orig 2016-12-01 15:25:21.769447171 +0000 ++++ src/LYUtils.c 2016-12-01 15:28:31.901411555 +0000 +@@ -4693,6 +4693,7 @@ + * Do a DNS test on the potential host field as presently trimmed. - FM + */ + StrAllocCopy(host, Str); ++ strip_userid(host, FALSE); + HTUnEscape(host); + if (LYCursesON) { + StrAllocCopy(MsgStr, WWW_FIND_MESSAGE); From owner-svn-ports-branches@freebsd.org Mon Jan 9 17:35:24 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 10155CA705A; Mon, 9 Jan 2017 17:35:24 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E0C4816B0; Mon, 9 Jan 2017 17:35:23 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v09HZNW0096661; Mon, 9 Jan 2017 17:35:23 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v09HZMcU096657; Mon, 9 Jan 2017 17:35:22 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201701091735.v09HZMcU096657@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 9 Jan 2017 17:35:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r430989 - in branches/2017Q1/devel/libdwarf: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jan 2017 17:35:24 -0000 Author: feld Date: Mon Jan 9 17:35:22 2017 New Revision: 430989 URL: https://svnweb.freebsd.org/changeset/ports/430989 Log: MFH: r430988 devel/libdwarf: Update and fix vulnerabilties -Update URL -Add LICENSE PR: 215085 Approved by: ports-secteam (with hat) Deleted: branches/2017Q1/devel/libdwarf/files/ Modified: branches/2017Q1/devel/libdwarf/Makefile branches/2017Q1/devel/libdwarf/distinfo branches/2017Q1/devel/libdwarf/pkg-descr branches/2017Q1/devel/libdwarf/pkg-plist Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/devel/libdwarf/Makefile ============================================================================== --- branches/2017Q1/devel/libdwarf/Makefile Mon Jan 9 17:33:50 2017 (r430988) +++ branches/2017Q1/devel/libdwarf/Makefile Mon Jan 9 17:35:22 2017 (r430989) @@ -2,13 +2,16 @@ # $FreeBSD$ PORTNAME= libdwarf -PORTVERSION= 20130207 +PORTVERSION= 20161124 CATEGORIES= devel -MASTER_SITES= http://pkgs.fedoraproject.org/repo/pkgs/libdwarf/libdwarf-20130207.tar.gz/64b42692e947d5180e162e46c689dfbf/ +MASTER_SITES= https://www.prevanders.net/ \ + http://pkgs.fedoraproject.org/repo/pkgs/libdwarf/ MAINTAINER= joerg@FreeBSD.org COMMENT= Library to analyze DWARF debugging information in ELF files +LICENSE= LGPL21 + CONFLICTS_INSTALL= bsdlibdwarf* MAKE_JOBS_UNSAFE= yes @@ -22,7 +25,7 @@ CFLAGS+= -I. -I${LOCALBASE}/include USES= dos2unix DOS2UNIX_GLOB= *.h -PS_FILES= dwarf.v2.pdf index.v2.pdf libdwarf2.1.pdf libdwarf2p.1.pdf mips_extensions.pdf +PS_FILES= libdwarf2.1.pdf libdwarf2p.1.pdf mips_extensions.pdf do-install: ${INSTALL_DATA} ${WRKSRC}/libdwarf.a ${STAGEDIR}${PREFIX}/lib Modified: branches/2017Q1/devel/libdwarf/distinfo ============================================================================== --- branches/2017Q1/devel/libdwarf/distinfo Mon Jan 9 17:33:50 2017 (r430988) +++ branches/2017Q1/devel/libdwarf/distinfo Mon Jan 9 17:35:22 2017 (r430989) @@ -1,2 +1,3 @@ -SHA256 (libdwarf-20130207.tar.gz) = 5cb81459f0a1f6a2a10ef4635faddc2fa5e1a9e36901018c017759e491e708b8 -SIZE (libdwarf-20130207.tar.gz) = 1534527 +TIMESTAMP = 1480998515 +SHA256 (libdwarf-20161124.tar.gz) = bd3d6dc7da0509876fb95b8681f165febd898845dc66714aa58e69b8feca988f +SIZE (libdwarf-20161124.tar.gz) = 1732155 Modified: branches/2017Q1/devel/libdwarf/pkg-descr ============================================================================== --- branches/2017Q1/devel/libdwarf/pkg-descr Mon Jan 9 17:33:50 2017 (r430988) +++ branches/2017Q1/devel/libdwarf/pkg-descr Mon Jan 9 17:35:22 2017 (r430989) @@ -2,4 +2,4 @@ The libdwarf library is the base for the by the same author. It implements routines to access the DWARF debugging information found in ELF object files. -WWW: http://reality.sgiweb.org/davea/dwarf.html +WWW: https://www.prevanders.net/dwarf.html Modified: branches/2017Q1/devel/libdwarf/pkg-plist ============================================================================== --- branches/2017Q1/devel/libdwarf/pkg-plist Mon Jan 9 17:33:50 2017 (r430988) +++ branches/2017Q1/devel/libdwarf/pkg-plist Mon Jan 9 17:35:22 2017 (r430989) @@ -1,8 +1,6 @@ include/dwarf.h include/libdwarf.h lib/libdwarf.a -share/doc/libdwarf/dwarf.v2.pdf -share/doc/libdwarf/index.v2.pdf -share/doc/libdwarf/libdwarf2.1.pdf -share/doc/libdwarf/libdwarf2p.1.pdf -share/doc/libdwarf/mips_extensions.pdf +%%PORTDOCS%%%%DOCSDIR%%/libdwarf2.1.pdf +%%PORTDOCS%%%%DOCSDIR%%/libdwarf2p.1.pdf +%%PORTDOCS%%%%DOCSDIR%%/mips_extensions.pdf From owner-svn-ports-branches@freebsd.org Mon Jan 9 18:00:37 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 16401CA795F; Mon, 9 Jan 2017 18:00:37 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E511E16E7; Mon, 9 Jan 2017 18:00:36 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v09I0anC005587; Mon, 9 Jan 2017 18:00:36 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v09I0aXc005585; Mon, 9 Jan 2017 18:00:36 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201701091800.v09I0aXc005585@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 9 Jan 2017 18:00:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r430993 - branches/2017Q1/graphics/py-pillow X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jan 2017 18:00:37 -0000 Author: feld Date: Mon Jan 9 18:00:35 2017 New Revision: 430993 URL: https://svnweb.freebsd.org/changeset/ports/430993 Log: MFH: r430992 graphics/py-pillow: Update to 3.4.2 (security fixes) - Update to 3.4.2 - Add JPEG2000 option Changes: https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst PR: 215615 Approved by: ports-secteam (with hat) Modified: branches/2017Q1/graphics/py-pillow/Makefile branches/2017Q1/graphics/py-pillow/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/graphics/py-pillow/Makefile ============================================================================== --- branches/2017Q1/graphics/py-pillow/Makefile Mon Jan 9 18:00:01 2017 (r430992) +++ branches/2017Q1/graphics/py-pillow/Makefile Mon Jan 9 18:00:35 2017 (r430993) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= pillow -PORTVERSION= 3.1.1 -PORTREVISION= 1 +PORTVERSION= 3.4.2 CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,8 +14,8 @@ LICENSE_NAME= Standard PIL License LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -OPTIONS_DEFINE= FREETYPE JPEG LCMS PNG TIFF TKINTER WEBP -OPTIONS_DEFAULT= FREETYPE JPEG PNG TKINTER WEBP +OPTIONS_DEFINE= FREETYPE JPEG JPEG2000 LCMS PNG TIFF TKINTER WEBP +OPTIONS_DEFAULT= FREETYPE JPEG JPEG2000 PNG TKINTER WEBP LCMS_DESC= Little Color Management System TKINTER_DESC= Tkinter (Tcl/Tk) BitmapImage & PhotoImage support @@ -29,6 +28,10 @@ JPEG_USES= jpeg JPEG_VARS= PYDISTUTILS_BUILDARGS+=--enable-jpeg JPEG_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-jpeg +JPEG2000_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg +JPEG2000_VARS= PYDISTUTILS_BUILDARGS+=--enable-jpeg2000 +JPEG2000_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-jpeg2000 + LCMS_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LCMS_VARS= PYDISTUTILS_BUILDARGS+=--enable-lcms LCMS_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-lcms @@ -43,12 +46,11 @@ TIFF_VARS_OFF= PYDISTUTILS_BUILDARGS+=- TKINTER_USES= tk TKINTER_BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter TKINTER_RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter -TKINTER_VARS= PYDISTUTILS_BUILDARGS+="--enable-tcl --enable-tk --include-dirs=${TCL_INCLUDEDIR}:${TK_INCLUDEDIR}" -TKINTER_VARS_OFF= PYDISTUTILS_BUILDARGS+="--disable-tcl --disable-tk" +TKINTER_VARS= PYDISTUTILS_BUILDARGS+="--include-dirs=${TCL_INCLUDEDIR}:${TK_INCLUDEDIR}" WEBP_LIB_DEPENDS= libwebp.so:graphics/webp -WEBP_VARS= PYDISTUTILS_BUILDARGS+=--enable-webp -WEBP_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-webp +WEBP_VARS= PYDISTUTILS_BUILDARGS+=--enable-webp --enable-webpmux +WEBP_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-webp --disable-webpmux USES?= cpe python USE_GITHUB= yes Modified: branches/2017Q1/graphics/py-pillow/distinfo ============================================================================== --- branches/2017Q1/graphics/py-pillow/distinfo Mon Jan 9 18:00:01 2017 (r430992) +++ branches/2017Q1/graphics/py-pillow/distinfo Mon Jan 9 18:00:35 2017 (r430993) @@ -1,2 +1,3 @@ -SHA256 (python-pillow-Pillow-3.1.1_GH0.tar.gz) = a2ab64b39378031effdd86a6cd303de7b5b606445ab0338359e9ff9dc3f2e634 -SIZE (python-pillow-Pillow-3.1.1_GH0.tar.gz) = 10051635 +TIMESTAMP = 1482579087 +SHA256 (python-pillow-Pillow-3.4.2_GH0.tar.gz) = 0ee762ab924e004b7e69643b44e82cf65e0fa1f16862e11bd821950dbbc5f3d3 +SIZE (python-pillow-Pillow-3.4.2_GH0.tar.gz) = 10746584 From owner-svn-ports-branches@freebsd.org Mon Jan 9 18:06:00 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 40A2DCA7C3A; Mon, 9 Jan 2017 18:06:00 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1AAEE1D5D; Mon, 9 Jan 2017 18:06:00 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v09I5xwR009551; Mon, 9 Jan 2017 18:05:59 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v09I5xZJ009548; Mon, 9 Jan 2017 18:05:59 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201701091805.v09I5xZJ009548@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 9 Jan 2017 18:05:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r430994 - in branches/2017Q1/www/w3m: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jan 2017 18:06:00 -0000 Author: feld Date: Mon Jan 9 18:05:58 2017 New Revision: 430994 URL: https://svnweb.freebsd.org/changeset/ports/430994 Log: MFH: r430919 - Update to 0.5.3.20170102. - Switch to code maintained by the Debian Project. - This version fixes multiple vulnerabilities. - Add LICENSE. - Add NLS option. - Change default Japanese character encoding to UTF-8. PR: 215822 Reported by: Daniel Security: http://www.vuxml.org/freebsd/eafa3aec-211b-4dd4-9b8a-a664a3f0917a.html Approved by: ports-secteam (with hat) Deleted: branches/2017Q1/www/w3m/files/ Modified: branches/2017Q1/www/w3m/Makefile branches/2017Q1/www/w3m/distinfo branches/2017Q1/www/w3m/pkg-plist Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/www/w3m/Makefile ============================================================================== --- branches/2017Q1/www/w3m/Makefile Mon Jan 9 18:00:35 2017 (r430993) +++ branches/2017Q1/www/w3m/Makefile Mon Jan 9 18:05:58 2017 (r430994) @@ -2,18 +2,26 @@ # $FreeBSD$ PORTNAME= w3m -PORTVERSION= 0.5.3 -PORTREVISION= 6 +PORTVERSION= 0.5.3.20170102 CATEGORIES+= www ipv6 -MASTER_SITES= SF/w3m/w3m/w3m-${PORTVERSION} MAINTAINER?= nobutaka@FreeBSD.org COMMENT?= Pager/text-based WWW browser -USES= pkgconfig perl5 -USE_OPENSSL= yes +LICENSE= w3m +LICENSE_NAME= w3m +LICENSE_FILE= ${WRKSRC}/doc/README +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + LIB_DEPENDS= libgc.so:devel/boehm-gc +USES= iconv pkgconfig perl5 ssl +USE_GITHUB= yes + +GH_ACCOUNT= tats +GH_PROJECT= w3m +GH_TAGNAME= 1ac245b + MAKE_JOBS_UNSAFE= yes CONFLICTS?= ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-img-0.5.* @@ -22,28 +30,34 @@ CONFIGURE_ARGS= --with-gc=${LOCALBASE} \ ac_cv_path_PERL=${PERL} CONFIGURE_ENV= DEFS="-I${LOCALBASE}/include" -DOCS= FAQ.html HISTORY MANUAL.html README \ - README.dict README.func README.img README.m17n STORY.html \ +DOCS_COMMON= FAQ.html HISTORY MANUAL.html README README.cookie \ + README.cygwin README.dict README.func README.img \ + README.m17n README.mouse README.passwd README.pre_form \ + README.siteconf README.tab STORY.html \ keymap.default keymap.lynx menu.default menu.submenu -DOCS_JP= ${DOCS} README.SSL README.cookie README.keymap README.img \ +DOCS_DE= FAQ.html MANUAL.html README.func +DOCS_EN= README.sixel +DOCS_JP= ${DOCS_COMMON} README.SSL README.keymap \ README.mailcap README.menu README.migemo -OPTIONS_DEFINE= JAPANESE INLINE_IMAGE KEY_LYNX DOCS -JAPANESE_DESC= Japanese messages and migemo support +OPTIONS_DEFINE= INLINE_IMAGE JAPANESE KEY_LYNX DOCS NLS INLINE_IMAGE_DESC= Inline image support +JAPANESE_DESC= Japanese messages and migemo support KEY_LYNX_DESC= Keymap like lynx browser OPTIONS_SUB= yes -JAPANESE_USES= gettext -JAPANESE_CONFIGURE_ON= --enable-japanese=E --with-migemo=yes gt_cv_func_gnugettext1_libintl=yes -JAPANESE_CONFIGURE_ENABLE= nls - -INLINE_IMAGE_USE= gnome=gtk20 +INLINE_IMAGE_USE= xorg=x11 gnome=gtk20,gdkpixbuf2 INLINE_IMAGE_CONFIGURE_ON= --with-imagelib=gtk2 --enable-image=fb,x11 INLINE_IMAGE_CONFIGURE_OFF= --enable-image=no +JAPANESE_CONFIGURE_ON= --enable-japanese=U --with-migemo=yes + KEY_LYNX_CONFIGURE_ON= --with-keymap=lynx +NLS_USES= gettext +NLS_CONFIGURE_ON= --enable-nls +NLS_CONFIGURE_OFF= --disable-nls + .include .if ${PORT_OPTIONS:MINLINE_IMAGE} @@ -61,6 +75,16 @@ post-patch: ${WRKSRC}/configure @${FIND} ${WRKSRC}/doc* -type f \! -name HISTORY \ -exec ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' {} + + @${CP} ${WRKSRC}/doc-jp/README.func ${WRKSRC}/README.func.bak + @${ICONV_CMD} -f EUC-JP -t UTF-8 ${WRKSRC}/README.func.bak \ + > ${WRKSRC}/doc-jp/README.func + @${CP} ${WRKSRC}/scripts/w3mhelp-funcdesc.ja.pl.in \ + ${WRKSRC}/scripts/w3mhelp-funcdesc.ja.pl.in.bak + @${ICONV_CMD} -f EUC-JP -t UTF-8 \ + ${WRKSRC}/scripts/w3mhelp-funcdesc.ja.pl.in.bak \ + > ${WRKSRC}/scripts/w3mhelp-funcdesc.ja.pl.in + @${REINPLACE_CMD} -e 's|EUC-JP|UTF-8|g' \ + ${WRKSRC}/scripts/w3mhelp-funcdesc.ja.pl.in post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/w3m @@ -68,11 +92,16 @@ post-install: for i in ${DOCS_JP} ; do \ ${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/share/doc/ja/w3m/ ; \ done + @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/de/w3m + @cd ${WRKSRC}/doc-de; \ + for i in ${DOCS_DE} ; do \ + ${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/share/doc/de/w3m/ ; \ + done @cd ${WRKSRC}/doc; \ ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/w3m/; \ - for i in ${DOCS} ; do \ + for i in ${DOCS_COMMON} ${DOCS_EN} ; do \ ${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/share/doc/w3m/ ; \ done - @${INSTALL_MAN} ${WRKSRC}/scripts/w3mman/w3mman.1 ${STAGEDIR}${PREFIX}/man/ja/man1 + ${INSTALL_MAN} ${WRKSRC}/scripts/w3mman/w3mman.1 ${STAGEDIR}${PREFIX}/man/ja/man1 .include Modified: branches/2017Q1/www/w3m/distinfo ============================================================================== --- branches/2017Q1/www/w3m/distinfo Mon Jan 9 18:00:35 2017 (r430993) +++ branches/2017Q1/www/w3m/distinfo Mon Jan 9 18:05:58 2017 (r430994) @@ -1,4 +1,3 @@ -SHA256 (w3m-0.5.3.tar.gz) = e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3 -SIZE (w3m-0.5.3.tar.gz) = 2202328 -SHA256 (w3m-0.5-version-xhtml.patch) = 3cc144a233f566a4b718eec480f3008bb67b8155ecf10663bb98b0aa47a33796 -SIZE (w3m-0.5-version-xhtml.patch) = 8965 +TIMESTAMP = 1483884967 +SHA256 (tats-w3m-0.5.3.20170102-1ac245b_GH0.tar.gz) = 77b1fc96baeea6ae713dd029cf86b5b4711b4fe1a93487a280ef5cf913b77a18 +SIZE (tats-w3m-0.5.3.20170102-1ac245b_GH0.tar.gz) = 2180133 Modified: branches/2017Q1/www/w3m/pkg-plist ============================================================================== --- branches/2017Q1/www/w3m/pkg-plist Mon Jan 9 18:00:35 2017 (r430993) +++ branches/2017Q1/www/w3m/pkg-plist Mon Jan 9 18:05:58 2017 (r430994) @@ -3,6 +3,7 @@ bin/w3mman libexec/w3m/cgi-bin/dirlist.cgi libexec/w3m/cgi-bin/multipart.cgi libexec/w3m/cgi-bin/w3mbookmark +libexec/w3m/cgi-bin/w3mdict.cgi libexec/w3m/cgi-bin/w3mhelp.cgi libexec/w3m/cgi-bin/w3mmail.cgi libexec/w3m/cgi-bin/w3mman2html.cgi @@ -10,44 +11,67 @@ libexec/w3m/cgi-bin/w3mhelperpanel libexec/w3m/inflate libexec/w3m/xface2xpm %%INLINE_IMAGE%%libexec/w3m/w3mimgdisplay -%%JAPANESE%%man/ja/man1/w3m.1.gz -%%JAPANESE%%man/ja/man1/w3mman.1.gz +man/ja/man1/w3m.1.gz +man/ja/man1/w3mman.1.gz +man/de/man1/w3m.1.gz +man/de/man1/w3mman.1.gz man/man1/w3m.1.gz man/man1/w3mman.1.gz -%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/FAQ.html -%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/HISTORY -%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/MANUAL.html -%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README -%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.SSL -%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.cookie -%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.dict -%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.func -%%PORTDOCS%%%%JAPANESE%%%%INLINE_IMAGE%%share/doc/ja/w3m/README.img -%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.keymap -%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.m17n -%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.mailcap -%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.menu -%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.migemo -%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/STORY.html -%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/keymap.default -%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/keymap.lynx -%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/menu.default -%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/menu.submenu +%%PORTDOCS%%share/doc/de/w3m/FAQ.html +%%PORTDOCS%%share/doc/de/w3m/MANUAL.html +%%PORTDOCS%%share/doc/de/w3m/README.func +%%PORTDOCS%%share/doc/ja/w3m/FAQ.html +%%PORTDOCS%%share/doc/ja/w3m/HISTORY +%%PORTDOCS%%share/doc/ja/w3m/MANUAL.html +%%PORTDOCS%%share/doc/ja/w3m/README +%%PORTDOCS%%share/doc/ja/w3m/README.SSL +%%PORTDOCS%%share/doc/ja/w3m/README.cookie +%%PORTDOCS%%share/doc/ja/w3m/README.cygwin +%%PORTDOCS%%share/doc/ja/w3m/README.dict +%%PORTDOCS%%share/doc/ja/w3m/README.func +%%PORTDOCS%%share/doc/ja/w3m/README.img +%%PORTDOCS%%share/doc/ja/w3m/README.keymap +%%PORTDOCS%%share/doc/ja/w3m/README.m17n +%%PORTDOCS%%share/doc/ja/w3m/README.mailcap +%%PORTDOCS%%share/doc/ja/w3m/README.menu +%%PORTDOCS%%share/doc/ja/w3m/README.migemo +%%PORTDOCS%%share/doc/ja/w3m/README.mouse +%%PORTDOCS%%share/doc/ja/w3m/README.passwd +%%PORTDOCS%%share/doc/ja/w3m/README.pre_form +%%PORTDOCS%%share/doc/ja/w3m/README.siteconf +%%PORTDOCS%%share/doc/ja/w3m/README.tab +%%PORTDOCS%%share/doc/ja/w3m/STORY.html +%%PORTDOCS%%share/doc/ja/w3m/keymap.default +%%PORTDOCS%%share/doc/ja/w3m/keymap.lynx +%%PORTDOCS%%share/doc/ja/w3m/menu.default +%%PORTDOCS%%share/doc/ja/w3m/menu.submenu %%PORTDOCS%%%%DOCSDIR%%/FAQ.html %%PORTDOCS%%%%DOCSDIR%%/HISTORY %%PORTDOCS%%%%DOCSDIR%%/MANUAL.html %%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.cookie +%%PORTDOCS%%%%DOCSDIR%%/README.cygwin %%PORTDOCS%%%%DOCSDIR%%/README.dict %%PORTDOCS%%%%DOCSDIR%%/README.func -%%PORTDOCS%%%%INLINE_IMAGE%%%%DOCSDIR%%/README.img +%%PORTDOCS%%%%DOCSDIR%%/README.img %%PORTDOCS%%%%DOCSDIR%%/README.m17n +%%PORTDOCS%%%%DOCSDIR%%/README.mouse +%%PORTDOCS%%%%DOCSDIR%%/README.passwd +%%PORTDOCS%%%%DOCSDIR%%/README.pre_form +%%PORTDOCS%%%%DOCSDIR%%/README.siteconf +%%PORTDOCS%%%%DOCSDIR%%/README.sixel +%%PORTDOCS%%%%DOCSDIR%%/README.tab %%PORTDOCS%%%%DOCSDIR%%/STORY.html %%PORTDOCS%%%%DOCSDIR%%/keymap.default %%PORTDOCS%%%%DOCSDIR%%/keymap.lynx %%PORTDOCS%%%%DOCSDIR%%/menu.default %%PORTDOCS%%%%DOCSDIR%%/menu.submenu -%%JAPANESE%%share/locale/ja/LC_MESSAGES/w3m.mo -share/w3m/w3mhelp-funcdesc.en.pl -share/w3m/w3mhelp-funcdesc.ja.pl -share/w3m/w3mhelp-funcname.pl -share/w3m/w3mhelp.html +%%NLS%%share/locale/de/LC_MESSAGES/w3m.mo +%%NLS%%share/locale/ja/LC_MESSAGES/w3m.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/w3m.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/w3m.mo +%%DATADIR%%/w3mhelp-funcdesc.de.pl +%%DATADIR%%/w3mhelp-funcdesc.en.pl +%%DATADIR%%/w3mhelp-funcdesc.ja.pl +%%DATADIR%%/w3mhelp-funcname.pl +%%DATADIR%%/w3mhelp.html From owner-svn-ports-branches@freebsd.org Mon Jan 9 21:51:51 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4EC3ECA8E7E; Mon, 9 Jan 2017 21:51:51 +0000 (UTC) (envelope-from mat@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 03F57165F; Mon, 9 Jan 2017 21:51:50 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v09LpoHT008737; Mon, 9 Jan 2017 21:51:50 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v09Lpojt008735; Mon, 9 Jan 2017 21:51:50 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201701092151.v09Lpojt008735@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 9 Jan 2017 21:51:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431036 - in branches/2017Q1/sysutils: munin-common/files munin-node X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jan 2017 21:51:51 -0000 Author: mat Date: Mon Jan 9 21:51:49 2017 New Revision: 431036 URL: https://svnweb.freebsd.org/changeset/ports/431036 Log: MFH: r431033 Also, don't report autofs. Sponsored by: Absolight Added: branches/2017Q1/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in - copied unchanged from r431033, head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in Modified: branches/2017Q1/sysutils/munin-node/Makefile Directory Properties: branches/2017Q1/ (props changed) Copied: branches/2017Q1/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in (from r431033, head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in Mon Jan 9 21:51:49 2017 (r431036, copy of r431033, head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in) @@ -0,0 +1,11 @@ +--- plugins/node.d.freebsd/df.in.orig 2016-12-04 19:34:49 UTC ++++ plugins/node.d.freebsd/df.in +@@ -24,7 +24,7 @@ if [ "$1" = "autoconf" ]; then + exit 0 + fi + +-EXCLUDEDFS="-t noprocfs,devfs,fdescfs,linprocfs,linsysfs,nfs,nullfs" ++EXCLUDEDFS="-t noprocfs,devfs,fdescfs,linprocfs,linsysfs,nfs,nullfs,autofs" + + if [ $(uname -s) = "GNU/kFreeBSD" ]; then + EXCLUDEDFS=$(echo $EXCLUDEDFS | sed 's/^-t /-x /; s/,/ -x /g') Modified: branches/2017Q1/sysutils/munin-node/Makefile ============================================================================== --- branches/2017Q1/sysutils/munin-node/Makefile Mon Jan 9 21:50:36 2017 (r431035) +++ branches/2017Q1/sysutils/munin-node/Makefile Mon Jan 9 21:51:49 2017 (r431036) @@ -3,7 +3,7 @@ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -node From owner-svn-ports-branches@freebsd.org Tue Jan 10 02:18:20 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0B51CA4BD3; Tue, 10 Jan 2017 02:18:20 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7D24A11FA; Tue, 10 Jan 2017 02:18:20 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0A2IJax014902; Tue, 10 Jan 2017 02:18:19 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0A2IJCG014901; Tue, 10 Jan 2017 02:18:19 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201701100218.v0A2IJCG014901@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 10 Jan 2017 02:18:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431047 - branches/2017Q1/www/rubygem-jekyll X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jan 2017 02:18:20 -0000 Author: feld Date: Tue Jan 10 02:18:19 2017 New Revision: 431047 URL: https://svnweb.freebsd.org/changeset/ports/431047 Log: MFH: r430729 www/rubygem-jekyll: Fix RUN_DEPENDS - Does not work with the latest liquid release so depend on textproc/rubygem-liquid3 - Does not work with the latest rouge release so depend on textproc/rubygem-rouge1 PR: 213500 Reported by: freebsdbug@patpro.net Reviewed by: mat Approved by: mat Differential Revision: https://reviews.freebsd.org/D8978 Approved by: ports-secteam (with hat) Modified: branches/2017Q1/www/rubygem-jekyll/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/www/rubygem-jekyll/Makefile ============================================================================== --- branches/2017Q1/www/rubygem-jekyll/Makefile Tue Jan 10 02:06:06 2017 (r431046) +++ branches/2017Q1/www/rubygem-jekyll/Makefile Tue Jan 10 02:18:19 2017 (r431047) @@ -17,10 +17,10 @@ RUN_DEPENDS= rubygem-addressable>=2.4:ww rubygem-jekyll-sass-converter>=1.0:textproc/rubygem-jekyll-sass-converter \ rubygem-jekyll-watch>=1.1:www/rubygem-jekyll-watch \ rubygem-kramdown>=1.3:textproc/rubygem-kramdown \ - rubygem-liquid>=3.0.0:textproc/rubygem-liquid \ + rubygem-liquid3>=3.0.0:textproc/rubygem-liquid3 \ rubygem-mercenary>=0.3.3:devel/rubygem-mercenary \ rubygem-pathutil>=0.9:devel/rubygem-pathutil \ - rubygem-rouge>=1.7:textproc/rubygem-rouge \ + rubygem-rouge1>=1.7:textproc/rubygem-rouge1 \ rubygem-safe_yaml>=1.0:devel/rubygem-safe_yaml CONFLICTS_INSTALL= rubygem-jekyll2-* From owner-svn-ports-branches@freebsd.org Tue Jan 10 02:19:10 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 657D3CA4C93; Tue, 10 Jan 2017 02:19:10 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 34797130D; Tue, 10 Jan 2017 02:19:10 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0A2J9ug015095; Tue, 10 Jan 2017 02:19:09 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0A2J9vv015094; Tue, 10 Jan 2017 02:19:09 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201701100219.v0A2J9vv015094@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 10 Jan 2017 02:19:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431048 - branches/2017Q1/devel/rubygem-listen X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jan 2017 02:19:10 -0000 Author: feld Date: Tue Jan 10 02:19:09 2017 New Revision: 431048 URL: https://svnweb.freebsd.org/changeset/ports/431048 Log: MFH: r430727 devel/rubygem-listen: Add missing dependency - Add missing dependency on devel/rubygem-ruby_dep PR: 213500 Reported by: freebsdbug@patpro.net Reviewed by: mat Approved by: mat Differential Revision: https://reviews.freebsd.org/D8977 Approved by: ports-secteam (with hat) Modified: branches/2017Q1/devel/rubygem-listen/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/devel/rubygem-listen/Makefile ============================================================================== --- branches/2017Q1/devel/rubygem-listen/Makefile Tue Jan 10 02:18:19 2017 (r431047) +++ branches/2017Q1/devel/rubygem-listen/Makefile Tue Jan 10 02:19:09 2017 (r431048) @@ -14,7 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= rubygem-rb-fsevent>=0.9.4:devel/rubygem-rb-fsevent \ rubygem-rb-inotify>=0.9.7:devel/rubygem-rb-inotify \ - rubygem-rb-kqueue>=0.2:devel/rubygem-rb-kqueue + rubygem-rb-kqueue>=0.2:devel/rubygem-rb-kqueue \ + rubygem-ruby_dep>=1.2:devel/rubygem-ruby_dep NO_ARCH= yes USE_RUBY= yes From owner-svn-ports-branches@freebsd.org Tue Jan 10 02:20:07 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E70B1CA4DE2; Tue, 10 Jan 2017 02:20:07 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B9056147F; Tue, 10 Jan 2017 02:20:07 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0A2K6h5015324; Tue, 10 Jan 2017 02:20:06 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0A2K6VE015323; Tue, 10 Jan 2017 02:20:06 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201701100220.v0A2K6VE015323@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 10 Jan 2017 02:20:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431049 - in branches/2017Q1/textproc: . rubygem-rouge1 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jan 2017 02:20:08 -0000 Author: feld Date: Tue Jan 10 02:20:06 2017 New Revision: 431049 URL: https://svnweb.freebsd.org/changeset/ports/431049 Log: MFH: r430726 textproc/rubygem-rouge1: New port - Required by www/rubygem-jekyll PR: 213500 Reported by: freebsdbug@patpro.net Reviewed by: mat Approved by: mat Differential Revision: https://reviews.freebsd.org/D8976 Approved by: ports-secteam (with hat) Added: branches/2017Q1/textproc/rubygem-rouge1/ - copied from r430726, head/textproc/rubygem-rouge1/ Modified: branches/2017Q1/textproc/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/textproc/Makefile ============================================================================== --- branches/2017Q1/textproc/Makefile Tue Jan 10 02:19:09 2017 (r431048) +++ branches/2017Q1/textproc/Makefile Tue Jan 10 02:20:06 2017 (r431049) @@ -1499,6 +1499,7 @@ SUBDIR += rubygem-rich SUBDIR += rubygem-rmmseg-cpp SUBDIR += rubygem-rouge + SUBDIR += rubygem-rouge1 SUBDIR += rubygem-rttool SUBDIR += rubygem-ruby-augeas SUBDIR += rubygem-ruby-xslt From owner-svn-ports-branches@freebsd.org Tue Jan 10 02:20:59 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 42591CA4E73; Tue, 10 Jan 2017 02:20:59 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 145E01603; Tue, 10 Jan 2017 02:20:59 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0A2KwFA015525; Tue, 10 Jan 2017 02:20:58 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0A2KwPJ015524; Tue, 10 Jan 2017 02:20:58 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201701100220.v0A2KwPJ015524@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 10 Jan 2017 02:20:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431050 - in branches/2017Q1/textproc: . rubygem-liquid3 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jan 2017 02:20:59 -0000 Author: feld Date: Tue Jan 10 02:20:58 2017 New Revision: 431050 URL: https://svnweb.freebsd.org/changeset/ports/431050 Log: MFH: r430725 textproc/rubygem-liquid3: new port - Required for www/rubygem-jekyll PR: 213500 Reported by: freebsdbug@patpro.net Reviewed by: mat Approved by: mat Differential Revision: https://reviews.freebsd.org/D8975 Approved by: ports-secteam (with hat) Added: branches/2017Q1/textproc/rubygem-liquid3/ - copied from r430725, head/textproc/rubygem-liquid3/ Modified: branches/2017Q1/textproc/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/textproc/Makefile ============================================================================== --- branches/2017Q1/textproc/Makefile Tue Jan 10 02:20:06 2017 (r431049) +++ branches/2017Q1/textproc/Makefile Tue Jan 10 02:20:58 2017 (r431050) @@ -1470,6 +1470,7 @@ SUBDIR += rubygem-linguistics SUBDIR += rubygem-liquid SUBDIR += rubygem-liquid2 + SUBDIR += rubygem-liquid3 SUBDIR += rubygem-loggability SUBDIR += rubygem-loofah SUBDIR += rubygem-ltsv From owner-svn-ports-branches@freebsd.org Tue Jan 10 03:06:38 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0EA83CA8789; Tue, 10 Jan 2017 03:06:38 +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 D180A1031; Tue, 10 Jan 2017 03:06:37 +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 v0A36b60037813; Tue, 10 Jan 2017 03:06:37 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0A36bH4037812; Tue, 10 Jan 2017 03:06:37 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201701100306.v0A36bH4037812@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Tue, 10 Jan 2017 03:06:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431062 - branches/2017Q1/databases/mariadb55-server/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jan 2017 03:06:38 -0000 Author: junovitch Date: Tue Jan 10 03:06:36 2017 New Revision: 431062 URL: https://svnweb.freebsd.org/changeset/ports/431062 Log: MFH: r430977 Fix patch. Sponsored by: Absolight Approved by: ports-secteam (blanket) Modified: branches/2017Q1/databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh ============================================================================== --- branches/2017Q1/databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh Tue Jan 10 02:55:19 2017 (r431061) +++ branches/2017Q1/databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh Tue Jan 10 03:06:36 2017 (r431062) @@ -1,6 +1,6 @@ ---- scripts/mysqld_safe.sh.orig 2007-10-08 10:39:23.000000000 +0200 -+++ scripts/mysqld_safe.sh 2007-10-08 10:40:52.000000000 +0200 -@@ -242,10 +242,10 @@ +--- scripts/mysqld_safe.sh.orig 2017-01-09 14:36:43 UTC ++++ scripts/mysqld_safe.sh +@@ -468,10 +468,10 @@ fi if test -z "$MYSQL_HOME" then @@ -13,12 +13,12 @@ $DATADIR/my.cnf IGNORING $DATADIR/my.cnf" -@@ -254,7 +254,7 @@ +@@ -480,7 +480,7 @@ IGNORING $DATADIR/my.cnf" then log_error "WARNING: Found $DATADIR/my.cnf The data directory is a deprecated location for my.cnf, please move it to -$MY_BASEDIR_VERSION/my.cnf" +$MY_BASEDIR_VERSION/etc/my.cnf" + unsafe_my_cnf=1 MYSQL_HOME=$DATADIR else - MYSQL_HOME=$MY_BASEDIR_VERSION From owner-svn-ports-branches@freebsd.org Tue Jan 10 03:24:53 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 34C55CA8E81; Tue, 10 Jan 2017 03:24:53 +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 EB7E51D23; Tue, 10 Jan 2017 03:24:52 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0A3Oq6x046338; Tue, 10 Jan 2017 03:24:52 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0A3OpYb046335; Tue, 10 Jan 2017 03:24:51 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201701100324.v0A3OpYb046335@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Tue, 10 Jan 2017 03:24:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431065 - in branches/2017Q1/devel/dwarfdump: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jan 2017 03:24:53 -0000 Author: junovitch Date: Tue Jan 10 03:24:51 2017 New Revision: 431065 URL: https://svnweb.freebsd.org/changeset/ports/431065 Log: MFH: r431064 devel/dwarfdump: update 20130207 -> 20161124; add LICENSE PR: 215086 Submitted by: pfg Approved by: maintainer timeout (4 weeks) Approved by: ports-secteam (with hat) Deleted: branches/2017Q1/devel/dwarfdump/files/patch-Makefile.in Modified: branches/2017Q1/devel/dwarfdump/Makefile branches/2017Q1/devel/dwarfdump/distinfo branches/2017Q1/devel/dwarfdump/files/patch-configure Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/devel/dwarfdump/Makefile ============================================================================== --- branches/2017Q1/devel/dwarfdump/Makefile Tue Jan 10 03:23:50 2017 (r431064) +++ branches/2017Q1/devel/dwarfdump/Makefile Tue Jan 10 03:24:51 2017 (r431065) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dwarfdump -PORTVERSION= 20130207 +PORTVERSION= 20161124 CATEGORIES= devel MASTER_SITES= http://www.prevanders.net/ DISTNAME= libdwarf-${PORTVERSION} @@ -10,6 +10,8 @@ DISTNAME= libdwarf-${PORTVERSION} MAINTAINER= joerg@FreeBSD.org COMMENT= Tool to display DWARF debugging information in ELF files +LICENSE= GPLv2 + BUILD_DEPENDS= ${LOCALBASE}/lib/libdwarf.a:devel/libdwarf WRKSRC= ${WRKDIR}/dwarf-${PORTVERSION}/dwarfdump Modified: branches/2017Q1/devel/dwarfdump/distinfo ============================================================================== --- branches/2017Q1/devel/dwarfdump/distinfo Tue Jan 10 03:23:50 2017 (r431064) +++ branches/2017Q1/devel/dwarfdump/distinfo Tue Jan 10 03:24:51 2017 (r431065) @@ -1,2 +1,3 @@ -SHA256 (libdwarf-20130207.tar.gz) = 5cb81459f0a1f6a2a10ef4635faddc2fa5e1a9e36901018c017759e491e708b8 -SIZE (libdwarf-20130207.tar.gz) = 1534527 +TIMESTAMP = 1481000089 +SHA256 (libdwarf-20161124.tar.gz) = bd3d6dc7da0509876fb95b8681f165febd898845dc66714aa58e69b8feca988f +SIZE (libdwarf-20161124.tar.gz) = 1732155 Modified: branches/2017Q1/devel/dwarfdump/files/patch-configure ============================================================================== --- branches/2017Q1/devel/dwarfdump/files/patch-configure Tue Jan 10 03:23:50 2017 (r431064) +++ branches/2017Q1/devel/dwarfdump/files/patch-configure Tue Jan 10 03:24:51 2017 (r431065) @@ -1,11 +1,11 @@ ---- configure.orig 2010-02-04 22:00:43.000000000 +0000 -+++ configure 2010-02-08 13:36:07.000000000 +0000 -@@ -3508,7 +3508,7 @@ +--- configure.orig 2016-12-06 05:12:37 UTC ++++ configure +@@ -3585,7 +3585,7 @@ fi done --for ac_header in elf.h getopt.h libelf.h libelf/libelf.h sgidefs.h sys/types.h -+for ac_header in getopt.h libelf.h libelf/libelf.h sgidefs.h sys/types.h +-for ac_header in elf.h unistd.h libelf.h libelf/libelf.h sgidefs.h sys/types.h ++for ac_header in unistd.h libelf.h libelf/libelf.h sgidefs.h sys/types.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" From owner-svn-ports-branches@freebsd.org Tue Jan 10 03:44:49 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 14EF7CA862A; Tue, 10 Jan 2017 03:44:49 +0000 (UTC) (envelope-from lifanov@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BCB4E1849; Tue, 10 Jan 2017 03:44:48 +0000 (UTC) (envelope-from lifanov@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0A3ilSD054491; Tue, 10 Jan 2017 03:44:47 GMT (envelope-from lifanov@FreeBSD.org) Received: (from lifanov@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0A3ilZK054489; Tue, 10 Jan 2017 03:44:47 GMT (envelope-from lifanov@FreeBSD.org) Message-Id: <201701100344.v0A3ilZK054489@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lifanov set sender to lifanov@FreeBSD.org using -f From: Nikolai Lifanov Date: Tue, 10 Jan 2017 03:44:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431066 - branches/2017Q1/devel/pcsc-lite X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jan 2017 03:44:49 -0000 Author: lifanov Date: Tue Jan 10 03:44:47 2017 New Revision: 431066 URL: https://svnweb.freebsd.org/changeset/ports/431066 Log: MFH: r430434 r430953 - Pass maintainership to submitter PR: 215713 Submitted by: mokhi64@gmail.com update devel/pcsc-lite to 1.8.20 PR: 215834 Submitted by: Mahdi Mokhtari (maintainer) Reviewed by: matthew Approved by: matthew (mentor) Security: https://vuxml.FreeBSD.org/freebsd/c218873d-d444-11e6-84ef-f0def167eeea.html Differential Revision: https://reviews.freebsd.org/D9071 Approved by: ports-secteam Modified: branches/2017Q1/devel/pcsc-lite/Makefile branches/2017Q1/devel/pcsc-lite/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/devel/pcsc-lite/Makefile ============================================================================== --- branches/2017Q1/devel/pcsc-lite/Makefile Tue Jan 10 03:24:51 2017 (r431065) +++ branches/2017Q1/devel/pcsc-lite/Makefile Tue Jan 10 03:44:47 2017 (r431066) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= pcsc-lite -PORTVERSION= 1.8.19 +PORTVERSION= 1.8.20 PORTEPOCH= 2 CATEGORIES= devel security -MASTER_SITES= https://alioth.debian.org/frs/download.php/file/4198/ +MASTER_SITES= https://alioth.debian.org/frs/download.php/latestfile/39/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mokhi64@gmail.com COMMENT= Smartcard development library LICENSE= BSD3CLAUSE Modified: branches/2017Q1/devel/pcsc-lite/distinfo ============================================================================== --- branches/2017Q1/devel/pcsc-lite/distinfo Tue Jan 10 03:24:51 2017 (r431065) +++ branches/2017Q1/devel/pcsc-lite/distinfo Tue Jan 10 03:44:47 2017 (r431066) @@ -1,3 +1,3 @@ -TIMESTAMP = 1481446804 -SHA256 (pcsc-lite-1.8.19.tar.bz2) = b65e25ec6dd1328983b424ce1a649e2993b1c4c59fc87252689b5fa7037c4340 -SIZE (pcsc-lite-1.8.19.tar.bz2) = 744283 +TIMESTAMP = 1483729174 +SHA256 (pcsc-lite-1.8.20.tar.bz2) = ec7d0114016c788c1c09859c84860f6cec6c4595436d23245105154b9c046bb2 +SIZE (pcsc-lite-1.8.20.tar.bz2) = 745049 From owner-svn-ports-branches@freebsd.org Tue Jan 10 12:10:21 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7E061CA876E; Tue, 10 Jan 2017 12:10:21 +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 333F9115C; Tue, 10 Jan 2017 12:10:21 +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 v0ACAKqs057567; Tue, 10 Jan 2017 12:10:20 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0ACAKPa057563; Tue, 10 Jan 2017 12:10:20 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201701101210.v0ACAKPa057563@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Tue, 10 Jan 2017 12:10:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431080 - in branches/2017Q1/net: samba42 samba43 samba44 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jan 2017 12:10:21 -0000 Author: antoine Date: Tue Jan 10 12:10:19 2017 New Revision: 431080 URL: https://svnweb.freebsd.org/changeset/ports/431080 Log: MFH: r431079 Remove WANT_OPENLDAP_SASL from a few ports as it prevents users from easily installing a desktop environment and samba. WANT_OPENLDAP_SASL must not be used in invidual ports Makefiles. Note: there is a wip to rewrite the handling of openldap in ports With hat: portmgr Reviewed by: mat Differential Revision: https://reviews.freebsd.org/D9083 Modified: branches/2017Q1/net/samba42/Makefile branches/2017Q1/net/samba43/Makefile branches/2017Q1/net/samba44/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/net/samba42/Makefile ============================================================================== --- branches/2017Q1/net/samba42/Makefile Tue Jan 10 12:08:19 2017 (r431079) +++ branches/2017Q1/net/samba42/Makefile Tue Jan 10 12:10:19 2017 (r431080) @@ -345,7 +345,6 @@ CONFIGURE_ARGS+= --without-ads .if defined(SAMBA4_WANT_LDAP) USE_OPENLDAP= yes -#WANT_OPENLDAP_SASL= yes CONFIGURE_ARGS+= --with-ldap PLIST_SUB+= LDAP="" .else Modified: branches/2017Q1/net/samba43/Makefile ============================================================================== --- branches/2017Q1/net/samba43/Makefile Tue Jan 10 12:08:19 2017 (r431079) +++ branches/2017Q1/net/samba43/Makefile Tue Jan 10 12:10:19 2017 (r431080) @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}43 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -345,7 +345,6 @@ CONFIGURE_ARGS+= --without-ads .if defined(SAMBA4_WANT_LDAP) USE_OPENLDAP= yes -WANT_OPENLDAP_SASL= yes CONFIGURE_ARGS+= --with-ldap PLIST_SUB+= LDAP="" .else Modified: branches/2017Q1/net/samba44/Makefile ============================================================================== --- branches/2017Q1/net/samba44/Makefile Tue Jan 10 12:08:19 2017 (r431079) +++ branches/2017Q1/net/samba44/Makefile Tue Jan 10 12:10:19 2017 (r431080) @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}44 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -333,7 +333,6 @@ PLIST_SUB+= ADS="@comment " .if defined(SAMBA4_WANT_LDAP) USE_OPENLDAP= yes -WANT_OPENLDAP_SASL= yes CONFIGURE_ARGS+= --with-ldap PLIST_SUB+= LDAP="" .else From owner-svn-ports-branches@freebsd.org Tue Jan 10 15:13:37 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E5A46CA9920; Tue, 10 Jan 2017 15:13:37 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BD7751033; Tue, 10 Jan 2017 15:13:37 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0AFDagI034475; Tue, 10 Jan 2017 15:13:36 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0AFDas9034471; Tue, 10 Jan 2017 15:13:36 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201701101513.v0AFDas9034471@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 10 Jan 2017 15:13:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431090 - in branches/2017Q1/mail: archiveopteryx archiveopteryx-devel archiveopteryx-devel/files archiveopteryx/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jan 2017 15:13:38 -0000 Author: feld Date: Tue Jan 10 15:13:36 2017 New Revision: 431090 URL: https://svnweb.freebsd.org/changeset/ports/431090 Log: MFH: r431089 mail/archiveopteryx{-devel}: Fix build on HEAD Approved by: ports-secteam (with hat) Added: branches/2017Q1/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp - copied unchanged from r431089, head/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp branches/2017Q1/mail/archiveopteryx/files/patch-server_tlsthread.cpp - copied unchanged from r431089, head/mail/archiveopteryx/files/patch-server_tlsthread.cpp Modified: branches/2017Q1/mail/archiveopteryx-devel/Makefile branches/2017Q1/mail/archiveopteryx/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/mail/archiveopteryx-devel/Makefile ============================================================================== --- branches/2017Q1/mail/archiveopteryx-devel/Makefile Tue Jan 10 15:12:44 2017 (r431089) +++ branches/2017Q1/mail/archiveopteryx-devel/Makefile Tue Jan 10 15:13:36 2017 (r431090) @@ -3,7 +3,7 @@ PORTNAME= archiveopteryx PORTVERSION= 3.2.99.20160129 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail PKGNAMESUFFIX= -devel Copied: branches/2017Q1/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp (from r431089, head/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp Tue Jan 10 15:13:36 2017 (r431090, copy of r431089, head/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp) @@ -0,0 +1,11 @@ +--- server/tlsthread.cpp.orig 2017-01-10 15:06:31 UTC ++++ server/tlsthread.cpp +@@ -93,7 +93,7 @@ void TlsThread::setup() + SSL_library_init(); + + ctx = ::SSL_CTX_new( SSLv23_server_method() ); +- int options = SSL_OP_ALL ++ long options = SSL_OP_ALL + // also try to pick the same ciphers suites more often + | SSL_OP_CIPHER_SERVER_PREFERENCE + // and don't use SSLv2, even if the client wants to Modified: branches/2017Q1/mail/archiveopteryx/Makefile ============================================================================== --- branches/2017Q1/mail/archiveopteryx/Makefile Tue Jan 10 15:12:44 2017 (r431089) +++ branches/2017Q1/mail/archiveopteryx/Makefile Tue Jan 10 15:13:36 2017 (r431090) @@ -3,7 +3,7 @@ PORTNAME= archiveopteryx PORTVERSION= 3.2.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= mail MASTER_SITES= http://archiveopteryx.org/download/ Copied: branches/2017Q1/mail/archiveopteryx/files/patch-server_tlsthread.cpp (from r431089, head/mail/archiveopteryx/files/patch-server_tlsthread.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/mail/archiveopteryx/files/patch-server_tlsthread.cpp Tue Jan 10 15:13:36 2017 (r431090, copy of r431089, head/mail/archiveopteryx/files/patch-server_tlsthread.cpp) @@ -0,0 +1,11 @@ +--- server/tlsthread.cpp.orig 2017-01-10 15:10:07 UTC ++++ server/tlsthread.cpp +@@ -93,7 +93,7 @@ void TlsThread::setup() + SSL_library_init(); + + ctx = ::SSL_CTX_new( SSLv23_server_method() ); +- int options = SSL_OP_ALL ++ long options = SSL_OP_ALL + // also try to pick the same ciphers suites more often + | SSL_OP_CIPHER_SERVER_PREFERENCE + // and don't use SSLv2, even if the client wants to From owner-svn-ports-branches@freebsd.org Wed Jan 11 02:22:10 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 730B2CAA597; Wed, 11 Jan 2017 02:22:10 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C183617A7; Wed, 11 Jan 2017 02:22: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 v0B2M8cv011269; Wed, 11 Jan 2017 02:22:08 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0B2M8QS011267; Wed, 11 Jan 2017 02:22:08 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201701110222.v0B2M8QS011267@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Wed, 11 Jan 2017 02:22:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431154 - branches/2017Q1/www/linux-flashplayer X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jan 2017 02:22:10 -0000 Author: junovitch Date: Wed Jan 11 02:22:08 2017 New Revision: 431154 URL: https://svnweb.freebsd.org/changeset/ports/431154 Log: MFH: r431088 Update to 24.0.0.194. Security: CVE-2017-2925 Security: CVE-2017-2926 Security: CVE-2017-2927 Security: CVE-2017-2928 Security: CVE-2017-2930 Security: CVE-2017-2931 Security: CVE-2017-2932 Security: CVE-2017-2933 Security: CVE-2017-2934 Security: CVE-2017-2935 Security: CVE-2017-2936 Security: CVE-2017-2937 Security: CVE-2017-2938 Security: https://vuxml.FreeBSD.org/freebsd/2a7bdc56-d7a3-11e6-ae1b-002590263bf5.html Approved by: ports-secteam (with hat) Modified: branches/2017Q1/www/linux-flashplayer/Makefile branches/2017Q1/www/linux-flashplayer/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/www/linux-flashplayer/Makefile ============================================================================== --- branches/2017Q1/www/linux-flashplayer/Makefile Wed Jan 11 02:21:58 2017 (r431153) +++ branches/2017Q1/www/linux-flashplayer/Makefile Wed Jan 11 02:22:08 2017 (r431154) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flashplayer -PORTVERSION= 24.0.0.186 +PORTVERSION= 24.0.0.194 CATEGORIES= www multimedia linux MASTER_SITES= https://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION}/ PKGNAMEPREFIX= linux- Modified: branches/2017Q1/www/linux-flashplayer/distinfo ============================================================================== --- branches/2017Q1/www/linux-flashplayer/distinfo Wed Jan 11 02:21:58 2017 (r431153) +++ branches/2017Q1/www/linux-flashplayer/distinfo Wed Jan 11 02:22:08 2017 (r431154) @@ -1,3 +1,3 @@ -TIMESTAMP = 1482070603 -SHA256 (flashplayer/24.0.0.186/flash_player_npapi_linux.i386.tar.gz) = 3b5803388f31940484c1020db4c5533aa48cfccab3880eb55a6f25610eb691fd -SIZE (flashplayer/24.0.0.186/flash_player_npapi_linux.i386.tar.gz) = 9159537 +TIMESTAMP = 1484059733 +SHA256 (flashplayer/24.0.0.194/flash_player_npapi_linux.i386.tar.gz) = f461cbabc965cb5fa6d2271259e166340e8b20833f6a9ce60a81a04021e72ed3 +SIZE (flashplayer/24.0.0.194/flash_player_npapi_linux.i386.tar.gz) = 9161011 From owner-svn-ports-branches@freebsd.org Wed Jan 11 06:40:01 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A6206CA90C3; Wed, 11 Jan 2017 06:40:01 +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 832AF1EA7; Wed, 11 Jan 2017 06:40:01 +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 v0B6e0nB015855; Wed, 11 Jan 2017 06:40:00 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0B6e0Ze015850; Wed, 11 Jan 2017 06:40:00 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701110640.v0B6e0Ze015850@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 11 Jan 2017 06:40:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431159 - in branches/2017Q1: mail/thunderbird/files www/firefox-esr/files www/firefox/files www/libxul/files www/seamonkey/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jan 2017 06:40:01 -0000 Author: jbeich Date: Wed Jan 11 06:40:00 2017 New Revision: 431159 URL: https://svnweb.freebsd.org/changeset/ports/431159 Log: MFH: r431138 gecko: attempt to unbreak aarch64 ../../xpcom/reflect/xptcall/xptcall.o:(.data.rel.ro._ZTV14nsXPTCStubBase+0x28): undefined reference to `nsXPTCStubBase::Stub3()' ../../xpcom/reflect/xptcall/xptcall.o:(.data.rel.ro._ZTV14nsXPTCStubBase+0x30): undefined reference to `nsXPTCStubBase::Stub4()' [...] ../../xpcom/build/Unified_cpp_xpcom_build0.o:(.data.rel.ro._ZL16kFrozenFunctions+0x180): undefined reference to `NS_InvokeByIndex' ../../js/xpconnect/src/Unified_cpp_js_xpconnect_src1.o: In function `XPCWrappedNative::CallMethod(XPCCallContext&, XPCWrappedNative::CallMode)': obj-aarch64-unknown-freebsd11.0/js/xpconnect/src/Unified_cpp_js_xpconnect_src1.cpp:(.text._ZN16XPCWrappedNative10CallMethodER14XPCCallContextNS_8CallModeE+0xd24): undefined reference to `NS_InvokeByIndex' ../../dom/xslt/xpath/Unified_cpp_dom_xslt_xpath2.o: In function `txXPCOMExtensionFunctionCall::evaluate(txIEvalContext*, txAExprResult**)': obj-aarch64-unknown-freebsd11.0/dom/xslt/xpath/Unified_cpp_dom_xslt_xpath2.cpp:(.text._ZN28txXPCOMExtensionFunctionCall8evaluateEP14txIEvalContextPP13txAExprResult+0xa5c): undefined reference to `NS_InvokeByIndex' /usr/bin/ld: libxul.so: hidden symbol `_ZN14nsXPTCStubBase7Stub234Ev' isn't defined /usr/bin/ld: final link failed: Bad value Reported by: pkg-fallout Approved by: ports-secteam blanket Added: branches/2017Q1/mail/thunderbird/files/patch-bug1330119 - copied unchanged from r431138, head/mail/thunderbird/files/patch-bug1330119 branches/2017Q1/www/firefox-esr/files/patch-bug1330119 - copied unchanged from r431138, head/www/firefox-esr/files/patch-bug1330119 branches/2017Q1/www/firefox/files/patch-bug1330119 - copied unchanged from r431138, head/www/firefox/files/patch-bug1330119 branches/2017Q1/www/libxul/files/patch-bug1330119 - copied unchanged from r431138, head/www/libxul/files/patch-bug1330119 branches/2017Q1/www/seamonkey/files/patch-bug1330119 - copied unchanged from r431138, head/www/seamonkey/files/patch-bug1330119 Modified: Directory Properties: branches/2017Q1/ (props changed) Copied: branches/2017Q1/mail/thunderbird/files/patch-bug1330119 (from r431138, head/mail/thunderbird/files/patch-bug1330119) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/mail/thunderbird/files/patch-bug1330119 Wed Jan 11 06:40:00 2017 (r431159, copy of r431138, head/mail/thunderbird/files/patch-bug1330119) @@ -0,0 +1,13 @@ +diff --git xpcom/reflect/xptcall/md/unix/moz.build xpcom/reflect/xptcall/md/unix/moz.build +index 019487bd69a2..a54026e70412 100644 +--- mozilla/xpcom/reflect/xptcall/md/unix/moz.build ++++ mozilla/xpcom/reflect/xptcall/md/unix/moz.build +@@ -151,7 +151,7 @@ if CONFIG['OS_ARCH'] == 'NetBSD': + 'xptcstubs_netbsd_m68k.cpp' + ] + +-if CONFIG['OS_ARCH'] == 'Linux': ++if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD', 'OpenBSD'): + if CONFIG['OS_TEST'] == 'aarch64': + SOURCES += [ + 'xptcinvoke_aarch64.cpp', Copied: branches/2017Q1/www/firefox-esr/files/patch-bug1330119 (from r431138, head/www/firefox-esr/files/patch-bug1330119) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/firefox-esr/files/patch-bug1330119 Wed Jan 11 06:40:00 2017 (r431159, copy of r431138, head/www/firefox-esr/files/patch-bug1330119) @@ -0,0 +1,13 @@ +diff --git xpcom/reflect/xptcall/md/unix/moz.build xpcom/reflect/xptcall/md/unix/moz.build +index 019487bd69a2..a54026e70412 100644 +--- xpcom/reflect/xptcall/md/unix/moz.build ++++ xpcom/reflect/xptcall/md/unix/moz.build +@@ -151,7 +151,7 @@ if CONFIG['OS_ARCH'] == 'NetBSD': + 'xptcstubs_netbsd_m68k.cpp' + ] + +-if CONFIG['OS_ARCH'] == 'Linux': ++if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD', 'OpenBSD'): + if CONFIG['OS_TEST'] == 'aarch64': + SOURCES += [ + 'xptcinvoke_aarch64.cpp', Copied: branches/2017Q1/www/firefox/files/patch-bug1330119 (from r431138, head/www/firefox/files/patch-bug1330119) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/firefox/files/patch-bug1330119 Wed Jan 11 06:40:00 2017 (r431159, copy of r431138, head/www/firefox/files/patch-bug1330119) @@ -0,0 +1,13 @@ +diff --git xpcom/reflect/xptcall/md/unix/moz.build xpcom/reflect/xptcall/md/unix/moz.build +index 019487bd69a2..a54026e70412 100644 +--- xpcom/reflect/xptcall/md/unix/moz.build ++++ xpcom/reflect/xptcall/md/unix/moz.build +@@ -151,7 +151,7 @@ if CONFIG['OS_ARCH'] == 'NetBSD': + 'xptcstubs_netbsd_m68k.cpp' + ] + +-if CONFIG['OS_ARCH'] == 'Linux': ++if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD', 'OpenBSD'): + if CONFIG['OS_TEST'] == 'aarch64': + SOURCES += [ + 'xptcinvoke_aarch64.cpp', Copied: branches/2017Q1/www/libxul/files/patch-bug1330119 (from r431138, head/www/libxul/files/patch-bug1330119) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/libxul/files/patch-bug1330119 Wed Jan 11 06:40:00 2017 (r431159, copy of r431138, head/www/libxul/files/patch-bug1330119) @@ -0,0 +1,13 @@ +diff --git xpcom/reflect/xptcall/md/unix/moz.build xpcom/reflect/xptcall/md/unix/moz.build +index 019487bd69a2..a54026e70412 100644 +--- xpcom/reflect/xptcall/md/unix/moz.build ++++ xpcom/reflect/xptcall/md/unix/moz.build +@@ -151,7 +151,7 @@ if CONFIG['OS_ARCH'] == 'NetBSD': + 'xptcstubs_netbsd_m68k.cpp' + ] + +-if CONFIG['OS_ARCH'] == 'Linux': ++if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD', 'OpenBSD'): + if CONFIG['OS_TEST'] == 'aarch64': + SOURCES += [ + 'xptcinvoke_aarch64.cpp', Copied: branches/2017Q1/www/seamonkey/files/patch-bug1330119 (from r431138, head/www/seamonkey/files/patch-bug1330119) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/seamonkey/files/patch-bug1330119 Wed Jan 11 06:40:00 2017 (r431159, copy of r431138, head/www/seamonkey/files/patch-bug1330119) @@ -0,0 +1,13 @@ +diff --git xpcom/reflect/xptcall/md/unix/moz.build xpcom/reflect/xptcall/md/unix/moz.build +index 019487bd69a2..a54026e70412 100644 +--- mozilla/xpcom/reflect/xptcall/md/unix/moz.build ++++ mozilla/xpcom/reflect/xptcall/md/unix/moz.build +@@ -151,7 +151,7 @@ if CONFIG['OS_ARCH'] == 'NetBSD': + 'xptcstubs_netbsd_m68k.cpp' + ] + +-if CONFIG['OS_ARCH'] == 'Linux': ++if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD', 'OpenBSD'): + if CONFIG['OS_TEST'] == 'aarch64': + SOURCES += [ + 'xptcinvoke_aarch64.cpp', From owner-svn-ports-branches@freebsd.org Wed Jan 11 10:00:46 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F3F6DCAA47D; Wed, 11 Jan 2017 10:00:45 +0000 (UTC) (envelope-from tz@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 AC1131F1B; Wed, 11 Jan 2017 10:00:45 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0BA0iAb098065; Wed, 11 Jan 2017 10:00:44 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0BA0iRc098063; Wed, 11 Jan 2017 10:00:44 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201701111000.v0BA0iRc098063@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Wed, 11 Jan 2017 10:00:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431168 - in branches/2017Q1/news/nzbget: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jan 2017 10:00:46 -0000 Author: tz Date: Wed Jan 11 10:00:44 2017 New Revision: 431168 URL: https://svnweb.freebsd.org/changeset/ports/431168 Log: MFH: r431072 news/nzbget: Switch default option from GNUTLS to OPENSSL There are a series of reports of TLS handshake failures from users of the port. Upstream responds to this reports with "Use OpenSSL instead of GNU TLS". Therefore the maintainer decided to switch the default option to OPENSSL. PR: 215788 Submitted by: Toxic (maintainer) Approved by: ports-secteam (junovitch) Modified: branches/2017Q1/news/nzbget/Makefile branches/2017Q1/news/nzbget/files/pkg-message.in Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/news/nzbget/Makefile ============================================================================== --- branches/2017Q1/news/nzbget/Makefile Wed Jan 11 09:19:37 2017 (r431167) +++ branches/2017Q1/news/nzbget/Makefile Wed Jan 11 10:00:44 2017 (r431168) @@ -4,6 +4,7 @@ PORTNAME= nzbget PORTVERSION= 17.1 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= news MAINTAINER= toxic@doobie.com @@ -32,7 +33,7 @@ USE_GITHUB= yes OPTIONS_DEFINE= 7Z PYTHON RAR DOCS OPTIONS_SINGLE= TLSLIB OPTIONS_SINGLE_TLSLIB= GNUTLS OPENSSL -OPTIONS_DEFAULT= GNUTLS PAR PYTHON RAR 7Z +OPTIONS_DEFAULT= OPENSSL PAR PYTHON RAR 7Z 7Z_DESC= Support extraction of 7z archives PYTHON_DESC= Support for python post-processing scripts RAR_DESC= Support extraction of rar archives Modified: branches/2017Q1/news/nzbget/files/pkg-message.in ============================================================================== --- branches/2017Q1/news/nzbget/files/pkg-message.in Wed Jan 11 09:19:37 2017 (r431167) +++ branches/2017Q1/news/nzbget/files/pkg-message.in Wed Jan 11 10:00:44 2017 (r431168) @@ -1,2 +1,2 @@ -To run nzbget as an unprivileged user you can set the nzbget_user -variable in %%ETCDIR%%/nzbget.conf +To run nzbget as an unprivileged user you can set the Daemonuser +variable in %%LOCALBASE%%/etc/nzbget.conf From owner-svn-ports-branches@freebsd.org Wed Jan 11 13:32:59 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D287ECAADCA; Wed, 11 Jan 2017 13:32:59 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 99E481B6C; Wed, 11 Jan 2017 13:32:59 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0BDWw0b086948; Wed, 11 Jan 2017 13:32:58 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0BDWwvA086947; Wed, 11 Jan 2017 13:32:58 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201701111332.v0BDWwvA086947@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Wed, 11 Jan 2017 13:32:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431179 - branches/2017Q1/news/pan X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jan 2017 13:32:59 -0000 Author: kwm Date: Wed Jan 11 13:32:58 2017 New Revision: 431179 URL: https://svnweb.freebsd.org/changeset/ports/431179 Log: MFH: r431039 Drop USE_GCC, this fixed a segfault crash when starting the program. PR: 199303 Approved by: ports-secteam (feld@) Modified: branches/2017Q1/news/pan/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/news/pan/Makefile ============================================================================== --- branches/2017Q1/news/pan/Makefile Wed Jan 11 13:30:16 2017 (r431178) +++ branches/2017Q1/news/pan/Makefile Wed Jan 11 13:32:58 2017 (r431179) @@ -4,7 +4,7 @@ PORTNAME= pan PORTVERSION= 0.140 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= news gnome MASTER_SITES= http://pan.rebelbase.com/download/releases/${PORTVERSION}/source/ DIST_SUBDIR= gnome2 @@ -19,7 +19,6 @@ LIB_DEPENDS= libpcre.so:devel/pcre \ USES= gmake iconv localbase pathfix pkgconfig tar:bzip2 USE_GNOME= intlhack -USE_GCC= any GNU_CONFIGURE= yes LDFLAGS+= -lgnuregex ${ICONV_LIB} CONFIGURE_ENV+= ZLIB_CFLAGS="-I/usr/include" \ From owner-svn-ports-branches@freebsd.org Wed Jan 11 15:04:04 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B918DCAAFFD; Wed, 11 Jan 2017 15:04:04 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 96243123C; Wed, 11 Jan 2017 15:04:04 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0BF4377023918; Wed, 11 Jan 2017 15:04:03 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0BF43QN023914; Wed, 11 Jan 2017 15:04:03 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201701111504.v0BF43QN023914@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Wed, 11 Jan 2017 15:04:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431185 - in branches/2017Q1/www/chromium: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jan 2017 15:04:04 -0000 Author: cpm Date: Wed Jan 11 15:04:03 2017 New Revision: 431185 URL: https://svnweb.freebsd.org/changeset/ports/431185 Log: MFH: r431170 - Fix build on HEAD In file included from ../../services/ui/ws/window_manager_state.cc:5: In file included from ../../services/ui/ws/window_manager_state.h:10: In file included from /usr/include/c++/v1/memory:599: /usr/include/c++/v1/__config:58:2: error: "_LIBCPP_TRIVIAL_PAIR_COPY_CTOR" is no longer supported. use _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR instead #error "_LIBCPP_TRIVIAL_PAIR_COPY_CTOR" is no longer supported. \ ^ 1 error generated. PR: 214654 Submitted by: dim Reported by: jbeich Reviewed by: rene Approved by: chromium (rene) Approved by: ports-secteam (feld) Added: branches/2017Q1/www/chromium/files/extra-patch-libc++-new - copied unchanged from r431170, head/www/chromium/files/extra-patch-libc++-new branches/2017Q1/www/chromium/files/extra-patch-libc++-old - copied unchanged from r431170, head/www/chromium/files/extra-patch-libc++-old Modified: branches/2017Q1/www/chromium/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/www/chromium/Makefile ============================================================================== --- branches/2017Q1/www/chromium/Makefile Wed Jan 11 14:58:06 2017 (r431184) +++ branches/2017Q1/www/chromium/Makefile Wed Jan 11 15:04:03 2017 (r431185) @@ -187,10 +187,10 @@ GN_ARGS+= is_clang=true EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1002000 -BUILD_DEPENDS+= ${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++ -GN_ARGS+= extra_cxxflags="-stdlib=libc++ -isystem ${LOCALBASE}/include/c++/v1" \ - extra_ldflags="-L${LOCALBASE}/lib" +.if ${OSVERSION} < 1200017 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old +.else +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new .endif .if ${OSVERSION} < 1100000 Copied: branches/2017Q1/www/chromium/files/extra-patch-libc++-new (from r431170, head/www/chromium/files/extra-patch-libc++-new) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/chromium/files/extra-patch-libc++-new Wed Jan 11 15:04:03 2017 (r431185, copy of r431170, head/www/chromium/files/extra-patch-libc++-new) @@ -0,0 +1,14 @@ +--- services/ui/ws/BUILD.gn.orig 2016-12-09 17:47:26.343517000 +0000 ++++ services/ui/ws/BUILD.gn 2016-12-09 17:48:45.323876000 +0000 +@@ -103,6 +103,11 @@ + "window_tree_host_factory.h", + ] + ++ # Work around base r261801 ++ if (is_bsd) { ++ defines = ["_LIBCPP_ABI_UNSTABLE=1"] ++ } ++ + deps = [ + # TODO(sad): Temporary, until the GPU process is split out of ws. + "//services/ui/gpu", Copied: branches/2017Q1/www/chromium/files/extra-patch-libc++-old (from r431170, head/www/chromium/files/extra-patch-libc++-old) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/chromium/files/extra-patch-libc++-old Wed Jan 11 15:04:03 2017 (r431185, copy of r431170, head/www/chromium/files/extra-patch-libc++-old) @@ -0,0 +1,14 @@ +--- services/ui/ws/BUILD.gn.orig 2016-12-09 17:47:26.343517000 +0000 ++++ services/ui/ws/BUILD.gn 2016-12-09 17:50:06.387679000 +0000 +@@ -103,6 +103,11 @@ + "window_tree_host_factory.h", + ] + ++ # Work around base r261801 ++ if (is_bsd) { ++ defines = ["_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1"] ++ } ++ + deps = [ + # TODO(sad): Temporary, until the GPU process is split out of ws. + "//services/ui/gpu", From owner-svn-ports-branches@freebsd.org Wed Jan 11 15:06:23 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D820BCAA10C; Wed, 11 Jan 2017 15:06:23 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9967A141E; Wed, 11 Jan 2017 15:06:23 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0BF6Mtn024229; Wed, 11 Jan 2017 15:06:22 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0BF6MtE024224; Wed, 11 Jan 2017 15:06:22 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201701111506.v0BF6MtE024224@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 11 Jan 2017 15:06:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431186 - in branches/2017Q1/net-mgmt/rancid3: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jan 2017 15:06:23 -0000 Author: feld Date: Wed Jan 11 15:06:22 2017 New Revision: 431186 URL: https://svnweb.freebsd.org/changeset/ports/431186 Log: MFH: r430723 r430728 r431184 net-mgmt/rancid3: Port cleanup Fix some variables in post-install, make Comware support include a version number that matches PORTVERSION PR: 215832 - add missing fix for rancid version s/3.1.99/@VERSION@/ PR: 215832 net-mgmt/rancid3: Update to 3.6.2 Approved by: ports-secteam (with hat) Added: branches/2017Q1/net-mgmt/rancid3/files/cmw.pm.in - copied, changed from r430723, head/net-mgmt/rancid3/files/cmw.pm.in branches/2017Q1/net-mgmt/rancid3/files/cmwlogin.in - copied, changed from r430723, head/net-mgmt/rancid3/files/cmwlogin.in Deleted: branches/2017Q1/net-mgmt/rancid3/files/cmw.pm branches/2017Q1/net-mgmt/rancid3/files/cmwlogin Modified: branches/2017Q1/net-mgmt/rancid3/Makefile branches/2017Q1/net-mgmt/rancid3/distinfo branches/2017Q1/net-mgmt/rancid3/pkg-plist Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/net-mgmt/rancid3/Makefile ============================================================================== --- branches/2017Q1/net-mgmt/rancid3/Makefile Wed Jan 11 15:04:03 2017 (r431185) +++ branches/2017Q1/net-mgmt/rancid3/Makefile Wed Jan 11 15:06:22 2017 (r431186) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rancid -PORTVERSION= 3.6.1 +PORTVERSION= 3.6.2 PORTREVISION= 0 CATEGORIES= net-mgmt MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/ @@ -30,8 +30,8 @@ CONFIGURE_ARGS= --localstatedir=${LOCALB OLDCONFIG_FILE1= bin/env OLDCONFIG_FILE2= util/lg/lg.conf -NEWERCONFIG_FILES1= etc/rancid.conf -NEWERCONFIG_FILES2= etc/lg.conf +NEWERCONFIG_FILE1= etc/rancid.conf +NEWERCONFIG_FILE2= etc/lg.conf NEWCONFIG_FILES= rancid.conf lg.conf OPTIONS_DEFINE= COMWARE SVN @@ -64,6 +64,8 @@ pre-everything:: post-patch: .if ${PORT_OPTIONS:MCOMWARE} ${CAT} ${FILESDIR}/comware_types.conf >> ${WRKSRC}/etc/rancid.types.base + ${SED} -e 's/@VERSION@/${PORTVERSION}/g' ${FILESDIR}/cmwlogin.in > ${WRKDIR}/cmwlogin + ${SED} -e 's/@VERSION@/${PORTVERSION}/g' ${FILESDIR}/cmw.pm.in > ${WRKDIR}/cmw.pm .endif ${REINPLACE_CMD} "s|par.1|rancid-par.1|" ${WRKSRC}/man/Makefile.in ${MV} ${WRKSRC}/man/par.1 ${WRKSRC}/man/rancid-par.1 @@ -74,8 +76,8 @@ post-install: ${LN} -s ${LOCALBASE}/libexec/${PORTNAME}/rancid-cvs ${STAGEDIR}${LOCALBASE}/bin ${LN} -s ${LOCALBASE}/libexec/${PORTNAME}/rancid-run ${STAGEDIR}${LOCALBASE}/bin .if ${PORT_OPTIONS:MCOMWARE} - ${INSTALL_DATA} ${FILESDIR}/cmw.pm ${STAGEDIR}/${LOCALBASE}/lib/rancid - ${INSTALL_SCRIPT} ${FILESDIR}/cmwlogin ${STAGEDIR}/${LOCALBASE}/libexec/rancid + ${INSTALL_DATA} ${WRKDIR}/cmw.pm ${STAGEDIR}/${LOCALBASE}/lib/rancid + ${INSTALL_SCRIPT} ${WRKDIR}/cmwlogin ${STAGEDIR}/${LOCALBASE}/libexec/rancid .endif .for file in ${NEWCONFIG_FILES} @ if [ -f ${LOCALBASE}/etc/${PORTNAME}/${file} ] ; then \ Modified: branches/2017Q1/net-mgmt/rancid3/distinfo ============================================================================== --- branches/2017Q1/net-mgmt/rancid3/distinfo Wed Jan 11 15:04:03 2017 (r431185) +++ branches/2017Q1/net-mgmt/rancid3/distinfo Wed Jan 11 15:06:22 2017 (r431186) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483462757 -SHA256 (rancid-3.6.1.tar.gz) = b7506b5e75eb324c41474b254e3b91ecd59bbeebd4b4155cd690ba1a6870a65a -SIZE (rancid-3.6.1.tar.gz) = 494527 +TIMESTAMP = 1484146349 +SHA256 (rancid-3.6.2.tar.gz) = 23751829c9bacdd07f90512271265c0cac279ca2f36ac86be815dd21831c253d +SIZE (rancid-3.6.2.tar.gz) = 511207 Copied and modified: branches/2017Q1/net-mgmt/rancid3/files/cmw.pm.in (from r430723, head/net-mgmt/rancid3/files/cmw.pm.in) ============================================================================== --- head/net-mgmt/rancid3/files/cmw.pm.in Fri Jan 6 18:23:38 2017 (r430723, copy source) +++ branches/2017Q1/net-mgmt/rancid3/files/cmw.pm.in Wed Jan 11 15:06:22 2017 (r431186) @@ -2,7 +2,7 @@ package cmw; ## ## $Id: cmw.pm.in 3000 2015-01-06 18:47:49Z heas $ ## -## rancid 3.1.99 +## rancid @VERSION@ ## Copyright (c) 1997-2015 by Terrapin Communications, Inc. ## All rights reserved. ## @@ -53,7 +53,7 @@ no warnings 'uninitialized'; require(Exporter); our @ISA = qw(Exporter); -use rancid 3.1.99; +use rancid @VERSION@; our $login; Copied and modified: branches/2017Q1/net-mgmt/rancid3/files/cmwlogin.in (from r430723, head/net-mgmt/rancid3/files/cmwlogin.in) ============================================================================== --- head/net-mgmt/rancid3/files/cmwlogin.in Fri Jan 6 18:23:38 2017 (r430723, copy source) +++ branches/2017Q1/net-mgmt/rancid3/files/cmwlogin.in Wed Jan 11 15:06:22 2017 (r431186) @@ -2,7 +2,7 @@ ## ## $Id: cmwlogin 3022 2015-01-13 20:00:00Z heas $ ## -## rancid 3.1.99 +## rancid @VERSION@ ## Copyright (c) 1997-2015 by Terrapin Communications, Inc. ## All rights reserved. ## @@ -140,7 +140,7 @@ for {set i 0} {$i < $argc} {incr i} { set do_passwd 0 # Version string } -V* { - send_user "rancid 3.1.99\n" + send_user "rancid @VERSION@\n" exit 0 # Enable Username } -w* { Modified: branches/2017Q1/net-mgmt/rancid3/pkg-plist ============================================================================== --- branches/2017Q1/net-mgmt/rancid3/pkg-plist Wed Jan 11 15:04:03 2017 (r431185) +++ branches/2017Q1/net-mgmt/rancid3/pkg-plist Wed Jan 11 15:06:22 2017 (r431186) @@ -171,5 +171,6 @@ man/man5/router.db.5.gz %%DATADIR%%/lgnotes.html %%DATADIR%%/rancid-cvspurge %%DATADIR%%/rancid.conf.sample +%%DATADIR%%/rancid.types.conf %%DATADIR%%/rtrfilter @dir(rancid,rancid,755) var/rancid From owner-svn-ports-branches@freebsd.org Wed Jan 11 20:07:01 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9FC5ACAB79E; Wed, 11 Jan 2017 20:07:01 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 56D69113D; Wed, 11 Jan 2017 20:07:01 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0BK70fw047463; Wed, 11 Jan 2017 20:07:00 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0BK70lS047461; Wed, 11 Jan 2017 20:07:00 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201701112007.v0BK70lS047461@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Wed, 11 Jan 2017 20:07:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431206 - in branches/2017Q1/security/libressl: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jan 2017 20:07:01 -0000 Author: brnrd Date: Wed Jan 11 20:07:00 2017 New Revision: 431206 URL: https://svnweb.freebsd.org/changeset/ports/431206 Log: MFH: r431174 security/libressl: Fix ECDSA P-256 timing attack vuln - Add patch from OpenBSD Security: 7caebe30-d7f1-11e6-a9a5-b499baebfeaf Security: CVE-2016-7056 Approved by: ports-secteam (feld) Added: branches/2017Q1/security/libressl/files/patch-CVE-2016-7056 - copied unchanged from r431174, head/security/libressl/files/patch-CVE-2016-7056 Modified: branches/2017Q1/security/libressl/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/security/libressl/Makefile ============================================================================== --- branches/2017Q1/security/libressl/Makefile Wed Jan 11 19:53:54 2017 (r431205) +++ branches/2017Q1/security/libressl/Makefile Wed Jan 11 20:07:00 2017 (r431206) @@ -3,6 +3,7 @@ PORTNAME= libressl PORTVERSION= 2.4.4 +PORTREVISION= 1 CATEGORIES= security devel MASTER_SITES= OPENBSD/LibreSSL Copied: branches/2017Q1/security/libressl/files/patch-CVE-2016-7056 (from r431174, head/security/libressl/files/patch-CVE-2016-7056) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/security/libressl/files/patch-CVE-2016-7056 Wed Jan 11 20:07:00 2017 (r431206, copy of r431174, head/security/libressl/files/patch-CVE-2016-7056) @@ -0,0 +1,35 @@ +untrusted comment: signature from openbsd 6.0 base secret key +RWSho3oKSqgLQ55BCxFoKK3pckJBYNZ3l6vujvan4SYLtXvRIsH6PNnmu7Xu18ILyYPxIQnYmCf1ux+IeoD8vzKfEeoCb+UVdQg= + +OpenBSD 6.0 errata 16, Jan 5, 2017: + +Avoid possible side-channel leak of ECDSA private keys when signing. + +Apply by doing: + signify -Vep /etc/signify/openbsd-60-base.pub -x 016_libcrypto.patch.sig \ + -m - | (cd /usr/src && patch -p0) + +And then rebuild and install libcrypto: + cd /usr/src/lib/libcrypto + make obj + make depend + make + make install + +Index: lib/libssl/src/crypto/ecdsa/ecs_ossl.c +=================================================================== +RCS file: /cvs/src/lib/libssl/src/crypto/ecdsa/Attic/ecs_ossl.c,v +retrieving revision 1.6 +retrieving revision 1.6.8.1 +diff -u -p -r1.6 -r1.6.8.1 +--- crypto/ecdsa/ecs_ossl.c 8 Feb 2015 13:35:07 -0000 1.6 ++++ crypto/ecdsa/ecs_ossl.c 5 Jan 2017 13:28:48 -0000 1.6.8.1 +@@ -141,6 +141,8 @@ ecdsa_sign_setup(EC_KEY *eckey, BN_CTX * + if (BN_num_bits(k) <= BN_num_bits(order)) + if (!BN_add(k, k, order)) + goto err; ++ ++ BN_set_flags(k, BN_FLG_CONSTTIME); + + /* compute r the x-coordinate of generator * k */ + if (!EC_POINT_mul(group, tmp_point, k, NULL, NULL, ctx)) { From owner-svn-ports-branches@freebsd.org Wed Jan 11 20:07:50 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE429CAB7E7; Wed, 11 Jan 2017 20:07:50 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AD7B71275; Wed, 11 Jan 2017 20:07:50 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0BK7nRM047647; Wed, 11 Jan 2017 20:07:49 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0BK7nms047646; Wed, 11 Jan 2017 20:07:49 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201701112007.v0BK7nms047646@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Wed, 11 Jan 2017 20:07:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431207 - in branches/2017Q1/security/libressl-devel: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jan 2017 20:07:51 -0000 Author: brnrd Date: Wed Jan 11 20:07:49 2017 New Revision: 431207 URL: https://svnweb.freebsd.org/changeset/ports/431207 Log: MFH: r431176 security/libressl-devel: Fix ECDSA P-256 timing attack vuln - Add patch from LibreSSL github Security: 7caebe30-d7f1-11e6-a9a5-b499baebfeaf Security: CVE-2016-7056 Approved by: ports-secteam (feld) Added: branches/2017Q1/security/libressl-devel/files/ - copied from r431176, head/security/libressl-devel/files/ Modified: branches/2017Q1/security/libressl-devel/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/security/libressl-devel/Makefile ============================================================================== --- branches/2017Q1/security/libressl-devel/Makefile Wed Jan 11 20:07:00 2017 (r431206) +++ branches/2017Q1/security/libressl-devel/Makefile Wed Jan 11 20:07:49 2017 (r431207) @@ -3,6 +3,7 @@ PORTNAME= libressl PORTVERSION= 2.5.0 +PORTREVISION= 1 CATEGORIES= security devel MASTER_SITES= OPENBSD/LibreSSL PKGNAMESUFFIX= -devel From owner-svn-ports-branches@freebsd.org Thu Jan 12 07:31:33 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5CFFCCAB1FE; Thu, 12 Jan 2017 07:31:33 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 10CC71FB3; Thu, 12 Jan 2017 07:31:32 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0C7VWYn024950; Thu, 12 Jan 2017 07:31:32 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0C7VWIL024949; Thu, 12 Jan 2017 07:31:32 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201701120731.v0C7VWIL024949@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 12 Jan 2017 07:31:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431227 - branches/2017Q1/dns/bind99 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2017 07:31:33 -0000 Author: delphij Date: Thu Jan 12 07:31:31 2017 New Revision: 431227 URL: https://svnweb.freebsd.org/changeset/ports/431227 Log: MFH: r431224 Security update to 9.9.5-P5. Security: d4c7e9a9-d893-11e6-9b4d-d050996490d0 Approved by: ports-secteam Modified: branches/2017Q1/dns/bind99/Makefile branches/2017Q1/dns/bind99/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/dns/bind99/Makefile ============================================================================== --- branches/2017Q1/dns/bind99/Makefile Thu Jan 12 07:30:00 2017 (r431226) +++ branches/2017Q1/dns/bind99/Makefile Thu Jan 12 07:31:31 2017 (r431227) @@ -3,7 +3,6 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 99 @@ -15,7 +14,7 @@ COMMENT= BIND DNS suite with updated DNS LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.9.9-P4 +ISCVERSION= 9.9.9-P5 USES= cpe libedit Modified: branches/2017Q1/dns/bind99/distinfo ============================================================================== --- branches/2017Q1/dns/bind99/distinfo Thu Jan 12 07:30:00 2017 (r431226) +++ branches/2017Q1/dns/bind99/distinfo Thu Jan 12 07:31:31 2017 (r431227) @@ -1,5 +1,5 @@ -TIMESTAMP = 1477663203 -SHA256 (bind-9.9.9-P4.tar.gz) = fdd5120aea9bf5147c350fb2460bfe79c3f1bcc36baa863aee4e1a9de910f1e2 -SIZE (bind-9.9.9-P4.tar.gz) = 8764378 -SHA256 (9.9.9-P4-rpz2+rl.14038.05.patch.xz) = 6cc256dfc7895c9e3eac72465b43deaaba0a01e9f97c492eefc4fe4d80fac4aa -SIZE (9.9.9-P4-rpz2+rl.14038.05.patch.xz) = 39308 +TIMESTAMP = 1484202726 +SHA256 (bind-9.9.9-P5.tar.gz) = 5ccd1c7356093da100c45dfcea314fea882a41e8e2c660d269c46137212bc1fa +SIZE (bind-9.9.9-P5.tar.gz) = 8770509 +SHA256 (9.9.9-P5-rpz2+rl.14038.05.patch.xz) = ca6a0a697ddb2d3839077dc9b38556439ced1ee115a8af2c040d720a778c716a +SIZE (9.9.9-P5-rpz2+rl.14038.05.patch.xz) = 39308 From owner-svn-ports-branches@freebsd.org Thu Jan 12 07:32:11 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E8240CAB24F; Thu, 12 Jan 2017 07:32:11 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B7A4F122B; Thu, 12 Jan 2017 07:32:11 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0C7WAUd027900; Thu, 12 Jan 2017 07:32:10 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0C7WAJa027898; Thu, 12 Jan 2017 07:32:10 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201701120732.v0C7WAJa027898@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 12 Jan 2017 07:32:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431228 - branches/2017Q1/dns/bind910 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2017 07:32:12 -0000 Author: delphij Date: Thu Jan 12 07:32:10 2017 New Revision: 431228 URL: https://svnweb.freebsd.org/changeset/ports/431228 Log: MFH: r431225 Security update to 9.10.4-P5. Security: d4c7e9a9-d893-11e6-9b4d-d050996490d0 Approved by: ports-secteam Modified: branches/2017Q1/dns/bind910/Makefile branches/2017Q1/dns/bind910/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/dns/bind910/Makefile ============================================================================== --- branches/2017Q1/dns/bind910/Makefile Thu Jan 12 07:31:31 2017 (r431227) +++ branches/2017Q1/dns/bind910/Makefile Thu Jan 12 07:32:10 2017 (r431228) @@ -3,7 +3,6 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 910 @@ -15,7 +14,7 @@ COMMENT= BIND DNS suite with updated DNS LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.10.4-P4 +ISCVERSION= 9.10.4-P5 USES= cpe libedit Modified: branches/2017Q1/dns/bind910/distinfo ============================================================================== --- branches/2017Q1/dns/bind910/distinfo Thu Jan 12 07:31:31 2017 (r431227) +++ branches/2017Q1/dns/bind910/distinfo Thu Jan 12 07:32:10 2017 (r431228) @@ -1,3 +1,3 @@ -TIMESTAMP = 1477663379 -SHA256 (bind-9.10.4-P4.tar.gz) = a41ce7518e1d0faa40312cc89f4ca42246906b2718099d992e87a5d3ce9a9d86 -SIZE (bind-9.10.4-P4.tar.gz) = 9299638 +TIMESTAMP = 1484203033 +SHA256 (bind-9.10.4-P5.tar.gz) = 89c47b413613feddb1b623ad092f3def2247402e4148c464dbc6c0021e3f0feb +SIZE (bind-9.10.4-P5.tar.gz) = 9303205 From owner-svn-ports-branches@freebsd.org Thu Jan 12 07:32:54 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2996ACAB294; Thu, 12 Jan 2017 07:32:54 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ED00F1355; Thu, 12 Jan 2017 07:32:53 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0C7Wrrm028086; Thu, 12 Jan 2017 07:32:53 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0C7WrOX028084; Thu, 12 Jan 2017 07:32:53 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201701120732.v0C7WrOX028084@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 12 Jan 2017 07:32:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431229 - branches/2017Q1/dns/bind911 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2017 07:32:54 -0000 Author: delphij Date: Thu Jan 12 07:32:52 2017 New Revision: 431229 URL: https://svnweb.freebsd.org/changeset/ports/431229 Log: MFH: r431226 Security update to 9.11.0-P2. Security: d4c7e9a9-d893-11e6-9b4d-d050996490d0 Approved by: ports-secteam Modified: branches/2017Q1/dns/bind911/Makefile branches/2017Q1/dns/bind911/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/dns/bind911/Makefile ============================================================================== --- branches/2017Q1/dns/bind911/Makefile Thu Jan 12 07:32:10 2017 (r431228) +++ branches/2017Q1/dns/bind911/Makefile Thu Jan 12 07:32:52 2017 (r431229) @@ -5,10 +5,10 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here -PORTREVISION= 1 +PORTREVISION= 0 .else # dns/bind9xx here -PORTREVISION= 1 +PORTREVISION= 0 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} @@ -29,7 +29,7 @@ COMMENT= BIND DNS suite with updated DNS LICENSE= MPL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.11.0-P1 +ISCVERSION= 9.11.0-P2 USES= cpe libedit Modified: branches/2017Q1/dns/bind911/distinfo ============================================================================== --- branches/2017Q1/dns/bind911/distinfo Thu Jan 12 07:32:10 2017 (r431228) +++ branches/2017Q1/dns/bind911/distinfo Thu Jan 12 07:32:52 2017 (r431229) @@ -1,3 +1,3 @@ -TIMESTAMP = 1477663452 -SHA256 (bind-9.11.0-P1.tar.gz) = 094cd3134ba1b44f0910de1334f05a7dca68d583da038de40a8ad7a0cb1592c6 -SIZE (bind-9.11.0-P1.tar.gz) = 9673074 +TIMESTAMP = 1484203132 +SHA256 (bind-9.11.0-P2.tar.gz) = d651f83ce1c08c83d6ac8201685c4f2b5fdb79794f3a4f93c3948e0ef439c1e5 +SIZE (bind-9.11.0-P2.tar.gz) = 9677204 From owner-svn-ports-branches@freebsd.org Thu Jan 12 08:16:48 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 47B94CAA0D7; Thu, 12 Jan 2017 08:16:48 +0000 (UTC) (envelope-from mat@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 09EEE1B7A; Thu, 12 Jan 2017 08:16:47 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0C8Gltl044965; Thu, 12 Jan 2017 08:16:47 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0C8GkwS044960; Thu, 12 Jan 2017 08:16:46 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201701120816.v0C8GkwS044960@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 12 Jan 2017 08:16:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431234 - in branches/2017Q1/dns/bind9-devel: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2017 08:16:48 -0000 Author: mat Date: Thu Jan 12 08:16:46 2017 New Revision: 431234 URL: https://svnweb.freebsd.org/changeset/ports/431234 Log: MFH: r431232 Update to latest commit. Security: CVE-2016-9131 CVE-2016-9147 CVE-2016-9444 CVE-2016-9778 Sponsored by: Absolight Modified: branches/2017Q1/dns/bind9-devel/Makefile branches/2017Q1/dns/bind9-devel/distinfo branches/2017Q1/dns/bind9-devel/files/extrapatch-bind-min-override-ttl branches/2017Q1/dns/bind9-devel/files/patch-configure Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/dns/bind9-devel/Makefile ============================================================================== --- branches/2017Q1/dns/bind9-devel/Makefile Thu Jan 12 08:15:41 2017 (r431233) +++ branches/2017Q1/dns/bind9-devel/Makefile Thu Jan 12 08:16:46 2017 (r431234) @@ -30,8 +30,8 @@ COMMENT= BIND DNS suite with updated DNS LICENSE= MPL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.12.0a.2016.12.28 -HASH= eff07b5 +ISCVERSION= 9.12.0a.2017.01.12 +HASH= d2e1b47 USES= cpe libedit Modified: branches/2017Q1/dns/bind9-devel/distinfo ============================================================================== --- branches/2017Q1/dns/bind9-devel/distinfo Thu Jan 12 08:15:41 2017 (r431233) +++ branches/2017Q1/dns/bind9-devel/distinfo Thu Jan 12 08:16:46 2017 (r431234) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483349274 -SHA256 (bind9-eff07b5.tar.gz) = 50dc288d3d4e576bdae6cd2e14d5146712230983e2e856354a39dd5fc8941298 -SIZE (bind9-eff07b5.tar.gz) = 11811939 +TIMESTAMP = 1484208237 +SHA256 (bind9-d2e1b47.tar.gz) = 8945ede00fd1adf336ee0c92149f195d4dd3a6364422721a8ebfa4047cc7fb55 +SIZE (bind9-d2e1b47.tar.gz) = 11845654 Modified: branches/2017Q1/dns/bind9-devel/files/extrapatch-bind-min-override-ttl ============================================================================== --- branches/2017Q1/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Thu Jan 12 08:15:41 2017 (r431233) +++ branches/2017Q1/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Thu Jan 12 08:16:46 2017 (r431234) @@ -1,6 +1,6 @@ ---- bin/named/config.c.orig 2016-12-04 23:46:43 UTC +--- bin/named/config.c.orig 2017-01-12 03:25:45 UTC +++ bin/named/config.c -@@ -154,6 +154,8 @@ options {\n\ +@@ -158,6 +158,8 @@ options {\n\ lame-ttl 600;\n\ servfail-ttl 1;\n\ max-ncache-ttl 10800; /* 3 hours */\n\ @@ -9,9 +9,9 @@ max-cache-ttl 604800; /* 1 week */\n\ transfer-format many-answers;\n\ max-cache-size 90%;\n\ ---- bin/named/server.c.orig 2016-12-04 23:46:43 UTC +--- bin/named/server.c.orig 2017-01-12 03:25:45 UTC +++ bin/named/server.c -@@ -3638,6 +3638,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -3635,6 +3635,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; @@ -28,7 +28,7 @@ result = ns_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2016-12-04 23:46:43 UTC +--- lib/dns/include/dns/view.h.orig 2017-01-12 03:25:45 UTC +++ lib/dns/include/dns/view.h @@ -146,6 +146,8 @@ struct dns_view { isc_boolean_t requestnsid; @@ -39,9 +39,9 @@ dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2016-12-04 23:46:43 UTC +--- lib/dns/resolver.c.orig 2017-01-12 03:25:45 UTC +++ lib/dns/resolver.c -@@ -5433,6 +5433,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5462,6 +5462,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* @@ -60,9 +60,9 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2016-12-04 23:46:43 UTC +--- lib/isccfg/namedconf.c.orig 2017-01-12 03:25:45 UTC +++ lib/isccfg/namedconf.c -@@ -1760,6 +1760,8 @@ view_clauses[] = { +@@ -1782,6 +1782,8 @@ view_clauses[] = { { "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE }, { "max-acache-size", &cfg_type_sizenodefault, 0 }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, Modified: branches/2017Q1/dns/bind9-devel/files/patch-configure ============================================================================== --- branches/2017Q1/dns/bind9-devel/files/patch-configure Thu Jan 12 08:15:41 2017 (r431233) +++ branches/2017Q1/dns/bind9-devel/files/patch-configure Thu Jan 12 08:16:46 2017 (r431234) @@ -1,6 +1,6 @@ ---- configure.orig 2016-12-04 23:46:43 UTC +--- configure.orig 2017-01-12 03:25:45 UTC +++ configure -@@ -14385,27 +14385,9 @@ done +@@ -14389,27 +14389,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ @@ -30,7 +30,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5 $as_echo_n "checking linking as $TRY_LIBS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -14448,47 +14430,7 @@ $as_echo "no" >&6; } ;; +@@ -14452,47 +14434,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac @@ -79,7 +79,7 @@ DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -22648,7 +22590,7 @@ $as_echo "" >&6; } +@@ -22654,7 +22596,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). From owner-svn-ports-branches@freebsd.org Thu Jan 12 08:20:59 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1910BCAA317; Thu, 12 Jan 2017 08:20:59 +0000 (UTC) (envelope-from mat@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 D5D061F41; Thu, 12 Jan 2017 08:20:58 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0C8KwTO046285; Thu, 12 Jan 2017 08:20:58 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0C8KvsY046274; Thu, 12 Jan 2017 08:20:57 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201701120820.v0C8KvsY046274@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 12 Jan 2017 08:20:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431235 - in branches/2017Q1/dns: bind910 bind910/files bind911 bind911/files bind99 bind99/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2017 08:20:59 -0000 Author: mat Date: Thu Jan 12 08:20:56 2017 New Revision: 431235 URL: https://svnweb.freebsd.org/changeset/ports/431235 Log: MFH: r431233 Commit the cleanups that should have gone in with the pervious update. Sponsored by: Absolight Approved by: delphij Deleted: branches/2017Q1/dns/bind910/pkg-install branches/2017Q1/dns/bind911/pkg-install branches/2017Q1/dns/bind99/pkg-install Modified: branches/2017Q1/dns/bind910/Makefile branches/2017Q1/dns/bind910/files/pkg-message.in branches/2017Q1/dns/bind910/pkg-plist branches/2017Q1/dns/bind911/Makefile branches/2017Q1/dns/bind911/files/pkg-message.in branches/2017Q1/dns/bind911/pkg-plist branches/2017Q1/dns/bind99/Makefile branches/2017Q1/dns/bind99/files/extrapatch-bind-min-override-ttl branches/2017Q1/dns/bind99/files/pkg-message.in branches/2017Q1/dns/bind99/pkg-plist Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/dns/bind910/Makefile ============================================================================== --- branches/2017Q1/dns/bind910/Makefile Thu Jan 12 08:16:46 2017 (r431234) +++ branches/2017Q1/dns/bind910/Makefile Thu Jan 12 08:20:56 2017 (r431235) @@ -3,6 +3,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} +PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 910 @@ -38,13 +39,13 @@ ETCDIR= ${PREFIX}/etc/namedb CONFLICTS+= bind-tools bind99 bind911 bind9-devel -SUB_FILES= pkg-message +SUB_FILES= pkg-message named.conf OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON \ DLZ_FILESYSTEM RPZ_NSIP RPZ_NSDNAME OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA \ - LINKS RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ + RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ MINCACHE PORTREVISION FETCHLIMIT QUERYTRACE \ START_LATE OPTIONS_RADIO= CRYPTO GOSTDEF @@ -77,7 +78,6 @@ PORTREVISION_DESC= Show PORTREVISION in FETCHLIMIT_DESC= Enable the query quotas for resolvers QUERYTRACE_DESC= Enable the very verbose query tracelogging -LINKS_DESC= Create conf file symlinks in ${PREFIX} RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records DLZ_DESC= Dynamically Loadable Zones @@ -170,28 +170,13 @@ GSSAPI_NONE_CONFIGURE_ON= --without-gssa CONFIGURE_ARGS+= --without-gost .endif -.if !${PORT_OPTIONS:MLINKS} -PKGINSTALL=${NONEXISTENT} -.endif - .if ${PORT_OPTIONS:MTHREADS} && !${PORT_OPTIONS:MDLZ_MYSQL} CONFIGURE_ARGS+= --enable-threads .else CONFIGURE_ARGS+= --disable-threads .endif -.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100) -PKGINSTALL= ${NONEXISTENT} -PLIST_SUB+= NOBASE="" BASE="@comment " -SUB_LIST+= NOBASE="" BASE="@comment " -USE_RC_SUBR+= named -SUB_FILES+= named.conf -.else -PLIST_SUB+= NOBASE="@comment " BASE="" -SUB_LIST+= NOBASE="@comment " BASE="" -.endif - -PKGDEINSTALL= ${PKGINSTALL} +USE_RC_SUBR= named MAKE_JOBS_UNSAFE= yes Modified: branches/2017Q1/dns/bind910/files/pkg-message.in ============================================================================== --- branches/2017Q1/dns/bind910/files/pkg-message.in Thu Jan 12 08:16:46 2017 (r431234) +++ branches/2017Q1/dns/bind910/files/pkg-message.in Thu Jan 12 08:20:56 2017 (r431235) @@ -10,13 +10,6 @@ * 'rndc-confgen -a' to generate the proper conf file, with a new * * random key, and appropriate file permissions. * * * -%%NOBASE%%* The %%PREFIX%%/etc/rc.d/named script will do that for you. * -%%BASE%%* The /etc/rc.d/named script in the base will do that for you. * -%%BASE%%* * -%%BASE%%* You will need to make sure that you have the following line * -%%BASE%%* in your /etc/rc.conf in order to have the startup script * -%%BASE%%* run the named version from the port: * -%%BASE%%* * -%%BASE%%* named_program="%%PREFIX%%/sbin/named" * +* The %%PREFIX%%/etc/rc.d/named script will do that for you. * * * ********************************************************************** Modified: branches/2017Q1/dns/bind910/pkg-plist ============================================================================== --- branches/2017Q1/dns/bind910/pkg-plist Thu Jan 12 08:16:46 2017 (r431234) +++ branches/2017Q1/dns/bind910/pkg-plist Thu Jan 12 08:20:56 2017 (r431235) @@ -5,6 +5,15 @@ bin/host bin/isc-config.sh bin/nslookup bin/nsupdate +etc/mtree/BIND.chroot.dist +etc/mtree/BIND.chroot.local.dist +%%ETCDIR%%/bind.keys +%%ETCDIR%%/master/empty.db +%%ETCDIR%%/master/localhost-forward.db +%%ETCDIR%%/master/localhost-reverse.db +@sample %%ETCDIR%%/named.conf.sample +%%ETCDIR%%/named.root +%%ETCDIR%%/rndc.conf.sample include/bind9/check.h include/bind9/getaddresses.h include/bind9/version.h @@ -372,13 +381,13 @@ man/man8/named-compilezone.8.gz man/man8/named-journalprint.8.gz man/man8/named.8.gz man/man8/nsec3hash.8.gz -man/man8/tsig-keygen.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-keygen.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-list.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-tokens.8.gz man/man8/rndc-confgen.8.gz man/man8/rndc.8.gz +man/man8/tsig-keygen.8.gz sbin/arpaname sbin/ddns-confgen %%PYTHON%%sbin/dnssec-checkds @@ -408,16 +417,7 @@ sbin/nsec3hash sbin/rndc sbin/rndc-confgen sbin/tsig-keygen -%%ETCDIR%%/rndc.conf.sample -%%ETCDIR%%/bind.keys -%%NOBASE%%etc/mtree/BIND.chroot.dist -%%NOBASE%%etc/mtree/BIND.chroot.local.dist -%%NOBASE%%@sample %%ETCDIR%%/named.conf.sample -%%NOBASE%%%%ETCDIR%%/named.root -%%NOBASE%%%%ETCDIR%%/master/empty.db -%%NOBASE%%%%ETCDIR%%/master/localhost-forward.db -%%NOBASE%%%%ETCDIR%%/master/localhost-reverse.db -%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/dynamic -%%NOBASE%%@dir %%ETCDIR%%/master -%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/slave -%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/working +@dir(bind,bind,) %%ETCDIR%%/dynamic +@dir %%ETCDIR%%/master +@dir(bind,bind,) %%ETCDIR%%/slave +@dir(bind,bind,) %%ETCDIR%%/working Modified: branches/2017Q1/dns/bind911/Makefile ============================================================================== --- branches/2017Q1/dns/bind911/Makefile Thu Jan 12 08:16:46 2017 (r431234) +++ branches/2017Q1/dns/bind911/Makefile Thu Jan 12 08:20:56 2017 (r431235) @@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b PORTREVISION= 0 .else # dns/bind9xx here -PORTREVISION= 0 +PORTREVISION= 1 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} @@ -69,7 +69,7 @@ OPTIONS_RADIO_GOSTDEF= GOST GOST_ASN1 .if !defined(BIND_TOOLS_SLAVE) OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP -OPTIONS_DEFINE+= LINKS RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ +OPTIONS_DEFINE+= RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \ START_LATE OPTIONS_GROUP= DLZ @@ -100,7 +100,6 @@ QUERYTRACE_DESC= Enable the very verbose LMDB_DESC= Use LMDB for zone management DNSTAP_DESC= Provides fast passive logging of DNS messages -LINKS_DESC= Create conf file symlinks in ${PREFIX} RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records DLZ_DESC= Dynamically Loadable Zones @@ -209,31 +208,17 @@ DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fs CONFIGURE_ARGS+= --without-gost .endif -.if !${PORT_OPTIONS:MLINKS} -PKGINSTALL=${NONEXISTENT} -.endif - .if ${PORT_OPTIONS:MTHREADS} && !${PORT_OPTIONS:MDLZ_MYSQL} CONFIGURE_ARGS+= --enable-threads .else CONFIGURE_ARGS+= --disable-threads .endif -.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100) -PKGINSTALL= ${NONEXISTENT} -PLIST_SUB+= NOBASE="" BASE="@comment " -SUB_LIST+= NOBASE="" BASE="@comment " .if !defined(BIND_TOOLS_SLAVE) USE_RC_SUBR+= named SUB_FILES+= named.conf -.endif # !defined(BIND_TOOLS_SLAVE) -.else -PLIST_SUB+= NOBASE="@comment " BASE="" -SUB_LIST+= NOBASE="@comment " BASE="" .endif -PKGDEINSTALL= ${PKGINSTALL} - MAKE_JOBS_UNSAFE= yes PORTDOCS= * Modified: branches/2017Q1/dns/bind911/files/pkg-message.in ============================================================================== --- branches/2017Q1/dns/bind911/files/pkg-message.in Thu Jan 12 08:16:46 2017 (r431234) +++ branches/2017Q1/dns/bind911/files/pkg-message.in Thu Jan 12 08:20:56 2017 (r431235) @@ -10,13 +10,6 @@ * 'rndc-confgen -a' to generate the proper conf file, with a new * * random key, and appropriate file permissions. * * * -%%NOBASE%%* The %%PREFIX%%/etc/rc.d/named script will do that for you. * -%%BASE%%* The /etc/rc.d/named script in the base will do that for you. * -%%BASE%%* * -%%BASE%%* You will need to make sure that you have the following line * -%%BASE%%* in your /etc/rc.conf in order to have the startup script * -%%BASE%%* run the named version from the port: * -%%BASE%%* * -%%BASE%%* named_program="%%PREFIX%%/sbin/named" * +* The %%PREFIX%%/etc/rc.d/named script will do that for you. * * * ********************************************************************** Modified: branches/2017Q1/dns/bind911/pkg-plist ============================================================================== --- branches/2017Q1/dns/bind911/pkg-plist Thu Jan 12 08:16:46 2017 (r431234) +++ branches/2017Q1/dns/bind911/pkg-plist Thu Jan 12 08:20:56 2017 (r431235) @@ -9,6 +9,15 @@ bin/mdig bin/named-rrchecker bin/nslookup bin/nsupdate +etc/mtree/BIND.chroot.dist +etc/mtree/BIND.chroot.local.dist +%%ETCDIR%%/bind.keys +%%ETCDIR%%/master/empty.db +%%ETCDIR%%/master/localhost-forward.db +%%ETCDIR%%/master/localhost-reverse.db +@sample %%ETCDIR%%/named.conf.sample +%%ETCDIR%%/named.root +%%ETCDIR%%/rndc.conf.sample include/bind9/check.h include/bind9/getaddresses.h include/bind9/version.h @@ -232,7 +241,6 @@ include/isccc/sexpr.h include/isccc/symtab.h include/isccc/symtype.h include/isccc/types.h -include/pk11/site.h include/isccc/util.h include/isccc/version.h include/isccfg/aclconf.h @@ -261,6 +269,7 @@ include/pk11/constants.h include/pk11/internal.h include/pk11/pk11.h include/pk11/result.h +include/pk11/site.h include/pkcs11/cryptoki.h include/pkcs11/pkcs11.h include/pkcs11/pkcs11f.h @@ -428,16 +437,7 @@ sbin/nsec3hash sbin/rndc sbin/rndc-confgen sbin/tsig-keygen -%%ETCDIR%%/rndc.conf.sample -%%ETCDIR%%/bind.keys -%%NOBASE%%etc/mtree/BIND.chroot.dist -%%NOBASE%%etc/mtree/BIND.chroot.local.dist -%%NOBASE%%@sample %%ETCDIR%%/named.conf.sample -%%NOBASE%%%%ETCDIR%%/named.root -%%NOBASE%%%%ETCDIR%%/master/empty.db -%%NOBASE%%%%ETCDIR%%/master/localhost-forward.db -%%NOBASE%%%%ETCDIR%%/master/localhost-reverse.db -%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/dynamic -%%NOBASE%%@dir %%ETCDIR%%/master -%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/slave -%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/working +@dir(bind,bind,) %%ETCDIR%%/dynamic +@dir %%ETCDIR%%/master +@dir(bind,bind,) %%ETCDIR%%/slave +@dir(bind,bind,) %%ETCDIR%%/working Modified: branches/2017Q1/dns/bind99/Makefile ============================================================================== --- branches/2017Q1/dns/bind99/Makefile Thu Jan 12 08:16:46 2017 (r431234) +++ branches/2017Q1/dns/bind99/Makefile Thu Jan 12 08:20:56 2017 (r431235) @@ -3,6 +3,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} +PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 99 @@ -38,13 +39,13 @@ ETCDIR= ${PREFIX}/etc/namedb CONFLICTS= bind-tools bind9-devel bind910 bind911 -SUB_FILES= pkg-message +SUB_FILES= pkg-message named.conf OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE RRL DLZ_FILESYSTEM \ RPZ_NSIP RPZ_NSDNAME -OPTIONS_DEFINE= SSL IDN REPLACE_BASE LARGE_FILE FIXED_RRSET SIGCHASE \ +OPTIONS_DEFINE= SSL IDN LARGE_FILE FIXED_RRSET SIGCHASE \ IPV6 THREADS FILTER_AAAA GOST PYTHON START_LATE MINCACHE \ - LINKS RPZ_NSIP RPZ_NSDNAME RRL DOCS RPZ_PATCH NEWSTATS \ + RPZ_NSIP RPZ_NSDNAME RRL DOCS RPZ_PATCH NEWSTATS \ PORTREVISION FETCHLIMIT QUERYTRACE OPTIONS_GROUP= DLZ OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ @@ -55,7 +56,6 @@ OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAP OPTIONS_SUB= yes SSL_DESC= Build with OpenSSL (Required for DNSSEC) -REPLACE_BASE_DESC= EOL, no longer supported LARGE_FILE_DESC= 64-bit file support FIXED_RRSET_DESC= Enable fixed rrset ordering SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation @@ -68,7 +68,6 @@ PORTREVISION_DESC= Show PORTREVISION in FETCHLIMIT_DESC= Enable the query quotas for resolvers QUERYTRACE_DESC= Enable the very verbose query tracelogging -LINKS_DESC= Create conf file symlinks in ${PREFIX} NEWSTATS_DESC= Enable alternate xml statistics channel format RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records @@ -158,32 +157,13 @@ GSSAPI_NONE_CONFIGURE_ON= --without-gssa .include -.if !${PORT_OPTIONS:MLINKS} -PKGINSTALL=${NONEXISTENT} -.endif - .if ${PORT_OPTIONS:MTHREADS} && !${PORT_OPTIONS:MDLZ_MYSQL} CONFIGURE_ARGS+= --enable-threads .else CONFIGURE_ARGS+= --disable-threads .endif -.if ${PORT_OPTIONS:MREPLACE_BASE} -IGNORE= REPLACE_BASE is no longer supported -.endif # REPLACE_BASE - -.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100) -PKGINSTALL= ${NONEXISTENT} -PLIST_SUB+= NOBASE="" BASE="@comment " -SUB_LIST+= NOBASE="" BASE="@comment " -USE_RC_SUBR+= named -SUB_FILES+= named.conf -.else -PLIST_SUB+= NOBASE="@comment " BASE="" -SUB_LIST+= NOBASE="@comment " BASE="" -.endif - -PKGDEINSTALL= ${PKGINSTALL} +USE_RC_SUBR= named MAKE_JOBS_UNSAFE= yes Modified: branches/2017Q1/dns/bind99/files/extrapatch-bind-min-override-ttl ============================================================================== --- branches/2017Q1/dns/bind99/files/extrapatch-bind-min-override-ttl Thu Jan 12 08:16:46 2017 (r431234) +++ branches/2017Q1/dns/bind99/files/extrapatch-bind-min-override-ttl Thu Jan 12 08:20:56 2017 (r431235) @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2016-10-21 05:12:02 UTC +--- bin/named/config.c.orig 2016-12-11 22:02:39 UTC +++ bin/named/config.c @@ -141,6 +141,8 @@ options {\n\ min-roots 2;\n\ @@ -9,9 +9,9 @@ max-cache-ttl 604800; /* 1 week */\n\ transfer-format many-answers;\n\ max-cache-size 0;\n\ ---- bin/named/server.c.orig 2016-10-21 05:12:02 UTC +--- bin/named/server.c.orig 2017-01-11 11:22:46 UTC +++ bin/named/server.c -@@ -2559,6 +2559,16 @@ configure_view(dns_view_t *view, cfg_obj +@@ -2683,6 +2683,16 @@ configure_view(dns_view_t *view, cfg_obj } obj = NULL; @@ -28,7 +28,7 @@ result = ns_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2016-10-21 05:12:02 UTC +--- lib/dns/include/dns/view.h.orig 2017-01-11 11:22:46 UTC +++ lib/dns/include/dns/view.h @@ -148,6 +148,8 @@ struct dns_view { isc_boolean_t provideixfr; @@ -39,7 +39,7 @@ dns_ttl_t maxncachettl; in_port_t dstport; dns_aclenv_t aclenv; ---- lib/dns/resolver.c.orig 2016-10-21 05:12:02 UTC +--- lib/dns/resolver.c.orig 2016-12-11 22:02:39 UTC +++ lib/dns/resolver.c @@ -5116,6 +5116,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } @@ -60,9 +60,9 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2016-10-21 05:12:02 UTC +--- lib/isccfg/namedconf.c.orig 2017-01-11 11:22:46 UTC +++ lib/isccfg/namedconf.c -@@ -1459,6 +1459,8 @@ view_clauses[] = { +@@ -1464,6 +1464,8 @@ view_clauses[] = { { "lame-ttl", &cfg_type_uint32, 0 }, { "max-acache-size", &cfg_type_sizenodefault, 0 }, { "max-cache-size", &cfg_type_sizenodefault, 0 }, Modified: branches/2017Q1/dns/bind99/files/pkg-message.in ============================================================================== --- branches/2017Q1/dns/bind99/files/pkg-message.in Thu Jan 12 08:16:46 2017 (r431234) +++ branches/2017Q1/dns/bind99/files/pkg-message.in Thu Jan 12 08:20:56 2017 (r431235) @@ -10,13 +10,6 @@ * 'rndc-confgen -a' to generate the proper conf file, with a new * * random key, and appropriate file permissions. * * * -%%NOBASE%%* The %%PREFIX%%/etc/rc.d/named script will do that for you. * -%%BASE%%* The /etc/rc.d/named script in the base will do that for you. * -%%BASE%%* * -%%BASE%%* You will need to make sure that you have the following line * -%%BASE%%* in your /etc/rc.conf in order to have the startup script * -%%BASE%%* run the named version from the port: * -%%BASE%%* * -%%BASE%%* named_program="%%PREFIX%%/sbin/named" * +* The %%PREFIX%%/etc/rc.d/named script will do that for you. * * * ********************************************************************** Modified: branches/2017Q1/dns/bind99/pkg-plist ============================================================================== --- branches/2017Q1/dns/bind99/pkg-plist Thu Jan 12 08:16:46 2017 (r431234) +++ branches/2017Q1/dns/bind99/pkg-plist Thu Jan 12 08:20:56 2017 (r431235) @@ -4,6 +4,15 @@ bin/host bin/isc-config.sh bin/nslookup bin/nsupdate +etc/mtree/BIND.chroot.dist +etc/mtree/BIND.chroot.local.dist +%%ETCDIR%%/bind.keys +%%ETCDIR%%/master/empty.db +%%ETCDIR%%/master/localhost-forward.db +%%ETCDIR%%/master/localhost-reverse.db +@sample %%ETCDIR%%/named.conf.sample +%%ETCDIR%%/named.root +%%ETCDIR%%/rndc.conf.sample include/bind9/check.h include/bind9/getaddresses.h include/bind9/version.h @@ -375,16 +384,7 @@ sbin/named-journalprint sbin/nsec3hash sbin/rndc sbin/rndc-confgen -%%ETCDIR%%/rndc.conf.sample -%%ETCDIR%%/bind.keys -%%NOBASE%%etc/mtree/BIND.chroot.dist -%%NOBASE%%etc/mtree/BIND.chroot.local.dist -%%NOBASE%%@sample %%ETCDIR%%/named.conf.sample -%%NOBASE%%%%ETCDIR%%/named.root -%%NOBASE%%%%ETCDIR%%/master/empty.db -%%NOBASE%%%%ETCDIR%%/master/localhost-forward.db -%%NOBASE%%%%ETCDIR%%/master/localhost-reverse.db -%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/dynamic -%%NOBASE%%@dir %%ETCDIR%%/master -%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/slave -%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/working +@dir(bind,bind,) %%ETCDIR%%/dynamic +@dir %%ETCDIR%%/master +@dir(bind,bind,) %%ETCDIR%%/slave +@dir(bind,bind,) %%ETCDIR%%/working From owner-svn-ports-branches@freebsd.org Thu Jan 12 09:33:07 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D6D57CACA70; Thu, 12 Jan 2017 09:33:07 +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 96A081B65; Thu, 12 Jan 2017 09:33:07 +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 v0C9X6iB078402; Thu, 12 Jan 2017 09:33:06 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0C9X6bJ078398; Thu, 12 Jan 2017 09:33:06 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201701120933.v0C9X6bJ078398@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Thu, 12 Jan 2017 09:33:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431240 - in branches/2017Q1/security/gnutls: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2017 09:33:08 -0000 Author: tijl Date: Thu Jan 12 09:33:06 2017 New Revision: 431240 URL: https://svnweb.freebsd.org/changeset/ports/431240 Log: MFH: r431214 Update to 3.5.8. PR: 215909 Submitted by: brnrd Exp-run by: antoine Security: 0c5369fc-d671-11e6-a9a5-b499baebfeaf Approved by: ports-secteam (junovitch) Modified: branches/2017Q1/security/gnutls/Makefile branches/2017Q1/security/gnutls/distinfo branches/2017Q1/security/gnutls/files/patch-lib-tpm.c branches/2017Q1/security/gnutls/pkg-plist Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/security/gnutls/Makefile ============================================================================== --- branches/2017Q1/security/gnutls/Makefile Thu Jan 12 09:16:11 2017 (r431239) +++ branches/2017Q1/security/gnutls/Makefile Thu Jan 12 09:33:06 2017 (r431240) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gnutls -PORTVERSION= 3.4.17 +PORTVERSION= 3.5.8 CATEGORIES= security net MASTER_SITES= GNUPG/gnutls/v${PORTVERSION:R} @@ -10,12 +10,13 @@ COMMENT= GNU Transport Layer Security li LICENSE= GPLv3 LGPL21 LICENSE_COMB= multi -LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING -LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LESSER +LICENSE_FILE_GPLv3= ${WRKSRC}/doc/COPYING +LICENSE_FILE_LGPL21= ${WRKSRC}/doc/COPYING.LESSER LIB_DEPENDS= libgmp.so:math/gmp \ libnettle.so:security/nettle \ - libtasn1.so:security/libtasn1 + libtasn1.so:security/libtasn1 \ + libunistring.so:devel/libunistring BUILD_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss Modified: branches/2017Q1/security/gnutls/distinfo ============================================================================== --- branches/2017Q1/security/gnutls/distinfo Thu Jan 12 09:16:11 2017 (r431239) +++ branches/2017Q1/security/gnutls/distinfo Thu Jan 12 09:33:06 2017 (r431240) @@ -1,3 +1,3 @@ -TIMESTAMP = 1481276012 -SHA256 (gnutls-3.4.17.tar.xz) = 9b50e8a670d5e950425d96935c7ddd415eb6f8079615a36df425f09a3143172e -SIZE (gnutls-3.4.17.tar.xz) = 6709492 +TIMESTAMP = 1483969740 +SHA256 (gnutls-3.5.8.tar.xz) = 0e97f243ae72b70307d684b84c7fe679385aa7a7a0e37e5be810193dcc17d4ff +SIZE (gnutls-3.5.8.tar.xz) = 7264448 Modified: branches/2017Q1/security/gnutls/files/patch-lib-tpm.c ============================================================================== --- branches/2017Q1/security/gnutls/files/patch-lib-tpm.c Thu Jan 12 09:16:11 2017 (r431239) +++ branches/2017Q1/security/gnutls/files/patch-lib-tpm.c Thu Jan 12 09:33:06 2017 (r431240) @@ -1,9 +1,9 @@ ---- lib/tpm.c.orig 2015-09-26 12:02:10 UTC +--- lib/tpm.c.orig 2016-12-19 14:10:59 UTC +++ lib/tpm.c -@@ -71,7 +71,6 @@ typedef TSS_RESULT (*Tspi_DecodeBER_TssB - typedef TSS_RESULT (*Tspi_Context_LoadKeyByBlob_func)(TSS_HCONTEXT, TSS_HKEY, UINT32, BYTE*, TSS_HKEY*); +@@ -72,7 +72,6 @@ typedef TSS_RESULT (*Tspi_Context_LoadKe typedef TSS_RESULT (*Tspi_Policy_AssignToObject_func)(TSS_HPOLICY, TSS_HOBJECT); typedef TSS_RESULT (*Tspi_GetAttribData_func)(TSS_HOBJECT, TSS_FLAG, TSS_FLAG, UINT32*, BYTE**); + typedef TSS_RESULT (*Tspi_GetAttribUint32_func)(TSS_HOBJECT, TSS_FLAG, TSS_FLAG, UINT32*); -typedef TSS_RESULT (*Tspi_Context_GetTpmObject_func)(TSS_HCONTEXT, TSS_HTPM*); typedef TSS_RESULT (*Tspi_TPM_StirRandom_func)(TSS_HTPM, UINT32, BYTE*); typedef TSS_RESULT (*Tspi_SetAttribUint32_func)(TSS_HOBJECT, TSS_FLAG, TSS_FLAG, UINT32); Modified: branches/2017Q1/security/gnutls/pkg-plist ============================================================================== --- branches/2017Q1/security/gnutls/pkg-plist Thu Jan 12 09:16:11 2017 (r431239) +++ branches/2017Q1/security/gnutls/pkg-plist Thu Jan 12 09:33:06 2017 (r431240) @@ -21,6 +21,7 @@ include/gnutls/pkcs11.h include/gnutls/pkcs12.h include/gnutls/pkcs7.h include/gnutls/self-test.h +include/gnutls/socket.h include/gnutls/system-keys.h include/gnutls/tpm.h include/gnutls/urls.h @@ -41,7 +42,7 @@ info/pkcs11-vision.png %%DANE%%lib/libgnutls-dane.so.0.4.1 lib/libgnutls.so lib/libgnutls.so.30 -lib/libgnutls.so.30.7.0 +lib/libgnutls.so.30.13.1 lib/libgnutlsxx.so lib/libgnutlsxx.so.28 lib/libgnutlsxx.so.28.1.0 @@ -92,6 +93,7 @@ man/man3/gnutls_anon_free_client_credent man/man3/gnutls_anon_free_server_credentials.3.gz man/man3/gnutls_anon_set_params_function.3.gz man/man3/gnutls_anon_set_server_dh_params.3.gz +man/man3/gnutls_anon_set_server_known_dh_params.3.gz man/man3/gnutls_anon_set_server_params_function.3.gz man/man3/gnutls_auth_client_get_type.3.gz man/man3/gnutls_auth_get_type.3.gz @@ -123,8 +125,10 @@ man/man3/gnutls_certificate_server_set_r man/man3/gnutls_certificate_set_dh_params.3.gz man/man3/gnutls_certificate_set_flags.3.gz man/man3/gnutls_certificate_set_key.3.gz +man/man3/gnutls_certificate_set_known_dh_params.3.gz man/man3/gnutls_certificate_set_ocsp_status_request_file.3.gz man/man3/gnutls_certificate_set_ocsp_status_request_function.3.gz +man/man3/gnutls_certificate_set_ocsp_status_request_function2.3.gz man/man3/gnutls_certificate_set_openpgp_key.3.gz man/man3/gnutls_certificate_set_openpgp_key_file.3.gz man/man3/gnutls_certificate_set_openpgp_key_file2.3.gz @@ -179,7 +183,6 @@ man/man3/gnutls_cipher_get_name.3.gz man/man3/gnutls_cipher_get_tag_size.3.gz man/man3/gnutls_cipher_init.3.gz man/man3/gnutls_cipher_list.3.gz -man/man3/gnutls_cipher_self_test.3.gz man/man3/gnutls_cipher_set_iv.3.gz man/man3/gnutls_cipher_suite_get_name.3.gz man/man3/gnutls_cipher_suite_info.3.gz @@ -205,6 +208,7 @@ man/man3/gnutls_db_set_ptr.3.gz man/man3/gnutls_db_set_remove_function.3.gz man/man3/gnutls_db_set_retrieve_function.3.gz man/man3/gnutls_db_set_store_function.3.gz +man/man3/gnutls_decode_ber_digest_info.3.gz man/man3/gnutls_deinit.3.gz man/man3/gnutls_dh_get_group.3.gz man/man3/gnutls_dh_get_peers_public_bits.3.gz @@ -217,6 +221,7 @@ man/man3/gnutls_dh_params_export2_pkcs3. man/man3/gnutls_dh_params_export_pkcs3.3.gz man/man3/gnutls_dh_params_export_raw.3.gz man/man3/gnutls_dh_params_generate2.3.gz +man/man3/gnutls_dh_params_import_dsa.3.gz man/man3/gnutls_dh_params_import_pkcs3.3.gz man/man3/gnutls_dh_params_import_raw.3.gz man/man3/gnutls_dh_params_import_raw2.3.gz @@ -226,7 +231,6 @@ man/man3/gnutls_digest_get_id.3.gz man/man3/gnutls_digest_get_name.3.gz man/man3/gnutls_digest_get_oid.3.gz man/man3/gnutls_digest_list.3.gz -man/man3/gnutls_digest_self_test.3.gz man/man3/gnutls_dtls_cookie_send.3.gz man/man3/gnutls_dtls_cookie_verify.3.gz man/man3/gnutls_dtls_get_data_mtu.3.gz @@ -240,12 +244,15 @@ man/man3/gnutls_ecc_curve_get.3.gz man/man3/gnutls_ecc_curve_get_id.3.gz man/man3/gnutls_ecc_curve_get_name.3.gz man/man3/gnutls_ecc_curve_get_oid.3.gz +man/man3/gnutls_ecc_curve_get_pk.3.gz man/man3/gnutls_ecc_curve_get_size.3.gz man/man3/gnutls_ecc_curve_list.3.gz +man/man3/gnutls_encode_ber_digest_info.3.gz man/man3/gnutls_error_is_fatal.3.gz man/man3/gnutls_error_to_alert.3.gz man/man3/gnutls_est_record_overhead_size.3.gz man/man3/gnutls_ext_get_data.3.gz +man/man3/gnutls_ext_get_name.3.gz man/man3/gnutls_ext_register.3.gz man/man3/gnutls_ext_set_data.3.gz man/man3/gnutls_fingerprint.3.gz @@ -305,7 +312,6 @@ man/man3/gnutls_mac_get_key_size.3.gz man/man3/gnutls_mac_get_name.3.gz man/man3/gnutls_mac_get_nonce_size.3.gz man/man3/gnutls_mac_list.3.gz -man/man3/gnutls_mac_self_test.3.gz man/man3/gnutls_memcmp.3.gz man/man3/gnutls_memset.3.gz man/man3/gnutls_ocsp_req_add_cert.3.gz @@ -330,6 +336,7 @@ man/man3/gnutls_ocsp_resp_get_extension. man/man3/gnutls_ocsp_resp_get_nonce.3.gz man/man3/gnutls_ocsp_resp_get_produced.3.gz man/man3/gnutls_ocsp_resp_get_responder.3.gz +man/man3/gnutls_ocsp_resp_get_responder2.3.gz man/man3/gnutls_ocsp_resp_get_responder_raw_id.3.gz man/man3/gnutls_ocsp_resp_get_response.3.gz man/man3/gnutls_ocsp_resp_get_signature.3.gz @@ -347,6 +354,7 @@ man/man3/gnutls_ocsp_status_request_get. man/man3/gnutls_ocsp_status_request_is_checked.3.gz man/man3/gnutls_oid_to_digest.3.gz man/man3/gnutls_oid_to_ecc_curve.3.gz +man/man3/gnutls_oid_to_mac.3.gz man/man3/gnutls_oid_to_pk.3.gz man/man3/gnutls_oid_to_sign.3.gz man/man3/gnutls_openpgp_crt_check_email.3.gz @@ -440,7 +448,6 @@ man/man3/gnutls_pk_get_id.3.gz man/man3/gnutls_pk_get_name.3.gz man/man3/gnutls_pk_get_oid.3.gz man/man3/gnutls_pk_list.3.gz -man/man3/gnutls_pk_self_test.3.gz man/man3/gnutls_pk_to_sign.3.gz man/man3/gnutls_pkcs11_add_provider.3.gz man/man3/gnutls_pkcs11_copy_attached_extension.3.gz @@ -584,7 +591,9 @@ man/man3/gnutls_privkey_export_pkcs11.3. man/man3/gnutls_privkey_export_rsa_raw.3.gz man/man3/gnutls_privkey_export_x509.3.gz man/man3/gnutls_privkey_generate.3.gz +man/man3/gnutls_privkey_generate2.3.gz man/man3/gnutls_privkey_get_pk_algorithm.3.gz +man/man3/gnutls_privkey_get_seed.3.gz man/man3/gnutls_privkey_get_type.3.gz man/man3/gnutls_privkey_import_dsa_raw.3.gz man/man3/gnutls_privkey_import_ecc_raw.3.gz @@ -602,11 +611,13 @@ man/man3/gnutls_privkey_import_url.3.gz man/man3/gnutls_privkey_import_x509.3.gz man/man3/gnutls_privkey_import_x509_raw.3.gz man/man3/gnutls_privkey_init.3.gz +man/man3/gnutls_privkey_set_flags.3.gz man/man3/gnutls_privkey_set_pin_function.3.gz man/man3/gnutls_privkey_sign_data.3.gz man/man3/gnutls_privkey_sign_hash.3.gz man/man3/gnutls_privkey_status.3.gz man/man3/gnutls_privkey_verify_params.3.gz +man/man3/gnutls_privkey_verify_seed.3.gz man/man3/gnutls_protocol_get_id.3.gz man/man3/gnutls_protocol_get_name.3.gz man/man3/gnutls_protocol_get_version.3.gz @@ -624,6 +635,7 @@ man/man3/gnutls_psk_set_server_credentia man/man3/gnutls_psk_set_server_credentials_function.3.gz man/man3/gnutls_psk_set_server_credentials_hint.3.gz man/man3/gnutls_psk_set_server_dh_params.3.gz +man/man3/gnutls_psk_set_server_known_dh_params.3.gz man/man3/gnutls_psk_set_server_params_function.3.gz man/man3/gnutls_pubkey_deinit.3.gz man/man3/gnutls_pubkey_encrypt_data.3.gz @@ -696,12 +708,15 @@ man/man3/gnutls_session_channel_binding. man/man3/gnutls_session_enable_compatibility_mode.3.gz man/man3/gnutls_session_etm_status.3.gz man/man3/gnutls_session_ext_master_secret_status.3.gz +man/man3/gnutls_session_ext_register.3.gz man/man3/gnutls_session_force_valid.3.gz man/man3/gnutls_session_get_data.3.gz man/man3/gnutls_session_get_data2.3.gz man/man3/gnutls_session_get_desc.3.gz +man/man3/gnutls_session_get_flags.3.gz man/man3/gnutls_session_get_id.3.gz man/man3/gnutls_session_get_id2.3.gz +man/man3/gnutls_session_get_master_secret.3.gz man/man3/gnutls_session_get_ptr.3.gz man/man3/gnutls_session_get_random.3.gz man/man3/gnutls_session_get_verify_cert_status.3.gz @@ -714,6 +729,7 @@ man/man3/gnutls_session_set_ptr.3.gz man/man3/gnutls_session_set_verify_cert.3.gz man/man3/gnutls_session_set_verify_cert2.3.gz man/man3/gnutls_session_set_verify_function.3.gz +man/man3/gnutls_session_supplemental_register.3.gz man/man3/gnutls_session_ticket_enable_client.3.gz man/man3/gnutls_session_ticket_enable_server.3.gz man/man3/gnutls_session_ticket_key_generate.3.gz @@ -785,6 +801,7 @@ man/man3/gnutls_transport_get_ptr.3.gz man/man3/gnutls_transport_get_ptr2.3.gz man/man3/gnutls_transport_set_errno.3.gz man/man3/gnutls_transport_set_errno_function.3.gz +man/man3/gnutls_transport_set_fastopen.3.gz man/man3/gnutls_transport_set_int.3.gz man/man3/gnutls_transport_set_int2.3.gz man/man3/gnutls_transport_set_ptr.3.gz @@ -794,6 +811,7 @@ man/man3/gnutls_transport_set_pull_timeo man/man3/gnutls_transport_set_push_function.3.gz man/man3/gnutls_transport_set_vec_push_function.3.gz man/man3/gnutls_url_is_supported.3.gz +man/man3/gnutls_utf8_password_normalize.3.gz man/man3/gnutls_verify_stored_pubkey.3.gz man/man3/gnutls_x509_aia_deinit.3.gz man/man3/gnutls_x509_aia_get.3.gz @@ -805,6 +823,7 @@ man/man3/gnutls_x509_aki_get_id.3.gz man/man3/gnutls_x509_aki_init.3.gz man/man3/gnutls_x509_aki_set_cert_issuer.3.gz man/man3/gnutls_x509_aki_set_id.3.gz +man/man3/gnutls_x509_cidr_to_rfc5280.3.gz man/man3/gnutls_x509_crl_check_issuer.3.gz man/man3/gnutls_x509_crl_deinit.3.gz man/man3/gnutls_x509_crl_dist_points_deinit.3.gz @@ -824,12 +843,14 @@ man/man3/gnutls_x509_crl_get_extension_i man/man3/gnutls_x509_crl_get_extension_oid.3.gz man/man3/gnutls_x509_crl_get_issuer_dn.3.gz man/man3/gnutls_x509_crl_get_issuer_dn2.3.gz +man/man3/gnutls_x509_crl_get_issuer_dn3.3.gz man/man3/gnutls_x509_crl_get_issuer_dn_by_oid.3.gz man/man3/gnutls_x509_crl_get_next_update.3.gz man/man3/gnutls_x509_crl_get_number.3.gz man/man3/gnutls_x509_crl_get_raw_issuer_dn.3.gz man/man3/gnutls_x509_crl_get_signature.3.gz man/man3/gnutls_x509_crl_get_signature_algorithm.3.gz +man/man3/gnutls_x509_crl_get_signature_oid.3.gz man/man3/gnutls_x509_crl_get_this_update.3.gz man/man3/gnutls_x509_crl_get_version.3.gz man/man3/gnutls_x509_crl_import.3.gz @@ -860,6 +881,7 @@ man/man3/gnutls_x509_crq_get_basic_const man/man3/gnutls_x509_crq_get_challenge_password.3.gz man/man3/gnutls_x509_crq_get_dn.3.gz man/man3/gnutls_x509_crq_get_dn2.3.gz +man/man3/gnutls_x509_crq_get_dn3.3.gz man/man3/gnutls_x509_crq_get_dn_by_oid.3.gz man/man3/gnutls_x509_crq_get_dn_oid.3.gz man/man3/gnutls_x509_crq_get_extension_by_oid.3.gz @@ -872,10 +894,13 @@ man/man3/gnutls_x509_crq_get_key_purpose man/man3/gnutls_x509_crq_get_key_rsa_raw.3.gz man/man3/gnutls_x509_crq_get_key_usage.3.gz man/man3/gnutls_x509_crq_get_pk_algorithm.3.gz +man/man3/gnutls_x509_crq_get_pk_oid.3.gz man/man3/gnutls_x509_crq_get_private_key_usage_period.3.gz man/man3/gnutls_x509_crq_get_signature_algorithm.3.gz +man/man3/gnutls_x509_crq_get_signature_oid.3.gz man/man3/gnutls_x509_crq_get_subject_alt_name.3.gz man/man3/gnutls_x509_crq_get_subject_alt_othername_oid.3.gz +man/man3/gnutls_x509_crq_get_tlsfeatures.3.gz man/man3/gnutls_x509_crq_get_version.3.gz man/man3/gnutls_x509_crq_import.3.gz man/man3/gnutls_x509_crq_init.3.gz @@ -886,6 +911,7 @@ man/man3/gnutls_x509_crq_set_basic_const man/man3/gnutls_x509_crq_set_challenge_password.3.gz man/man3/gnutls_x509_crq_set_dn.3.gz man/man3/gnutls_x509_crq_set_dn_by_oid.3.gz +man/man3/gnutls_x509_crq_set_extension_by_oid.3.gz man/man3/gnutls_x509_crq_set_key.3.gz man/man3/gnutls_x509_crq_set_key_purpose_oid.3.gz man/man3/gnutls_x509_crq_set_key_rsa_raw.3.gz @@ -893,6 +919,8 @@ man/man3/gnutls_x509_crq_set_key_usage.3 man/man3/gnutls_x509_crq_set_private_key_usage_period.3.gz man/man3/gnutls_x509_crq_set_pubkey.3.gz man/man3/gnutls_x509_crq_set_subject_alt_name.3.gz +man/man3/gnutls_x509_crq_set_subject_alt_othername.3.gz +man/man3/gnutls_x509_crq_set_tlsfeatures.3.gz man/man3/gnutls_x509_crq_set_version.3.gz man/man3/gnutls_x509_crq_sign.3.gz man/man3/gnutls_x509_crq_sign2.3.gz @@ -901,9 +929,12 @@ man/man3/gnutls_x509_crt_check_email.3.g man/man3/gnutls_x509_crt_check_hostname.3.gz man/man3/gnutls_x509_crt_check_hostname2.3.gz man/man3/gnutls_x509_crt_check_issuer.3.gz +man/man3/gnutls_x509_crt_check_key_purpose.3.gz man/man3/gnutls_x509_crt_check_revocation.3.gz man/man3/gnutls_x509_crt_cpy_crl_dist_points.3.gz man/man3/gnutls_x509_crt_deinit.3.gz +man/man3/gnutls_x509_crt_equals.3.gz +man/man3/gnutls_x509_crt_equals2.3.gz man/man3/gnutls_x509_crt_export.3.gz man/man3/gnutls_x509_crt_export2.3.gz man/man3/gnutls_x509_crt_get_activation_time.3.gz @@ -915,6 +946,7 @@ man/man3/gnutls_x509_crt_get_ca_status.3 man/man3/gnutls_x509_crt_get_crl_dist_points.3.gz man/man3/gnutls_x509_crt_get_dn.3.gz man/man3/gnutls_x509_crt_get_dn2.3.gz +man/man3/gnutls_x509_crt_get_dn3.3.gz man/man3/gnutls_x509_crt_get_dn_by_oid.3.gz man/man3/gnutls_x509_crt_get_dn_oid.3.gz man/man3/gnutls_x509_crt_get_expiration_time.3.gz @@ -931,6 +963,7 @@ man/man3/gnutls_x509_crt_get_issuer_alt_ man/man3/gnutls_x509_crt_get_issuer_alt_othername_oid.3.gz man/man3/gnutls_x509_crt_get_issuer_dn.3.gz man/man3/gnutls_x509_crt_get_issuer_dn2.3.gz +man/man3/gnutls_x509_crt_get_issuer_dn3.3.gz man/man3/gnutls_x509_crt_get_issuer_dn_by_oid.3.gz man/man3/gnutls_x509_crt_get_issuer_dn_oid.3.gz man/man3/gnutls_x509_crt_get_issuer_unique_id.3.gz @@ -941,6 +974,7 @@ man/man3/gnutls_x509_crt_get_name_constr man/man3/gnutls_x509_crt_get_pk_algorithm.3.gz man/man3/gnutls_x509_crt_get_pk_dsa_raw.3.gz man/man3/gnutls_x509_crt_get_pk_ecc_raw.3.gz +man/man3/gnutls_x509_crt_get_pk_oid.3.gz man/man3/gnutls_x509_crt_get_pk_rsa_raw.3.gz man/man3/gnutls_x509_crt_get_policy.3.gz man/man3/gnutls_x509_crt_get_preferred_hash_algorithm.3.gz @@ -951,12 +985,14 @@ man/man3/gnutls_x509_crt_get_raw_issuer_ man/man3/gnutls_x509_crt_get_serial.3.gz man/man3/gnutls_x509_crt_get_signature.3.gz man/man3/gnutls_x509_crt_get_signature_algorithm.3.gz +man/man3/gnutls_x509_crt_get_signature_oid.3.gz man/man3/gnutls_x509_crt_get_subject.3.gz man/man3/gnutls_x509_crt_get_subject_alt_name.3.gz man/man3/gnutls_x509_crt_get_subject_alt_name2.3.gz man/man3/gnutls_x509_crt_get_subject_alt_othername_oid.3.gz man/man3/gnutls_x509_crt_get_subject_key_id.3.gz man/man3/gnutls_x509_crt_get_subject_unique_id.3.gz +man/man3/gnutls_x509_crt_get_tlsfeatures.3.gz man/man3/gnutls_x509_crt_get_version.3.gz man/man3/gnutls_x509_crt_import.3.gz man/man3/gnutls_x509_crt_import_pkcs11.3.gz @@ -976,12 +1012,14 @@ man/man3/gnutls_x509_crt_set_ca_status.3 man/man3/gnutls_x509_crt_set_crl_dist_points.3.gz man/man3/gnutls_x509_crt_set_crl_dist_points2.3.gz man/man3/gnutls_x509_crt_set_crq.3.gz +man/man3/gnutls_x509_crt_set_crq_extension_by_oid.3.gz man/man3/gnutls_x509_crt_set_crq_extensions.3.gz man/man3/gnutls_x509_crt_set_dn.3.gz man/man3/gnutls_x509_crt_set_dn_by_oid.3.gz man/man3/gnutls_x509_crt_set_expiration_time.3.gz man/man3/gnutls_x509_crt_set_extension_by_oid.3.gz man/man3/gnutls_x509_crt_set_issuer_alt_name.3.gz +man/man3/gnutls_x509_crt_set_issuer_alt_othername.3.gz man/man3/gnutls_x509_crt_set_issuer_dn.3.gz man/man3/gnutls_x509_crt_set_issuer_dn_by_oid.3.gz man/man3/gnutls_x509_crt_set_issuer_unique_id.3.gz @@ -997,9 +1035,11 @@ man/man3/gnutls_x509_crt_set_proxy_dn.3. man/man3/gnutls_x509_crt_set_pubkey.3.gz man/man3/gnutls_x509_crt_set_serial.3.gz man/man3/gnutls_x509_crt_set_subject_alt_name.3.gz +man/man3/gnutls_x509_crt_set_subject_alt_othername.3.gz man/man3/gnutls_x509_crt_set_subject_alternative_name.3.gz man/man3/gnutls_x509_crt_set_subject_key_id.3.gz man/man3/gnutls_x509_crt_set_subject_unique_id.3.gz +man/man3/gnutls_x509_crt_set_tlsfeatures.3.gz man/man3/gnutls_x509_crt_set_version.3.gz man/man3/gnutls_x509_crt_sign.3.gz man/man3/gnutls_x509_crt_sign2.3.gz @@ -1010,10 +1050,12 @@ man/man3/gnutls_x509_dn_export.3.gz man/man3/gnutls_x509_dn_export2.3.gz man/man3/gnutls_x509_dn_get_rdn_ava.3.gz man/man3/gnutls_x509_dn_get_str.3.gz +man/man3/gnutls_x509_dn_get_str2.3.gz man/man3/gnutls_x509_dn_import.3.gz man/man3/gnutls_x509_dn_init.3.gz man/man3/gnutls_x509_dn_oid_known.3.gz man/man3/gnutls_x509_dn_oid_name.3.gz +man/man3/gnutls_x509_dn_set_str.3.gz man/man3/gnutls_x509_ext_deinit.3.gz man/man3/gnutls_x509_ext_export_aia.3.gz man/man3/gnutls_x509_ext_export_authority_key_id.3.gz @@ -1027,6 +1069,7 @@ man/man3/gnutls_x509_ext_export_private_ man/man3/gnutls_x509_ext_export_proxy.3.gz man/man3/gnutls_x509_ext_export_subject_alt_names.3.gz man/man3/gnutls_x509_ext_export_subject_key_id.3.gz +man/man3/gnutls_x509_ext_export_tlsfeatures.3.gz man/man3/gnutls_x509_ext_import_aia.3.gz man/man3/gnutls_x509_ext_import_authority_key_id.3.gz man/man3/gnutls_x509_ext_import_basic_constraints.3.gz @@ -1039,6 +1082,7 @@ man/man3/gnutls_x509_ext_import_private_ man/man3/gnutls_x509_ext_import_proxy.3.gz man/man3/gnutls_x509_ext_import_subject_alt_names.3.gz man/man3/gnutls_x509_ext_import_subject_key_id.3.gz +man/man3/gnutls_x509_ext_import_tlsfeatures.3.gz man/man3/gnutls_x509_ext_print.3.gz man/man3/gnutls_x509_key_purpose_deinit.3.gz man/man3/gnutls_x509_key_purpose_get.3.gz @@ -1070,9 +1114,11 @@ man/man3/gnutls_x509_privkey_export_rsa_ man/man3/gnutls_x509_privkey_export_rsa_raw2.3.gz man/man3/gnutls_x509_privkey_fix.3.gz man/man3/gnutls_x509_privkey_generate.3.gz +man/man3/gnutls_x509_privkey_generate2.3.gz man/man3/gnutls_x509_privkey_get_key_id.3.gz man/man3/gnutls_x509_privkey_get_pk_algorithm.3.gz man/man3/gnutls_x509_privkey_get_pk_algorithm2.3.gz +man/man3/gnutls_x509_privkey_get_seed.3.gz man/man3/gnutls_x509_privkey_import.3.gz man/man3/gnutls_x509_privkey_import2.3.gz man/man3/gnutls_x509_privkey_import_dsa_raw.3.gz @@ -1083,13 +1129,21 @@ man/man3/gnutls_x509_privkey_import_rsa_ man/man3/gnutls_x509_privkey_import_rsa_raw2.3.gz man/man3/gnutls_x509_privkey_init.3.gz man/man3/gnutls_x509_privkey_sec_param.3.gz +man/man3/gnutls_x509_privkey_set_flags.3.gz man/man3/gnutls_x509_privkey_set_pin_function.3.gz man/man3/gnutls_x509_privkey_sign_data.3.gz man/man3/gnutls_x509_privkey_sign_hash.3.gz man/man3/gnutls_x509_privkey_verify_params.3.gz +man/man3/gnutls_x509_privkey_verify_seed.3.gz man/man3/gnutls_x509_rdn_get.3.gz +man/man3/gnutls_x509_rdn_get2.3.gz man/man3/gnutls_x509_rdn_get_by_oid.3.gz man/man3/gnutls_x509_rdn_get_oid.3.gz +man/man3/gnutls_x509_tlsfeatures_add.3.gz +man/man3/gnutls_x509_tlsfeatures_check_crt.3.gz +man/man3/gnutls_x509_tlsfeatures_deinit.3.gz +man/man3/gnutls_x509_tlsfeatures_get.3.gz +man/man3/gnutls_x509_tlsfeatures_init.3.gz man/man3/gnutls_x509_trust_list_add_cas.3.gz man/man3/gnutls_x509_trust_list_add_crls.3.gz man/man3/gnutls_x509_trust_list_add_named_crt.3.gz @@ -1119,13 +1173,13 @@ man/man3/gnutls_x509_trust_list_verify_n %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-resume.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-srp.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-x509.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-x509-3.1.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-crq.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-ocsp-client.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-pkcs11-list.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-pkcs12.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-anon.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-dtls.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-pgp.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-psk.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-srp.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-x509.c From owner-svn-ports-branches@freebsd.org Thu Jan 12 11:18:30 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EF394CABC78; Thu, 12 Jan 2017 11:18:30 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BE41A10E9; Thu, 12 Jan 2017 11:18:30 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0CBITr3021053; Thu, 12 Jan 2017 11:18:29 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0CBITiR021052; Thu, 12 Jan 2017 11:18:29 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201701121118.v0CBITiR021052@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Thu, 12 Jan 2017 11:18:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431247 - branches/2017Q1/www/chromium/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2017 11:18:31 -0000 Author: cpm Date: Thu Jan 12 11:18:29 2017 New Revision: 431247 URL: https://svnweb.freebsd.org/changeset/ports/431247 Log: MFH: r431208 - Remove leftover patch after r431170 ===> Patching for chromium-54.0.2840.100_1 ===> Applying extra patch /xports/www/chromium/files/extra-patch-clang ===> Applying extra patch /xports/www/chromium/files/extra-patch-libc++-old ===> Applying FreeBSD patches for chromium-54.0.2840.100_1 Ignoring previously applied (or reversed) patch. 1 out of 1 hunks ignored--saving rejects to services/ui/ws/BUILD.gn.rej => Patch patch-services_ui_ws_BUILD.gn failed to apply cleanly. Reported by: Jonathan Chen via email Approved by: ports-secteam (junovitch) Deleted: branches/2017Q1/www/chromium/files/patch-services_ui_ws_BUILD.gn Modified: Directory Properties: branches/2017Q1/ (props changed) From owner-svn-ports-branches@freebsd.org Thu Jan 12 13:46:47 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 86513CAC3A8; Thu, 12 Jan 2017 13:46:47 +0000 (UTC) (envelope-from tz@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 3BFC7152F; Thu, 12 Jan 2017 13:46:47 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0CDkkuw083090; Thu, 12 Jan 2017 13:46:46 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0CDkkrf083087; Thu, 12 Jan 2017 13:46:46 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201701121346.v0CDkkrf083087@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Thu, 12 Jan 2017 13:46:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431264 - branches/2017Q1/mail/phpmailer X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2017 13:46:47 -0000 Author: tz Date: Thu Jan 12 13:46:46 2017 New Revision: 431264 URL: https://svnweb.freebsd.org/changeset/ports/431264 Log: MFH: r431252 mail/phpmailer: Update from 5.2.20 to 5.2.22 - SECURITY: Fix CVE-2017-5223, local file disclosure vulnerability if content passed to msgHTML() is sourced from unfiltered user input - Add simple contact form example - Emoji in test content Security: CVE-2017-5223 Approved by: ports-secteam (feld) Modified: branches/2017Q1/mail/phpmailer/Makefile branches/2017Q1/mail/phpmailer/distinfo branches/2017Q1/mail/phpmailer/pkg-plist Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/mail/phpmailer/Makefile ============================================================================== --- branches/2017Q1/mail/phpmailer/Makefile Thu Jan 12 13:45:40 2017 (r431263) +++ branches/2017Q1/mail/phpmailer/Makefile Thu Jan 12 13:46:46 2017 (r431264) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= phpmailer -PORTVERSION= 5.2.20 +PORTVERSION= 5.2.22 DISTVERSIONPREFIX= v CATEGORIES= mail Modified: branches/2017Q1/mail/phpmailer/distinfo ============================================================================== --- branches/2017Q1/mail/phpmailer/distinfo Thu Jan 12 13:45:40 2017 (r431263) +++ branches/2017Q1/mail/phpmailer/distinfo Thu Jan 12 13:46:46 2017 (r431264) @@ -1,3 +1,3 @@ -TIMESTAMP = 1482937380 -SHA256 (PHPMailer-PHPMailer-v5.2.20_GH0.tar.gz) = 4716acef60503f345323849842f3138a8453c178d3829477553bf1e347664976 -SIZE (PHPMailer-PHPMailer-v5.2.20_GH0.tar.gz) = 156793 +TIMESTAMP = 1484220608 +SHA256 (PHPMailer-PHPMailer-v5.2.22_GH0.tar.gz) = e30631e04333e05eb10077c94385d002c2cd3452d451da3b3899951e3aa1ff42 +SIZE (PHPMailer-PHPMailer-v5.2.22_GH0.tar.gz) = 157657 Modified: branches/2017Q1/mail/phpmailer/pkg-plist ============================================================================== --- branches/2017Q1/mail/phpmailer/pkg-plist Thu Jan 12 13:45:40 2017 (r431263) +++ branches/2017Q1/mail/phpmailer/pkg-plist Thu Jan 12 13:46:46 2017 (r431264) @@ -1,5 +1,6 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/DKIM.phps %%PORTEXAMPLES%%%%EXAMPLESDIR%%/code_generator.phps +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contactform.phps %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contents.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contentsutf8.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exceptions.phps From owner-svn-ports-branches@freebsd.org Fri Jan 13 02:41:26 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9E597CACAA1; Fri, 13 Jan 2017 02:41:26 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6DBE71D10; Fri, 13 Jan 2017 02:41:26 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0D2fPkB003254; Fri, 13 Jan 2017 02:41:25 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0D2fPse003253; Fri, 13 Jan 2017 02:41:25 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201701130241.v0D2fPse003253@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Fri, 13 Jan 2017 02:41:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431338 - branches/2017Q1/www/chromium X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jan 2017 02:41:26 -0000 Author: cpm Date: Fri Jan 13 02:41:25 2017 New Revision: 431338 URL: https://svnweb.freebsd.org/changeset/ports/431338 Log: MFH: r431337 - Always check OPSYS along with OSVERSION - Fix build on 11.0-STABLE [1] Reported by: Jonathan Chen [1] via email Reviewed by: rene Approved by: chromium (rene) Approved by: ports-secteam (blanket) Modified: branches/2017Q1/www/chromium/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/www/chromium/Makefile ============================================================================== --- branches/2017Q1/www/chromium/Makefile Fri Jan 13 02:36:08 2017 (r431337) +++ branches/2017Q1/www/chromium/Makefile Fri Jan 13 02:41:25 2017 (r431338) @@ -187,13 +187,13 @@ GN_ARGS+= is_clang=true EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang .endif -.if ${OSVERSION} < 1200017 +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100508 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old .else EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new .endif -.if ${OSVERSION} < 1100000 +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10 .endif From owner-svn-ports-branches@freebsd.org Fri Jan 13 03:22:06 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3B37ACADCA0; Fri, 13 Jan 2017 03:22:06 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0AD621BE6; Fri, 13 Jan 2017 03:22:05 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0D3M575022411; Fri, 13 Jan 2017 03:22:05 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0D3M5Lf022410; Fri, 13 Jan 2017 03:22:05 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201701130322.v0D3M5Lf022410@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Fri, 13 Jan 2017 03:22:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431340 - branches/2017Q1/www/chromium X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jan 2017 03:22:06 -0000 Author: cpm Date: Fri Jan 13 03:22:05 2017 New Revision: 431340 URL: https://svnweb.freebsd.org/changeset/ports/431340 Log: MFH: r431339 - Wrap the entire block with OPSYS check Reported by: marino Approved by: ports-secteam (blanket) Modified: branches/2017Q1/www/chromium/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/www/chromium/Makefile ============================================================================== --- branches/2017Q1/www/chromium/Makefile Fri Jan 13 03:18:05 2017 (r431339) +++ branches/2017Q1/www/chromium/Makefile Fri Jan 13 03:22:05 2017 (r431340) @@ -187,15 +187,17 @@ GN_ARGS+= is_clang=true EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100508 +.if ${OPSYS} == FreeBSD +.if ${OSVERSION} < 1100508 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old .else EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 +.if ${OSVERSION} < 1100000 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10 .endif +.endif .if ! ${PORT_OPTIONS:MKERBEROS} GN_ARGS+= use_kerberos=true From owner-svn-ports-branches@freebsd.org Fri Jan 13 04:28:00 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3E65BCAD16B; Fri, 13 Jan 2017 04:28:00 +0000 (UTC) (envelope-from lifanov@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 06A40173A; Fri, 13 Jan 2017 04:27:59 +0000 (UTC) (envelope-from lifanov@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0D4RxJH047161; Fri, 13 Jan 2017 04:27:59 GMT (envelope-from lifanov@FreeBSD.org) Received: (from lifanov@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0D4Rw7p047157; Fri, 13 Jan 2017 04:27:58 GMT (envelope-from lifanov@FreeBSD.org) Message-Id: <201701130427.v0D4Rw7p047157@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lifanov set sender to lifanov@FreeBSD.org using -f From: Nikolai Lifanov Date: Fri, 13 Jan 2017 04:27:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431341 - in branches/2017Q1/sysutils/ansible: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jan 2017 04:28:00 -0000 Author: lifanov Date: Fri Jan 13 04:27:58 2017 New Revision: 431341 URL: https://svnweb.freebsd.org/changeset/ports/431341 Log: MFH: r431329 sysutils/ansible: address CVE-2016-9587 Reviewed by: matthew Approved by: matthew (mentor) Security: CVE-2016-9587 Security: https://vuxml.FreeBSD.org/freebsd/a93c3287-d8fd-11e6-be5c-001fbc0f280f.html Differential Revision: https://reviews.freebsd.org/D9158 Approved by: ports-secteam (junovitch) Added: branches/2017Q1/sysutils/ansible/files/extra-patch-cc4634a - copied unchanged from r431329, head/sysutils/ansible/files/extra-patch-cc4634a branches/2017Q1/sysutils/ansible/files/extra-patch-eb8c26c - copied unchanged from r431329, head/sysutils/ansible/files/extra-patch-eb8c26c branches/2017Q1/sysutils/ansible/files/extra-patch-ec84ff6 - copied unchanged from r431329, head/sysutils/ansible/files/extra-patch-ec84ff6 Modified: branches/2017Q1/sysutils/ansible/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/sysutils/ansible/Makefile ============================================================================== --- branches/2017Q1/sysutils/ansible/Makefile Fri Jan 13 03:22:05 2017 (r431340) +++ branches/2017Q1/sysutils/ansible/Makefile Fri Jan 13 04:27:58 2017 (r431341) @@ -3,7 +3,7 @@ PORTNAME= ansible PORTVERSION?= 2.2.0.0 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= sysutils python MASTER_SITES= http://releases.ansible.com/ansible/ @@ -18,7 +18,10 @@ RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}yam ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 -EXTRA_PATCHES?= ${FILESDIR}/extra-patch-872594b +EXTRA_PATCHES?= ${FILESDIR}/extra-patch-872594b \ + ${FILESDIR}/extra-patch-ec84ff6 \ + ${FILESDIR}/extra-patch-eb8c26c \ + ${FILESDIR}/extra-patch-cc4634a NO_ARCH= yes USES?= cpe python shebangfix Copied: branches/2017Q1/sysutils/ansible/files/extra-patch-cc4634a (from r431329, head/sysutils/ansible/files/extra-patch-cc4634a) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/sysutils/ansible/files/extra-patch-cc4634a Fri Jan 13 04:27:58 2017 (r431341, copy of r431329, head/sysutils/ansible/files/extra-patch-cc4634a) @@ -0,0 +1,159 @@ +From cc4634a5e73c06c6b4581f11171289ca9228391e Mon Sep 17 00:00:00 2001 +From: James Cammarata +Date: Tue, 10 Jan 2017 16:54:00 -0600 +Subject: [PATCH] Additional fixes for security related to CVE-2016-9587 + +(cherry picked from commit d316068831f9e08ef96833200ec7df2132263966) +--- + lib/ansible/playbook/conditional.py | 10 +++++----- + lib/ansible/template/__init__.py | 28 ++++++++++++++-------------- + 2 files changed, 19 insertions(+), 19 deletions(-) + +diff --git lib/ansible/playbook/conditional.py lib/ansible/playbook/conditional.py +index 99e377c..57e20a0 100644 +--- lib/ansible/playbook/conditional.py ++++ lib/ansible/playbook/conditional.py +@@ -104,7 +104,7 @@ def _check_conditional(self, conditional, templar, all_vars): + if conditional is None or conditional == '': + return True + +- if conditional in all_vars and '-' not in text_type(all_vars[conditional]): ++ if conditional in all_vars and re.match("^[_A-Za-z][_a-zA-Z0-9]*$", conditional): + conditional = all_vars[conditional] + + # make sure the templar is using the variables specified with this method +@@ -116,12 +116,12 @@ def _check_conditional(self, conditional, templar, all_vars): + return conditional + + # a Jinja2 evaluation that results in something Python can eval! +- if hasattr(conditional, '__UNSAFE__') and LOOKUP_REGEX.match(conditional): +- raise AnsibleError("The conditional '%s' contains variables which came from an unsafe " \ +- "source and also contains a lookup() call, failing conditional check" % conditional) ++ disable_lookups = False ++ if hasattr(conditional, '__UNSAFE__'): ++ disable_lookups = True + + presented = "{%% if %s %%} True {%% else %%} False {%% endif %%}" % conditional +- val = templar.template(presented).strip() ++ val = templar.template(presented, disable_lookups=disable_lookups).strip() + if val == "True": + return True + elif val == "False": +diff --git lib/ansible/template/__init__.py lib/ansible/template/__init__.py +index 53b2675..1a43486 100644 +--- lib/ansible/template/__init__.py ++++ lib/ansible/template/__init__.py +@@ -30,10 +30,8 @@ + from jinja2 import Environment + from jinja2.loaders import FileSystemLoader + from jinja2.exceptions import TemplateSyntaxError, UndefinedError +-from jinja2.nodes import EvalContext + from jinja2.utils import concat as j2_concat + from jinja2.runtime import Context, StrictUndefined +- + from ansible import constants as C + from ansible.compat.six import string_types, text_type + from ansible.errors import AnsibleError, AnsibleFilterError, AnsibleUndefinedVariable +@@ -42,7 +40,6 @@ + from ansible.template.template import AnsibleJ2Template + from ansible.template.vars import AnsibleJ2Vars + from ansible.module_utils._text import to_native, to_text +-from ansible.vars.unsafe_proxy import UnsafeProxy, wrap_var + + try: + from hashlib import sha1 +@@ -127,13 +124,6 @@ def _count_newlines_from_end(in_str): + # Uncommon cases: zero length string and string containing only newlines + return i + +-class AnsibleEvalContext(EvalContext): +- ''' +- A custom jinja2 EvalContext, which is currently unused and saved +- here for possible future use. +- ''' +- pass +- + class AnsibleContext(Context): + ''' + A custom context, which intercepts resolve() calls and sets a flag +@@ -143,7 +133,6 @@ class AnsibleContext(Context): + ''' + def __init__(self, *args, **kwargs): + super(AnsibleContext, self).__init__(*args, **kwargs) +- self.eval_ctx = AnsibleEvalContext(self.environment, self.name) + self.unsafe = False + + def _is_unsafe(self, val): +@@ -335,7 +324,7 @@ def set_available_variables(self, variables): + self._available_variables = variables + self._cached_result = {} + +- def template(self, variable, convert_bare=False, preserve_trailing_newlines=True, escape_backslashes=True, fail_on_undefined=None, overrides=None, convert_data=True, static_vars = [''], cache = True, bare_deprecated=True): ++ def template(self, variable, convert_bare=False, preserve_trailing_newlines=True, escape_backslashes=True, fail_on_undefined=None, overrides=None, convert_data=True, static_vars = [''], cache = True, bare_deprecated=True, disable_lookups=False): + ''' + Templates (possibly recursively) any given data as input. If convert_bare is + set to True, the given data will be wrapped as a jinja2 variable ('{{foo}}') +@@ -391,6 +380,7 @@ def template(self, variable, convert_bare=False, preserve_trailing_newlines=True + escape_backslashes=escape_backslashes, + fail_on_undefined=fail_on_undefined, + overrides=overrides, ++ disable_lookups=disable_lookups, + ) + unsafe = hasattr(result, '__UNSAFE__') + if convert_data and not self._no_type_regex.match(variable) and not unsafe: +@@ -401,6 +391,7 @@ def template(self, variable, convert_bare=False, preserve_trailing_newlines=True + if eval_results[1] is None: + result = eval_results[0] + if unsafe: ++ from ansible.vars.unsafe_proxy import wrap_var + result = wrap_var(result) + else: + # FIXME: if the safe_eval raised an error, should we do something with it? +@@ -482,6 +473,9 @@ def _finalize(self, thing): + ''' + return thing if thing is not None else '' + ++ def _fail_lookup(self, name, *args, **kwargs): ++ raise AnsibleError("The lookup `%s` was found, however lookups were disabled from templating" % name) ++ + def _lookup(self, name, *args, **kwargs): + instance = self._lookup_loader.get(name.lower(), loader=self._loader, templar=self) + +@@ -501,6 +495,7 @@ def _lookup(self, name, *args, **kwargs): + ran = None + + if ran: ++ from ansible.vars.unsafe_proxy import UnsafeProxy, wrap_var + if wantlist: + ran = wrap_var(ran) + else: +@@ -516,7 +511,7 @@ def _lookup(self, name, *args, **kwargs): + else: + raise AnsibleError("lookup plugin (%s) not found" % name) + +- def _do_template(self, data, preserve_trailing_newlines=True, escape_backslashes=True, fail_on_undefined=None, overrides=None): ++ def _do_template(self, data, preserve_trailing_newlines=True, escape_backslashes=True, fail_on_undefined=None, overrides=None, disable_lookups=False): + # For preserving the number of input newlines in the output (used + # later in this method) + data_newlines = _count_newlines_from_end(data) +@@ -560,7 +555,11 @@ def do_template(self, data, preserve_trailing_newlines=True, escape_backslashes= + else: + return data + +- t.globals['lookup'] = self._lookup ++ if disable_lookups: ++ t.globals['lookup'] = self._fail_lookup ++ else: ++ t.globals['lookup'] = self._lookup ++ + t.globals['finalize'] = self._finalize + + jvars = AnsibleJ2Vars(self, t.globals) +@@ -571,6 +570,7 @@ def do_template(self, data, preserve_trailing_newlines=True, escape_backslashes= + try: + res = j2_concat(rf) + if new_context.unsafe: ++ from ansible.vars.unsafe_proxy import wrap_var + res = wrap_var(res) + except TypeError as te: + if 'StrictUndefined' in to_native(te): Copied: branches/2017Q1/sysutils/ansible/files/extra-patch-eb8c26c (from r431329, head/sysutils/ansible/files/extra-patch-eb8c26c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/sysutils/ansible/files/extra-patch-eb8c26c Fri Jan 13 04:27:58 2017 (r431341, copy of r431329, head/sysutils/ansible/files/extra-patch-eb8c26c) @@ -0,0 +1,60 @@ +From eb8c26c105e8457b86324b64a13fac37d8862d47 Mon Sep 17 00:00:00 2001 +From: Computest +Date: Tue, 10 Jan 2017 16:51:40 -0600 +Subject: [PATCH] Fixing another corner case for security related to + CVE-2016-9587 + +(cherry picked from commit bcceada5d9b78ad77069c78226f8e9b336ff8949) +--- + lib/ansible/template/__init__.py | 6 +++--- + lib/ansible/vars/unsafe_proxy.py | 8 ++++++-- + 2 files changed, 9 insertions(+), 5 deletions(-) + +diff --git lib/ansible/template/__init__.py lib/ansible/template/__init__.py +index 4e24fbe..53b2675 100644 +--- lib/ansible/template/__init__.py ++++ lib/ansible/template/__init__.py +@@ -155,7 +155,7 @@ def _is_unsafe(self, val): + ''' + if isinstance(val, dict): + for key in val.keys(): +- if self._is_unsafe(val[key]): ++ if self._is_unsafe(key) or self._is_unsafe(val[key]): + return True + elif isinstance(val, list): + for item in val: +@@ -392,11 +392,11 @@ def template(self, variable, convert_bare=False, preserve_trailing_newlines=True + fail_on_undefined=fail_on_undefined, + overrides=overrides, + ) +- if convert_data and not self._no_type_regex.match(variable): ++ unsafe = hasattr(result, '__UNSAFE__') ++ if convert_data and not self._no_type_regex.match(variable) and not unsafe: + # if this looks like a dictionary or list, convert it to such using the safe_eval method + if (result.startswith("{") and not result.startswith(self.environment.variable_start_string)) or \ + result.startswith("[") or result in ("True", "False"): +- unsafe = hasattr(result, '__UNSAFE__') + eval_results = safe_eval(result, locals=self._available_variables, include_exceptions=True) + if eval_results[1] is None: + result = eval_results[0] +diff --git lib/ansible/vars/unsafe_proxy.py lib/ansible/vars/unsafe_proxy.py +index 426410a..4284705 100644 +--- lib/ansible/vars/unsafe_proxy.py ++++ lib/ansible/vars/unsafe_proxy.py +@@ -98,10 +98,14 @@ def decode(self, obj): + + + def _wrap_dict(v): ++ # Create new dict to get rid of the keys that are not wrapped. ++ new = {} + for k in v.keys(): + if v[k] is not None: +- v[wrap_var(k)] = wrap_var(v[k]) +- return v ++ new[wrap_var(k)] = wrap_var(v[k]) ++ else: ++ new[wrap_var(k)] = None ++ return new + + + def _wrap_list(v): Copied: branches/2017Q1/sysutils/ansible/files/extra-patch-ec84ff6 (from r431329, head/sysutils/ansible/files/extra-patch-ec84ff6) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/sysutils/ansible/files/extra-patch-ec84ff6 Fri Jan 13 04:27:58 2017 (r431341, copy of r431329, head/sysutils/ansible/files/extra-patch-ec84ff6) @@ -0,0 +1,359 @@ +--- lib/ansible/playbook/conditional.py.orig 2016-11-01 03:43:19 UTC ++++ lib/ansible/playbook/conditional.py +@@ -19,6 +19,8 @@ + from __future__ import (absolute_import, division, print_function) + __metaclass__ = type + ++import re ++ + from jinja2.exceptions import UndefinedError + + from ansible.compat.six import text_type +@@ -26,6 +28,9 @@ from ansible.errors import AnsibleError, + from ansible.playbook.attribute import FieldAttribute + from ansible.template import Templar + from ansible.module_utils._text import to_native ++from ansible.vars.unsafe_proxy import wrap_var ++ ++LOOKUP_REGEX = re.compile(r'lookup\s*\(') + + class Conditional: + +@@ -100,9 +105,12 @@ class Conditional: + return conditional + + # a Jinja2 evaluation that results in something Python can eval! ++ if hasattr(conditional, '__UNSAFE__') and LOOKUP_REGEX.match(conditional): ++ raise AnsibleError("The conditional '%s' contains variables which came from an unsafe " \ ++ "source and also contains a lookup() call, failing conditional check" % conditional) ++ + presented = "{%% if %s %%} True {%% else %%} False {%% endif %%}" % conditional +- conditional = templar.template(presented) +- val = conditional.strip() ++ val = templar.template(presented).strip() + if val == "True": + return True + elif val == "False": +--- lib/ansible/plugins/action/__init__.py.orig 2016-11-01 03:43:19 UTC ++++ lib/ansible/plugins/action/__init__.py +@@ -30,9 +30,8 @@ import tempfile + import time + from abc import ABCMeta, abstractmethod + +-from ansible.compat.six import binary_type, text_type, iteritems, with_metaclass +- + from ansible import constants as C ++from ansible.compat.six import binary_type, string_types, text_type, iteritems, with_metaclass + from ansible.errors import AnsibleError, AnsibleConnectionFailure + from ansible.executor.module_common import modify_module + from ansible.module_utils._text import to_bytes, to_native, to_text +@@ -40,6 +39,7 @@ from ansible.module_utils.json_utils imp + from ansible.parsing.utils.jsonify import jsonify + from ansible.playbook.play_context import MAGIC_VARIABLE_MAPPING + from ansible.release import __version__ ++from ansible.vars.unsafe_proxy import wrap_var + + + try: +@@ -449,6 +449,8 @@ class ActionBase(with_metaclass(ABCMeta, + # happens sometimes when it is a dir and not on bsd + if 'checksum' not in mystat['stat']: + mystat['stat']['checksum'] = '' ++ elif not isinstance(mystat['stat']['checksum'], string_types): ++ raise AnsibleError("Invalid checksum returned by stat: expected a string type but got %s" % type(mystat['stat']['checksum'])) + + return mystat['stat'] + +@@ -664,6 +666,39 @@ class ActionBase(with_metaclass(ABCMeta, + display.debug("done with _execute_module (%s, %s)" % (module_name, module_args)) + return data + ++ def _clean_returned_data(self, data): ++ remove_keys = set() ++ fact_keys = set(data.keys()) ++ # first we add all of our magic variable names to the set of ++ # keys we want to remove from facts ++ for magic_var in MAGIC_VARIABLE_MAPPING: ++ remove_keys.update(fact_keys.intersection(MAGIC_VARIABLE_MAPPING[magic_var])) ++ # next we remove any connection plugin specific vars ++ for conn_path in self._shared_loader_obj.connection_loader.all(path_only=True): ++ try: ++ conn_name = os.path.splitext(os.path.basename(conn_path))[0] ++ re_key = re.compile('^ansible_%s_' % conn_name) ++ for fact_key in fact_keys: ++ if re_key.match(fact_key): ++ remove_keys.add(fact_key) ++ except AttributeError: ++ pass ++ ++ # remove some KNOWN keys ++ for hard in ['ansible_rsync_path', 'ansible_playbook_python']: ++ if hard in fact_keys: ++ remove_keys.add(hard) ++ ++ # finally, we search for interpreter keys to remove ++ re_interp = re.compile('^ansible_.*_interpreter$') ++ for fact_key in fact_keys: ++ if re_interp.match(fact_key): ++ remove_keys.add(fact_key) ++ # then we remove them (except for ssh host keys) ++ for r_key in remove_keys: ++ if not r_key.startswith('ansible_ssh_host_key_'): ++ del data[r_key] ++ + def _parse_returned_data(self, res): + try: + filtered_output, warnings = _filter_non_json_lines(res.get('stdout', u'')) +@@ -672,31 +707,11 @@ class ActionBase(with_metaclass(ABCMeta, + data = json.loads(filtered_output) + data['_ansible_parsed'] = True + if 'ansible_facts' in data and isinstance(data['ansible_facts'], dict): +- remove_keys = set() +- fact_keys = set(data['ansible_facts'].keys()) +- # first we add all of our magic variable names to the set of +- # keys we want to remove from facts +- for magic_var in MAGIC_VARIABLE_MAPPING: +- remove_keys.update(fact_keys.intersection(MAGIC_VARIABLE_MAPPING[magic_var])) +- # next we remove any connection plugin specific vars +- for conn_path in self._shared_loader_obj.connection_loader.all(path_only=True): +- try: +- conn_name = os.path.splitext(os.path.basename(conn_path))[0] +- re_key = re.compile('^ansible_%s_' % conn_name) +- for fact_key in fact_keys: +- if re_key.match(fact_key): +- remove_keys.add(fact_key) +- except AttributeError: +- pass +- # finally, we search for interpreter keys to remove +- re_interp = re.compile('^ansible_.*_interpreter$') +- for fact_key in fact_keys: +- if re_interp.match(fact_key): +- remove_keys.add(fact_key) +- # then we remove them (except for ssh host keys) +- for r_key in remove_keys: +- if not r_key.startswith('ansible_ssh_host_key_'): +- del data['ansible_facts'][r_key] ++ self._clean_returned_data(data['ansible_facts']) ++ data['ansible_facts'] = wrap_var(data['ansible_facts']) ++ if 'add_host' in data and isinstance(data['add_host'].get('host_vars', None), dict): ++ self._clean_returned_data(data['add_host']['host_vars']) ++ data['add_host'] = wrap_var(data['add_host']) + except ValueError: + # not valid json, lets try to capture error + data = dict(failed=True, _ansible_parsed=False) +--- lib/ansible/plugins/action/template.py.orig 2016-11-01 03:43:19 UTC ++++ lib/ansible/plugins/action/template.py +@@ -23,6 +23,7 @@ import pwd + import time + + from ansible import constants as C ++from ansible.compat.six import string_types + from ansible.errors import AnsibleError + from ansible.module_utils._text import to_bytes, to_native, to_text + from ansible.plugins.action import ActionBase +--- lib/ansible/template/__init__.py.orig 2016-11-01 03:43:19 UTC ++++ lib/ansible/template/__init__.py +@@ -30,8 +30,9 @@ from numbers import Number + from jinja2 import Environment + from jinja2.loaders import FileSystemLoader + from jinja2.exceptions import TemplateSyntaxError, UndefinedError ++from jinja2.nodes import EvalContext + from jinja2.utils import concat as j2_concat +-from jinja2.runtime import StrictUndefined ++from jinja2.runtime import Context, StrictUndefined + + from ansible import constants as C + from ansible.compat.six import string_types, text_type +@@ -41,7 +42,7 @@ from ansible.template.safe_eval import s + from ansible.template.template import AnsibleJ2Template + from ansible.template.vars import AnsibleJ2Vars + from ansible.module_utils._text import to_native, to_text +- ++from ansible.vars.unsafe_proxy import UnsafeProxy, wrap_var + + try: + from hashlib import sha1 +@@ -126,6 +127,62 @@ def _count_newlines_from_end(in_str): + # Uncommon cases: zero length string and string containing only newlines + return i + ++class AnsibleEvalContext(EvalContext): ++ ''' ++ A custom jinja2 EvalContext, which is currently unused and saved ++ here for possible future use. ++ ''' ++ pass ++ ++class AnsibleContext(Context): ++ ''' ++ A custom context, which intercepts resolve() calls and sets a flag ++ internally if any variable lookup returns an AnsibleUnsafe value. This ++ flag is checked post-templating, and (when set) will result in the ++ final templated result being wrapped via UnsafeProxy. ++ ''' ++ def __init__(self, *args, **kwargs): ++ super(AnsibleContext, self).__init__(*args, **kwargs) ++ self.eval_ctx = AnsibleEvalContext(self.environment, self.name) ++ self.unsafe = False ++ ++ def _is_unsafe(self, val): ++ ''' ++ Our helper function, which will also recursively check dict and ++ list entries due to the fact that they may be repr'd and contain ++ a key or value which contains jinja2 syntax and would otherwise ++ lose the AnsibleUnsafe value. ++ ''' ++ if isinstance(val, dict): ++ for key in val.keys(): ++ if self._is_unsafe(val[key]): ++ return True ++ elif isinstance(val, list): ++ for item in val: ++ if self._is_unsafe(item): ++ return True ++ elif isinstance(val, string_types) and hasattr(val, '__UNSAFE__'): ++ return True ++ return False ++ ++ def resolve(self, key): ++ ''' ++ The intercepted resolve(), which uses the helper above to set the ++ internal flag whenever an unsafe variable value is returned. ++ ''' ++ val = super(AnsibleContext, self).resolve(key) ++ if val is not None and not self.unsafe: ++ if self._is_unsafe(val): ++ self.unsafe = True ++ return val ++ ++class AnsibleEnvironment(Environment): ++ ''' ++ Our custom environment, which simply allows us to override the class-level ++ values for the Template and Context classes used by jinja2 internally. ++ ''' ++ context_class = AnsibleContext ++ template_class = AnsibleJ2Template + + class Templar: + ''' +@@ -159,14 +216,13 @@ class Templar: + self._fail_on_filter_errors = True + self._fail_on_undefined_errors = C.DEFAULT_UNDEFINED_VAR_BEHAVIOR + +- self.environment = Environment( ++ self.environment = AnsibleEnvironment( + trim_blocks=True, + undefined=StrictUndefined, + extensions=self._get_extensions(), + finalize=self._finalize, + loader=FileSystemLoader(self._basedir), + ) +- self.environment.template_class = AnsibleJ2Template + + self.SINGLE_VAR = re.compile(r"^%s\s*(\w*)\s*%s$" % (self.environment.variable_start_string, self.environment.variable_end_string)) + +@@ -229,7 +285,7 @@ class Templar: + def _clean_data(self, orig_data): + ''' remove jinja2 template tags from a string ''' + +- if not isinstance(orig_data, string_types) or hasattr(orig_data, '__ENCRYPTED__'): ++ if not isinstance(orig_data, string_types) or hasattr(orig_data, '__ENCRYPTED__') or hasattr(orig_data, '__UNSAFE__'): + return orig_data + + with contextlib.closing(StringIO(orig_data)) as data: +@@ -292,11 +348,12 @@ class Templar: + # Don't template unsafe variables, instead drop them back down to their constituent type. + if hasattr(variable, '__UNSAFE__'): + if isinstance(variable, text_type): +- return self._clean_data(variable) ++ rval = self._clean_data(variable) + else: + # Do we need to convert these into text_type as well? + # return self._clean_data(to_text(variable._obj, nonstring='passthru')) +- return self._clean_data(variable._obj) ++ rval = self._clean_data(variable._obj) ++ return rval + + try: + if convert_bare: +@@ -328,14 +385,23 @@ class Templar: + if cache and sha1_hash in self._cached_result: + result = self._cached_result[sha1_hash] + else: +- result = self._do_template(variable, preserve_trailing_newlines=preserve_trailing_newlines, escape_backslashes=escape_backslashes, fail_on_undefined=fail_on_undefined, overrides=overrides) ++ result = self.do_template( ++ variable, ++ preserve_trailing_newlines=preserve_trailing_newlines, ++ escape_backslashes=escape_backslashes, ++ fail_on_undefined=fail_on_undefined, ++ overrides=overrides, ++ ) + if convert_data and not self._no_type_regex.match(variable): + # if this looks like a dictionary or list, convert it to such using the safe_eval method + if (result.startswith("{") and not result.startswith(self.environment.variable_start_string)) or \ + result.startswith("[") or result in ("True", "False"): ++ unsafe = hasattr(result, '__UNSAFE__') + eval_results = safe_eval(result, locals=self._available_variables, include_exceptions=True) + if eval_results[1] is None: + result = eval_results[0] ++ if unsafe: ++ result = wrap_var(result) + else: + # FIXME: if the safe_eval raised an error, should we do something with it? + pass +@@ -435,7 +501,6 @@ class Templar: + ran = None + + if ran: +- from ansible.vars.unsafe_proxy import UnsafeProxy, wrap_var + if wantlist: + ran = wrap_var(ran) + else: +@@ -505,6 +570,8 @@ class Templar: + + try: + res = j2_concat(rf) ++ if new_context.unsafe: ++ res = wrap_var(res) + except TypeError as te: + if 'StrictUndefined' in to_native(te): + errmsg = "Unable to look up a name or access an attribute in template string (%s).\n" % to_native(data) +--- lib/ansible/template/template.py.orig 2016-11-01 03:43:19 UTC ++++ lib/ansible/template/template.py +@@ -33,5 +33,5 @@ class AnsibleJ2Template(jinja2.environme + ''' + + def new_context(self, vars=None, shared=False, locals=None): +- return jinja2.runtime.Context(self.environment, vars.add_locals(locals), self.name, self.blocks) ++ return self.environment.context_class(self.environment, vars.add_locals(locals), self.name, self.blocks) + +--- lib/ansible/template/vars.py.orig 2016-11-01 03:43:19 UTC ++++ lib/ansible/template/vars.py +@@ -82,7 +82,7 @@ class AnsibleJ2Vars: + # HostVars is special, return it as-is, as is the special variable + # 'vars', which contains the vars structure + from ansible.vars.hostvars import HostVars +- if isinstance(variable, dict) and varname == "vars" or isinstance(variable, HostVars): ++ if isinstance(variable, dict) and varname == "vars" or isinstance(variable, HostVars) or hasattr(variable, '__UNSAFE__'): + return variable + else: + value = None +--- lib/ansible/vars/unsafe_proxy.py.orig 2016-11-01 03:43:19 UTC ++++ lib/ansible/vars/unsafe_proxy.py +@@ -64,7 +64,6 @@ __all__ = ['UnsafeProxy', 'AnsibleUnsafe + class AnsibleUnsafe(object): + __UNSAFE__ = True + +- + class AnsibleUnsafeText(text_type, AnsibleUnsafe): + pass + +@@ -101,7 +100,7 @@ class AnsibleJSONUnsafeDecoder(json.JSON + def _wrap_dict(v): + for k in v.keys(): + if v[k] is not None: +- v[k] = wrap_var(v[k]) ++ v[wrap_var(k)] = wrap_var(v[k]) + return v + + From owner-svn-ports-branches@freebsd.org Fri Jan 13 17:43:10 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9420CAEE12; Fri, 13 Jan 2017 17:43:10 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8B3DB1013; Fri, 13 Jan 2017 17:43:10 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0DHh9CU080747; Fri, 13 Jan 2017 17:43:09 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0DHh9ir080746; Fri, 13 Jan 2017 17:43:09 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201701131743.v0DHh9ir080746@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 13 Jan 2017 17:43:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431405 - branches/2017Q1/net-mgmt/rancid3 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jan 2017 17:43:10 -0000 Author: feld Date: Fri Jan 13 17:43:09 2017 New Revision: 431405 URL: https://svnweb.freebsd.org/changeset/ports/431405 Log: MFH: r431404 net-mgmt/rancid3: Fix path to perl in sample config file Approved by: ports-secteam (with hat) Modified: branches/2017Q1/net-mgmt/rancid3/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/net-mgmt/rancid3/Makefile ============================================================================== --- branches/2017Q1/net-mgmt/rancid3/Makefile Fri Jan 13 17:42:24 2017 (r431404) +++ branches/2017Q1/net-mgmt/rancid3/Makefile Fri Jan 13 17:43:09 2017 (r431405) @@ -3,7 +3,7 @@ PORTNAME= rancid PORTVERSION= 3.6.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/ PKGNAMESUFFIX= 3 @@ -69,6 +69,7 @@ post-patch: .endif ${REINPLACE_CMD} "s|par.1|rancid-par.1|" ${WRKSRC}/man/Makefile.in ${MV} ${WRKSRC}/man/par.1 ${WRKSRC}/man/rancid-par.1 + ${REINPLACE_CMD} 's|uid=`perl|uid=`${PERL}|' ${WRKSRC}/etc/rancid.conf.sample.in post-install: ${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/periodic/hourly From owner-svn-ports-branches@freebsd.org Fri Jan 13 17:56:11 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C27CCCAE1E1; Fri, 13 Jan 2017 17:56:11 +0000 (UTC) (envelope-from olivierd@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 830F416E4; Fri, 13 Jan 2017 17:56:11 +0000 (UTC) (envelope-from olivierd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0DHuArP085177; Fri, 13 Jan 2017 17:56:10 GMT (envelope-from olivierd@FreeBSD.org) Received: (from olivierd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0DHuAvK085176; Fri, 13 Jan 2017 17:56:10 GMT (envelope-from olivierd@FreeBSD.org) Message-Id: <201701131756.v0DHuAvK085176@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olivierd set sender to olivierd@FreeBSD.org using -f From: Olivier Duchateau Date: Fri, 13 Jan 2017 17:56:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431407 - branches/2017Q1/x11-wm/xfce4-desktop X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jan 2017 17:56:11 -0000 Author: olivierd Date: Fri Jan 13 17:56:10 2017 New Revision: 431407 URL: https://svnweb.freebsd.org/changeset/ports/431407 Log: MFH: r431365 - Fix creation of folder from desktop context menu - Bump PORTREVISION While I'm here, switch to optional extra build target (when NLS option is unset) PR: 214207 Reported by: Marko Cupac Approved by: ports-secteam (feld@) Modified: branches/2017Q1/x11-wm/xfce4-desktop/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/x11-wm/xfce4-desktop/Makefile ============================================================================== --- branches/2017Q1/x11-wm/xfce4-desktop/Makefile Fri Jan 13 17:51:19 2017 (r431406) +++ branches/2017Q1/x11-wm/xfce4-desktop/Makefile Fri Jan 13 17:56:10 2017 (r431407) @@ -3,6 +3,7 @@ PORTNAME= xfce4-desktop PORTVERSION= 4.12.3 +PORTREVISION= 1 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE/src/xfce/xfdesktop/${PORTVERSION:R}/ DISTNAME= xfdesktop-${PORTVERSION} @@ -39,11 +40,11 @@ THUNAR_USE_OFF= xfce=libexo THUNAR_DESC= Thunar file manager support OPTIONS_SUB= yes -.include - post-patch: -.if !${PORT_OPTIONS:MNLS} + ${REINPLACE_CMD} -e 's|inode/directory|folder|' \ + ${WRKSRC}/src/xfdesktop-file-icon-manager.c + +post-patch-NLS-off: @${REINPLACE_CMD} -e 's|po ||' ${WRKSRC}/Makefile.in -.endif -.include +.include From owner-svn-ports-branches@freebsd.org Fri Jan 13 23:48:09 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 17DC8CAE94D; Fri, 13 Jan 2017 23:48:09 +0000 (UTC) (envelope-from bdrewery@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 CFF681B13; Fri, 13 Jan 2017 23:48:08 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0DNm85h035073; Fri, 13 Jan 2017 23:48:08 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0DNm77u035069; Fri, 13 Jan 2017 23:48:07 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201701132348.v0DNm77u035069@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 13 Jan 2017 23:48:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431450 - in branches/2017Q1/security/openssh-portable: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jan 2017 23:48:09 -0000 Author: bdrewery Date: Fri Jan 13 23:48:07 2017 New Revision: 431450 URL: https://svnweb.freebsd.org/changeset/ports/431450 Log: MFH: r431438 r431445 Add patches to cover security issues CVE-2016-10009 and CVE-2016-10010. Security: 2c948527-d823-11e6-9171-14dae9d210b8 Submitted by: Tim Zingelman Add forgotten patch in r431438 for CVE-2016-10009 and CVE-2016-10010. Security: 2c948527-d823-11e6-9171-14dae9d210b8 Submitted by: Tim Zingelman Approved by: portmgr (implicit) Added: branches/2017Q1/security/openssh-portable/files/patch-serverloop.c - copied unchanged from r431445, head/security/openssh-portable/files/patch-serverloop.c Modified: branches/2017Q1/security/openssh-portable/Makefile branches/2017Q1/security/openssh-portable/files/patch-ssh-agent.1 branches/2017Q1/security/openssh-portable/files/patch-ssh-agent.c Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/security/openssh-portable/Makefile ============================================================================== --- branches/2017Q1/security/openssh-portable/Makefile Fri Jan 13 23:47:07 2017 (r431449) +++ branches/2017Q1/security/openssh-portable/Makefile Fri Jan 13 23:48:07 2017 (r431450) @@ -3,7 +3,7 @@ PORTNAME= openssh DISTVERSION= 7.3p1 -PORTREVISION= 1 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= OPENBSD/OpenSSH/portable Copied: branches/2017Q1/security/openssh-portable/files/patch-serverloop.c (from r431445, head/security/openssh-portable/files/patch-serverloop.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/security/openssh-portable/files/patch-serverloop.c Fri Jan 13 23:48:07 2017 (r431450, copy of r431445, head/security/openssh-portable/files/patch-serverloop.c) @@ -0,0 +1,23 @@ +Fix CVE-2016-10010 + + +--- serverloop.c.orig 2016-07-27 17:54:27.000000000 -0500 ++++ serverloop.c 2017-01-11 18:44:42.881227000 -0600 +@@ -999,7 +999,7 @@ + + /* XXX fine grained permissions */ + if ((options.allow_streamlocal_forwarding & FORWARD_LOCAL) != 0 && +- !no_port_forwarding_flag) { ++ !no_port_forwarding_flag && use_privsep) { + c = channel_connect_to_path(target, + "direct-streamlocal@openssh.com", "direct-streamlocal"); + } else { +@@ -1280,7 +1280,7 @@ + + /* check permissions */ + if ((options.allow_streamlocal_forwarding & FORWARD_REMOTE) == 0 +- || no_port_forwarding_flag) { ++ || no_port_forwarding_flag || !use_privsep) { + success = 0; + packet_send_debug("Server has disabled port forwarding."); + } else { Modified: branches/2017Q1/security/openssh-portable/files/patch-ssh-agent.1 ============================================================================== --- branches/2017Q1/security/openssh-portable/files/patch-ssh-agent.1 Fri Jan 13 23:47:07 2017 (r431449) +++ branches/2017Q1/security/openssh-portable/files/patch-ssh-agent.1 Fri Jan 13 23:48:07 2017 (r431450) @@ -4,9 +4,12 @@ r226103 | des | 2011-10-07 08:10:16 -050 Add a -x option that causes ssh-agent(1) to exit when all clients have disconnected. ---- ssh-agent.1.orig 2015-05-29 03:27:21.000000000 -0500 -+++ ssh-agent.1 2015-06-02 09:45:37.025390000 -0500 -@@ -43,7 +43,7 @@ +Add a -P option to specify PKCS11_WHITELIST + + +--- ssh-agent.1.orig 2016-07-27 17:54:27.000000000 -0500 ++++ ssh-agent.1 2017-01-11 19:05:12.513900000 -0600 +@@ -43,10 +43,11 @@ .Sh SYNOPSIS .Nm ssh-agent .Op Fl c | s @@ -15,7 +18,30 @@ disconnected. .Op Fl a Ar bind_address .Op Fl E Ar fingerprint_hash .Op Fl t Ar life -@@ -128,6 +128,8 @@ ++.Op Fl P Ar pkcs11_whitelist + .Op Ar command Op Ar arg ... + .Nm ssh-agent + .Op Fl c | s +@@ -121,6 +122,18 @@ + Kill the current agent (given by the + .Ev SSH_AGENT_PID + environment variable). ++.It Fl P ++Specify a pattern-list of acceptable paths for PKCS#11 shared libraries ++that may be added using the ++.Fl s ++option to ++.Xr ssh-add 1 . ++The default is to allow loading PKCS#11 libraries from ++.Dq /usr/lib/*,/usr/local/lib/* . ++PKCS#11 libraries that do not match the whitelist will be refused. ++See PATTERNS in ++.Xr ssh_config 5 ++for a description of pattern-list syntax. + .It Fl s + Generate Bourne shell commands on + .Dv stdout . +@@ -135,6 +148,8 @@ .Xr ssh-add 1 overrides this value. Without this option the default maximum lifetime is forever. @@ -23,4 +49,4 @@ disconnected. +Exit after the last client has disconnected. .El .Pp - If a commandline is given, this is executed as a subprocess of the agent. + If a command line is given, this is executed as a subprocess of the agent. Modified: branches/2017Q1/security/openssh-portable/files/patch-ssh-agent.c ============================================================================== --- branches/2017Q1/security/openssh-portable/files/patch-ssh-agent.c Fri Jan 13 23:47:07 2017 (r431449) +++ branches/2017Q1/security/openssh-portable/files/patch-ssh-agent.c Fri Jan 13 23:48:07 2017 (r431450) @@ -8,9 +8,39 @@ r226103 | des | 2011-10-07 08:10:16 -050 Add a -x option that causes ssh-agent(1) to exit when all clients have disconnected. ---- ssh-agent.c.orig 2015-05-29 03:27:21.000000000 -0500 -+++ ssh-agent.c 2015-06-02 09:46:54.719580000 -0500 -@@ -157,15 +157,34 @@ static long lifetime = 0; +Add a -P option to specify PKCS11_WHITELIST (fixes CVE-2016-10009) + + +--- ssh-agent.c.orig 2016-07-27 17:54:27.000000000 -0500 ++++ ssh-agent.c 2017-01-11 19:02:59.600125000 -0600 +@@ -83,11 +83,16 @@ + #include "misc.h" + #include "digest.h" + #include "ssherr.h" ++#include "match.h" + + #ifdef ENABLE_PKCS11 + #include "ssh-pkcs11.h" + #endif + ++#ifndef DEFAULT_PKCS11_WHITELIST ++# define DEFAULT_PKCS11_WHITELIST "/usr/lib/*,/usr/local/lib/*" ++#endif ++ + typedef enum { + AUTH_UNUSED, + AUTH_SOCKET, +@@ -135,6 +140,9 @@ + char socket_name[PATH_MAX]; + char socket_dir[PATH_MAX]; + ++/* PKCS#11 path whitelist */ ++static char *pkcs11_whitelist; ++ + /* locking */ + #define LOCK_SIZE 32 + #define LOCK_SALT_SIZE 16 +@@ -150,15 +158,34 @@ static int fingerprint_hash = SSH_FP_HASH_DEFAULT; @@ -45,7 +75,50 @@ disconnected. } static void -@@ -939,6 +958,10 @@ new_socket(sock_type type, int fd) +@@ -738,7 +765,7 @@ + static void + process_add_smartcard_key(SocketEntry *e) + { +- char *provider = NULL, *pin; ++ char *provider = NULL, *pin, canonical_provider[PATH_MAX]; + int r, i, version, count = 0, success = 0, confirm = 0; + u_int seconds; + time_t death = 0; +@@ -770,10 +797,21 @@ + goto send; + } + } ++ if (realpath(provider, canonical_provider) == NULL) { ++ verbose("failed PKCS#11 add of \"%.100s\": realpath: %s", ++ provider, strerror(errno)); ++ goto send; ++ } ++ if (match_pattern_list(canonical_provider, pkcs11_whitelist, 0) != 1) { ++ verbose("refusing PKCS#11 add of \"%.100s\": " ++ "provider not whitelisted", canonical_provider); ++ goto send; ++ } ++ debug("%s: add %.100s", __func__, canonical_provider); + if (lifetime && !death) + death = monotime() + lifetime; + +- count = pkcs11_add_provider(provider, pin, &keys); ++ count = pkcs11_add_provider(canonical_provider, pin, &keys); + for (i = 0; i < count; i++) { + k = keys[i]; + version = k->type == KEY_RSA1 ? 1 : 2; +@@ -781,8 +819,8 @@ + if (lookup_identity(k, version) == NULL) { + id = xcalloc(1, sizeof(Identity)); + id->key = k; +- id->provider = xstrdup(provider); +- id->comment = xstrdup(provider); /* XXX */ ++ id->provider = xstrdup(canonical_provider); ++ id->comment = xstrdup(canonical_provider); /* XXX */ + id->death = death; + id->confirm = confirm; + TAILQ_INSERT_TAIL(&tab->idlist, id, next); +@@ -945,6 +983,10 @@ { u_int i, old_alloc, new_alloc; @@ -56,33 +129,47 @@ disconnected. set_nonblock(fd); if (fd > max_fd) -@@ -1166,7 +1189,7 @@ static void +@@ -1172,8 +1214,8 @@ usage(void) { fprintf(stderr, - "usage: ssh-agent [-c | -s] [-Dd] [-a bind_address] [-E fingerprint_hash]\n" +- " [-t life] [command [arg ...]]\n" + "usage: ssh-agent [-c | -s] [-Ddx] [-a bind_address] [-E fingerprint_hash]\n" - " [-t life] [command [arg ...]]\n" ++ " [-P pkcs11_whitelist] [-t life] [command [arg ...]]\n" " ssh-agent [-c | -s] -k\n"); exit(1); -@@ -1197,6 +1220,7 @@ main(int ac, char **av) + } +@@ -1204,6 +1246,7 @@ /* drop */ setegid(getgid()); setgid(getgid()); + setuid(geteuid()); - #if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE) - /* Disable ptrace on Linux without sgid bit */ -@@ -1210,7 +1234,7 @@ main(int ac, char **av) + platform_disable_tracing(0); /* strict=no */ + +@@ -1214,7 +1257,7 @@ __progname = ssh_get_progname(av[0]); seed_rng(); - while ((ch = getopt(ac, av, "cDdksE:a:t:")) != -1) { -+ while ((ch = getopt(ac, av, "cDdksE:a:t:x")) != -1) { ++ while ((ch = getopt(ac, av, "cDdksE:a:P:t:x")) != -1) { switch (ch) { case 'E': fingerprint_hash = ssh_digest_alg_by_name(optarg); -@@ -1249,6 +1273,9 @@ main(int ac, char **av) +@@ -1229,6 +1272,11 @@ + case 'k': + k_flag++; + break; ++ case 'P': ++ if (pkcs11_whitelist != NULL) ++ fatal("-P option already specified"); ++ pkcs11_whitelist = xstrdup(optarg); ++ break; + case 's': + if (c_flag) + usage(); +@@ -1253,6 +1301,9 @@ usage(); } break; @@ -92,3 +179,22 @@ disconnected. default: usage(); } +@@ -1263,6 +1314,9 @@ + if (ac > 0 && (c_flag || k_flag || s_flag || d_flag || D_flag)) + usage(); + ++ if (pkcs11_whitelist == NULL) ++ pkcs11_whitelist = xstrdup(DEFAULT_PKCS11_WHITELIST); ++ + if (ac == 0 && !c_flag && !s_flag) { + shell = getenv("SHELL"); + if (shell != NULL && (len = strlen(shell)) > 2 && +@@ -1410,7 +1464,7 @@ + signal(SIGTERM, cleanup_handler); + nalloc = 0; + +- if (pledge("stdio cpath unix id proc exec", NULL) == -1) ++ if (pledge("stdio rpath cpath unix id proc exec", NULL) == -1) + fatal("%s: pledge: %s", __progname, strerror(errno)); + platform_pledge_agent(); + From owner-svn-ports-branches@freebsd.org Sat Jan 14 00:12:31 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AC63ACAEBD2; Sat, 14 Jan 2017 00:12:31 +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 7105A11C8; Sat, 14 Jan 2017 00:12:31 +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 v0E0CUkI047369; Sat, 14 Jan 2017 00:12:30 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0E0CT3Y047359; Sat, 14 Jan 2017 00:12:29 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701140012.v0E0CT3Y047359@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 14 Jan 2017 00:12:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431453 - in branches/2017Q1: mail/thunderbird mail/thunderbird/files www/firefox-esr www/firefox-esr/files www/libxul www/libxul/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jan 2017 00:12:31 -0000 Author: jbeich Date: Sat Jan 14 00:12:29 2017 New Revision: 431453 URL: https://svnweb.freebsd.org/changeset/ports/431453 Log: MFH: r431408 www/firefox-esr: improve A/V sync with SNDIO=on PR: 215867 Reported by: Sergey Submitted by: Tobias Kortkamp Obtained from: upstream Approved by: ports-secteam (feld) Added: branches/2017Q1/mail/thunderbird/files/patch-bug1153151 - copied unchanged from r431408, head/mail/thunderbird/files/patch-bug1153151 branches/2017Q1/mail/thunderbird/files/patch-bug1153179 - copied unchanged from r431408, head/mail/thunderbird/files/patch-bug1153179 branches/2017Q1/www/firefox-esr/files/patch-bug1153151 - copied unchanged from r431408, head/www/firefox-esr/files/patch-bug1153151 branches/2017Q1/www/firefox-esr/files/patch-bug1153179 - copied unchanged from r431408, head/www/firefox-esr/files/patch-bug1153179 branches/2017Q1/www/libxul/files/patch-bug1153151 - copied unchanged from r431408, head/www/libxul/files/patch-bug1153151 branches/2017Q1/www/libxul/files/patch-bug1153179 - copied unchanged from r431408, head/www/libxul/files/patch-bug1153179 Modified: branches/2017Q1/mail/thunderbird/Makefile branches/2017Q1/www/firefox-esr/Makefile branches/2017Q1/www/libxul/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/mail/thunderbird/Makefile ============================================================================== --- branches/2017Q1/mail/thunderbird/Makefile Fri Jan 13 23:51:24 2017 (r431452) +++ branches/2017Q1/mail/thunderbird/Makefile Sat Jan 14 00:12:29 2017 (r431453) @@ -3,7 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 45.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Copied: branches/2017Q1/mail/thunderbird/files/patch-bug1153151 (from r431408, head/mail/thunderbird/files/patch-bug1153151) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/mail/thunderbird/files/patch-bug1153151 Sat Jan 14 00:12:29 2017 (r431453, copy of r431408, head/mail/thunderbird/files/patch-bug1153151) @@ -0,0 +1,13 @@ +Bug 1153151 - make libcubeb sndio use non-blocking i/o + +--- mozilla/media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC ++++ mozilla/media/libcubeb/src/cubeb_sndio.c +@@ -187,7 +187,7 @@ sndio_stream_init(cubeb *context, + if (s == NULL) + return CUBEB_ERROR; + s->context = context; +- s->hdl = sio_open(NULL, SIO_PLAY, 0); ++ s->hdl = sio_open(NULL, SIO_PLAY, 1); + if (s->hdl == NULL) { + free(s); + DPR("sndio_stream_init(), sio_open() failed\n"); Copied: branches/2017Q1/mail/thunderbird/files/patch-bug1153179 (from r431408, head/mail/thunderbird/files/patch-bug1153179) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/mail/thunderbird/files/patch-bug1153179 Sat Jan 14 00:12:29 2017 (r431453, copy of r431408, head/mail/thunderbird/files/patch-bug1153179) @@ -0,0 +1,40 @@ +Bug 1153179 - fix latency reporting in libcubeb sndio + +--- mozilla/media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC ++++ mozilla/media/libcubeb/src/cubeb_sndio.c +@@ -67,7 +67,7 @@ sndio_onmove(void *arg, int delta) + { + cubeb_stream *s = (cubeb_stream *)arg; + +- s->rdpos += delta; ++ s->rdpos += delta * s->bpf; + } + + static void * +@@ -135,7 +135,7 @@ sndio_mainloop(void *arg) + state = CUBEB_STATE_ERROR; + break; + } +- s->wrpos = 0; ++ s->wrpos += n; + start += n; + } + } +@@ -326,7 +336,7 @@ sndio_stream_get_position(cubeb_stream * + { + pthread_mutex_lock(&s->mtx); + DPR("sndio_stream_get_position() %lld\n", s->rdpos); +- *p = s->rdpos; ++ *p = s->rdpos / s->bpf; + pthread_mutex_unlock(&s->mtx); + return CUBEB_OK; + } +@@ -346,7 +356,7 @@ sndio_stream_get_latency(cubeb_stream * + { + // http://www.openbsd.org/cgi-bin/man.cgi?query=sio_open + // in the "Measuring the latency and buffers usage" paragraph. +- *latency = stm->wrpos - stm->rdpos; ++ *latency = (stm->wrpos - stm->rdpos) / stm->bpf; + return CUBEB_OK; + } + Modified: branches/2017Q1/www/firefox-esr/Makefile ============================================================================== --- branches/2017Q1/www/firefox-esr/Makefile Fri Jan 13 23:51:24 2017 (r431452) +++ branches/2017Q1/www/firefox-esr/Makefile Sat Jan 14 00:12:29 2017 (r431453) @@ -4,7 +4,7 @@ PORTNAME= firefox DISTVERSION= 45.6.0 DISTVERSIONSUFFIX=esr.source -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ Copied: branches/2017Q1/www/firefox-esr/files/patch-bug1153151 (from r431408, head/www/firefox-esr/files/patch-bug1153151) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/firefox-esr/files/patch-bug1153151 Sat Jan 14 00:12:29 2017 (r431453, copy of r431408, head/www/firefox-esr/files/patch-bug1153151) @@ -0,0 +1,13 @@ +Bug 1153151 - make libcubeb sndio use non-blocking i/o + +--- media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC ++++ media/libcubeb/src/cubeb_sndio.c +@@ -187,7 +187,7 @@ sndio_stream_init(cubeb *context, + if (s == NULL) + return CUBEB_ERROR; + s->context = context; +- s->hdl = sio_open(NULL, SIO_PLAY, 0); ++ s->hdl = sio_open(NULL, SIO_PLAY, 1); + if (s->hdl == NULL) { + free(s); + DPR("sndio_stream_init(), sio_open() failed\n"); Copied: branches/2017Q1/www/firefox-esr/files/patch-bug1153179 (from r431408, head/www/firefox-esr/files/patch-bug1153179) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/firefox-esr/files/patch-bug1153179 Sat Jan 14 00:12:29 2017 (r431453, copy of r431408, head/www/firefox-esr/files/patch-bug1153179) @@ -0,0 +1,40 @@ +Bug 1153179 - fix latency reporting in libcubeb sndio + +--- media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC ++++ media/libcubeb/src/cubeb_sndio.c +@@ -67,7 +67,7 @@ sndio_onmove(void *arg, int delta) + { + cubeb_stream *s = (cubeb_stream *)arg; + +- s->rdpos += delta; ++ s->rdpos += delta * s->bpf; + } + + static void * +@@ -135,7 +135,7 @@ sndio_mainloop(void *arg) + state = CUBEB_STATE_ERROR; + break; + } +- s->wrpos = 0; ++ s->wrpos += n; + start += n; + } + } +@@ -326,7 +336,7 @@ sndio_stream_get_position(cubeb_stream * + { + pthread_mutex_lock(&s->mtx); + DPR("sndio_stream_get_position() %lld\n", s->rdpos); +- *p = s->rdpos; ++ *p = s->rdpos / s->bpf; + pthread_mutex_unlock(&s->mtx); + return CUBEB_OK; + } +@@ -346,7 +356,7 @@ sndio_stream_get_latency(cubeb_stream * + { + // http://www.openbsd.org/cgi-bin/man.cgi?query=sio_open + // in the "Measuring the latency and buffers usage" paragraph. +- *latency = stm->wrpos - stm->rdpos; ++ *latency = (stm->wrpos - stm->rdpos) / stm->bpf; + return CUBEB_OK; + } + Modified: branches/2017Q1/www/libxul/Makefile ============================================================================== --- branches/2017Q1/www/libxul/Makefile Fri Jan 13 23:51:24 2017 (r431452) +++ branches/2017Q1/www/libxul/Makefile Sat Jan 14 00:12:29 2017 (r431453) @@ -3,7 +3,7 @@ PORTNAME= libxul DISTVERSION= 45.6.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= www devel MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \ MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build1/source Copied: branches/2017Q1/www/libxul/files/patch-bug1153151 (from r431408, head/www/libxul/files/patch-bug1153151) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/libxul/files/patch-bug1153151 Sat Jan 14 00:12:29 2017 (r431453, copy of r431408, head/www/libxul/files/patch-bug1153151) @@ -0,0 +1,13 @@ +Bug 1153151 - make libcubeb sndio use non-blocking i/o + +--- media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC ++++ media/libcubeb/src/cubeb_sndio.c +@@ -187,7 +187,7 @@ sndio_stream_init(cubeb *context, + if (s == NULL) + return CUBEB_ERROR; + s->context = context; +- s->hdl = sio_open(NULL, SIO_PLAY, 0); ++ s->hdl = sio_open(NULL, SIO_PLAY, 1); + if (s->hdl == NULL) { + free(s); + DPR("sndio_stream_init(), sio_open() failed\n"); Copied: branches/2017Q1/www/libxul/files/patch-bug1153179 (from r431408, head/www/libxul/files/patch-bug1153179) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/libxul/files/patch-bug1153179 Sat Jan 14 00:12:29 2017 (r431453, copy of r431408, head/www/libxul/files/patch-bug1153179) @@ -0,0 +1,40 @@ +Bug 1153179 - fix latency reporting in libcubeb sndio + +--- media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC ++++ media/libcubeb/src/cubeb_sndio.c +@@ -67,7 +67,7 @@ sndio_onmove(void *arg, int delta) + { + cubeb_stream *s = (cubeb_stream *)arg; + +- s->rdpos += delta; ++ s->rdpos += delta * s->bpf; + } + + static void * +@@ -135,7 +135,7 @@ sndio_mainloop(void *arg) + state = CUBEB_STATE_ERROR; + break; + } +- s->wrpos = 0; ++ s->wrpos += n; + start += n; + } + } +@@ -326,7 +336,7 @@ sndio_stream_get_position(cubeb_stream * + { + pthread_mutex_lock(&s->mtx); + DPR("sndio_stream_get_position() %lld\n", s->rdpos); +- *p = s->rdpos; ++ *p = s->rdpos / s->bpf; + pthread_mutex_unlock(&s->mtx); + return CUBEB_OK; + } +@@ -346,7 +356,7 @@ sndio_stream_get_latency(cubeb_stream * + { + // http://www.openbsd.org/cgi-bin/man.cgi?query=sio_open + // in the "Measuring the latency and buffers usage" paragraph. +- *latency = stm->wrpos - stm->rdpos; ++ *latency = (stm->wrpos - stm->rdpos) / stm->bpf; + return CUBEB_OK; + } + From owner-svn-ports-branches@freebsd.org Sat Jan 14 20:53:22 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9254CAF696; Sat, 14 Jan 2017 20:53:22 +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 71D7F15DD; Sat, 14 Jan 2017 20:53:22 +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 v0EKrLXc059286; Sat, 14 Jan 2017 20:53:21 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0EKrL1k059285; Sat, 14 Jan 2017 20:53:21 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701142053.v0EKrL1k059285@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 14 Jan 2017 20:53:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431495 - branches/2017Q1/security/gnutls X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jan 2017 20:53:22 -0000 Author: jbeich Date: Sat Jan 14 20:53:21 2017 New Revision: 431495 URL: https://svnweb.freebsd.org/changeset/ports/431495 Log: MFH: r431494 security/gnutls: unbreak aarch64 after r431214 lib/accelerated/aarch64/elf/aes-aarch64.s.tmp.S:5:1: error: unknown directive .arch armv8-a+crypto ^ lib/accelerated/aarch64/elf/aes-aarch64.s.tmp.S:49:2: error: instruction requires: crypto aese v6.16b,v0.16b ^ PR: 216045 Approved by: tijl (maintainer) Approved by: ports-secteam blanket Modified: branches/2017Q1/security/gnutls/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/security/gnutls/Makefile ============================================================================== --- branches/2017Q1/security/gnutls/Makefile Sat Jan 14 20:51:32 2017 (r431494) +++ branches/2017Q1/security/gnutls/Makefile Sat Jan 14 20:53:21 2017 (r431495) @@ -20,8 +20,8 @@ LIB_DEPENDS= libgmp.so:math/gmp \ BUILD_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss -USES= cpe gmake iconv libtool localbase makeinfo pathfix pkgconfig \ - tar:xz +USES= compiler cpe gmake iconv libtool localbase makeinfo \ + pathfix pkgconfig tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-guile \ @@ -64,6 +64,15 @@ ZLIB_CONFIGURE_WITH= zlib INFO= gnutls gnutls-guile +.include + +# XXX CHOSEN_COMPILER_VERSION isn't supported, so check CC hasn't changed +.if ${ARCH} == aarch64 && ${CC} == cc && \ + ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 40 +BUILD_DEPENDS+= as:devel/binutils +CFLAGS+= -no-integrated-as +.endif + post-patch: @${RM} ${WRKSRC}/doc/*.info* @@ -71,4 +80,4 @@ post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/doc/examples/*.[ch] ${STAGEDIR}${EXAMPLESDIR} -.include +.include