From owner-svn-ports-branches@freebsd.org Sun Jun 4 12:22:45 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 C8967B7AE57; Sun, 4 Jun 2017 12:22:45 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 95EEF74DC4; Sun, 4 Jun 2017 12:22:45 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v54CMivM000712; Sun, 4 Jun 2017 12:22:44 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v54CMiAt000710; Sun, 4 Jun 2017 12:22:44 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201706041222.v54CMiAt000710@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Sun, 4 Jun 2017 12:22:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442557 - in branches/2017Q2/www/fcgiwrap: . 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, 04 Jun 2017 12:22:45 -0000 Author: matthew Date: Sun Jun 4 12:22:44 2017 New Revision: 442557 URL: https://svnweb.freebsd.org/changeset/ports/442557 Log: MFH: r442556 Avoid accidentally killing init or other important processes when running 'service fcgiwrap onestop' if /var/run/fcgiwrap/fcgiwrap.pid doesn't exist or contain the fcgiwrap PID. This prevents killing any processes in process groups 0 or 1 or in the caller's process group if the rc script cannot read the fcgiwrap pidfile. PR: 219724 Submitted by: bblister@gmail.com Approved by: portmgr (implicit blanket: functionality fix) Modified: branches/2017Q2/www/fcgiwrap/Makefile branches/2017Q2/www/fcgiwrap/files/fcgiwrap.in Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/www/fcgiwrap/Makefile ============================================================================== --- branches/2017Q2/www/fcgiwrap/Makefile Sun Jun 4 12:07:33 2017 (r442556) +++ branches/2017Q2/www/fcgiwrap/Makefile Sun Jun 4 12:22:44 2017 (r442557) @@ -2,7 +2,7 @@ PORTNAME= fcgiwrap PORTVERSION= 1.1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MAINTAINER= ports@FreeBSD.org Modified: branches/2017Q2/www/fcgiwrap/files/fcgiwrap.in ============================================================================== --- branches/2017Q2/www/fcgiwrap/files/fcgiwrap.in Sun Jun 4 12:07:33 2017 (r442556) +++ branches/2017Q2/www/fcgiwrap/files/fcgiwrap.in Sun Jun 4 12:22:44 2017 (r442557) @@ -88,8 +88,10 @@ fcgiwrap_postcmd() { } fcgiwrap_stop() { - fcgiwrap_pgrp=$(/bin/ps -o ppid= $(cat ${pidfile})) - if [ -z "$fcgiwrap_pgrp" ] || ! kill -0 $fcgiwrap_pgrp; then + if [ -s ${pidfile} ]; then + fcgiwrap_pgrp=$(/bin/ps -o ppid= $(cat ${pidfile})) + fi + if [ -z "$fcgiwrap_pgrp" -o "${fcgiwrap_pgrp:-0}" -le 1 ] || ! kill -0 $fcgiwrap_pgrp; then [ -n "$rc_fast" ] && return 0 _run_rc_notrunning return 1 From owner-svn-ports-branches@freebsd.org Sun Jun 4 21:51: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 798A2BF0824; Sun, 4 Jun 2017 21:51: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 53C8B27FB; Sun, 4 Jun 2017 21:51:09 +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 v54Lp8cO034482; Sun, 4 Jun 2017 21:51:08 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v54Lp7G5034469; Sun, 4 Jun 2017 21:51:07 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201706042151.v54Lp7G5034469@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 4 Jun 2017 21:51:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442593 - in branches/2017Q2: archivers/py-attic archivers/py-borgbackup audio/lollypop comms/wsjt comms/wspr mail/rss2email3 math/convertall math/rpcalc multimedia/mps-youtube net-im/p... 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, 04 Jun 2017 21:51:09 -0000 Author: bdrewery Date: Sun Jun 4 21:51:07 2017 New Revision: 442593 URL: https://svnweb.freebsd.org/changeset/ports/442593 Log: MFH: r442592 Allow these ports to build with PACKAGE_BUILDING_FLAVORS set. Poudriere in particulr did not properly handle DEPENDS_ARGS which made these ports not properly install dependencies. That bug is being addressed along with adding FLAVORS support to it. With hat: portmgr Approved by: portmgr (implicit) Modified: branches/2017Q2/archivers/py-attic/Makefile branches/2017Q2/archivers/py-borgbackup/Makefile branches/2017Q2/audio/lollypop/Makefile branches/2017Q2/comms/wsjt/Makefile branches/2017Q2/comms/wspr/Makefile branches/2017Q2/mail/rss2email3/Makefile branches/2017Q2/math/convertall/Makefile branches/2017Q2/math/rpcalc/Makefile branches/2017Q2/multimedia/mps-youtube/Makefile branches/2017Q2/net-im/poezio/Makefile branches/2017Q2/net/tiny-network-utilities/Makefile branches/2017Q2/ports-mgmt/py-pytoport/Makefile branches/2017Q2/security/morphis/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/archivers/py-attic/Makefile ============================================================================== --- branches/2017Q2/archivers/py-attic/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/archivers/py-attic/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -25,7 +25,8 @@ PYDISTUTILS_BUILDPATH=${BUILD_WRKSRC}/build/lib.${OPSY .include -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/archivers/py-borgbackup/Makefile ============================================================================== --- branches/2017Q2/archivers/py-borgbackup/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/archivers/py-borgbackup/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -28,7 +28,8 @@ USE_PYTHON= autoplist distutils .include -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/audio/lollypop/Makefile ============================================================================== --- branches/2017Q2/audio/lollypop/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/audio/lollypop/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -36,7 +36,8 @@ SUB_FILES= pkg-message .include -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/comms/wsjt/Makefile ============================================================================== --- branches/2017Q2/comms/wsjt/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/comms/wsjt/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -103,7 +103,8 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR} .endfor -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/comms/wspr/Makefile ============================================================================== --- branches/2017Q2/comms/wspr/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/comms/wspr/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -63,7 +63,8 @@ do-fetch: .endif .endif -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/mail/rss2email3/Makefile ============================================================================== --- branches/2017Q2/mail/rss2email3/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/mail/rss2email3/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -35,7 +35,8 @@ post-install: .include -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/math/convertall/Makefile ============================================================================== --- branches/2017Q2/math/convertall/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/math/convertall/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -41,7 +41,8 @@ do-install: .include -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/math/rpcalc/Makefile ============================================================================== --- branches/2017Q2/math/rpcalc/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/math/rpcalc/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -36,7 +36,8 @@ do-install: .include -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/multimedia/mps-youtube/Makefile ============================================================================== --- branches/2017Q2/multimedia/mps-youtube/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/multimedia/mps-youtube/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -47,7 +47,8 @@ post-install: .include -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/net-im/poezio/Makefile ============================================================================== --- branches/2017Q2/net-im/poezio/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/net-im/poezio/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -20,7 +20,8 @@ USE_PYTHON= distutils autoplist .include -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/net/tiny-network-utilities/Makefile ============================================================================== --- branches/2017Q2/net/tiny-network-utilities/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/net/tiny-network-utilities/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -27,7 +27,8 @@ PLIST_FILES= ${FILES_EXEC:%=bin/%} ${FILES_LIB:%=${PYT .include -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/ports-mgmt/py-pytoport/Makefile ============================================================================== --- branches/2017Q2/ports-mgmt/py-pytoport/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/ports-mgmt/py-pytoport/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -25,7 +25,8 @@ USE_PYTHON= autoplist distutils .include -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/security/morphis/Makefile ============================================================================== --- branches/2017Q2/security/morphis/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/security/morphis/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -27,7 +27,8 @@ NO_ARCH= yes .include -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif From owner-svn-ports-branches@freebsd.org Mon Jun 5 12:57: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 30ADAAF89A7; Mon, 5 Jun 2017 12:57:37 +0000 (UTC) (envelope-from demon@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 E5C127D445; Mon, 5 Jun 2017 12:57:36 +0000 (UTC) (envelope-from demon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v55CvaGP000688; Mon, 5 Jun 2017 12:57:36 GMT (envelope-from demon@FreeBSD.org) Received: (from demon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v55CvZ0r000686; Mon, 5 Jun 2017 12:57:35 GMT (envelope-from demon@FreeBSD.org) Message-Id: <201706051257.v55CvZ0r000686@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: demon set sender to demon@FreeBSD.org using -f From: Dmitry Sivachenko Date: Mon, 5 Jun 2017 12:57:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442614 - branches/2017Q2/devel/spark 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, 05 Jun 2017 12:57:37 -0000 Author: demon Date: Mon Jun 5 12:57:35 2017 New Revision: 442614 URL: https://svnweb.freebsd.org/changeset/ports/442614 Log: MFH: r438655 r439441 bash is needed on build stage too. - Fix shebangs - Fix plist - Bump PORTREVISION Approved by: ports-secteam (miwi) Modified: branches/2017Q2/devel/spark/Makefile branches/2017Q2/devel/spark/pkg-plist Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/devel/spark/Makefile ============================================================================== --- branches/2017Q2/devel/spark/Makefile Mon Jun 5 12:54:27 2017 (r442613) +++ branches/2017Q2/devel/spark/Makefile Mon Jun 5 12:57:35 2017 (r442614) @@ -3,6 +3,7 @@ PORTNAME= spark PORTVERSION= 2.1.0 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION} \ LOCAL/demon/:maven \ @@ -17,14 +18,16 @@ COMMENT= Fast big data processing engine LICENSE= APACHE20 BUILD_DEPENDS= ${LOCALBASE}/share/java/maven33/bin/mvn:devel/maven33 \ - ${LOCALBASE}/lib/libsnappyjava.so:archivers/snappy-java + ${LOCALBASE}/lib/libsnappyjava.so:archivers/snappy-java \ + bash:shells/bash RUN_DEPENDS= bash:shells/bash \ yarn:devel/hadoop2 -USES= python:2 +USES= python:2 shebangfix USE_JAVA= yes JAVA_VERSION= 1.7+ MAKE_ENV+= JAVA_HOME=${JAVA_HOME} MAVEN_OPTS="-Xmx2g -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=512m" +SHEBANG_FILES= bin/sparkR USERS= spark GROUPS= spark Modified: branches/2017Q2/devel/spark/pkg-plist ============================================================================== --- branches/2017Q2/devel/spark/pkg-plist Mon Jun 5 12:54:27 2017 (r442613) +++ branches/2017Q2/devel/spark/pkg-plist Mon Jun 5 12:57:35 2017 (r442614) @@ -792,5 +792,6 @@ %%DATADIR%%/sbin/stop-slave.sh %%DATADIR%%/sbin/stop-slaves.sh %%DATADIR%%/sbin/stop-thriftserver.sh +@dir %%DATADIR%%/lib @dir(%%SPARK_USER%%,%%SPARK_GROUP%%,) /var/log/spark @dir(%%SPARK_USER%%,%%SPARK_GROUP%%,) /var/run/spark From owner-svn-ports-branches@freebsd.org Mon Jun 5 20:33: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 C17F1B7A0FB; Mon, 5 Jun 2017 20:33:48 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8FB196A09D; Mon, 5 Jun 2017 20:33:48 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v55KXlJ6093673; Mon, 5 Jun 2017 20:33:47 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v55KXlEU093671; Mon, 5 Jun 2017 20:33:47 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201706052033.v55KXlEU093671@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Mon, 5 Jun 2017 20:33:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442687 - branches/2017Q2/games/gemrb 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, 05 Jun 2017 20:33:48 -0000 Author: rakuco Date: Mon Jun 5 20:33:47 2017 New Revision: 442687 URL: https://svnweb.freebsd.org/changeset/ports/442687 Log: MFH: r442686 Switch to an out-of-source CMake build. This prevents some build system files from being installed. Bump PORTREVISION accordingly. Approved by: ports-secteam (blanket approval) Modified: branches/2017Q2/games/gemrb/Makefile branches/2017Q2/games/gemrb/pkg-plist Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/games/gemrb/Makefile ============================================================================== --- branches/2017Q2/games/gemrb/Makefile Mon Jun 5 20:31:32 2017 (r442686) +++ branches/2017Q2/games/gemrb/Makefile Mon Jun 5 20:33:47 2017 (r442687) @@ -3,6 +3,7 @@ PORTNAME= gemrb PORTVERSION= 0.8.4 +PORTREVISION= 3 CATEGORIES= games emulators MASTER_SITES= SF/${PORTNAME}/GemRB%20Sources/GemRB%20${PORTVERSION:.1=}%20Sources @@ -23,7 +24,7 @@ OPTIONS_SUB= yes OPENGL_USE= gl=gl,glu,glew OPENGL_CMAKE_ON= -DUSE_OPENGL=1 -USES= cmake openal:al,alut python shebangfix iconv localbase +USES= cmake:outsource openal:al,alut python shebangfix iconv localbase SHEBANG_FILES= admin/extend2da.py USE_SDL= sdl2 mixer2 ttf2 USE_LDCONFIG= yes Modified: branches/2017Q2/games/gemrb/pkg-plist ============================================================================== --- branches/2017Q2/games/gemrb/pkg-plist Mon Jun 5 20:31:32 2017 (r442686) +++ branches/2017Q2/games/gemrb/pkg-plist Mon Jun 5 20:33:47 2017 (r442687) @@ -56,8 +56,6 @@ share/applications/gemrb.desktop %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/en/CMakeFiles/CMakeDirectoryInformation.cmake -%%PORTDOCS%%%%DOCSDIR%%/en/CMakeFiles/progress.marks %%PORTDOCS%%%%DOCSDIR%%/en/CheatKeys.txt %%PORTDOCS%%%%DOCSDIR%%/en/CodingStyle.txt %%PORTDOCS%%%%DOCSDIR%%/en/Engine/Charcolors.txt @@ -77,7 +75,6 @@ share/applications/gemrb.desktop %%PORTDOCS%%%%DOCSDIR%%/en/GUIScript/index.txt %%PORTDOCS%%%%DOCSDIR%%/en/GUIScript/reserved_functions.txt %%PORTDOCS%%%%DOCSDIR%%/en/GUIScript/start.txt -%%PORTDOCS%%%%DOCSDIR%%/en/Makefile %%PORTDOCS%%%%DOCSDIR%%/en/Release.txt %%PORTDOCS%%%%DOCSDIR%%/en/Tables/HPBARB.txt %%PORTDOCS%%%%DOCSDIR%%/en/Tables/ability.txt @@ -135,7 +132,6 @@ share/applications/gemrb.desktop %%PORTDOCS%%%%DOCSDIR%%/en/Tables/wssingle.txt %%PORTDOCS%%%%DOCSDIR%%/en/Tables/wstwohnd.txt %%PORTDOCS%%%%DOCSDIR%%/en/Tables/wstwowpn.txt -%%PORTDOCS%%%%DOCSDIR%%/en/cmake_install.cmake %%PORTDOCS%%%%DOCSDIR%%/en/default_ini.txt %%PORTDOCS%%%%DOCSDIR%%/en/gemrb_ini.txt %%DATADIR%%/GUIScripts/Actor.py From owner-svn-ports-branches@freebsd.org Tue Jun 6 00:56:58 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 CD5A6B7DEC2; Tue, 6 Jun 2017 00:56:58 +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 9B47E75137; Tue, 6 Jun 2017 00:56:58 +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 v560uvJp002720; Tue, 6 Jun 2017 00:56:57 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v560uvdv002718; Tue, 6 Jun 2017 00:56:57 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201706060056.v560uvdv002718@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 6 Jun 2017 00:56:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442732 - in branches/2017Q2/Mk: . Uses 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, 06 Jun 2017 00:56:58 -0000 Author: bdrewery Date: Tue Jun 6 00:56:57 2017 New Revision: 442732 URL: https://svnweb.freebsd.org/changeset/ports/442732 Log: MFH: r442729 r442730 r442729: No quoting needed here. r442730: Don't pass the default version in DEPENDS_ARGS. This greatly simplifies handling for Poudriere. With hat: portmgr Approved by: portmgr (implicit) Modified: branches/2017Q2/Mk/Uses/python.mk branches/2017Q2/Mk/bsd.ruby.mk Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/Mk/Uses/python.mk ============================================================================== --- branches/2017Q2/Mk/Uses/python.mk Tue Jun 6 00:47:24 2017 (r442731) +++ branches/2017Q2/Mk/Uses/python.mk Tue Jun 6 00:56:57 2017 (r442732) @@ -377,7 +377,8 @@ IGNORE= needs an unsupported version of Python # try to find a different one, if the passed version fits into # the supported version range. PYTHON_VERSION?= python${_PYTHON_VERSION} -.if !defined(PYTHON_NO_DEPENDS) +.if !defined(PYTHON_NO_DEPENDS) && \ + ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION} DEPENDS_ARGS+= PYTHON_VERSION=${PYTHON_VERSION} .endif Modified: branches/2017Q2/Mk/bsd.ruby.mk ============================================================================== --- branches/2017Q2/Mk/bsd.ruby.mk Tue Jun 6 00:47:24 2017 (r442731) +++ branches/2017Q2/Mk/bsd.ruby.mk Tue Jun 6 00:56:57 2017 (r442732) @@ -267,7 +267,9 @@ RUBY_SHLIBVER?= ${RUBY_VER:S/.//} RUBY_CONFIGURE_ARGS+= --program-prefix="" -DEPENDS_ARGS+= RUBY_VER="${RUBY_VER}" +.if ${RUBY_VER} != ${RUBY_DEFAULT_VER} +DEPENDS_ARGS+= RUBY_VER=${RUBY_VER} +.endif RUBY_CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}" From owner-svn-ports-branches@freebsd.org Tue Jun 6 10:59: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 9894BBFD3AE; Tue, 6 Jun 2017 10:59:51 +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 66B313488; Tue, 6 Jun 2017 10:59:51 +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 v56AxouW051123; Tue, 6 Jun 2017 10:59:50 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v56AxmWj051099; Tue, 6 Jun 2017 10:59:48 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201706061059.v56AxmWj051099@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Tue, 6 Jun 2017 10:59:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442755 - in branches/2017Q2/databases: postgresql92-server postgresql92-server/files postgresql93-server postgresql93-server/files postgresql94-server postgresql94-server/files postgre... 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, 06 Jun 2017 10:59:51 -0000 Author: tz Date: Tue Jun 6 10:59:48 2017 New Revision: 442755 URL: https://svnweb.freebsd.org/changeset/ports/442755 Log: MFH: r440628 PostgreSQL security updates The PostgreSQL Global Development Group has released an update to all supported versions of our database system, including 9.6.3, 9.5.7, 9.4.12, 9.3.17, and 9.2.21. This release fixes three security issues. It also patches a number of other bugs reported over the last three months. Users who use the PGREQUIRESSL environment variable to control connections, and users who rely on security isolation between database users when using foreign servers, should update as soon as possible. Other users should plan to update at the next convenient downtime. URL: https://www.postgresql.org/about/news/1746/ Security: CVE-2017-7484, CVE-2017-7485, CVE-2017-7486 Also modify rcorder and let sshd start before PostgreSQL, so any problems during startup can be reviewed promplty from an ssh login. Approved by: ports-secteam (miwi) Modified: branches/2017Q2/databases/postgresql92-server/Makefile branches/2017Q2/databases/postgresql92-server/distinfo branches/2017Q2/databases/postgresql92-server/files/postgresql.in branches/2017Q2/databases/postgresql92-server/pkg-plist-server branches/2017Q2/databases/postgresql93-server/Makefile branches/2017Q2/databases/postgresql93-server/distinfo branches/2017Q2/databases/postgresql93-server/files/postgresql.in branches/2017Q2/databases/postgresql93-server/pkg-plist-server branches/2017Q2/databases/postgresql94-server/Makefile branches/2017Q2/databases/postgresql94-server/distinfo branches/2017Q2/databases/postgresql94-server/files/postgresql.in branches/2017Q2/databases/postgresql94-server/pkg-plist-client branches/2017Q2/databases/postgresql94-server/pkg-plist-server branches/2017Q2/databases/postgresql95-server/Makefile branches/2017Q2/databases/postgresql95-server/distinfo branches/2017Q2/databases/postgresql95-server/files/postgresql.in branches/2017Q2/databases/postgresql95-server/pkg-plist-client branches/2017Q2/databases/postgresql95-server/pkg-plist-server branches/2017Q2/databases/postgresql96-server/Makefile branches/2017Q2/databases/postgresql96-server/distinfo branches/2017Q2/databases/postgresql96-server/files/postgresql.in branches/2017Q2/databases/postgresql96-server/pkg-plist-client branches/2017Q2/databases/postgresql96-server/pkg-plist-server Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/databases/postgresql92-server/Makefile ============================================================================== --- branches/2017Q2/databases/postgresql92-server/Makefile Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql92-server/Makefile Tue Jun 6 10:59:48 2017 (r442755) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= postgresql -DISTVERSION?= 9.2.20 +DISTVERSION?= 9.2.21 PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= PGSQL/source/v${DISTVERSION} Modified: branches/2017Q2/databases/postgresql92-server/distinfo ============================================================================== --- branches/2017Q2/databases/postgresql92-server/distinfo Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql92-server/distinfo Tue Jun 6 10:59:48 2017 (r442755) @@ -1,5 +1,5 @@ -TIMESTAMP = 1486640625 -SHA256 (postgresql/postgresql-9.2.20.tar.bz2) = 0b8abdae8400cabea5587a726003c9dd71c73c049bdae523abc35f9312dd8f26 -SIZE (postgresql/postgresql-9.2.20.tar.bz2) = 16480653 +TIMESTAMP = 1494282359 +SHA256 (postgresql/postgresql-9.2.21.tar.bz2) = 0697e843523ee60c563f987f9c65bc4201294b18525d6e5e4b2c50c6d4058ef9 +SIZE (postgresql/postgresql-9.2.21.tar.bz2) = 16508040 SHA256 (postgresql/pg-9218-icu-2016-08-10.diff.gz) = 2f9c831b3dff866f0b2f6f2a9ef771a4045486bc252a851aadc73c50d376319d SIZE (postgresql/pg-9218-icu-2016-08-10.diff.gz) = 5587 Modified: branches/2017Q2/databases/postgresql92-server/files/postgresql.in ============================================================================== --- branches/2017Q2/databases/postgresql92-server/files/postgresql.in Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql92-server/files/postgresql.in Tue Jun 6 10:59:48 2017 (r442755) @@ -3,7 +3,7 @@ # $FreeBSD$ # # PROVIDE: postgresql -# REQUIRE: LOGIN +# REQUIRE: sshd # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable PostgreSQL: Modified: branches/2017Q2/databases/postgresql92-server/pkg-plist-server ============================================================================== --- branches/2017Q2/databases/postgresql92-server/pkg-plist-server Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql92-server/pkg-plist-server Tue Jun 6 10:59:48 2017 (r442755) @@ -324,6 +324,7 @@ lib/postgresql/utf8_and_win.so %%TZDATA%%%%DATADIR%%/timezone/America/Porto_Acre %%TZDATA%%%%DATADIR%%/timezone/America/Porto_Velho %%TZDATA%%%%DATADIR%%/timezone/America/Puerto_Rico +%%TZDATA%%%%DATADIR%%/timezone/America/Punta_Arenas %%TZDATA%%%%DATADIR%%/timezone/America/Rainy_River %%TZDATA%%%%DATADIR%%/timezone/America/Rankin_Inlet %%TZDATA%%%%DATADIR%%/timezone/America/Recife Modified: branches/2017Q2/databases/postgresql93-server/Makefile ============================================================================== --- branches/2017Q2/databases/postgresql93-server/Makefile Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql93-server/Makefile Tue Jun 6 10:59:48 2017 (r442755) @@ -1,7 +1,7 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.3.16 +DISTVERSION?= 9.3.17 PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org Modified: branches/2017Q2/databases/postgresql93-server/distinfo ============================================================================== --- branches/2017Q2/databases/postgresql93-server/distinfo Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql93-server/distinfo Tue Jun 6 10:59:48 2017 (r442755) @@ -1,5 +1,5 @@ -TIMESTAMP = 1486640625 -SHA256 (postgresql/postgresql-9.3.16.tar.bz2) = 845f5e4ac8cf026b6a77c5a180a2fe869f51e9d06acf8d0365b05505a2c66873 -SIZE (postgresql/postgresql-9.3.16.tar.bz2) = 17108969 +TIMESTAMP = 1494282359 +SHA256 (postgresql/postgresql-9.3.17.tar.bz2) = 9c03e5f280cfe9bd202fa01af773eb146abd8ab3065f7279d574c568f6948dbe +SIZE (postgresql/postgresql-9.3.17.tar.bz2) = 17158802 SHA256 (postgresql/pg-9314-icu-2016-08-10.diff.gz) = 4be31ad9899d5caf9f57ad7ebfc0d14f0fcf58ad539c82fb353b016fb76c0c30 SIZE (postgresql/pg-9314-icu-2016-08-10.diff.gz) = 5583 Modified: branches/2017Q2/databases/postgresql93-server/files/postgresql.in ============================================================================== --- branches/2017Q2/databases/postgresql93-server/files/postgresql.in Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql93-server/files/postgresql.in Tue Jun 6 10:59:48 2017 (r442755) @@ -3,7 +3,7 @@ # $FreeBSD$ # # PROVIDE: postgresql -# REQUIRE: LOGIN +# REQUIRE: sshd # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable PostgreSQL: Modified: branches/2017Q2/databases/postgresql93-server/pkg-plist-server ============================================================================== --- branches/2017Q2/databases/postgresql93-server/pkg-plist-server Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql93-server/pkg-plist-server Tue Jun 6 10:59:48 2017 (r442755) @@ -313,6 +313,7 @@ lib/libpgcommon.a %%TZDATA%%%%DATADIR%%/timezone/America/Porto_Acre %%TZDATA%%%%DATADIR%%/timezone/America/Porto_Velho %%TZDATA%%%%DATADIR%%/timezone/America/Puerto_Rico +%%TZDATA%%%%DATADIR%%/timezone/America/Punta_Arenas %%TZDATA%%%%DATADIR%%/timezone/America/Rainy_River %%TZDATA%%%%DATADIR%%/timezone/America/Rankin_Inlet %%TZDATA%%%%DATADIR%%/timezone/America/Recife Modified: branches/2017Q2/databases/postgresql94-server/Makefile ============================================================================== --- branches/2017Q2/databases/postgresql94-server/Makefile Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql94-server/Makefile Tue Jun 6 10:59:48 2017 (r442755) @@ -1,7 +1,7 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.4.11 +DISTVERSION?= 9.4.12 MAINTAINER?= pgsql@FreeBSD.org Modified: branches/2017Q2/databases/postgresql94-server/distinfo ============================================================================== --- branches/2017Q2/databases/postgresql94-server/distinfo Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql94-server/distinfo Tue Jun 6 10:59:48 2017 (r442755) @@ -1,5 +1,5 @@ -TIMESTAMP = 1486640625 -SHA256 (postgresql/postgresql-9.4.11.tar.bz2) = e3eb51d045c180b03d2de1f0c3af9356e10be49448e966ca01dfc2c6d1cc9d23 -SIZE (postgresql/postgresql-9.4.11.tar.bz2) = 17832915 +TIMESTAMP = 1494282360 +SHA256 (postgresql/postgresql-9.4.12.tar.bz2) = fca055481875d1c49e31c28443f56472a1474b3fbe25b7ae64440c6118f82e64 +SIZE (postgresql/postgresql-9.4.12.tar.bz2) = 17833119 SHA256 (postgresql/pg-949-icu-2016-10-02.diff.gz) = 34612e685a79874db04bc6b66c700bfc6412042840c532eef0da7832d1f70d43 SIZE (postgresql/pg-949-icu-2016-10-02.diff.gz) = 5289 Modified: branches/2017Q2/databases/postgresql94-server/files/postgresql.in ============================================================================== --- branches/2017Q2/databases/postgresql94-server/files/postgresql.in Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql94-server/files/postgresql.in Tue Jun 6 10:59:48 2017 (r442755) @@ -3,7 +3,7 @@ # $FreeBSD$ # # PROVIDE: postgresql -# REQUIRE: LOGIN +# REQUIRE: sshd # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable PostgreSQL: Modified: branches/2017Q2/databases/postgresql94-server/pkg-plist-client ============================================================================== --- branches/2017Q2/databases/postgresql94-server/pkg-plist-client Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql94-server/pkg-plist-client Tue Jun 6 10:59:48 2017 (r442755) @@ -192,6 +192,7 @@ include/postgresql/server/commands/vacuum.h include/postgresql/server/commands/variable.h include/postgresql/server/commands/view.h include/postgresql/server/common/fe_memutils.h +include/postgresql/server/common/int128.h include/postgresql/server/common/relpath.h include/postgresql/server/common/string.h include/postgresql/server/common/username.h Modified: branches/2017Q2/databases/postgresql94-server/pkg-plist-server ============================================================================== --- branches/2017Q2/databases/postgresql94-server/pkg-plist-server Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql94-server/pkg-plist-server Tue Jun 6 10:59:48 2017 (r442755) @@ -314,6 +314,7 @@ lib/libpgcommon.a %%TZDATA%%%%DATADIR%%/timezone/America/Porto_Acre %%TZDATA%%%%DATADIR%%/timezone/America/Porto_Velho %%TZDATA%%%%DATADIR%%/timezone/America/Puerto_Rico +%%TZDATA%%%%DATADIR%%/timezone/America/Punta_Arenas %%TZDATA%%%%DATADIR%%/timezone/America/Rainy_River %%TZDATA%%%%DATADIR%%/timezone/America/Rankin_Inlet %%TZDATA%%%%DATADIR%%/timezone/America/Recife Modified: branches/2017Q2/databases/postgresql95-server/Makefile ============================================================================== --- branches/2017Q2/databases/postgresql95-server/Makefile Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql95-server/Makefile Tue Jun 6 10:59:48 2017 (r442755) @@ -1,7 +1,7 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.5.6 +DISTVERSION?= 9.5.7 MAINTAINER?= pgsql@FreeBSD.org Modified: branches/2017Q2/databases/postgresql95-server/distinfo ============================================================================== --- branches/2017Q2/databases/postgresql95-server/distinfo Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql95-server/distinfo Tue Jun 6 10:59:48 2017 (r442755) @@ -1,5 +1,5 @@ -TIMESTAMP = 1486640626 -SHA256 (postgresql/postgresql-9.5.6.tar.bz2) = bb9e5f6d34e20783e96e10c1d6c0c09c31749e802aaa46b793ce2522725ae12f -SIZE (postgresql/postgresql-9.5.6.tar.bz2) = 18598551 +TIMESTAMP = 1494282360 +SHA256 (postgresql/postgresql-9.5.7.tar.bz2) = 8b1e936f82109325decc0f5575e846b93fb4fd384e8c4bde83ff5e7f87fc6cad +SIZE (postgresql/postgresql-9.5.7.tar.bz2) = 18639775 SHA256 (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5fa083ec38087d6a0961642208f012e902221270708b919b92e9eedaa755e365 SIZE (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5952 Modified: branches/2017Q2/databases/postgresql95-server/files/postgresql.in ============================================================================== --- branches/2017Q2/databases/postgresql95-server/files/postgresql.in Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql95-server/files/postgresql.in Tue Jun 6 10:59:48 2017 (r442755) @@ -3,7 +3,7 @@ # $FreeBSD$ # # PROVIDE: postgresql -# REQUIRE: LOGIN +# REQUIRE: sshd # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable PostgreSQL: Modified: branches/2017Q2/databases/postgresql95-server/pkg-plist-client ============================================================================== --- branches/2017Q2/databases/postgresql95-server/pkg-plist-client Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql95-server/pkg-plist-client Tue Jun 6 10:59:48 2017 (r442755) @@ -213,6 +213,7 @@ include/postgresql/server/commands/vacuum.h include/postgresql/server/commands/variable.h include/postgresql/server/commands/view.h include/postgresql/server/common/fe_memutils.h +include/postgresql/server/common/int128.h include/postgresql/server/common/pg_lzcompress.h include/postgresql/server/common/relpath.h include/postgresql/server/common/restricted_token.h Modified: branches/2017Q2/databases/postgresql95-server/pkg-plist-server ============================================================================== --- branches/2017Q2/databases/postgresql95-server/pkg-plist-server Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql95-server/pkg-plist-server Tue Jun 6 10:59:48 2017 (r442755) @@ -335,6 +335,7 @@ lib/libpgcommon.a %%TZDATA%%%%DATADIR%%/timezone/America/Porto_Acre %%TZDATA%%%%DATADIR%%/timezone/America/Porto_Velho %%TZDATA%%%%DATADIR%%/timezone/America/Puerto_Rico +%%TZDATA%%%%DATADIR%%/timezone/America/Punta_Arenas %%TZDATA%%%%DATADIR%%/timezone/America/Rainy_River %%TZDATA%%%%DATADIR%%/timezone/America/Rankin_Inlet %%TZDATA%%%%DATADIR%%/timezone/America/Recife Modified: branches/2017Q2/databases/postgresql96-server/Makefile ============================================================================== --- branches/2017Q2/databases/postgresql96-server/Makefile Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql96-server/Makefile Tue Jun 6 10:59:48 2017 (r442755) @@ -1,7 +1,7 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.6.2 +DISTVERSION?= 9.6.3 MAINTAINER?= pgsql@FreeBSD.org Modified: branches/2017Q2/databases/postgresql96-server/distinfo ============================================================================== --- branches/2017Q2/databases/postgresql96-server/distinfo Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql96-server/distinfo Tue Jun 6 10:59:48 2017 (r442755) @@ -1,5 +1,5 @@ -TIMESTAMP = 1486640626 -SHA256 (postgresql/postgresql-9.6.2.tar.bz2) = 0187b5184be1c09034e74e44761505e52357248451b0c854dddec6c231fe50c9 -SIZE (postgresql/postgresql-9.6.2.tar.bz2) = 19478040 +TIMESTAMP = 1494282361 +SHA256 (postgresql/postgresql-9.6.3.tar.bz2) = 1645b3736901f6d854e695a937389e68ff2066ce0cde9d73919d6ab7c995b9c6 +SIZE (postgresql/postgresql-9.6.3.tar.bz2) = 19534323 SHA256 (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 85f81baa0fc8f692bcf802c8645196d9e3afdef4f760cef712d940b87655486e SIZE (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 5998 Modified: branches/2017Q2/databases/postgresql96-server/files/postgresql.in ============================================================================== --- branches/2017Q2/databases/postgresql96-server/files/postgresql.in Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql96-server/files/postgresql.in Tue Jun 6 10:59:48 2017 (r442755) @@ -3,7 +3,7 @@ # $FreeBSD$ # # PROVIDE: postgresql -# REQUIRE: LOGIN +# REQUIRE: sshd # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable PostgreSQL: Modified: branches/2017Q2/databases/postgresql96-server/pkg-plist-client ============================================================================== --- branches/2017Q2/databases/postgresql96-server/pkg-plist-client Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql96-server/pkg-plist-client Tue Jun 6 10:59:48 2017 (r442755) @@ -221,6 +221,7 @@ include/postgresql/server/commands/view.h include/postgresql/server/common/config_info.h include/postgresql/server/common/controldata_utils.h include/postgresql/server/common/fe_memutils.h +include/postgresql/server/common/int128.h include/postgresql/server/common/keywords.h include/postgresql/server/common/pg_lzcompress.h include/postgresql/server/common/relpath.h Modified: branches/2017Q2/databases/postgresql96-server/pkg-plist-server ============================================================================== --- branches/2017Q2/databases/postgresql96-server/pkg-plist-server Tue Jun 6 09:56:50 2017 (r442754) +++ branches/2017Q2/databases/postgresql96-server/pkg-plist-server Tue Jun 6 10:59:48 2017 (r442755) @@ -337,6 +337,7 @@ lib/libpgcommon.a %%TZDATA%%%%DATADIR%%/timezone/America/Porto_Acre %%TZDATA%%%%DATADIR%%/timezone/America/Porto_Velho %%TZDATA%%%%DATADIR%%/timezone/America/Puerto_Rico +%%TZDATA%%%%DATADIR%%/timezone/America/Punta_Arenas %%TZDATA%%%%DATADIR%%/timezone/America/Rainy_River %%TZDATA%%%%DATADIR%%/timezone/America/Rankin_Inlet %%TZDATA%%%%DATADIR%%/timezone/America/Recife From owner-svn-ports-branches@freebsd.org Tue Jun 6 12:54:28 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 95418B94FFB; Tue, 6 Jun 2017 12:54:28 +0000 (UTC) (envelope-from ak@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 65C5366C1E; Tue, 6 Jun 2017 12:54:28 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v56CsRKE099332; Tue, 6 Jun 2017 12:54:27 GMT (envelope-from ak@FreeBSD.org) Received: (from ak@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v56CsRUE099331; Tue, 6 Jun 2017 12:54:27 GMT (envelope-from ak@FreeBSD.org) Message-Id: <201706061254.v56CsRUE099331@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ak set sender to ak@FreeBSD.org using -f From: Alex Kozlov Date: Tue, 6 Jun 2017 12:54:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442758 - branches/2017Q2/devel/plan9port 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, 06 Jun 2017 12:54:28 -0000 Author: ak Date: Tue Jun 6 12:54:27 2017 New Revision: 442758 URL: https://svnweb.freebsd.org/changeset/ports/442758 Log: MFH: r438455 - Fix build Approved by: ports-secteam (build fix blanket) Modified: branches/2017Q2/devel/plan9port/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/devel/plan9port/Makefile ============================================================================== --- branches/2017Q2/devel/plan9port/Makefile Tue Jun 6 11:54:09 2017 (r442757) +++ branches/2017Q2/devel/plan9port/Makefile Tue Jun 6 12:54:27 2017 (r442758) @@ -20,6 +20,9 @@ USE_GITHUB= yes BROKEN_ia64= does not install: cleanname not found BROKEN_sparc64= does not install: cleanname not found +LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libfontconfig.so:x11-fonts/fontconfig + RUN_DEPENDS= rc:shells/rc USES= perl5 shebangfix tar:tgz From owner-svn-ports-branches@freebsd.org Tue Jun 6 15:05:17 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D9D00BEEC75; Tue, 6 Jun 2017 15:05:17 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A4AF06FD17; Tue, 6 Jun 2017 15:05:17 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v56F5GLJ054868; Tue, 6 Jun 2017 15:05:16 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v56F5G3d054866; Tue, 6 Jun 2017 15:05:16 GMT (envelope-from ler@FreeBSD.org) Message-Id: <201706061505.v56F5G3d054866@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Tue, 6 Jun 2017 15:05:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442777 - in branches/2017Q2/irc/irssi-xmpp: . 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, 06 Jun 2017 15:05:18 -0000 Author: ler Date: Tue Jun 6 15:05:16 2017 New Revision: 442777 URL: https://svnweb.freebsd.org/changeset/ports/442777 Log: MFH: r438990 r439548 Approved by: ports-secteam (blanket) irc/irssi-xmpp: Fix build with irssi 1.0 - Add patch from upstream PR: 217916, 218328 Submitted by: Thibault Jouan Approved by: maintainer timeout Obtained from: https://github.com/cdidier/irssi-xmpp/issues/18 irc/irssi-xmpp: Improve regex conformance PR: 218603 Submitted by: Kyle Evans Approved by: jadwin (maintainer timeout), rene (mentor) Differential Revision: https://reviews.freebsd.org/D10524 Added: branches/2017Q2/irc/irssi-xmpp/files/ - copied from r438990, head/irc/irssi-xmpp/files/ Modified: branches/2017Q2/irc/irssi-xmpp/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/irc/irssi-xmpp/Makefile ============================================================================== --- branches/2017Q2/irc/irssi-xmpp/Makefile Tue Jun 6 14:58:55 2017 (r442776) +++ branches/2017Q2/irc/irssi-xmpp/Makefile Tue Jun 6 15:05:16 2017 (r442777) @@ -29,7 +29,7 @@ OPTIONS_DEFINE= DOCS post-patch: # Try to unbreak parallel builds (-jX) - @${REINPLACE_CMD} -E 's|cd (.+) && (\$${MAKE})|\2 -C \1|' \ + @${REINPLACE_CMD} -E 's|cd (.+) && (\$$\{MAKE})|\2 -C \1|' \ ${WRKSRC}/Makefile ${WRKSRC}/src/Makefile post-install: From owner-svn-ports-branches@freebsd.org Tue Jun 6 22:31:32 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B3E8DBF62E1; Tue, 6 Jun 2017 22:31:32 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9052E7D59F; Tue, 6 Jun 2017 22:31:32 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v56MVVIt036968; Tue, 6 Jun 2017 22:31:31 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v56MVVXL036966; Tue, 6 Jun 2017 22:31:31 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201706062231.v56MVVXL036966@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Tue, 6 Jun 2017 22:31:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442809 - in branches/2017Q2/security/openvpn-auth-ldap: . 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, 06 Jun 2017 22:31:32 -0000 Author: mandree Date: Tue Jun 6 22:31:31 2017 New Revision: 442809 URL: https://svnweb.freebsd.org/changeset/ports/442809 Log: MFH: r440973 r440974 r440979 r440981 Unbreak security/openvpn-auth-ldap on 2017Q2, regressed since r440676 (which was an approved MFH of r440667, updating security/openvpn to v2.4.2), with these changes: Unbreak openvpn-plugin.h detection. Apparently the header file changed in openvpn 2.4.2 and now requires #include explicitly to pull the typedef for size_t in. Add that header line to the test so it won't report a false negative result. Reported by: pkg-fallout@ Modernize, resolving DEVELOPER=yes warnings. No longer depend on OpenVPN sources. OpenVPN 2.3.0 and newer have installed the openvpn-plugin.h file. Cease requiring and extracting the source tarball to obtain this file (as we used to do with 2.2.x and older). Revise Github comment. Invoking blanket approval "Build, Runtime or Packaging fixes, if the quarterly branch version is currently broken." Reported by: Johannes Jost Meixner Approved by: ports-secteam (blanket) Added: branches/2017Q2/security/openvpn-auth-ldap/files/patch-aclocal.m4 - copied, changed from r440973, head/security/openvpn-auth-ldap/files/patch-aclocal.m4 Modified: branches/2017Q2/security/openvpn-auth-ldap/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/security/openvpn-auth-ldap/Makefile ============================================================================== --- branches/2017Q2/security/openvpn-auth-ldap/Makefile Tue Jun 6 21:34:35 2017 (r442808) +++ branches/2017Q2/security/openvpn-auth-ldap/Makefile Tue Jun 6 22:31:31 2017 (r442809) @@ -15,17 +15,15 @@ COMMENT= LDAP authentication plugin for OpenVPN LICENSE= BSD3CLAUSE BUILD_DEPENDS= re2c:devel/re2c \ - ${NONEXISTENT}:security/openvpn:extract \ - check>=0:devel/check + check>=0:devel/check \ + ${LOCALBASE}/include/openvpn-plugin.h:security/openvpn -USES= objc tar:xz +USES= autoreconf objc tar:xz GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf autoheader USE_OPENLDAP= yes -OPENVPN_WRKSRC= `cd ${PORTSDIR}/security/openvpn; make -V WRKSRC` CONFIGURE_ARGS+= --with-openldap=${LOCALBASE} \ - --with-openvpn=${OPENVPN_WRKSRC}/include \ + --with-openvpn=${LOCALBASE}/include \ --with-objc-runtime=GNU PORTDOCS= README @@ -62,9 +60,7 @@ CC+= ${DEBUG_FLAGS} # this is a local target to build a tarball from SVN # and another target to upload it # Note that googlecode.com is gone. Apparently someone exported the code -# to Github, but aside from a README that got converted to Markdown -# syntax, there hadn't been changes as of 2016-12-07. -# https://github.com/threerings/openvpn-auth-ldap/ +# to Github: https://github.com/threerings/openvpn-auth-ldap/ build-tarball: ${DISTFILES} ${DISTFILES}: ${RM} -r ${WRKSRC} Copied and modified: branches/2017Q2/security/openvpn-auth-ldap/files/patch-aclocal.m4 (from r440973, head/security/openvpn-auth-ldap/files/patch-aclocal.m4) ============================================================================== --- head/security/openvpn-auth-ldap/files/patch-aclocal.m4 Mon May 15 21:11:21 2017 (r440973, copy source) +++ branches/2017Q2/security/openvpn-auth-ldap/files/patch-aclocal.m4 Tue Jun 6 22:31:31 2017 (r442809) @@ -4,7 +4,7 @@ AC_CACHE_VAL(od_cv_openvpn, [ AC_LINK_IFELSE([ AC_LANG_PROGRAM([ -+ #include ++ #include #include ], [ int flag = OPENVPN_PLUGIN_UP; From owner-svn-ports-branches@freebsd.org Wed Jun 7 14:30:25 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 A54C4C6EF9D; Wed, 7 Jun 2017 14:30:25 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7F2FA75FED; Wed, 7 Jun 2017 14:30:25 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v57EUOp8027583; Wed, 7 Jun 2017 14:30:24 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v57EUON4027578; Wed, 7 Jun 2017 14:30:24 GMT (envelope-from ler@FreeBSD.org) Message-Id: <201706071430.v57EUON4027578@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Wed, 7 Jun 2017 14:30:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442840 - in branches/2017Q2/net/py-pypcap: . 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, 07 Jun 2017 14:30:25 -0000 Author: ler Date: Wed Jun 7 14:30:24 2017 New Revision: 442840 URL: https://svnweb.freebsd.org/changeset/ports/442840 Log: MFH: r439843 net/py-pypcap: Unbreak, remove expiration. PR: 217372 Submitted by: dbaio@bsd.com.br Approved by: adamw (mentor, implicit), wxs (maintainer timeout) Approved by: ports-secteam (blanket) Modified: branches/2017Q2/net/py-pypcap/Makefile branches/2017Q2/net/py-pypcap/distinfo branches/2017Q2/net/py-pypcap/files/patch-pcap.pyx branches/2017Q2/net/py-pypcap/files/patch-setup.py branches/2017Q2/net/py-pypcap/pkg-descr Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/net/py-pypcap/Makefile ============================================================================== --- branches/2017Q2/net/py-pypcap/Makefile Wed Jun 7 14:25:31 2017 (r442839) +++ branches/2017Q2/net/py-pypcap/Makefile Wed Jun 7 14:30:24 2017 (r442840) @@ -3,20 +3,22 @@ PORTNAME= pypcap PORTVERSION= 1.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net python -MASTER_SITES= GOOGLE_CODE PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= wxs@FreeBSD.org COMMENT= Simplified object-oriented Python extension module for libpcap -BROKEN= Unfetchable (google code has gone away) -DEPRECATED= Unfetchable for more than six months (google code has gone away) -EXPIRATION_DATE= 2017-04-30 +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= pyrexc:devel/pyrex +USE_GITHUB= yes +GH_ACCOUNT= dugsong +GH_TAGNAME= PYPCAP_${PORTVERSION:S/./_/g} + USES= python USE_PYTHON= distutils autoplist @@ -25,5 +27,8 @@ post-patch: pre-build: (cd ${WRKSRC}; pyrexc pcap.pyx) + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pcap.so .include Modified: branches/2017Q2/net/py-pypcap/distinfo ============================================================================== --- branches/2017Q2/net/py-pypcap/distinfo Wed Jun 7 14:25:31 2017 (r442839) +++ branches/2017Q2/net/py-pypcap/distinfo Wed Jun 7 14:30:24 2017 (r442840) @@ -1,2 +1,3 @@ -SHA256 (pypcap-1.1.tar.gz) = 087677295c795f543fad2c286df1807d55876e85d04f7292335cd149f4d8d47f -SIZE (pypcap-1.1.tar.gz) = 22951 +TIMESTAMP = 1488113926 +SHA256 (dugsong-pypcap-1.1-PYPCAP_1_1_GH0.tar.gz) = a75d165f70a71e6c14c46b77c1b9b7a395fa425d0f90a2e342e641c66c14e634 +SIZE (dugsong-pypcap-1.1-PYPCAP_1_1_GH0.tar.gz) = 22812 Modified: branches/2017Q2/net/py-pypcap/files/patch-pcap.pyx ============================================================================== --- branches/2017Q2/net/py-pypcap/files/patch-pcap.pyx Wed Jun 7 14:25:31 2017 (r442839) +++ branches/2017Q2/net/py-pypcap/files/patch-pcap.pyx Wed Jun 7 14:30:24 2017 (r442840) @@ -1,15 +1,6 @@ ---- ./pcap.pyx.orig 2011-10-01 22:35:33.141146678 -0400 -+++ ./pcap.pyx 2011-10-01 22:35:39.416147272 -0400 -@@ -1,7 +1,7 @@ - # - # pcap.pyx - # --# $Id: pcap.pyx,v 1.20 2005/10/16 23:00:11 dugsong Exp $ -+# $Id: pcap.pyx 101 2010-07-16 08:20:16Z kosma@kosma.pl $ - - """packet capture library - -@@ -17,9 +17,11 @@ +--- pcap.pyx.orig 2005-10-17 00:08:17 UTC ++++ pcap.pyx +@@ -17,9 +17,11 @@ __url__ = 'http://monkey.org/~dugsong/py __version__ = '1.1' import sys @@ -21,7 +12,7 @@ int PyGILState_Ensure() void PyGILState_Release(int gil) void Py_BEGIN_ALLOW_THREADS() -@@ -42,6 +44,10 @@ +@@ -42,6 +44,10 @@ cdef extern from "pcap.h": unsigned int caplen ctypedef struct pcap_t: int __xxx @@ -32,7 +23,7 @@ ctypedef void (*pcap_handler)(void *arg, pcap_pkthdr *hdr, char *pkt) -@@ -62,6 +68,13 @@ +@@ -62,6 +68,13 @@ cdef extern from "pcap.h": char *pcap_geterr(pcap_t *p) void pcap_close(pcap_t *p) int bpf_filter(bpf_insn *insns, char *buf, int len, int caplen) @@ -46,7 +37,7 @@ cdef extern from "pcap_ex.h": # XXX - hrr, sync with libdnet and libevent -@@ -134,16 +147,18 @@ +@@ -134,16 +147,18 @@ cdef class bpf: raise IOError, 'bad filter' def filter(self, buf): """Return boolean match for buf against our filter.""" @@ -68,7 +59,7 @@ Open a handle to a packet capture descriptor. -@@ -152,6 +167,9 @@ +@@ -152,6 +167,9 @@ cdef class pcap: or None to open the first available up interface snaplen -- maximum number of bytes to capture for each packet promisc -- boolean to specify promiscuous mode sniffing @@ -78,7 +69,7 @@ immediate -- disable buffering, if possible """ cdef pcap_t *__pcap -@@ -161,7 +179,7 @@ +@@ -161,7 +179,7 @@ cdef class pcap: cdef int __dloff def __init__(self, name=None, snaplen=65535, promisc=True, @@ -87,16 +78,16 @@ global dltoff cdef char *p -@@ -171,7 +189,7 @@ +@@ -171,7 +189,7 @@ cdef class pcap: raise OSError, self.__ebuf else: p = name - -+ ++ self.__pcap = pcap_open_offline(p, self.__ebuf) if not self.__pcap: self.__pcap = pcap_open_live(pcap_ex_name(p), snaplen, promisc, -@@ -184,7 +202,7 @@ +@@ -184,7 +202,7 @@ cdef class pcap: try: self.__dloff = dltoff[pcap_datalink(self.__pcap)] except KeyError: pass if immediate and pcap_ex_immediate(self.__pcap) < 0: @@ -105,7 +96,7 @@ property name: """Network interface or dumpfile name.""" -@@ -243,16 +261,6 @@ +@@ -243,16 +261,6 @@ cdef class pcap: """Return datalink type (DLT_* values).""" return pcap_datalink(self.__pcap) @@ -122,7 +113,7 @@ def __add_pkts(self, ts, pkt, pkts): pkts.append((ts, pkt)) -@@ -288,18 +296,24 @@ +@@ -288,18 +296,24 @@ cdef class pcap: raise exc[0], exc[1], exc[2] return n @@ -150,7 +141,7 @@ pcap_ex_setup(self.__pcap) while 1: Py_BEGIN_ALLOW_THREADS -@@ -308,10 +322,22 @@ +@@ -308,10 +322,22 @@ cdef class pcap: if n == 1: callback(hdr.ts.tv_sec + (hdr.ts.tv_usec / 1000000.0), PyBuffer_FromMemory(pkt, hdr.caplen), *args) @@ -173,7 +164,7 @@ def geterr(self): """Return the last error message associated with this handle.""" -@@ -340,6 +366,8 @@ +@@ -340,6 +366,8 @@ cdef class pcap: if n == 1: return (hdr.ts.tv_sec + (hdr.ts.tv_usec / 1000000.0), PyBuffer_FromMemory(pkt, hdr.caplen)) @@ -182,7 +173,7 @@ elif n == -1: raise KeyboardInterrupt elif n == -2: -@@ -364,3 +392,36 @@ +@@ -364,3 +392,36 @@ def lookupdev(): raise OSError, ebuf return p Modified: branches/2017Q2/net/py-pypcap/files/patch-setup.py ============================================================================== --- branches/2017Q2/net/py-pypcap/files/patch-setup.py Wed Jun 7 14:25:31 2017 (r442839) +++ branches/2017Q2/net/py-pypcap/files/patch-setup.py Wed Jun 7 14:30:24 2017 (r442840) @@ -1,6 +1,6 @@ ---- ./setup.py.orig 2005-10-16 19:07:03.000000000 -0400 -+++ ./setup.py 2011-12-18 14:32:02.170660843 -0500 -@@ -25,7 +25,10 @@ +--- setup.py.orig 2005-10-17 00:08:17 UTC ++++ setup.py +@@ -25,7 +25,10 @@ class config_pcap(config.config): d = {} if os.path.exists(os.path.join(cfg['include_dirs'][0], 'pcap-int.h')): d['HAVE_PCAP_INT_H'] = 1 @@ -12,7 +12,7 @@ if buf.find('pcap_file(') != -1: d['HAVE_PCAP_FILE'] = 1 if buf.find('pcap_compile_nopcap(') != -1: -@@ -46,6 +49,7 @@ +@@ -46,6 +49,7 @@ class config_pcap(config.config): incdirs = [ os.path.join(d, sd) ] if os.path.exists(os.path.join(d, sd, 'pcap.h')): cfg['include_dirs'] = [ os.path.join(d, sd) ] Modified: branches/2017Q2/net/py-pypcap/pkg-descr ============================================================================== --- branches/2017Q2/net/py-pypcap/pkg-descr Wed Jun 7 14:25:31 2017 (r442839) +++ branches/2017Q2/net/py-pypcap/pkg-descr Wed Jun 7 14:30:24 2017 (r442840) @@ -1,3 +1,3 @@ A simplified object-oriented Python extension module for libpcap -WWW: http://code.google.com/p/pypcap/ +WWW: https://github.com/dugsong/pypcap From owner-svn-ports-branches@freebsd.org Wed Jun 7 19:23: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 18716D7BCB0; Wed, 7 Jun 2017 19:23:37 +0000 (UTC) (envelope-from pi@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 D57E78099C; Wed, 7 Jun 2017 19:23:36 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v57JNZrS054597; Wed, 7 Jun 2017 19:23:35 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v57JNZFn054595; Wed, 7 Jun 2017 19:23:35 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201706071923.v57JNZFn054595@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Wed, 7 Jun 2017 19:23:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442884 - branches/2017Q2/benchmarks/nuttcp 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, 07 Jun 2017 19:23:37 -0000 Author: pi Date: Wed Jun 7 19:23:35 2017 New Revision: 442884 URL: https://svnweb.freebsd.org/changeset/ports/442884 Log: benchmarks/nuttcp: fix distinfos to unbreak - and set LICENSE PR: 219822 Submitted by: xmj MFH: r442883 Approved by: ports-secteam (blanket) Modified: branches/2017Q2/benchmarks/nuttcp/Makefile branches/2017Q2/benchmarks/nuttcp/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/benchmarks/nuttcp/Makefile ============================================================================== --- branches/2017Q2/benchmarks/nuttcp/Makefile Wed Jun 7 19:20:14 2017 (r442883) +++ branches/2017Q2/benchmarks/nuttcp/Makefile Wed Jun 7 19:23:35 2017 (r442884) @@ -3,6 +3,7 @@ PORTNAME= nuttcp PORTVERSION= 7.3.2 +PORTREVISION= 1 CATEGORIES= benchmarks net MASTER_SITES= http://nuttcp.net/nuttcp/beta/ http://nuttcp.net/nuttcp/latest/:latest DISTFILES= ${PORTNAME}-${PORTVERSION}.c ${NUTTSCPDISTFILE} ${PORTNAME}.8:latest examples.txt:latest LICENSE:latest README:latest @@ -11,6 +12,8 @@ EXTRACT_ONLY= # none MAINTAINER= pi@FreeBSD.org COMMENT= TCP/UDP network testing tool + +LICENSE= GPLv2 NO_WRKSUBDIR= yes USES= shebangfix Modified: branches/2017Q2/benchmarks/nuttcp/distinfo ============================================================================== --- branches/2017Q2/benchmarks/nuttcp/distinfo Wed Jun 7 19:20:14 2017 (r442883) +++ branches/2017Q2/benchmarks/nuttcp/distinfo Wed Jun 7 19:23:35 2017 (r442884) @@ -1,13 +1,13 @@ -TIMESTAMP = 1465482030 +TIMESTAMP = 1496757295 SHA256 (nuttcp-7.3.2/nuttcp-7.3.2.c) = 4deb98a21bb8d2f75dff95436f85d616cdf321b50f29b2bf5f0ff9a0d42b0d62 SIZE (nuttcp-7.3.2/nuttcp-7.3.2.c) = 265085 SHA256 (nuttcp-7.3.2/nuttscp-2.2) = 0874f2f87b8def21bd3d1b18dab449e3d97648100d0c824af109eba897e2160d SIZE (nuttcp-7.3.2/nuttscp-2.2) = 28729 -SHA256 (nuttcp-7.3.2/nuttcp.8) = 83f10cb19e11e37a00fa78ad1f87afc02e5250777e91e78bdf2f2485d372e2c5 +SHA256 (nuttcp-7.3.2/nuttcp.8) = 7d133bcc293b24e9610a66e6fed933131a72865905c58585190f3756497a56f9 SIZE (nuttcp-7.3.2/nuttcp.8) = 16157 SHA256 (nuttcp-7.3.2/examples.txt) = eb94d5424880164cae4b4b5d8f4ab25299cb3396a32c4dcb136e9718c0844938 SIZE (nuttcp-7.3.2/examples.txt) = 5933 SHA256 (nuttcp-7.3.2/LICENSE) = ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 SIZE (nuttcp-7.3.2/LICENSE) = 17987 -SHA256 (nuttcp-7.3.2/README) = 7ad8dcb72bd72afed8f32a13d3f81614b659afacdfa91ca57b41ff20cd4806a1 -SIZE (nuttcp-7.3.2/README) = 5666 +SHA256 (nuttcp-7.3.2/README) = 7a4858e2e1863d5de64b4f559dc3f6061f535bd2901664073983359f034ad51c +SIZE (nuttcp-7.3.2/README) = 5228 From owner-svn-ports-branches@freebsd.org Thu Jun 8 00:29:14 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B49D7B94A9B; Thu, 8 Jun 2017 00:29:14 +0000 (UTC) (envelope-from zi@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 8346665831; Thu, 8 Jun 2017 00:29:14 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v580TD3u077198; Thu, 8 Jun 2017 00:29:13 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v580TDa1077196; Thu, 8 Jun 2017 00:29:13 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201706080029.v580TDa1077196@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Thu, 8 Jun 2017 00:29:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442896 - branches/2017Q2/irc/irssi 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, 08 Jun 2017 00:29:14 -0000 Author: zi Date: Thu Jun 8 00:29:13 2017 New Revision: 442896 URL: https://svnweb.freebsd.org/changeset/ports/442896 Log: MFH: r442895 - Update to 1.0.3 Security: 165e8951-4be0-11e7-a539-0050569f7e80 Approved by: ports-secteam (with hat) Modified: branches/2017Q2/irc/irssi/Makefile branches/2017Q2/irc/irssi/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/irc/irssi/Makefile ============================================================================== --- branches/2017Q2/irc/irssi/Makefile Thu Jun 8 00:28:23 2017 (r442895) +++ branches/2017Q2/irc/irssi/Makefile Thu Jun 8 00:29:13 2017 (r442896) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= irssi -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 PORTEPOCH= 1 CATEGORIES?= irc MASTER_SITES= https://github.com/irssi/irssi/releases/download/${PORTVERSION}/ Modified: branches/2017Q2/irc/irssi/distinfo ============================================================================== --- branches/2017Q2/irc/irssi/distinfo Thu Jun 8 00:28:23 2017 (r442895) +++ branches/2017Q2/irc/irssi/distinfo Thu Jun 8 00:29:13 2017 (r442896) @@ -1,3 +1,3 @@ -TIMESTAMP = 1489769494 -SHA256 (irssi-1.0.2.tar.xz) = 5c1c3cc2caf103aad073fadeb000e0f8cb3b416833a7f43ceb8bd9fcf275fbe9 -SIZE (irssi-1.0.2.tar.xz) = 1027912 +TIMESTAMP = 1496881515 +SHA256 (irssi-1.0.3.tar.xz) = 838220297dcbe7c8c42d01005059779a82f5b7b7e7043db37ad13f5966aff581 +SIZE (irssi-1.0.3.tar.xz) = 1029980 From owner-svn-ports-branches@freebsd.org Thu Jun 8 16:56: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 1D6FFC0A6BE; Thu, 8 Jun 2017 16:56:21 +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 D64A765068; Thu, 8 Jun 2017 16:56:20 +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 v58GuJCb082603; Thu, 8 Jun 2017 16:56:19 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v58GuJSG082600; Thu, 8 Jun 2017 16:56:19 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201706081656.v58GuJSG082600@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Thu, 8 Jun 2017 16:56:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442938 - branches/2017Q2/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: Thu, 08 Jun 2017 16:56:21 -0000 Author: tijl Date: Thu Jun 8 16:56:19 2017 New Revision: 442938 URL: https://svnweb.freebsd.org/changeset/ports/442938 Log: MFH: r439402, r440689, r442915 Update to 3.5.13 (without switch to libidn2). Approved by: ports-secteam (zi) Security: https://gnutls.org/security.html#GNUTLS-SA-2017-4 Modified: branches/2017Q2/security/gnutls/Makefile branches/2017Q2/security/gnutls/distinfo branches/2017Q2/security/gnutls/pkg-plist Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/security/gnutls/Makefile ============================================================================== --- branches/2017Q2/security/gnutls/Makefile Thu Jun 8 14:43:45 2017 (r442937) +++ branches/2017Q2/security/gnutls/Makefile Thu Jun 8 16:56:19 2017 (r442938) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gnutls -PORTVERSION= 3.5.9 +PORTVERSION= 3.5.13 CATEGORIES= security net MASTER_SITES= GNUPG/gnutls/v${PORTVERSION:R} @@ -34,7 +34,7 @@ INSTALL_TARGET= install-strip CPE_VENDOR= gnu -OPTIONS_DEFINE= DANE EXAMPLES IDN NLS P11KIT TPM ZLIB +OPTIONS_DEFINE= DANE DOCS EXAMPLES IDN NLS P11KIT TPM ZLIB OPTIONS_DEFAULT= IDN P11KIT TPM ZLIB OPTIONS_SUB= yes Modified: branches/2017Q2/security/gnutls/distinfo ============================================================================== --- branches/2017Q2/security/gnutls/distinfo Thu Jun 8 14:43:45 2017 (r442937) +++ branches/2017Q2/security/gnutls/distinfo Thu Jun 8 16:56:19 2017 (r442938) @@ -1,3 +1,3 @@ -TIMESTAMP = 1486998078 -SHA256 (gnutls-3.5.9.tar.xz) = 82b10f0c4ef18f4e64ad8cef5dbaf14be732f5095a41cf366b4ecb4050382951 -SIZE (gnutls-3.5.9.tar.xz) = 7166932 +TIMESTAMP = 1496917883 +SHA256 (gnutls-3.5.13.tar.xz) = 79f5480ad198dad5bc78e075f4a40c4a315a1b2072666919d2d05a08aec13096 +SIZE (gnutls-3.5.13.tar.xz) = 7226468 Modified: branches/2017Q2/security/gnutls/pkg-plist ============================================================================== --- branches/2017Q2/security/gnutls/pkg-plist Thu Jun 8 14:43:45 2017 (r442937) +++ branches/2017Q2/security/gnutls/pkg-plist Thu Jun 8 16:56:19 2017 (r442938) @@ -41,7 +41,7 @@ info/pkcs11-vision.png %%DANE%%lib/libgnutls-dane.so.0.4.1 lib/libgnutls.so lib/libgnutls.so.30 -lib/libgnutls.so.30.14.0 +lib/libgnutls.so.30.14.5 lib/libgnutlsxx.so lib/libgnutlsxx.so.28 lib/libgnutlsxx.so.28.1.0 @@ -1089,6 +1089,15 @@ man/man3/gnutls_x509_trust_list_remove_trust_mem.3.gz man/man3/gnutls_x509_trust_list_verify_crt.3.gz man/man3/gnutls_x509_trust_list_verify_crt2.3.gz man/man3/gnutls_x509_trust_list_verify_named_crt.3.gz +%%PORTDOCS%%%%DOCSDIR%%/gnutls-client-server-use-case.png +%%PORTDOCS%%%%DOCSDIR%%/gnutls-handshake-sequence.png +%%PORTDOCS%%%%DOCSDIR%%/gnutls-handshake-state.png +%%PORTDOCS%%%%DOCSDIR%%/gnutls-internals.png +%%PORTDOCS%%%%DOCSDIR%%/gnutls-layers.png +%%PORTDOCS%%%%DOCSDIR%%/gnutls-logo.png +%%PORTDOCS%%%%DOCSDIR%%/gnutls-modauth.png +%%PORTDOCS%%%%DOCSDIR%%/gnutls-x509.png +%%PORTDOCS%%%%DOCSDIR%%/pkcs11-vision.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-alert.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-cert-select-pkcs11.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-cert-select.c From owner-svn-ports-branches@freebsd.org Thu Jun 8 18:20:17 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8F572C31EF8; Thu, 8 Jun 2017 18:20:17 +0000 (UTC) (envelope-from zi@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 696E66830C; Thu, 8 Jun 2017 18:20:17 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v58IKGhg016479; Thu, 8 Jun 2017 18:20:16 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v58IKGtj016476; Thu, 8 Jun 2017 18:20:16 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201706081820.v58IKGtj016476@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Thu, 8 Jun 2017 18:20:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442947 - in branches/2017Q2/textproc/msort: . 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, 08 Jun 2017 18:20:17 -0000 Author: zi Date: Thu Jun 8 18:20:16 2017 New Revision: 442947 URL: https://svnweb.freebsd.org/changeset/ports/442947 Log: MFH: r441310 - Unbreak the build: the problem was caused by header file named `limits.h' present in the source tree which, with -I. option passed to the compiler, would sometimes be picked up instead of expected `/usr/include/limits.h'. Fix this by renaming local header file with a `${PORTNAME}_' prefix; - Convert CPPFLAGS/LDFLAGS/MAKE_ENV variables to USES+=localbase; - Rewrite condition expression in standard syntax to get rid of dependency on `shells/bash', and wrap an overly long line while I'm here. Approved by: ports-secteam (with hat) Added: branches/2017Q2/textproc/msort/files/patch-RegressionTests_RunTests.sh - copied unchanged from r441310, head/textproc/msort/files/patch-RegressionTests_RunTests.sh Modified: branches/2017Q2/textproc/msort/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/textproc/msort/Makefile ============================================================================== --- branches/2017Q2/textproc/msort/Makefile Thu Jun 8 18:10:31 2017 (r442946) +++ branches/2017Q2/textproc/msort/Makefile Thu Jun 8 18:20:16 2017 (r442947) @@ -17,22 +17,23 @@ LIB_DEPENDS= libtre.so:textproc/libtre \ libuninum.so:devel/libuninum \ libutf8proc.so:textproc/utf8proc RUN_DEPENDS= iwidgets>=0:x11-toolkits/iwidgets -TEST_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash BROKEN_aarch64= Fails to link: missing sbrk +USES= gettext localbase tk:wrapper,run CONFIGURE_ENV= ac_cv_lib_tre_regwcomp=yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ENV+= INCLUDES="-I${LOCALBASE}/include" GNU_CONFIGURE= yes -USES= gettext tk:wrapper,run TEST_TARGET= test PLIST_FILES= bin/msg bin/msort man/man1/msort.1.gz post-patch: - @${REINPLACE_CMD} -e "s|bash|${LOCALBASE}/bin/bash|g" ${WRKSRC}/RegressionTests/Makefile - @${REINPLACE_CMD} -e "s|msort|../&|g" ${WRKSRC}/RegressionTests/RunTests.sh \ + @${MV} ${WRKSRC}/limits.h ${WRKSRC}/${PORTNAME}_limits.h + @${REINPLACE_CMD} -e 's,limits\.h,${PORTNAME}_&,' \ + ${WRKSRC}/Makefile.in ${WRKSRC}/info.c \ + ${WRKSRC}/input.c ${WRKSRC}/msort.c + @${REINPLACE_CMD} -e 's|bash|sh|' ${WRKSRC}/RegressionTests/Makefile + @${REINPLACE_CMD} -e 's|msort|../&|' \ + ${WRKSRC}/RegressionTests/RunTests.sh .include Copied: branches/2017Q2/textproc/msort/files/patch-RegressionTests_RunTests.sh (from r441310, head/textproc/msort/files/patch-RegressionTests_RunTests.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/textproc/msort/files/patch-RegressionTests_RunTests.sh Thu Jun 8 18:20:16 2017 (r442947, copy of r441310, head/textproc/msort/files/patch-RegressionTests_RunTests.sh) @@ -0,0 +1,11 @@ +--- RegressionTests/RunTests.sh.orig 2009-08-05 03:09:24 UTC ++++ RegressionTests/RunTests.sh +@@ -54,7 +54,7 @@ msort -j -q -l -w -c n -Q < CheckOnlyTes + rstat2=$? + cmp -s CheckOnlyTest01B.result CheckOnlyTest01.norm + cstat2=$? +-if [[($rstat1 == 0) && ($cstat1 == 0) && ($cstat2 == 0) && ($rstat2 > 0)]]; ++if [ $rstat1 -eq 0 -a $cstat1 -eq 0 -a $cstat2 -eq 0 -a $rstat2 -gt 0 ]; + then echo "PASSED" >> TestResults; + else echo $'\x1b[1m\x1b[31mFAILED\x1b[0m' >> TestResults; + fi From owner-svn-ports-branches@freebsd.org Thu Jun 8 19:56: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 99241C78BF5; Thu, 8 Jun 2017 19:56:20 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 694B16F7D5; Thu, 8 Jun 2017 19:56:20 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v58JuJmX058146; Thu, 8 Jun 2017 19:56:19 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v58JuJ9C058144; Thu, 8 Jun 2017 19:56:19 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201706081956.v58JuJ9C058144@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 8 Jun 2017 19:56:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442954 - branches/2017Q2/misc/compat9x 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, 08 Jun 2017 19:56:20 -0000 Author: bapt Date: Thu Jun 8 19:56:19 2017 New Revision: 442954 URL: https://svnweb.freebsd.org/changeset/ports/442954 Log: MFH: r442942 by des Final version of compat9x after 9.3 EoL. Approved by: bapt (portmgr) Modified: branches/2017Q2/misc/compat9x/Makefile branches/2017Q2/misc/compat9x/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/misc/compat9x/Makefile ============================================================================== --- branches/2017Q2/misc/compat9x/Makefile Thu Jun 8 19:50:25 2017 (r442953) +++ branches/2017Q2/misc/compat9x/Makefile Thu Jun 8 19:56:19 2017 (r442954) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= compat9x -PORTVERSION= 9.3.903000.20161027 +PORTVERSION= 9.3.903000.20170608 CATEGORIES= misc MASTER_SITES= LOCAL/des PKGNAMESUFFIX= -${ARCH} Modified: branches/2017Q2/misc/compat9x/distinfo ============================================================================== --- branches/2017Q2/misc/compat9x/distinfo Thu Jun 8 19:50:25 2017 (r442953) +++ branches/2017Q2/misc/compat9x/distinfo Thu Jun 8 19:56:19 2017 (r442954) @@ -1,5 +1,5 @@ -TIMESTAMP = 1477583461 -SHA256 (compat9x-amd64-9.3.903000.20161027.tar.xz) = b18fa9463edb18ba0712b2f2f6ef6475472fed128b42ca983ac350d229d419d8 -SIZE (compat9x-amd64-9.3.903000.20161027.tar.xz) = 2910072 -SHA256 (compat9x-i386-9.3.903000.20161027.tar.xz) = b964c710bdfcc935b76049887910c90c0d5e7c1bca016778f0662340cbf40d75 -SIZE (compat9x-i386-9.3.903000.20161027.tar.xz) = 1524980 +TIMESTAMP = 1496942485 +SHA256 (compat9x-amd64-9.3.903000.20170608.tar.xz) = f52781a8f365dea14f0f0c2ae0f61c6981738b25b2be360ee9f68fb434d96736 +SIZE (compat9x-amd64-9.3.903000.20170608.tar.xz) = 2910468 +SHA256 (compat9x-i386-9.3.903000.20170608.tar.xz) = 78e164e43a3891b66b0309550a62a8310ab0eac7ef47598b10eabef6a233957d +SIZE (compat9x-i386-9.3.903000.20170608.tar.xz) = 1523716 From owner-svn-ports-branches@freebsd.org Thu Jun 8 19:57:13 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0272BC78C31; Thu, 8 Jun 2017 19:57:13 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C6F6D6F8B8; Thu, 8 Jun 2017 19:57:12 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v58JvBDo058325; Thu, 8 Jun 2017 19:57:11 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v58JvBEN058323; Thu, 8 Jun 2017 19:57:11 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201706081957.v58JvBEN058323@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 8 Jun 2017 19:57:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442955 - branches/2017Q2/misc/compat10x 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, 08 Jun 2017 19:57:13 -0000 Author: bapt Date: Thu Jun 8 19:57:11 2017 New Revision: 442955 URL: https://svnweb.freebsd.org/changeset/ports/442955 Log: MFH: r442943 by des Update to 10.3-RELEASE-p19. Approved by: bapt (portmgr) Modified: branches/2017Q2/misc/compat10x/Makefile branches/2017Q2/misc/compat10x/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/misc/compat10x/Makefile ============================================================================== --- branches/2017Q2/misc/compat10x/Makefile Thu Jun 8 19:56:19 2017 (r442954) +++ branches/2017Q2/misc/compat10x/Makefile Thu Jun 8 19:57:11 2017 (r442955) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= compat10x -PORTVERSION= 10.3.1003000.20161027 +PORTVERSION= 10.3.1003000.20170608 CATEGORIES= misc MASTER_SITES= LOCAL/des PKGNAMESUFFIX= -${ARCH} Modified: branches/2017Q2/misc/compat10x/distinfo ============================================================================== --- branches/2017Q2/misc/compat10x/distinfo Thu Jun 8 19:56:19 2017 (r442954) +++ branches/2017Q2/misc/compat10x/distinfo Thu Jun 8 19:57:11 2017 (r442955) @@ -1,5 +1,5 @@ -TIMESTAMP = 1477583491 -SHA256 (compat10x-amd64-10.3.1003000.20161027.tar.xz) = a089d703fba21917f3d93b9fa3d8de0b5de296cf5bffaac43002c2841b3815d5 -SIZE (compat10x-amd64-10.3.1003000.20161027.tar.xz) = 2402824 -SHA256 (compat10x-i386-10.3.1003000.20161027.tar.xz) = 42457ed7887afc574c4c5ac072924611e0a3184260387bf9d1bfbfe986774ed4 -SIZE (compat10x-i386-10.3.1003000.20161027.tar.xz) = 1236336 +TIMESTAMP = 1496942485 +SHA256 (compat10x-amd64-10.3.1003000.20170608.tar.xz) = 6a570a5b720a695a380eb487ecf9331bd90c1b2aee318b45d6308da6f048d758 +SIZE (compat10x-amd64-10.3.1003000.20170608.tar.xz) = 2403776 +SHA256 (compat10x-i386-10.3.1003000.20170608.tar.xz) = 05703f38e37a24d9bea17e97b570d55da3b68d5fa44ae533c4f41dd1dbd6b8f0 +SIZE (compat10x-i386-10.3.1003000.20170608.tar.xz) = 1236820 From owner-svn-ports-branches@freebsd.org Thu Jun 8 19:58: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 14378C78C67; Thu, 8 Jun 2017 19:58:22 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D6AA46F996; Thu, 8 Jun 2017 19:58:21 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v58JwKbN058515; Thu, 8 Jun 2017 19:58:20 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v58JwKqj058514; Thu, 8 Jun 2017 19:58:20 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201706081958.v58JwKqj058514@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 8 Jun 2017 19:58:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442956 - in branches/2017Q2/misc: . compat11x 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, 08 Jun 2017 19:58:22 -0000 Author: bapt Date: Thu Jun 8 19:58:20 2017 New Revision: 442956 URL: https://svnweb.freebsd.org/changeset/ports/442956 Log: MFH: r442944 by des New compat11x port based on 11.0-RELEASE-p10. Approved by: bapt (portmgr) Added: branches/2017Q2/misc/compat11x/ - copied from r442944, head/misc/compat11x/ Modified: branches/2017Q2/misc/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/misc/Makefile ============================================================================== --- branches/2017Q2/misc/Makefile Thu Jun 8 19:57:11 2017 (r442955) +++ branches/2017Q2/misc/Makefile Thu Jun 8 19:58:20 2017 (r442956) @@ -45,6 +45,7 @@ SUBDIR += colortail SUBDIR += colwide SUBDIR += compat10x + SUBDIR += compat11x SUBDIR += compat4x SUBDIR += compat5x SUBDIR += compat6x From owner-svn-ports-branches@freebsd.org Thu Jun 8 23:07: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 CF1DFD860F1; Thu, 8 Jun 2017 23:07: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 A08B6756E3; Thu, 8 Jun 2017 23:07:06 +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 v58N752T036247; Thu, 8 Jun 2017 23:07:05 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v58N75aA036242; Thu, 8 Jun 2017 23:07:05 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201706082307.v58N75aA036242@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, 8 Jun 2017 23:07:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442961 - in branches/2017Q2/security/libgcrypt: . 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, 08 Jun 2017 23:07:06 -0000 Author: cpm Date: Thu Jun 8 23:07:05 2017 New Revision: 442961 URL: https://svnweb.freebsd.org/changeset/ports/442961 Log: MFH: r442829 security/libgcrypt: update to 1.7.7 - Update libgcrypt to 1.7.7 - Silence all explicitly called commands - Update WWW in pkg-descr: use https:// - Bump library version in pkg-plist Noteworthy changes in version 1.7.7 * Bug fixes: - Fix possible timing attack on EdDSA session key. - Fix long standing bug in secure memory implementation which could lead to a segv on free. [bug#3027]. PR: 219747 Exp-run by: antoine Approved by: ports-secteam (zi) Modified: branches/2017Q2/security/libgcrypt/Makefile branches/2017Q2/security/libgcrypt/distinfo branches/2017Q2/security/libgcrypt/files/extra-patch-aarch64 branches/2017Q2/security/libgcrypt/pkg-descr branches/2017Q2/security/libgcrypt/pkg-plist Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/security/libgcrypt/Makefile ============================================================================== --- branches/2017Q2/security/libgcrypt/Makefile Thu Jun 8 21:52:56 2017 (r442960) +++ branches/2017Q2/security/libgcrypt/Makefile Thu Jun 8 23:07:05 2017 (r442961) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libgcrypt -PORTVERSION= 1.7.6 +PORTVERSION= 1.7.7 CATEGORIES= security MASTER_SITES= GNUPG @@ -42,14 +42,14 @@ CONFIGURE_ARGS+= --disable-asm .endif post-patch: - ${RM} ${WRKSRC}/doc/gcrypt.info* - ${REINPLACE_CMD} -e 's|ALIGN (3)|ALIGN (2)|g' ${WRKSRC}/mpi/i386/*.S + @${RM} ${WRKSRC}/doc/gcrypt.info* + @${REINPLACE_CMD} -e 's|ALIGN (3)|ALIGN (2)|g' ${WRKSRC}/mpi/i386/*.S post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .include Modified: branches/2017Q2/security/libgcrypt/distinfo ============================================================================== --- branches/2017Q2/security/libgcrypt/distinfo Thu Jun 8 21:52:56 2017 (r442960) +++ branches/2017Q2/security/libgcrypt/distinfo Thu Jun 8 23:07:05 2017 (r442961) @@ -1,3 +1,3 @@ -TIMESTAMP = 1485172752 -SHA256 (libgcrypt-1.7.6.tar.bz2) = 626aafee84af9d2ce253d2c143dc1c0902dda045780cc241f39970fc60be05bc -SIZE (libgcrypt-1.7.6.tar.bz2) = 2897695 +TIMESTAMP = 1496487630 +SHA256 (libgcrypt-1.7.7.tar.bz2) = b9b85eba0793ea3e6e66b896eb031fa05e1a4517277cc9ab10816b359254cd9a +SIZE (libgcrypt-1.7.7.tar.bz2) = 2861190 Modified: branches/2017Q2/security/libgcrypt/files/extra-patch-aarch64 ============================================================================== --- branches/2017Q2/security/libgcrypt/files/extra-patch-aarch64 Thu Jun 8 21:52:56 2017 (r442960) +++ branches/2017Q2/security/libgcrypt/files/extra-patch-aarch64 Thu Jun 8 23:07:05 2017 (r442961) @@ -58,11 +58,11 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE( [[__asm__( - ".arch armv8-a+crypto\n\t" -+ ".cpu generic+simd\n\t" ++ ".cpu generic+simd\n\t" + -+ "mov w0, \#42;\n\t" -+ "dup v0.8b, w0;\n\t" -+ "ld4 {v0.8b,v1.8b,v2.8b,v3.8b},[x0],\#32;\n\t" ++ "mov w0, \#42;\n\t" ++ "dup v0.8b, w0;\n\t" ++ "ld4 {v0.8b,v1.8b,v2.8b,v3.8b},[x0],\#32;\n\t" "sha1h s0, s0;\n\t" "sha1c q0, s0, v0.4s;\n\t" Modified: branches/2017Q2/security/libgcrypt/pkg-descr ============================================================================== --- branches/2017Q2/security/libgcrypt/pkg-descr Thu Jun 8 21:52:56 2017 (r442960) +++ branches/2017Q2/security/libgcrypt/pkg-descr Thu Jun 8 23:07:05 2017 (r442961) @@ -1,3 +1,3 @@ Libgcrypt is a general purpose crypto library based on the code used in GnuPG. -WWW: http://www.gnupg.org/ +WWW: https://www.gnupg.org/ Modified: branches/2017Q2/security/libgcrypt/pkg-plist ============================================================================== --- branches/2017Q2/security/libgcrypt/pkg-plist Thu Jun 8 21:52:56 2017 (r442960) +++ branches/2017Q2/security/libgcrypt/pkg-plist Thu Jun 8 23:07:05 2017 (r442961) @@ -6,6 +6,6 @@ include/gcrypt.h lib/libgcrypt.a lib/libgcrypt.so lib/libgcrypt.so.20 -lib/libgcrypt.so.20.1.6 +lib/libgcrypt.so.20.1.7 man/man1/hmac256.1.gz share/aclocal/libgcrypt.m4 From owner-svn-ports-branches@freebsd.org Fri Jun 9 13:55:40 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 AA30FBF53C9; Fri, 9 Jun 2017 13:55:40 +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 863D8685F5; Fri, 9 Jun 2017 13:55:40 +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 v59Dtdjh000225; Fri, 9 Jun 2017 13:55:39 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v59DtdmY000221; Fri, 9 Jun 2017 13:55:39 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201706091355.v59DtdmY000221@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 9 Jun 2017 13:55:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442990 - in branches/2017Q2/irc/anope: . 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, 09 Jun 2017 13:55:40 -0000 Author: feld Date: Fri Jun 9 13:55:39 2017 New Revision: 442990 URL: https://svnweb.freebsd.org/changeset/ports/442990 Log: MFH: r442989 irc/anope: Update to 2.0.5 Modernize port options Fix building with MySQL Add new REDIS option Changelog: https://github.com/anope/anope/blob/a9bf2518864a6919f7e1217016c9dec3a3b08323/docs/Changes Approved by: ports-secteam (with hat) Modified: branches/2017Q2/irc/anope/Makefile branches/2017Q2/irc/anope/distinfo branches/2017Q2/irc/anope/files/patch-CMakeLists.txt branches/2017Q2/irc/anope/pkg-plist Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/irc/anope/Makefile ============================================================================== --- branches/2017Q2/irc/anope/Makefile Fri Jun 9 13:55:01 2017 (r442989) +++ branches/2017Q2/irc/anope/Makefile Fri Jun 9 13:55:39 2017 (r442990) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= anope -PORTVERSION= 2.0.2 -PORTREVISION= 2 +PORTVERSION= 2.0.5 +PORTREVISION= 0 CATEGORIES= irc MAINTAINER= feld@FreeBSD.org @@ -13,7 +13,7 @@ LICENSE= GPLv2 USES= cmake:outsource shebangfix CMAKE_ARGS+= -DINSTDIR:STRING="${LOCALBASE}/anope" -CPPFLAGS+= "-I${LOCALBASE}/include" +CXXFLAGS+= "-I${LOCALBASE}/include" LDFLAGS+= "-L${LOCALBASE}/lib" SHEBANG_FILES= ${WRKSRC}/src/tools/*.sh @@ -23,83 +23,34 @@ USE_RC_SUBR= anope SUB_FILES= pkg-message -OPTIONS_DEFINE= GNUTLS LDAP MYSQL NLS OPENSSL PCRE POSIX SASL SQLITE STATS TRE +OPTIONS_DEFINE= GNUTLS LDAP MYSQL NLS OPENSSL PCRE POSIX REDIS SASL SQLITE STATS TRE OPTIONS_DEFAULT= MYSQL OPENSSL POSIX +OPTIONS_SUB= yes POSIX_DESC= POSIX Regex Module STATS_DESC= Channel Statistics Module TRE_DESC= Tre Regex Module -NLS_USES= gettext +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls -.include +LDAP_VARS_ON= USE_OPENLDAP=yes -.if ${PORT_OPTIONS:MGNUTLS} -PLIST_SUB+= GNUTLS="" -LIB_DEPENDS+= libgnutls.so:security/gnutls -.else -PLIST_SUB+= GNUTLS="@comment " -.endif +MYSQL_USES= mysql -.if ${PORT_OPTIONS:MLDAP} -PLIST_SUB+= LDAP="" -USE_OPENLDAP= yes -.else -PLIST_SUB+= LDAP="@comment " -.endif +NLS_USES= gettext -.if ${PORT_OPTIONS:MMYSQL} -PLIST_SUB+= MYSQL="" -USE_MYSQL= yes -.else -PLIST_SUB+= MYSQL="@comment " -.endif +OPENSSL_USES= ssl -.if ${PORT_OPTIONS:MOPENSSL} -PLIST_SUB+= OPENSSL="" -USES+= ssl -.else -PLIST_SUB+= OPENSSL="@comment " -.endif +REDIS_RUN_DEPENDS= redis:databases/redis -.if ${PORT_OPTIONS:MPCRE} -PLIST_SUB+= PCRE="" -LIB_DEPENDS+= libpcre.so:devel/pcre -.else -PLIST_SUB+= PCRE="@comment " -.endif +PCRE_LIB_DEPENDS= libpcre.so:devel/pcre -.if ${PORT_OPTIONS:MPOSIX} -PLIST_SUB+= POSIX="" -.else -PLIST_SUB+= POSIX="@comment " -.endif +SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -.if ${PORT_OPTIONS:MSASL} -PLIST_SUB+= SASL="" -LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2 -.else -PLIST_SUB+= SASL="@comment " -.endif +SQLITE_USES= sqlite -.if ${PORT_OPTIONS:MSQLITE} -PLIST_SUB+= SQLITE="" -USES+= sqlite -.else -PLIST_SUB+= SQLITE="@comment " -.endif +TRE_LIB_DEPENDS= libtre.so:textproc/libtre -.if ${PORT_OPTIONS:MSTATS} -PLIST_SUB+= STATS="" -.else -PLIST_SUB+= STATS="@comment " -.endif - -.if ${PORT_OPTIONS:MTRE} -PLIST_SUB+= TRE="" -LIB_DEPENDS+= libtre.so:textproc/libtre -.else -PLIST_SUB+= TRE="@comment " -.endif +.include .include Modified: branches/2017Q2/irc/anope/distinfo ============================================================================== --- branches/2017Q2/irc/anope/distinfo Fri Jun 9 13:55:01 2017 (r442989) +++ branches/2017Q2/irc/anope/distinfo Fri Jun 9 13:55:39 2017 (r442990) @@ -1,2 +1,3 @@ -SHA256 (anope-anope-2.0.2_GH0.tar.gz) = 15e041bf3ebe0c86002e41162e98beb9276a910ef43628c46b58ae0a230401e2 -SIZE (anope-anope-2.0.2_GH0.tar.gz) = 1764564 +TIMESTAMP = 1497014744 +SHA256 (anope-anope-2.0.5_GH0.tar.gz) = acfaa189b05a08108838dcdd6dc6c445cc437861911a7c922599eb7b862f3109 +SIZE (anope-anope-2.0.5_GH0.tar.gz) = 1779920 Modified: branches/2017Q2/irc/anope/files/patch-CMakeLists.txt ============================================================================== --- branches/2017Q2/irc/anope/files/patch-CMakeLists.txt Fri Jun 9 13:55:01 2017 (r442989) +++ branches/2017Q2/irc/anope/files/patch-CMakeLists.txt Fri Jun 9 13:55:39 2017 (r442990) @@ -1,27 +1,24 @@ ---- CMakeLists.txt.orig 2015-03-22 19:34:50 UTC +--- CMakeLists.txt.orig 2017-06-09 13:48:41 UTC +++ CMakeLists.txt -@@ -485,17 +485,17 @@ get_target_property(SERVICES_BINARY ${PR +@@ -489,16 +489,16 @@ get_target_property(SERVICES_BINARY ${PR get_filename_component(SERVICES_BINARY ${SERVICES_BINARY} NAME) # At install time, create the following additional directories --install(CODE "file(MAKE_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/${DB_DIR}/backups\")") --install(CODE "file(MAKE_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/${LOGS_DIR}\")") -+#install(CODE "file(MAKE_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/${DB_DIR}/backups\")") -+#install(CODE "file(MAKE_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/${LOGS_DIR}\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${DB_DIR}/backups\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${LOGS_DIR}\")") ++#install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${DB_DIR}/backups\")") ++#install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${LOGS_DIR}\")") if(WIN32) - install(CODE "file(MAKE_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/${DB_DIR}/runtime\")") + install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${DB_DIR}/runtime\")") endif(WIN32) # On non-Windows platforms, if RUNGROUP is set, change the permissions of the below directories, as well as the group of the data directory --if(NOT WIN32 AND RUNGROUP) -- install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\${CMAKE_INSTALL_PREFIX}/\${DB_DIR}/backups\")") -- install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\${CMAKE_INSTALL_PREFIX}/\${LOGS_DIR}\")") -- install(CODE "execute_process(COMMAND ${CHGRP} -R ${RUNGROUP} \"\${CMAKE_INSTALL_PREFIX}\")") --endif(NOT WIN32 AND RUNGROUP) -+#if(NOT WIN32 AND RUNGROUP) -+# install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\${CMAKE_INSTALL_PREFIX}/\${DB_DIR}/backups\")") -+# install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\${CMAKE_INSTALL_PREFIX}/\${LOGS_DIR}\")") -+# install(CODE "execute_process(COMMAND ${CHGRP} -R ${RUNGROUP} \"\${CMAKE_INSTALL_PREFIX}\")") -+#endif(NOT WIN32 AND RUNGROUP) + if(NOT WIN32 AND RUNGROUP) +- install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${DB_DIR}/backups\")") +- install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${LOGS_DIR}\")") +- install(CODE "execute_process(COMMAND ${CHGRP} -R ${RUNGROUP} \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\")") ++# install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${DB_DIR}/backups\")") ++# install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${LOGS_DIR}\")") ++# install(CODE "execute_process(COMMAND ${CHGRP} -R ${RUNGROUP} \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\")") + endif(NOT WIN32 AND RUNGROUP) # On Windows platforms, install extra files if(WIN32) - install(FILES ${Anope_SOURCE_DIR}/src/win32/anope.bat Modified: branches/2017Q2/irc/anope/pkg-plist ============================================================================== --- branches/2017Q2/irc/anope/pkg-plist Fri Jun 9 13:55:01 2017 (r442989) +++ branches/2017Q2/irc/anope/pkg-plist Fri Jun 9 13:55:39 2017 (r442990) @@ -202,21 +202,22 @@ anope/lib/modules/os_sxline.so anope/lib/modules/os_update.so anope/lib/modules/plexus.so anope/lib/modules/ratbox.so +anope/lib/modules/unreal4.so anope/lib/modules/unreal.so anope/lib/modules/webcpanel.so -anope/locale/ca_ES/LC_MESSAGES/anope.mo -anope/locale/de_DE/LC_MESSAGES/anope.mo -anope/locale/el_GR/LC_MESSAGES/anope.mo -anope/locale/en_US/LC_MESSAGES/anope.mo -anope/locale/es_ES/LC_MESSAGES/anope.mo -anope/locale/fr_FR/LC_MESSAGES/anope.mo -anope/locale/hu_HU/LC_MESSAGES/anope.mo -anope/locale/it_IT/LC_MESSAGES/anope.mo -anope/locale/nl_NL/LC_MESSAGES/anope.mo -anope/locale/pl_PL/LC_MESSAGES/anope.mo -anope/locale/pt_PT/LC_MESSAGES/anope.mo -anope/locale/ru_RU/LC_MESSAGES/anope.mo -anope/locale/tr_TR/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/ca_ES/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/de_DE/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/el_GR/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/en_US/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/es_ES/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/fr_FR/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/hu_HU/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/it_IT/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/nl_NL/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/pl_PL/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/pt_PT/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/ru_RU/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/tr_TR/LC_MESSAGES/anope.mo @dir(nobody,,) anope/data/backups @dir(nobody,,) anope/data @dir(nobody,,) anope/logs From owner-svn-ports-branches@freebsd.org Fri Jun 9 14:14: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 B7526BF59C4; Fri, 9 Jun 2017 14:14:26 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B50696A200; Fri, 9 Jun 2017 14:14:25 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v59EEO12009384; Fri, 9 Jun 2017 14:14:24 GMT (envelope-from miwi@FreeBSD.org) Received: (from miwi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v59EEO2T009382; Fri, 9 Jun 2017 14:14:24 GMT (envelope-from miwi@FreeBSD.org) Message-Id: <201706091414.v59EEO2T009382@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: miwi set sender to miwi@FreeBSD.org using -f From: Martin Wilke Date: Fri, 9 Jun 2017 14:14:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442993 - in branches/2017Q2/french: . wordpress X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Jun 2017 14:14:26 -0000 Author: miwi Date: Fri Jun 9 14:14:24 2017 New Revision: 442993 URL: https://svnweb.freebsd.org/changeset/ports/442993 Log: MFH: r439030 r439052 - Repocopy www/wordpress -> french/wordpress PR: 218161 Submitted by: joneum@bsdproject.de - Fix sanity check by adding correct category Reported by: dan@ Approved by: ports-secteam (myself) Added: branches/2017Q2/french/wordpress/ - copied from r439030, head/french/wordpress/ Modified: branches/2017Q2/french/Makefile branches/2017Q2/french/wordpress/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/french/Makefile ============================================================================== --- branches/2017Q2/french/Makefile Fri Jun 9 14:09:04 2017 (r442992) +++ branches/2017Q2/french/Makefile Fri Jun 9 14:14:24 2017 (r442993) @@ -22,5 +22,6 @@ SUBDIR += php_doc SUBDIR += trytond28_account_fr SUBDIR += verbiste + SUBDIR += wordpress .include Modified: branches/2017Q2/french/wordpress/Makefile ============================================================================== --- head/french/wordpress/Makefile Fri Apr 21 08:50:21 2017 (r439030) +++ branches/2017Q2/french/wordpress/Makefile Fri Jun 9 14:14:24 2017 (r442993) @@ -5,7 +5,7 @@ PORTNAME= wordpress PORTVERSION= 4.7.3 PORTEPOCH= 1 DISTVERSIONSUFFIX= -fr_FR -CATEGORIES= www +CATEGORIES= french www MASTER_SITES= http://fr.wordpress.org/ MAINTAINER= joneum@bsdproject.de From owner-svn-ports-branches@freebsd.org Fri Jun 9 14:25: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 0DEDCBF5D93; Fri, 9 Jun 2017 14:25:38 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DBE046AA2B; Fri, 9 Jun 2017 14:25:37 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v59EPafv013875; Fri, 9 Jun 2017 14:25:36 GMT (envelope-from miwi@FreeBSD.org) Received: (from miwi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v59EPZhh013861; Fri, 9 Jun 2017 14:25:35 GMT (envelope-from miwi@FreeBSD.org) Message-Id: <201706091425.v59EPZhh013861@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: miwi set sender to miwi@FreeBSD.org using -f From: Martin Wilke Date: Fri, 9 Jun 2017 14:25:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442996 - in branches/2017Q2: chinese/wordpress-zh_CN chinese/wordpress-zh_TW french/wordpress german/wordpress japanese/wordpress russian/wordpress www/wordpress X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Jun 2017 14:25:38 -0000 Author: miwi Date: Fri Jun 9 14:25:35 2017 New Revision: 442996 URL: https://svnweb.freebsd.org/changeset/ports/442996 Log: MFH: r439350 r439360 r441445 - Update to 4.7.4 - Switch to php7 Changelog: https://wordpress.org/news/2017/04/wordpress-4-7-4/ Submitted by: maintainer via irc - Revert the php7 switch, we can't force users to switch to php7 yet. - Update the Wordpress ports to 4.7.5 - Changes: https://wordpress.org/news/2017/05/wordpress-4-7-5/ Approved by: miwi (mentor) Security: http://vuxml.freebsd.org/freebsd/a5bb7ea0-3e58-11e7-94a2-00e04c1ea73d.html Differential Revision: https://reviews.freebsd.org/D10848 Approved by: ports-secteam (myself) Modified: branches/2017Q2/chinese/wordpress-zh_CN/Makefile branches/2017Q2/chinese/wordpress-zh_CN/distinfo branches/2017Q2/chinese/wordpress-zh_TW/Makefile branches/2017Q2/chinese/wordpress-zh_TW/distinfo branches/2017Q2/french/wordpress/Makefile branches/2017Q2/french/wordpress/distinfo branches/2017Q2/german/wordpress/Makefile branches/2017Q2/german/wordpress/distinfo branches/2017Q2/japanese/wordpress/Makefile branches/2017Q2/japanese/wordpress/distinfo branches/2017Q2/russian/wordpress/Makefile branches/2017Q2/russian/wordpress/distinfo branches/2017Q2/www/wordpress/Makefile branches/2017Q2/www/wordpress/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/chinese/wordpress-zh_CN/Makefile ============================================================================== --- branches/2017Q2/chinese/wordpress-zh_CN/Makefile Fri Jun 9 14:18:17 2017 (r442995) +++ branches/2017Q2/chinese/wordpress-zh_CN/Makefile Fri Jun 9 14:25:35 2017 (r442996) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7.3 +PORTVERSION= 4.7.4 DISTVERSIONSUFFIX= -zh_CN CATEGORIES= chinese www MASTER_SITES= http://cn.wordpress.org/ Modified: branches/2017Q2/chinese/wordpress-zh_CN/distinfo ============================================================================== --- branches/2017Q2/chinese/wordpress-zh_CN/distinfo Fri Jun 9 14:18:17 2017 (r442995) +++ branches/2017Q2/chinese/wordpress-zh_CN/distinfo Fri Jun 9 14:25:35 2017 (r442996) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488888068 -SHA256 (wordpress-4.7.3-zh_CN.tar.gz) = 2bdcd0d23ab12e86c5bcb8cfe30acd658dae2bfae95af7917d09f646db01bbf8 -SIZE (wordpress-4.7.3-zh_CN.tar.gz) = 8473348 +TIMESTAMP = 1493060658 +SHA256 (wordpress-4.7.4-zh_CN.tar.gz) = 2a0dfc19aebee9a0f8fd501e6435407cb4f6addb6e6a47003201088f910ddcad +SIZE (wordpress-4.7.4-zh_CN.tar.gz) = 8507412 Modified: branches/2017Q2/chinese/wordpress-zh_TW/Makefile ============================================================================== --- branches/2017Q2/chinese/wordpress-zh_TW/Makefile Fri Jun 9 14:18:17 2017 (r442995) +++ branches/2017Q2/chinese/wordpress-zh_TW/Makefile Fri Jun 9 14:25:35 2017 (r442996) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7.3 +PORTVERSION= 4.7.4 DISTVERSIONSUFFIX= -zh_TW CATEGORIES= chinese www MASTER_SITES= http://tw.wordpress.org/ Modified: branches/2017Q2/chinese/wordpress-zh_TW/distinfo ============================================================================== --- branches/2017Q2/chinese/wordpress-zh_TW/distinfo Fri Jun 9 14:18:17 2017 (r442995) +++ branches/2017Q2/chinese/wordpress-zh_TW/distinfo Fri Jun 9 14:25:35 2017 (r442996) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488888311 -SHA256 (wordpress-4.7.3-zh_TW.tar.gz) = 059fe1e62ae35016a58c2b1d3fc8dd444143901cc80c1046042f0d06b6e086df -SIZE (wordpress-4.7.3-zh_TW.tar.gz) = 8459452 +TIMESTAMP = 1493061006 +SHA256 (wordpress-4.7.4-zh_TW.tar.gz) = 735745684249be7bcefc12da3eeac6e9043ee6566746471b01045423f3cbdf81 +SIZE (wordpress-4.7.4-zh_TW.tar.gz) = 8495717 Modified: branches/2017Q2/french/wordpress/Makefile ============================================================================== --- branches/2017Q2/french/wordpress/Makefile Fri Jun 9 14:18:17 2017 (r442995) +++ branches/2017Q2/french/wordpress/Makefile Fri Jun 9 14:25:35 2017 (r442996) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7.3 +PORTVERSION= 4.7.5 PORTEPOCH= 1 DISTVERSIONSUFFIX= -fr_FR CATEGORIES= french www Modified: branches/2017Q2/french/wordpress/distinfo ============================================================================== --- branches/2017Q2/french/wordpress/distinfo Fri Jun 9 14:18:17 2017 (r442995) +++ branches/2017Q2/french/wordpress/distinfo Fri Jun 9 14:25:35 2017 (r442996) @@ -1,3 +1,3 @@ -TIMESTAMP = 1492764444 -SHA256 (wordpress-4.7.3-fr_FR.tar.gz) = 43b017da95f6e3763affaba53ef9d67282f99082dca93d7c34e85aee8b883f59 -SIZE (wordpress-4.7.3-fr_FR.tar.gz) = 8488876 +TIMESTAMP = 1495394825 +SHA256 (wordpress-4.7.5-fr_FR.tar.gz) = d4be08c0a155165afff9fe51242a1429d68e8053e84df0255778f5224c45f705 +SIZE (wordpress-4.7.5-fr_FR.tar.gz) = 8509383 Modified: branches/2017Q2/german/wordpress/Makefile ============================================================================== --- branches/2017Q2/german/wordpress/Makefile Fri Jun 9 14:18:17 2017 (r442995) +++ branches/2017Q2/german/wordpress/Makefile Fri Jun 9 14:25:35 2017 (r442996) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7.3 +PORTVERSION= 4.7.5 DISTVERSIONSUFFIX= -de_DE CATEGORIES= german www MASTER_SITES= http://de.wordpress.org/ Modified: branches/2017Q2/german/wordpress/distinfo ============================================================================== --- branches/2017Q2/german/wordpress/distinfo Fri Jun 9 14:18:17 2017 (r442995) +++ branches/2017Q2/german/wordpress/distinfo Fri Jun 9 14:25:35 2017 (r442996) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488888516 -SHA256 (wordpress-4.7.3-de_DE.tar.gz) = fc283b14903243a3edbf976cdbd1ff134691bc1ff2fd4bc3bca3053163256f42 -SIZE (wordpress-4.7.3-de_DE.tar.gz) = 8484875 +TIMESTAMP = 1495394579 +SHA256 (wordpress-4.7.5-de_DE.tar.gz) = d783ccab832886eab80fcf8c1432f1208f3b99d1d61788118e5affb2fb75c8f5 +SIZE (wordpress-4.7.5-de_DE.tar.gz) = 8509552 Modified: branches/2017Q2/japanese/wordpress/Makefile ============================================================================== --- branches/2017Q2/japanese/wordpress/Makefile Fri Jun 9 14:18:17 2017 (r442995) +++ branches/2017Q2/japanese/wordpress/Makefile Fri Jun 9 14:25:35 2017 (r442996) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7.3 +PORTVERSION= 4.7.5 DISTVERSIONSUFFIX= -ja CATEGORIES= japanese www MASTER_SITES= http://ja.wordpress.org/ Modified: branches/2017Q2/japanese/wordpress/distinfo ============================================================================== --- branches/2017Q2/japanese/wordpress/distinfo Fri Jun 9 14:18:17 2017 (r442995) +++ branches/2017Q2/japanese/wordpress/distinfo Fri Jun 9 14:25:35 2017 (r442996) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488888653 -SHA256 (wordpress-4.7.3-ja.tar.gz) = ce7f35a7a2b8af9416595d3a24fac3b2dcbb26237a4c02881fb1741444969670 -SIZE (wordpress-4.7.3-ja.tar.gz) = 8481247 +TIMESTAMP = 1495394837 +SHA256 (wordpress-4.7.5-ja.tar.gz) = a6c346f3ab2343fced62ff51f045d769632e661ac5e7af5ea15571764354d2f2 +SIZE (wordpress-4.7.5-ja.tar.gz) = 8500101 Modified: branches/2017Q2/russian/wordpress/Makefile ============================================================================== --- branches/2017Q2/russian/wordpress/Makefile Fri Jun 9 14:18:17 2017 (r442995) +++ branches/2017Q2/russian/wordpress/Makefile Fri Jun 9 14:25:35 2017 (r442996) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7.3 +PORTVERSION= 4.7.4 DISTVERSIONSUFFIX= -ru_RU CATEGORIES= russian www MASTER_SITES= http://ru.wordpress.org/ Modified: branches/2017Q2/russian/wordpress/distinfo ============================================================================== --- branches/2017Q2/russian/wordpress/distinfo Fri Jun 9 14:18:17 2017 (r442995) +++ branches/2017Q2/russian/wordpress/distinfo Fri Jun 9 14:25:35 2017 (r442996) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488850418 -SHA256 (wordpress-4.7.3-ru_RU.tar.gz) = eb4db4c04d83e65dae08816515f58c7f4035efbffc2580bf770f274278be6515 -SIZE (wordpress-4.7.3-ru_RU.tar.gz) = 8519538 +TIMESTAMP = 1493061472 +SHA256 (wordpress-4.7.4-ru_RU.tar.gz) = 793dc0c3637ff9fc3827c5b2f6d19198df0c3d8463e9f0f775884becd08d0459 +SIZE (wordpress-4.7.4-ru_RU.tar.gz) = 8555533 Modified: branches/2017Q2/www/wordpress/Makefile ============================================================================== --- branches/2017Q2/www/wordpress/Makefile Fri Jun 9 14:18:17 2017 (r442995) +++ branches/2017Q2/www/wordpress/Makefile Fri Jun 9 14:25:35 2017 (r442996) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7.3 +PORTVERSION= 4.7.5 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://wordpress.org/ Modified: branches/2017Q2/www/wordpress/distinfo ============================================================================== --- branches/2017Q2/www/wordpress/distinfo Fri Jun 9 14:18:17 2017 (r442995) +++ branches/2017Q2/www/wordpress/distinfo Fri Jun 9 14:25:35 2017 (r442996) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488881918 -SHA256 (wordpress-4.7.3.tar.gz) = e715069fdab049ec668cd74e57cabcb23583dc4a84c5e330c430cbe8998f6d89 -SIZE (wordpress-4.7.3.tar.gz) = 8008833 +TIMESTAMP = 1495394613 +SHA256 (wordpress-4.7.5.tar.gz) = 95af89101db8efea48711b7cc169c2a7440a2fba17eee1a057f442091cdec01b +SIZE (wordpress-4.7.5.tar.gz) = 8037036 From owner-svn-ports-branches@freebsd.org Fri Jun 9 14:32:15 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 B9448BF5FAB; Fri, 9 Jun 2017 14:32:15 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8791D6AE23; Fri, 9 Jun 2017 14:32:15 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v59EWERO018253; Fri, 9 Jun 2017 14:32:14 GMT (envelope-from miwi@FreeBSD.org) Received: (from miwi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v59EWEDP018252; Fri, 9 Jun 2017 14:32:14 GMT (envelope-from miwi@FreeBSD.org) Message-Id: <201706091432.v59EWEDP018252@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: miwi set sender to miwi@FreeBSD.org using -f From: Martin Wilke Date: Fri, 9 Jun 2017 14:32:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442997 - branches/2017Q2/russian/wordpress X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Jun 2017 14:32:15 -0000 Author: miwi Date: Fri Jun 9 14:32:14 2017 New Revision: 442997 URL: https://svnweb.freebsd.org/changeset/ports/442997 Log: MFH: r441244 Update to 4.7.5 Changes: https://wordpress.org/news/2017/05/wordpress-4-7-5/ PR: 219368 Submitted by: Mikhail Timofeev <9267096@gmail.com> (maintainer) Security: http://vuxml.freebsd.org/freebsd/a5bb7ea0-3e58-11e7-94a2-00e04c1ea73d.html Approved by: ports-secteam (myself) Modified: branches/2017Q2/russian/wordpress/Makefile branches/2017Q2/russian/wordpress/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/russian/wordpress/Makefile ============================================================================== --- branches/2017Q2/russian/wordpress/Makefile Fri Jun 9 14:25:35 2017 (r442996) +++ branches/2017Q2/russian/wordpress/Makefile Fri Jun 9 14:32:14 2017 (r442997) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7.4 +PORTVERSION= 4.7.5 DISTVERSIONSUFFIX= -ru_RU CATEGORIES= russian www MASTER_SITES= http://ru.wordpress.org/ Modified: branches/2017Q2/russian/wordpress/distinfo ============================================================================== --- branches/2017Q2/russian/wordpress/distinfo Fri Jun 9 14:25:35 2017 (r442996) +++ branches/2017Q2/russian/wordpress/distinfo Fri Jun 9 14:32:14 2017 (r442997) @@ -1,3 +1,3 @@ -TIMESTAMP = 1493061472 -SHA256 (wordpress-4.7.4-ru_RU.tar.gz) = 793dc0c3637ff9fc3827c5b2f6d19198df0c3d8463e9f0f775884becd08d0459 -SIZE (wordpress-4.7.4-ru_RU.tar.gz) = 8555533 +TIMESTAMP = 1495076443 +SHA256 (wordpress-4.7.5-ru_RU.tar.gz) = 2313937dcad82b63d4058b358102252a6cbc04529b5307442d9f4b363d3cb0f8 +SIZE (wordpress-4.7.5-ru_RU.tar.gz) = 8545614 From owner-svn-ports-branches@freebsd.org Fri Jun 9 14:45: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 D74BDBF6422; Fri, 9 Jun 2017 14:45: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 A519C6E4CE; Fri, 9 Jun 2017 14:45:09 +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 v59Ej8WA022731; Fri, 9 Jun 2017 14:45:08 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v59Ej8G2022730; Fri, 9 Jun 2017 14:45:08 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201706091445.v59Ej8G2022730@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 9 Jun 2017 14:45:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443000 - in branches/2017Q2/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, 09 Jun 2017 14:45:09 -0000 Author: bdrewery Date: Fri Jun 9 14:45:08 2017 New Revision: 443000 URL: https://svnweb.freebsd.org/changeset/ports/443000 Log: MFH: r442999 Fix LDNS detection. This is the same fix made upstream as well. PR: 218472 Submitted by: leres@ee.lbl.gov Approved by: portmgr (implicit) Modified: branches/2017Q2/security/openssh-portable/Makefile branches/2017Q2/security/openssh-portable/files/patch-configure.ac Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/security/openssh-portable/Makefile ============================================================================== --- branches/2017Q2/security/openssh-portable/Makefile Fri Jun 9 14:44:19 2017 (r442999) +++ branches/2017Q2/security/openssh-portable/Makefile Fri Jun 9 14:45:08 2017 (r443000) @@ -3,7 +3,7 @@ PORTNAME= openssh DISTVERSION= 7.5p1 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= OPENBSD/OpenSSH/portable Modified: branches/2017Q2/security/openssh-portable/files/patch-configure.ac ============================================================================== --- branches/2017Q2/security/openssh-portable/files/patch-configure.ac Fri Jun 9 14:44:19 2017 (r442999) +++ branches/2017Q2/security/openssh-portable/files/patch-configure.ac Fri Jun 9 14:45:08 2017 (r443000) @@ -1,6 +1,14 @@ ---- configure.ac.intermediate 2016-02-03 22:06:00 UTC +--- configure.ac.orig 2017-04-08 02:15:16 UTC +++ configure.ac -@@ -1543,7 +1543,7 @@ AC_ARG_WITH([libedit], +@@ -1486,6 +1486,7 @@ AC_ARG_WITH(ldns, + else + LIBS="$LIBS `$LDNSCONFIG --libs`" + CPPFLAGS="$CPPFLAGS `$LDNSCONFIG --cflags`" ++ ldns=yes + fi + elif test "x$withval" != "xno" ; then + CPPFLAGS="$CPPFLAGS -I${withval}/include" +@@ -1544,7 +1545,7 @@ AC_ARG_WITH([libedit], LIBEDIT=`$PKGCONFIG --libs libedit` CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" else From owner-svn-ports-branches@freebsd.org Fri Jun 9 15:07:14 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BEC96BF6E4B; Fri, 9 Jun 2017 15:07:14 +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 5296B6FE48; Fri, 9 Jun 2017 15:07:14 +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 v59F7D20032400; Fri, 9 Jun 2017 15:07:13 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v59F7Dkd032397; Fri, 9 Jun 2017 15:07:13 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201706091507.v59F7Dkd032397@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 9 Jun 2017 15:07:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443006 - branches/2017Q2/www/bolt 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, 09 Jun 2017 15:07:14 -0000 Author: feld Date: Fri Jun 9 15:07:12 2017 New Revision: 443006 URL: https://svnweb.freebsd.org/changeset/ports/443006 Log: MFH: r443005 www/bolt: Update to 2.2.24 Fix pkg-plist's trailing spaces Improve pkg-descr Modernize Makefile Changelog: https://github.com/bolt/bolt/releases/tag/v2.2.24 Security: CVE-2016-10074 Approved by: ports-secteam (with hat) Modified: branches/2017Q2/www/bolt/Makefile branches/2017Q2/www/bolt/distinfo branches/2017Q2/www/bolt/pkg-message branches/2017Q2/www/bolt/pkg-plist Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/www/bolt/Makefile ============================================================================== --- branches/2017Q2/www/bolt/Makefile Fri Jun 9 15:06:38 2017 (r443005) +++ branches/2017Q2/www/bolt/Makefile Fri Jun 9 15:07:12 2017 (r443006) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bolt -PORTVERSION= 2.2.17 +PORTVERSION= 2.2.24 PORTREVISION= 0 CATEGORIES= www MASTER_SITES= https://bolt.cm/distribution/ @@ -12,10 +12,11 @@ COMMENT= Sophisticated, lightweight & simple CMS LICENSE= MIT +USES= php:web + NO_ARCH= yes NO_BUILD= yes USE_PHP= ctype curl dom gd json mbstring openssl simplexml tokenizer -WANT_PHP_WEB= yes PLIST_SUB+= WWWGRP=${WWWGRP} @@ -27,7 +28,7 @@ PGSQL_USE= PHP=pdo_pgsql SQLITE_USE= PHP=pdo_sqlite do-install: - ${INSTALL} -d -m 755 ${STAGEDIR}${WWWDIR}/ - ${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/ + ${INSTALL} -d -m 755 ${STAGEDIR}${WWWDIR} + (cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR}) .include Modified: branches/2017Q2/www/bolt/distinfo ============================================================================== --- branches/2017Q2/www/bolt/distinfo Fri Jun 9 15:06:38 2017 (r443005) +++ branches/2017Q2/www/bolt/distinfo Fri Jun 9 15:07:12 2017 (r443006) @@ -1,2 +1,3 @@ -SHA256 (bolt-2.2.17.tar.gz) = 2ad35176c8460efb314262e09b3b022cc851dcdc3deff07906a1a62eb78c32e0 -SIZE (bolt-2.2.17.tar.gz) = 10162834 +TIMESTAMP = 1497019252 +SHA256 (bolt-2.2.24.tar.gz) = eebd3511609875d7bc741372586c1f2d240bda7eea7d7be5ebc78c1902c5e75d +SIZE (bolt-2.2.24.tar.gz) = 10137860 Modified: branches/2017Q2/www/bolt/pkg-message ============================================================================== --- branches/2017Q2/www/bolt/pkg-message Fri Jun 9 15:06:38 2017 (r443005) +++ branches/2017Q2/www/bolt/pkg-message Fri Jun 9 15:07:12 2017 (r443006) @@ -1,7 +1,7 @@ +Bolt is a tool for Content Management, which strives to be as simple and +straightforward as possible. It is quick to set up, easy to configure, +uses elegant templates, and above all: It's a joy to use. Bolt is +created using modern open source libraries, and is best suited to build +sites in HTML5 with modern markup. - -Additional configuration documentation can be found at: - -https://docs.bolt.cm/installation - - +WWW: https://bolt.cm/ Modified: branches/2017Q2/www/bolt/pkg-plist ============================================================================== --- branches/2017Q2/www/bolt/pkg-plist Fri Jun 9 15:06:38 2017 (r443005) +++ branches/2017Q2/www/bolt/pkg-plist Fri Jun 9 15:07:12 2017 (r443006) @@ -1,5512 +1,5742 @@ -%%WWWDIR%%/.htaccess -%%WWWDIR%%/LICENSE.md -%%WWWDIR%%/README.md +%%WWWDIR%%/LICENSE.md +%%WWWDIR%%/README.md @group %%WWWGRP%% @mode 0775 -%%WWWDIR%%/app/bootstrap.php -%%WWWDIR%%/app/cache/index.html -%%WWWDIR%%/app/config/config.yml.dist -%%WWWDIR%%/app/config/contenttypes.yml.dist -%%WWWDIR%%/app/config/extensions/index.html -%%WWWDIR%%/app/config/menu.yml.dist -%%WWWDIR%%/app/config/permissions.yml.dist -%%WWWDIR%%/app/config/routing.yml.dist -%%WWWDIR%%/app/config/taxonomy.yml.dist +%%WWWDIR%%/app/bootstrap.php +%%WWWDIR%%/app/cache/index.html +%%WWWDIR%%/app/config/config.yml.dist +%%WWWDIR%%/app/config/contenttypes.yml.dist +%%WWWDIR%%/app/config/extensions/index.html +%%WWWDIR%%/app/config/menu.yml.dist +%%WWWDIR%%/app/config/permissions.yml.dist +%%WWWDIR%%/app/config/routing.yml.dist +%%WWWDIR%%/app/config/taxonomy.yml.dist +%%WWWDIR%%/app/legacy.php +%%WWWDIR%%/app/nut +%%WWWDIR%%/app/resources/translations/cs_CZ/contenttypes.cs_CZ.yml +%%WWWDIR%%/app/resources/translations/cs_CZ/infos.cs_CZ.yml +%%WWWDIR%%/app/resources/translations/cs_CZ/messages.cs_CZ.yml +%%WWWDIR%%/app/resources/translations/cs_CZ/validators.cs_CZ.xlf +%%WWWDIR%%/app/resources/translations/de_DE/contenttypes.de_DE.yml +%%WWWDIR%%/app/resources/translations/de_DE/infos.de_DE.yml +%%WWWDIR%%/app/resources/translations/de_DE/messages.de_DE.yml +%%WWWDIR%%/app/resources/translations/de_DE/validators.de_DE.xlf +%%WWWDIR%%/app/resources/translations/el/contenttypes.el.yml +%%WWWDIR%%/app/resources/translations/el/infos.el.yml +%%WWWDIR%%/app/resources/translations/el/messages.el.yml +%%WWWDIR%%/app/resources/translations/el/validators.el.xlf +%%WWWDIR%%/app/resources/translations/en_GB/contenttypes.en_GB.yml +%%WWWDIR%%/app/resources/translations/en_GB/infos.en_GB.yml +%%WWWDIR%%/app/resources/translations/en_GB/messages.en_GB.yml +%%WWWDIR%%/app/resources/translations/en_GB/validators.en_GB.xlf +%%WWWDIR%%/app/resources/translations/es/contenttypes.es.yml +%%WWWDIR%%/app/resources/translations/es/infos.es.yml +%%WWWDIR%%/app/resources/translations/es/messages.es.yml +%%WWWDIR%%/app/resources/translations/es/validators.es.xlf +%%WWWDIR%%/app/resources/translations/fi/contenttypes.fi.yml +%%WWWDIR%%/app/resources/translations/fi/infos.fi.yml +%%WWWDIR%%/app/resources/translations/fi/messages.fi.yml +%%WWWDIR%%/app/resources/translations/fi/validators.fi.xlf +%%WWWDIR%%/app/resources/translations/fr/contenttypes.fr.yml +%%WWWDIR%%/app/resources/translations/fr/infos.fr.yml +%%WWWDIR%%/app/resources/translations/fr/messages.fr.yml +%%WWWDIR%%/app/resources/translations/fr/validators.fr.xlf +%%WWWDIR%%/app/resources/translations/hu/contenttypes.hu.yml +%%WWWDIR%%/app/resources/translations/hu/infos.hu.yml +%%WWWDIR%%/app/resources/translations/hu/messages.hu.yml +%%WWWDIR%%/app/resources/translations/hu/validators.hu.xlf +%%WWWDIR%%/app/resources/translations/id/contenttypes.id.yml +%%WWWDIR%%/app/resources/translations/id/infos.id.yml +%%WWWDIR%%/app/resources/translations/id/messages.id.yml +%%WWWDIR%%/app/resources/translations/id/validators.id.xlf +%%WWWDIR%%/app/resources/translations/it/contenttypes.it.yml +%%WWWDIR%%/app/resources/translations/it/messages.it.yml +%%WWWDIR%%/app/resources/translations/it/validators.it.xlf +%%WWWDIR%%/app/resources/translations/ja/contenttypes.ja.yml +%%WWWDIR%%/app/resources/translations/ja/infos.ja.yml +%%WWWDIR%%/app/resources/translations/ja/messages.ja.yml +%%WWWDIR%%/app/resources/translations/ja/validators.ja.xlf +%%WWWDIR%%/app/resources/translations/nb/contenttypes.nb.yml +%%WWWDIR%%/app/resources/translations/nb/messages.nb.yml +%%WWWDIR%%/app/resources/translations/nb/validators.nb.xlf +%%WWWDIR%%/app/resources/translations/nl_NL/contenttypes.nl_NL.yml +%%WWWDIR%%/app/resources/translations/nl_NL/infos.nl_NL.yml +%%WWWDIR%%/app/resources/translations/nl_NL/messages.nl_NL.yml +%%WWWDIR%%/app/resources/translations/nl_NL/validators.nl_NL.xlf +%%WWWDIR%%/app/resources/translations/pl_PL/contenttypes.pl_PL.yml +%%WWWDIR%%/app/resources/translations/pl_PL/infos.pl_PL.yml +%%WWWDIR%%/app/resources/translations/pl_PL/messages.pl_PL.yml +%%WWWDIR%%/app/resources/translations/pl_PL/validators.pl_PL.xlf +%%WWWDIR%%/app/resources/translations/pt/contenttypes.pt.yml +%%WWWDIR%%/app/resources/translations/pt/infos.pt.yml +%%WWWDIR%%/app/resources/translations/pt/messages.pt.yml +%%WWWDIR%%/app/resources/translations/pt/validators.pt.xlf +%%WWWDIR%%/app/resources/translations/pt_BR/contenttypes.pt_BR.yml +%%WWWDIR%%/app/resources/translations/pt_BR/infos.pt_BR.yml +%%WWWDIR%%/app/resources/translations/pt_BR/messages.pt_BR.yml +%%WWWDIR%%/app/resources/translations/pt_BR/validators.pt_BR.xlf +%%WWWDIR%%/app/resources/translations/ru/contenttypes.ru.yml +%%WWWDIR%%/app/resources/translations/ru/infos.ru.yml +%%WWWDIR%%/app/resources/translations/ru/messages.ru.yml +%%WWWDIR%%/app/resources/translations/ru/validators.ru.xlf +%%WWWDIR%%/app/resources/translations/sv_SE/contenttypes.sv_SE.yml +%%WWWDIR%%/app/resources/translations/sv_SE/infos.sv_SE.yml +%%WWWDIR%%/app/resources/translations/sv_SE/messages.sv_SE.yml +%%WWWDIR%%/app/resources/translations/sv_SE/validators.sv_SE.xlf +%%WWWDIR%%/app/resources/translations/zh_CN/contenttypes.zh_CN.yml +%%WWWDIR%%/app/resources/translations/zh_CN/infos.zh_CN.yml +%%WWWDIR%%/app/resources/translations/zh_CN/messages.zh_CN.yml +%%WWWDIR%%/app/resources/translations/zh_CN/validators.zh_CN.xlf +%%WWWDIR%%/app/resources/translations/zh_TW/contenttypes.zh_TW.yml +%%WWWDIR%%/app/resources/translations/zh_TW/infos.zh_TW.yml +%%WWWDIR%%/app/resources/translations/zh_TW/messages.zh_TW.yml +%%WWWDIR%%/app/resources/translations/zh_TW/validators.zh_TW.xlf +%%WWWDIR%%/app/resources/translations/zx/contenttypes.zx.yml +%%WWWDIR%%/app/resources/translations/zx/infos.zx.yml +%%WWWDIR%%/app/resources/translations/zx/messages.zx.yml +%%WWWDIR%%/app/resources/translations/zx/validators.zx.xlf +%%WWWDIR%%/app/theme_defaults/_sub_menu.twig +%%WWWDIR%%/app/theme_defaults/_sub_pager.twig +%%WWWDIR%%/app/theme_defaults/_sub_searchbox.twig +%%WWWDIR%%/app/theme_defaults/_sub_taxonomylinks.twig +%%WWWDIR%%/app/theme_defaults/error.twig +%%WWWDIR%%/app/theme_defaults/form_bolt_layout.twig +%%WWWDIR%%/app/theme_defaults/form_div_layout.html.twig +%%WWWDIR%%/app/theme_defaults/maintenance.css +%%WWWDIR%%/app/theme_defaults/maintenance_default.twig +%%WWWDIR%%/app/view/css/bolt-old-ie.css +%%WWWDIR%%/app/view/css/bolt.css +%%WWWDIR%%/app/view/css/ckeditor-contents.css +%%WWWDIR%%/app/view/css/ckeditor.css +%%WWWDIR%%/app/view/css/lib.css +%%WWWDIR%%/app/view/css/liveeditor.css +%%WWWDIR%%/app/view/fonts/FontAwesome.otf +%%WWWDIR%%/app/view/fonts/SourceSansPro-It.woff +%%WWWDIR%%/app/view/fonts/SourceSansPro-It.woff2 +%%WWWDIR%%/app/view/fonts/SourceSansPro-Regular.woff +%%WWWDIR%%/app/view/fonts/SourceSansPro-Regular.woff2 +%%WWWDIR%%/app/view/fonts/SourceSansPro-Semibold.woff +%%WWWDIR%%/app/view/fonts/SourceSansPro-Semibold.woff2 +%%WWWDIR%%/app/view/fonts/fontawesome-webfont.eot +%%WWWDIR%%/app/view/fonts/fontawesome-webfont.svg +%%WWWDIR%%/app/view/fonts/fontawesome-webfont.ttf +%%WWWDIR%%/app/view/fonts/fontawesome-webfont.woff +%%WWWDIR%%/app/view/fonts/fontawesome-webfont.woff2 +%%WWWDIR%%/app/view/img/apple-touch-icon-114x114.png +%%WWWDIR%%/app/view/img/apple-touch-icon-144x144.png +%%WWWDIR%%/app/view/img/apple-touch-icon-72x72.png +%%WWWDIR%%/app/view/img/apple-touch-icon.png +%%WWWDIR%%/app/view/img/bolt-icon.svg +%%WWWDIR%%/app/view/img/bolt-logo.png +%%WWWDIR%%/app/view/img/dash.png +%%WWWDIR%%/app/view/img/default_empty.png +%%WWWDIR%%/app/view/img/default_empty_4x3.png +%%WWWDIR%%/app/view/img/default_error.png +%%WWWDIR%%/app/view/img/default_notfound.png +%%WWWDIR%%/app/view/img/edit.png +%%WWWDIR%%/app/view/img/favicon-bolt.ico +%%WWWDIR%%/app/view/img/lib/jquery-ui-bg_flat_0_aaaaaa_40x100.png +%%WWWDIR%%/app/view/img/lib/jquery-ui-bg_flat_75_ffffff_40x100.png +%%WWWDIR%%/app/view/img/lib/jquery-ui-bg_glass_55_fbf9ee_1x400.png +%%WWWDIR%%/app/view/img/lib/jquery-ui-bg_glass_65_ffffff_1x400.png +%%WWWDIR%%/app/view/img/lib/jquery-ui-bg_glass_75_dadada_1x400.png +%%WWWDIR%%/app/view/img/lib/jquery-ui-bg_glass_75_e6e6e6_1x400.png +%%WWWDIR%%/app/view/img/lib/jquery-ui-bg_glass_95_fef1ec_1x400.png +%%WWWDIR%%/app/view/img/lib/jquery-ui-bg_highlight-soft_75_cccccc_1x100.png +%%WWWDIR%%/app/view/img/lib/jquery-ui-icons_222222_256x240.png +%%WWWDIR%%/app/view/img/lib/jquery-ui-icons_2e83ff_256x240.png +%%WWWDIR%%/app/view/img/lib/jquery-ui-icons_454545_256x240.png +%%WWWDIR%%/app/view/img/lib/jquery-ui-icons_888888_256x240.png +%%WWWDIR%%/app/view/img/lib/jquery-ui-icons_cd0a0a_256x240.png +%%WWWDIR%%/app/view/img/lib/jquery-upl-loading.gif +%%WWWDIR%%/app/view/img/lib/jquery-upl-progressbar.gif +%%WWWDIR%%/app/view/img/lib/select2-select2-spinner.gif +%%WWWDIR%%/app/view/img/lib/select2-select2.png +%%WWWDIR%%/app/view/img/lib/select2-select2x2.png +%%WWWDIR%%/app/view/img/log.png +%%WWWDIR%%/app/view/img/pin_red.png +%%WWWDIR%%/app/view/img/queries.png +%%WWWDIR%%/app/view/img/server.png +%%WWWDIR%%/app/view/img/sidebarbg.png +%%WWWDIR%%/app/view/js/bolt.min.js +%%WWWDIR%%/app/view/js/ckeditor/ckeditor.js +%%WWWDIR%%/app/view/js/ckeditor/config.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/about/dialogs/about.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png +%%WWWDIR%%/app/view/js/ckeditor/plugins/about/dialogs/logo_ckeditor.png +%%WWWDIR%%/app/view/js/ckeditor/plugins/clipboard/dialogs/paste.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/css/codemirror.min.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/js/beautify.min.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/js/codemirror.addons.min.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/js/codemirror.addons.search.min.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/js/codemirror.min.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/js/codemirror.mode.bbcode.min.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/js/codemirror.mode.bbcodemixed.min.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/js/codemirror.mode.htmlmixed.min.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/js/codemirror.mode.javascript.min.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/js/codemirror.mode.php.min.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/plugins/clike.min.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/plugins/css.min.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/plugins/htmlmixed.min.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/plugins/javascript.min.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/plugins/markdown.min.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/plugins/matchbrackets.min.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/plugins/php.min.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/plugins/xml.min.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/plugins/yaml.min.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/3024-day.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/3024-night.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/ambiance-mobile.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/ambiance.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/base16-dark.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/base16-light.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/blackboard.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/cobalt.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/colorforth.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/eclipse.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/elegant.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/erlang-dark.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/lesser-dark.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/liquibyte.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/mbo.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/mdn-like.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/midnight.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/monokai.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/neat.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/neo.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/night.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/paraiso-dark.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/paraiso-light.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/pastel-on-dark.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/rubyblue.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/solarized.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/the-matrix.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/tomorrow-night-bright.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/tomorrow-night-eighties.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/ttcn.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/twilight.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/vibrant-ink.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/xq-dark.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/xq-light.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/zenburn.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/dialogs/codesnippet.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/CHANGES.md +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/LICENSE +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/README.md +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/README.ru.md +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/highlight.pack.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/arta.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/ascetic.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/atelier-dune.dark.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/atelier-dune.light.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/atelier-forest.dark.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/atelier-forest.light.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/atelier-heath.dark.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/atelier-heath.light.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/atelier-lakeside.dark.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/atelier-lakeside.light.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/atelier-seaside.dark.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/atelier-seaside.light.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/brown_paper.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/brown_papersq.png +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/dark.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/default.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/docco.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/far.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/foundation.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/github.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/googlecode.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/idea.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/ir_black.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/magula.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/mono-blue.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/monokai.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/monokai_sublime.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/obsidian.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/paraiso.dark.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/paraiso.light.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/pojoaque.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/pojoaque.jpg +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/railscasts.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/rainbow.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/school_book.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/school_book.png +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/solarized_dark.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/solarized_light.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/sunburst.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/tomorrow-night-blue.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/tomorrow-night-bright.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/tomorrow-night-eighties.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/tomorrow-night.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/tomorrow.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/vs.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/xcode.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/codesnippet/lib/highlight/styles/zenburn.css +%%WWWDIR%%/app/view/js/ckeditor/plugins/dialog/dialogDefinition.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/find/dialogs/find.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/icons.png +%%WWWDIR%%/app/view/js/ckeditor/plugins/icons_hidpi.png +%%WWWDIR%%/app/view/js/ckeditor/plugins/image/dialogs/image.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/image/images/noimage.png +%%WWWDIR%%/app/view/js/ckeditor/plugins/link/dialogs/anchor.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/link/dialogs/link.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/link/images/anchor.png +%%WWWDIR%%/app/view/js/ckeditor/plugins/link/images/hidpi/anchor.png +%%WWWDIR%%/app/view/js/ckeditor/plugins/oembed/LICENSE.md +%%WWWDIR%%/app/view/js/ckeditor/plugins/oembed/README.md +%%WWWDIR%%/app/view/js/ckeditor/plugins/oembed/libs/jquery.oembed.min.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/pastefromword/filter/default.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/af.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/ar.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/bg.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/ca.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/cs.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/cy.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/da.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/de.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/el.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/en.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/eo.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/es.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/et.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/fa.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/fi.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/fr.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/gl.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/he.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/hr.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/hu.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/id.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/it.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/ja.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/km.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/ko.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/ku.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/lt.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/lv.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/nb.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/nl.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/no.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/pl.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/pt.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/ru.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/si.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/sk.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/sl.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/sq.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/sv.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/th.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/tr.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/tt.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/ug.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/uk.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/vi.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/lang/zh.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/specialchar/dialogs/specialchar.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/table/dialogs/table.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/tabletools/dialogs/tableCell.js +%%WWWDIR%%/app/view/js/ckeditor/plugins/widget/images/handle.png +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/dialog.css +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/dialog_ie.css +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/dialog_ie7.css +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/dialog_ie8.css +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/dialog_iequirks.css +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/dialog_opera.css +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/editor.css +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/editor_gecko.css +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/editor_ie.css +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/editor_ie7.css +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/editor_ie8.css +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/editor_iequirks.css +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/icons.png +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/icons_hidpi.png +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/images/arrow.png +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/images/close.png +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/images/hidpi/close.png +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/images/hidpi/lock-open.png +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/images/hidpi/lock.png +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/images/hidpi/refresh.png +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/images/lock-open.png +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/images/lock.png +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/images/refresh.png +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/readme.md +%%WWWDIR%%/app/view/js/ckeditor/skins/boltcke/skin.js +%%WWWDIR%%/app/view/js/ckeditor/styles.js +%%WWWDIR%%/app/view/js/jquery-1.12.1.min.js +%%WWWDIR%%/app/view/js/lib.min.js +%%WWWDIR%%/app/view/js/locale/ckeditor/af.js +%%WWWDIR%%/app/view/js/locale/ckeditor/ar.js +%%WWWDIR%%/app/view/js/locale/ckeditor/bg.js +%%WWWDIR%%/app/view/js/locale/ckeditor/bn.js +%%WWWDIR%%/app/view/js/locale/ckeditor/bs.js +%%WWWDIR%%/app/view/js/locale/ckeditor/ca.js +%%WWWDIR%%/app/view/js/locale/ckeditor/cs.js +%%WWWDIR%%/app/view/js/locale/ckeditor/cy.js +%%WWWDIR%%/app/view/js/locale/ckeditor/da.js +%%WWWDIR%%/app/view/js/locale/ckeditor/de.js +%%WWWDIR%%/app/view/js/locale/ckeditor/el.js +%%WWWDIR%%/app/view/js/locale/ckeditor/en-au.js +%%WWWDIR%%/app/view/js/locale/ckeditor/en-ca.js +%%WWWDIR%%/app/view/js/locale/ckeditor/en-gb.js +%%WWWDIR%%/app/view/js/locale/ckeditor/en.js +%%WWWDIR%%/app/view/js/locale/ckeditor/eo.js +%%WWWDIR%%/app/view/js/locale/ckeditor/es.js +%%WWWDIR%%/app/view/js/locale/ckeditor/et.js +%%WWWDIR%%/app/view/js/locale/ckeditor/eu.js +%%WWWDIR%%/app/view/js/locale/ckeditor/fa.js +%%WWWDIR%%/app/view/js/locale/ckeditor/fi.js +%%WWWDIR%%/app/view/js/locale/ckeditor/fo.js +%%WWWDIR%%/app/view/js/locale/ckeditor/fr-ca.js +%%WWWDIR%%/app/view/js/locale/ckeditor/fr.js +%%WWWDIR%%/app/view/js/locale/ckeditor/gl.js +%%WWWDIR%%/app/view/js/locale/ckeditor/gu.js +%%WWWDIR%%/app/view/js/locale/ckeditor/he.js +%%WWWDIR%%/app/view/js/locale/ckeditor/hi.js +%%WWWDIR%%/app/view/js/locale/ckeditor/hr.js +%%WWWDIR%%/app/view/js/locale/ckeditor/hu.js +%%WWWDIR%%/app/view/js/locale/ckeditor/id.js +%%WWWDIR%%/app/view/js/locale/ckeditor/is.js +%%WWWDIR%%/app/view/js/locale/ckeditor/it.js +%%WWWDIR%%/app/view/js/locale/ckeditor/ja.js +%%WWWDIR%%/app/view/js/locale/ckeditor/ka.js +%%WWWDIR%%/app/view/js/locale/ckeditor/km.js +%%WWWDIR%%/app/view/js/locale/ckeditor/ko.js +%%WWWDIR%%/app/view/js/locale/ckeditor/ku.js +%%WWWDIR%%/app/view/js/locale/ckeditor/lt.js +%%WWWDIR%%/app/view/js/locale/ckeditor/lv.js +%%WWWDIR%%/app/view/js/locale/ckeditor/mk.js +%%WWWDIR%%/app/view/js/locale/ckeditor/mn.js +%%WWWDIR%%/app/view/js/locale/ckeditor/ms.js +%%WWWDIR%%/app/view/js/locale/ckeditor/nb.js +%%WWWDIR%%/app/view/js/locale/ckeditor/nl.js +%%WWWDIR%%/app/view/js/locale/ckeditor/no.js +%%WWWDIR%%/app/view/js/locale/ckeditor/pl.js +%%WWWDIR%%/app/view/js/locale/ckeditor/pt-br.js +%%WWWDIR%%/app/view/js/locale/ckeditor/pt.js +%%WWWDIR%%/app/view/js/locale/ckeditor/ro.js +%%WWWDIR%%/app/view/js/locale/ckeditor/ru.js +%%WWWDIR%%/app/view/js/locale/ckeditor/si.js +%%WWWDIR%%/app/view/js/locale/ckeditor/sk.js +%%WWWDIR%%/app/view/js/locale/ckeditor/sl.js +%%WWWDIR%%/app/view/js/locale/ckeditor/sq.js +%%WWWDIR%%/app/view/js/locale/ckeditor/sr-latn.js +%%WWWDIR%%/app/view/js/locale/ckeditor/sr.js +%%WWWDIR%%/app/view/js/locale/ckeditor/sv.js +%%WWWDIR%%/app/view/js/locale/ckeditor/th.js +%%WWWDIR%%/app/view/js/locale/ckeditor/tr.js +%%WWWDIR%%/app/view/js/locale/ckeditor/tt.js +%%WWWDIR%%/app/view/js/locale/ckeditor/ug.js +%%WWWDIR%%/app/view/js/locale/ckeditor/uk.js +%%WWWDIR%%/app/view/js/locale/ckeditor/vi.js +%%WWWDIR%%/app/view/js/locale/ckeditor/zh-cn.js +%%WWWDIR%%/app/view/js/locale/ckeditor/zh.js +%%WWWDIR%%/app/view/js/locale/datepicker/af.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/ar.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/ar_DZ.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/az.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/be.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/bg.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/bs.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/ca.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/cs.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/cy_GB.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/da.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/de.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/el.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/en_AU.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/en_GB.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/en_NZ.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/eo.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/es.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/et.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/eu.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/fa.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/fi.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/fo.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/fr.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/fr_CA.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/fr_CH.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/gl.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/he.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/hi.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/hr.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/hu.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/hy.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/id.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/is.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/it.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/it_CH.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/ja.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/ka.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/kk.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/km.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/ko.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/ky.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/lb.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/lt.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/lv.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/mk.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/ml.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/ms.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/nb.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/nl.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/nl_BE.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/nn.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/no.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/pl.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/pt.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/pt_BR.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/rm.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/ro.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/ru.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/sk.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/sl.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/sq.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/sr.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/sr_SR.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/sv.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/ta.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/th.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/tj.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/tr.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/uk.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/vi.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/zh_CN.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/zh_HK.min.js +%%WWWDIR%%/app/view/js/locale/datepicker/zh_TW.min.js +%%WWWDIR%%/app/view/js/locale/moment/af.min.js +%%WWWDIR%%/app/view/js/locale/moment/ar.min.js +%%WWWDIR%%/app/view/js/locale/moment/ar_MA.min.js +%%WWWDIR%%/app/view/js/locale/moment/ar_SA.min.js +%%WWWDIR%%/app/view/js/locale/moment/ar_TN.min.js +%%WWWDIR%%/app/view/js/locale/moment/az.min.js +%%WWWDIR%%/app/view/js/locale/moment/be.min.js +%%WWWDIR%%/app/view/js/locale/moment/bg.min.js +%%WWWDIR%%/app/view/js/locale/moment/bn.min.js +%%WWWDIR%%/app/view/js/locale/moment/bo.min.js +%%WWWDIR%%/app/view/js/locale/moment/br.min.js +%%WWWDIR%%/app/view/js/locale/moment/bs.min.js +%%WWWDIR%%/app/view/js/locale/moment/ca.min.js +%%WWWDIR%%/app/view/js/locale/moment/cs.min.js +%%WWWDIR%%/app/view/js/locale/moment/cv.min.js +%%WWWDIR%%/app/view/js/locale/moment/cy.min.js +%%WWWDIR%%/app/view/js/locale/moment/da.min.js +%%WWWDIR%%/app/view/js/locale/moment/de.min.js +%%WWWDIR%%/app/view/js/locale/moment/de_AT.min.js +%%WWWDIR%%/app/view/js/locale/moment/dv.min.js +%%WWWDIR%%/app/view/js/locale/moment/el.min.js +%%WWWDIR%%/app/view/js/locale/moment/en_AU.min.js +%%WWWDIR%%/app/view/js/locale/moment/en_CA.min.js +%%WWWDIR%%/app/view/js/locale/moment/en_GB.min.js +%%WWWDIR%%/app/view/js/locale/moment/en_IE.min.js +%%WWWDIR%%/app/view/js/locale/moment/en_NZ.min.js +%%WWWDIR%%/app/view/js/locale/moment/eo.min.js +%%WWWDIR%%/app/view/js/locale/moment/es.min.js +%%WWWDIR%%/app/view/js/locale/moment/et.min.js +%%WWWDIR%%/app/view/js/locale/moment/eu.min.js +%%WWWDIR%%/app/view/js/locale/moment/fa.min.js +%%WWWDIR%%/app/view/js/locale/moment/fi.min.js +%%WWWDIR%%/app/view/js/locale/moment/fo.min.js +%%WWWDIR%%/app/view/js/locale/moment/fr.min.js +%%WWWDIR%%/app/view/js/locale/moment/fr_CA.min.js +%%WWWDIR%%/app/view/js/locale/moment/fr_CH.min.js +%%WWWDIR%%/app/view/js/locale/moment/fy.min.js +%%WWWDIR%%/app/view/js/locale/moment/gd.min.js +%%WWWDIR%%/app/view/js/locale/moment/gl.min.js +%%WWWDIR%%/app/view/js/locale/moment/he.min.js +%%WWWDIR%%/app/view/js/locale/moment/hi.min.js +%%WWWDIR%%/app/view/js/locale/moment/hr.min.js +%%WWWDIR%%/app/view/js/locale/moment/hu.min.js +%%WWWDIR%%/app/view/js/locale/moment/hy_AM.min.js +%%WWWDIR%%/app/view/js/locale/moment/id.min.js +%%WWWDIR%%/app/view/js/locale/moment/is.min.js +%%WWWDIR%%/app/view/js/locale/moment/it.min.js +%%WWWDIR%%/app/view/js/locale/moment/ja.min.js +%%WWWDIR%%/app/view/js/locale/moment/jv.min.js +%%WWWDIR%%/app/view/js/locale/moment/ka.min.js +%%WWWDIR%%/app/view/js/locale/moment/kk.min.js +%%WWWDIR%%/app/view/js/locale/moment/km.min.js +%%WWWDIR%%/app/view/js/locale/moment/ko.min.js +%%WWWDIR%%/app/view/js/locale/moment/ky.min.js +%%WWWDIR%%/app/view/js/locale/moment/lb.min.js +%%WWWDIR%%/app/view/js/locale/moment/lo.min.js +%%WWWDIR%%/app/view/js/locale/moment/lt.min.js +%%WWWDIR%%/app/view/js/locale/moment/lv.min.js +%%WWWDIR%%/app/view/js/locale/moment/me.min.js +%%WWWDIR%%/app/view/js/locale/moment/mk.min.js +%%WWWDIR%%/app/view/js/locale/moment/ml.min.js +%%WWWDIR%%/app/view/js/locale/moment/mr.min.js +%%WWWDIR%%/app/view/js/locale/moment/ms.min.js +%%WWWDIR%%/app/view/js/locale/moment/ms_MY.min.js +%%WWWDIR%%/app/view/js/locale/moment/my.min.js +%%WWWDIR%%/app/view/js/locale/moment/nb.min.js +%%WWWDIR%%/app/view/js/locale/moment/ne.min.js +%%WWWDIR%%/app/view/js/locale/moment/nl.min.js +%%WWWDIR%%/app/view/js/locale/moment/nn.min.js +%%WWWDIR%%/app/view/js/locale/moment/pa_IN.min.js +%%WWWDIR%%/app/view/js/locale/moment/pl.min.js +%%WWWDIR%%/app/view/js/locale/moment/pt.min.js +%%WWWDIR%%/app/view/js/locale/moment/pt_BR.min.js +%%WWWDIR%%/app/view/js/locale/moment/ro.min.js +%%WWWDIR%%/app/view/js/locale/moment/ru.min.js +%%WWWDIR%%/app/view/js/locale/moment/se.min.js +%%WWWDIR%%/app/view/js/locale/moment/si.min.js +%%WWWDIR%%/app/view/js/locale/moment/sk.min.js +%%WWWDIR%%/app/view/js/locale/moment/sl.min.js +%%WWWDIR%%/app/view/js/locale/moment/sq.min.js +%%WWWDIR%%/app/view/js/locale/moment/sr.min.js +%%WWWDIR%%/app/view/js/locale/moment/sr_CYRL.min.js +%%WWWDIR%%/app/view/js/locale/moment/ss.min.js +%%WWWDIR%%/app/view/js/locale/moment/sv.min.js +%%WWWDIR%%/app/view/js/locale/moment/sw.min.js +%%WWWDIR%%/app/view/js/locale/moment/ta.min.js +%%WWWDIR%%/app/view/js/locale/moment/te.min.js +%%WWWDIR%%/app/view/js/locale/moment/th.min.js +%%WWWDIR%%/app/view/js/locale/moment/tl_PH.min.js +%%WWWDIR%%/app/view/js/locale/moment/tlh.min.js +%%WWWDIR%%/app/view/js/locale/moment/tr.min.js +%%WWWDIR%%/app/view/js/locale/moment/tzl.min.js +%%WWWDIR%%/app/view/js/locale/moment/tzm.min.js +%%WWWDIR%%/app/view/js/locale/moment/tzm_LATN.min.js +%%WWWDIR%%/app/view/js/locale/moment/uk.min.js +%%WWWDIR%%/app/view/js/locale/moment/uz.min.js +%%WWWDIR%%/app/view/js/locale/moment/vi.min.js +%%WWWDIR%%/app/view/js/locale/moment/x_PSEUDO.min.js +%%WWWDIR%%/app/view/js/locale/moment/zh_CN.min.js +%%WWWDIR%%/app/view/js/locale/moment/zh_TW.min.js +%%WWWDIR%%/app/view/js/uikit/codemirror-compressed.js +%%WWWDIR%%/app/view/js/uikit/htmleditor.js +%%WWWDIR%%/app/view/js/uikit/htmleditor.min.css +%%WWWDIR%%/app/view/js/uikit/marked.js +%%WWWDIR%%/app/view/js/uikit/readme.md +%%WWWDIR%%/app/view/js/uikit/uikit.min.css +%%WWWDIR%%/app/view/js/uikit/uikit.min.js +%%WWWDIR%%/app/view/toolbar/bolt.html.twig +%%WWWDIR%%/app/view/toolbar/config.html.twig +%%WWWDIR%%/app/view/toolbar/db.html.twig +%%WWWDIR%%/app/view/toolbar/twig.html.twig +%%WWWDIR%%/app/view/twig/_base/_fieldset.twig +%%WWWDIR%%/app/view/twig/_base/_listing.twig +%%WWWDIR%%/app/view/twig/_base/_nothing.twig +%%WWWDIR%%/app/view/twig/_base/_page-nav.twig +%%WWWDIR%%/app/view/twig/_base/_page-no_nav.twig +%%WWWDIR%%/app/view/twig/_base/_page-popup.twig +%%WWWDIR%%/app/view/twig/_base/_page.twig +%%WWWDIR%%/app/view/twig/_base/_panel.twig +%%WWWDIR%%/app/view/twig/_macro/_files_path.twig +%%WWWDIR%%/app/view/twig/_macro/_macro.twig +%%WWWDIR%%/app/view/twig/_macro/_pager.twig +%%WWWDIR%%/app/view/twig/_macro/_panels.twig +%%WWWDIR%%/app/view/twig/_sub/_csrf_token.twig +%%WWWDIR%%/app/view/twig/_sub/_editable_record_list.twig +%%WWWDIR%%/app/view/twig/_sub/_listing.twig +%%WWWDIR%%/app/view/twig/_sub/_messages.twig +%%WWWDIR%%/app/view/twig/about/about.twig +%%WWWDIR%%/app/view/twig/activity/changelog.twig +%%WWWDIR%%/app/view/twig/activity/systemlog.twig +%%WWWDIR%%/app/view/twig/changelog/_macros.twig +%%WWWDIR%%/app/view/twig/changelog/changelogrecordall.twig +%%WWWDIR%%/app/view/twig/changelog/changelogrecordsingle.twig +%%WWWDIR%%/app/view/twig/clearcache/clearcache.twig +%%WWWDIR%%/app/view/twig/components/pager.twig +%%WWWDIR%%/app/view/twig/components/panel-change-record.twig +%%WWWDIR%%/app/view/twig/components/panel-change.twig +%%WWWDIR%%/app/view/twig/components/panel-lastmodified.twig +%%WWWDIR%%/app/view/twig/components/panel-news.twig +%%WWWDIR%%/app/view/twig/components/panel-stack.twig +%%WWWDIR%%/app/view/twig/components/panel-system.twig +%%WWWDIR%%/app/view/twig/components/stack-list.twig +%%WWWDIR%%/app/view/twig/components/stack-minimal.twig +%%WWWDIR%%/app/view/twig/custom/listing/pages.twig.dist +%%WWWDIR%%/app/view/twig/dashboard/_aside.twig +%%WWWDIR%%/app/view/twig/dashboard/_quicklinks-buttons.twig +%%WWWDIR%%/app/view/twig/dashboard/_quicklinks-dropdown.twig +%%WWWDIR%%/app/view/twig/dashboard/_recently_edited.twig +%%WWWDIR%%/app/view/twig/dashboard/_suggestloripsum.twig +%%WWWDIR%%/app/view/twig/dashboard/dashboard.twig +%%WWWDIR%%/app/view/twig/dbcheck/_macros.twig +%%WWWDIR%%/app/view/twig/dbcheck/dbcheck.twig +%%WWWDIR%%/app/view/twig/editcontent/_aside-delete.twig +%%WWWDIR%%/app/view/twig/editcontent/_aside-live-editor.twig +%%WWWDIR%%/app/view/twig/editcontent/_aside-preview.twig +%%WWWDIR%%/app/view/twig/editcontent/_aside-save.twig +%%WWWDIR%%/app/view/twig/editcontent/_aside-status.twig +%%WWWDIR%%/app/view/twig/editcontent/_aside.twig +%%WWWDIR%%/app/view/twig/editcontent/_buttons.twig +%%WWWDIR%%/app/view/twig/editcontent/_fields.twig +%%WWWDIR%%/app/view/twig/editcontent/_includes-data.twig +%%WWWDIR%%/app/view/twig/editcontent/_live-editor.twig +%%WWWDIR%%/app/view/twig/editcontent/_meta.twig +%%WWWDIR%%/app/view/twig/editcontent/_relations.twig +%%WWWDIR%%/app/view/twig/editcontent/_relationships.twig +%%WWWDIR%%/app/view/twig/editcontent/_taxonomies.twig +%%WWWDIR%%/app/view/twig/editcontent/_templatefields.twig +%%WWWDIR%%/app/view/twig/editcontent/editcontent.twig +%%WWWDIR%%/app/view/twig/editcontent/fields/_checkbox.twig +%%WWWDIR%%/app/view/twig/editcontent/fields/_date.twig +%%WWWDIR%%/app/view/twig/editcontent/fields/_datetime.twig +%%WWWDIR%%/app/view/twig/editcontent/fields/_file.twig +%%WWWDIR%%/app/view/twig/editcontent/fields/_filelist.twig +%%WWWDIR%%/app/view/twig/editcontent/fields/_float.twig +%%WWWDIR%%/app/view/twig/editcontent/fields/_geolocation.twig +%%WWWDIR%%/app/view/twig/editcontent/fields/_hidden.twig +%%WWWDIR%%/app/view/twig/editcontent/fields/_html.twig +%%WWWDIR%%/app/view/twig/editcontent/fields/_image.twig +%%WWWDIR%%/app/view/twig/editcontent/fields/_imagelist.twig +%%WWWDIR%%/app/view/twig/editcontent/fields/_integer.twig +%%WWWDIR%%/app/view/twig/editcontent/fields/_markdown.twig +%%WWWDIR%%/app/view/twig/editcontent/fields/_select.twig +%%WWWDIR%%/app/view/twig/editcontent/fields/_slug.twig +%%WWWDIR%%/app/view/twig/editcontent/fields/_templateselect.twig +%%WWWDIR%%/app/view/twig/editcontent/fields/_text.twig +%%WWWDIR%%/app/view/twig/editcontent/fields/_textarea.twig +%%WWWDIR%%/app/view/twig/editcontent/fields/_video.twig +%%WWWDIR%%/app/view/twig/editfile/editfile.twig +%%WWWDIR%%/app/view/twig/editlocale/editlocale.twig +%%WWWDIR%%/app/view/twig/edituser/edituser.twig +%%WWWDIR%%/app/view/twig/email/firstuser.twig +%%WWWDIR%%/app/view/twig/email/pingtest.twig +%%WWWDIR%%/app/view/twig/extend/_package.twig +%%WWWDIR%%/app/view/twig/extend/extend.twig +%%WWWDIR%%/app/view/twig/extend/install-package.twig +%%WWWDIR%%/app/view/twig/filebrowser/_content.twig +%%WWWDIR%%/app/view/twig/filebrowser/_navigation.twig +%%WWWDIR%%/app/view/twig/filebrowser/filebrowser.twig +%%WWWDIR%%/app/view/twig/files/_files.twig +%%WWWDIR%%/app/view/twig/files/_folders.twig +%%WWWDIR%%/app/view/twig/files/_upload.twig +%%WWWDIR%%/app/view/twig/files/files.twig +%%WWWDIR%%/app/view/twig/files_async/files_async.twig +%%WWWDIR%%/app/view/twig/files_ck/_files.twig +%%WWWDIR%%/app/view/twig/files_ck/_folders.twig +%%WWWDIR%%/app/view/twig/files_ck/files_ck.twig +%%WWWDIR%%/app/view/twig/firstuser/firstuser.twig +%%WWWDIR%%/app/view/twig/login/login.twig +%%WWWDIR%%/app/view/twig/mail/passwordreset.twig +%%WWWDIR%%/app/view/twig/nav/_macros.twig +%%WWWDIR%%/app/view/twig/nav/_primary.twig +%%WWWDIR%%/app/view/twig/nav/_secondary-configuration.twig +%%WWWDIR%%/app/view/twig/nav/_secondary-content.twig +%%WWWDIR%%/app/view/twig/nav/_secondary-extensions.twig +%%WWWDIR%%/app/view/twig/nav/_secondary-filemanagement.twig +%%WWWDIR%%/app/view/twig/nav/_secondary-search.twig +%%WWWDIR%%/app/view/twig/nav/_secondary-translations.twig +%%WWWDIR%%/app/view/twig/nav/_secondary.twig +%%WWWDIR%%/app/view/twig/old_extensions/old_extensions.twig +%%WWWDIR%%/app/view/twig/omnisearch/_aside.twig +%%WWWDIR%%/app/view/twig/omnisearch/_result.twig +%%WWWDIR%%/app/view/twig/omnisearch/omnisearch.twig +%%WWWDIR%%/app/view/twig/overview/_panel-actions_overview.twig +%%WWWDIR%%/app/view/twig/overview/overview.twig +%%WWWDIR%%/app/view/twig/prefill/prefill.twig +%%WWWDIR%%/app/view/twig/relatedto/_panel-actions_relatedto.twig +%%WWWDIR%%/app/view/twig/relatedto/_toolbar.twig +%%WWWDIR%%/app/view/twig/relatedto/relatedto.twig +%%WWWDIR%%/app/view/twig/roles/roles.twig +%%WWWDIR%%/app/view/twig/users/_aside.twig +%%WWWDIR%%/app/view/twig/users/_panel-actions_users.twig +%%WWWDIR%%/app/view/twig/users/_roles-permissons.twig +%%WWWDIR%%/app/view/twig/users/_sessions.twig +%%WWWDIR%%/app/view/twig/users/_userlist-actions.twig +%%WWWDIR%%/app/view/twig/users/_userlist.twig +%%WWWDIR%%/app/view/twig/users/users.twig @group @mode -%%WWWDIR%%/app/legacy.php -%%WWWDIR%%/app/nut -%%WWWDIR%%/app/resources/translations/cs_CZ/contenttypes.cs_CZ.yml -%%WWWDIR%%/app/resources/translations/cs_CZ/infos.cs_CZ.yml -%%WWWDIR%%/app/resources/translations/cs_CZ/messages.cs_CZ.yml -%%WWWDIR%%/app/resources/translations/de_DE/contenttypes.de_DE.yml -%%WWWDIR%%/app/resources/translations/de_DE/infos.de_DE.yml -%%WWWDIR%%/app/resources/translations/de_DE/messages.de_DE.yml -%%WWWDIR%%/app/resources/translations/de_DE/validators.de_DE.xlf -%%WWWDIR%%/app/resources/translations/el/contenttypes.el.yml -%%WWWDIR%%/app/resources/translations/el/infos.el.yml -%%WWWDIR%%/app/resources/translations/el/messages.el.yml -%%WWWDIR%%/app/resources/translations/el/validators.el.xlf -%%WWWDIR%%/app/resources/translations/en_GB/contenttypes.en_GB.yml -%%WWWDIR%%/app/resources/translations/en_GB/infos.en_GB.yml -%%WWWDIR%%/app/resources/translations/en_GB/messages.en_GB.yml -%%WWWDIR%%/app/resources/translations/en_GB/validators.en_GB.xlf -%%WWWDIR%%/app/resources/translations/es/contenttypes.es.yml -%%WWWDIR%%/app/resources/translations/es/infos.es.yml -%%WWWDIR%%/app/resources/translations/es/messages.es.yml -%%WWWDIR%%/app/resources/translations/es/validators.es.xlf -%%WWWDIR%%/app/resources/translations/fi/contenttypes.fi.yml -%%WWWDIR%%/app/resources/translations/fi/messages.fi.yml -%%WWWDIR%%/app/resources/translations/fi/validators.fi.xlf -%%WWWDIR%%/app/resources/translations/fr/contenttypes.fr.yml -%%WWWDIR%%/app/resources/translations/fr/infos.fr.yml -%%WWWDIR%%/app/resources/translations/fr/messages.fr.yml -%%WWWDIR%%/app/resources/translations/fr_FR/contenttypes.fr_FR.yml -%%WWWDIR%%/app/resources/translations/fr_FR/infos.fr_FR.yml -%%WWWDIR%%/app/resources/translations/fr_FR/messages.fr_FR.yml -%%WWWDIR%%/app/resources/translations/hu/infos.hu.yml -%%WWWDIR%%/app/resources/translations/hu/messages.hu.yml -%%WWWDIR%%/app/resources/translations/hu/validators.hu.xlf -%%WWWDIR%%/app/resources/translations/id/infos.id.yml -%%WWWDIR%%/app/resources/translations/id/messages.id.yml -%%WWWDIR%%/app/resources/translations/it/contenttypes.it.yml -%%WWWDIR%%/app/resources/translations/it/messages.it.yml -%%WWWDIR%%/app/resources/translations/ja/contenttypes.ja.yml -%%WWWDIR%%/app/resources/translations/ja/infos.ja.yml -%%WWWDIR%%/app/resources/translations/ja/messages.ja.yml -%%WWWDIR%%/app/resources/translations/nb/messages.nb.yml -%%WWWDIR%%/app/resources/translations/nl_NL/contenttypes.nl_NL.yml -%%WWWDIR%%/app/resources/translations/nl_NL/infos.nl_NL.yml -%%WWWDIR%%/app/resources/translations/nl_NL/messages.nl_NL.yml -%%WWWDIR%%/app/resources/translations/nl_NL/validators.nl_NL.xlf -%%WWWDIR%%/app/resources/translations/pl_PL/contenttypes.pl_PL.yml -%%WWWDIR%%/app/resources/translations/pl_PL/infos.pl_PL.yml -%%WWWDIR%%/app/resources/translations/pl_PL/messages.pl_PL.yml -%%WWWDIR%%/app/resources/translations/pt/contenttypes.pt.yml -%%WWWDIR%%/app/resources/translations/pt/infos.pt.yml -%%WWWDIR%%/app/resources/translations/pt/messages.pt.yml -%%WWWDIR%%/app/resources/translations/pt/validators.pt.xlf -%%WWWDIR%%/app/resources/translations/ru/contenttypes.ru.yml -%%WWWDIR%%/app/resources/translations/ru/infos.ru.yml -%%WWWDIR%%/app/resources/translations/ru/messages.ru.yml -%%WWWDIR%%/app/resources/translations/ru/validators.ru.xlf -%%WWWDIR%%/app/resources/translations/sv_SE/contenttypes.sv_SE.yml -%%WWWDIR%%/app/resources/translations/sv_SE/infos.sv_SE.yml -%%WWWDIR%%/app/resources/translations/sv_SE/messages.sv_SE.yml -%%WWWDIR%%/app/resources/translations/sv_SE/validators.sv_SE.xlf -%%WWWDIR%%/app/resources/translations/zh_CN/contenttypes.zh_CN.yml -%%WWWDIR%%/app/resources/translations/zh_CN/infos.zh_CN.yml -%%WWWDIR%%/app/resources/translations/zh_CN/messages.zh_CN.yml -%%WWWDIR%%/app/resources/translations/zh_CN/validators.zh_CN.xlf -%%WWWDIR%%/app/resources/translations/zh_TW/contenttypes.zh_TW.yml -%%WWWDIR%%/app/resources/translations/zh_TW/infos.zh_TW.yml -%%WWWDIR%%/app/resources/translations/zh_TW/messages.zh_TW.yml -%%WWWDIR%%/app/resources/translations/zh_TW/validators.zh_TW.xlf -%%WWWDIR%%/app/theme_defaults/_sub_menu.twig -%%WWWDIR%%/app/theme_defaults/_sub_pager.twig -%%WWWDIR%%/app/theme_defaults/_sub_searchbox.twig -%%WWWDIR%%/app/theme_defaults/_sub_taxonomylinks.twig -%%WWWDIR%%/app/theme_defaults/error.twig -%%WWWDIR%%/app/theme_defaults/form_bolt_layout.twig -%%WWWDIR%%/app/theme_defaults/form_div_layout.html.twig -%%WWWDIR%%/app/theme_defaults/maintenance.css -%%WWWDIR%%/app/theme_defaults/maintenance_default.twig -%%WWWDIR%%/app/view/css/bolt-old-ie.css -%%WWWDIR%%/app/view/css/bolt.css -%%WWWDIR%%/app/view/css/ckeditor-contents.css -%%WWWDIR%%/app/view/css/ckeditor.css -%%WWWDIR%%/app/view/css/lib.css -%%WWWDIR%%/app/view/css/liveeditor.css -%%WWWDIR%%/app/view/fonts/FontAwesome.otf -%%WWWDIR%%/app/view/fonts/SourceSansPro-It.woff -%%WWWDIR%%/app/view/fonts/SourceSansPro-It.woff2 -%%WWWDIR%%/app/view/fonts/SourceSansPro-Regular.woff -%%WWWDIR%%/app/view/fonts/SourceSansPro-Regular.woff2 -%%WWWDIR%%/app/view/fonts/SourceSansPro-Semibold.woff -%%WWWDIR%%/app/view/fonts/SourceSansPro-Semibold.woff2 -%%WWWDIR%%/app/view/fonts/fontawesome-webfont.eot -%%WWWDIR%%/app/view/fonts/fontawesome-webfont.svg -%%WWWDIR%%/app/view/fonts/fontawesome-webfont.ttf -%%WWWDIR%%/app/view/fonts/fontawesome-webfont.woff -%%WWWDIR%%/app/view/fonts/fontawesome-webfont.woff2 -%%WWWDIR%%/app/view/img/apple-touch-icon-114x114.png -%%WWWDIR%%/app/view/img/apple-touch-icon-144x144.png -%%WWWDIR%%/app/view/img/apple-touch-icon-72x72.png -%%WWWDIR%%/app/view/img/apple-touch-icon.png -%%WWWDIR%%/app/view/img/bolt-icon.svg -%%WWWDIR%%/app/view/img/bolt-logo.png -%%WWWDIR%%/app/view/img/dash.png -%%WWWDIR%%/app/view/img/default_empty.png -%%WWWDIR%%/app/view/img/default_empty_4x3.png -%%WWWDIR%%/app/view/img/default_error.png -%%WWWDIR%%/app/view/img/default_notfound.png -%%WWWDIR%%/app/view/img/edit.png -%%WWWDIR%%/app/view/img/favicon-bolt.ico -%%WWWDIR%%/app/view/img/lib/jquery-ui-bg_flat_0_aaaaaa_40x100.png -%%WWWDIR%%/app/view/img/lib/jquery-ui-bg_flat_75_ffffff_40x100.png -%%WWWDIR%%/app/view/img/lib/jquery-ui-bg_glass_55_fbf9ee_1x400.png -%%WWWDIR%%/app/view/img/lib/jquery-ui-bg_glass_65_ffffff_1x400.png -%%WWWDIR%%/app/view/img/lib/jquery-ui-bg_glass_75_dadada_1x400.png -%%WWWDIR%%/app/view/img/lib/jquery-ui-bg_glass_75_e6e6e6_1x400.png -%%WWWDIR%%/app/view/img/lib/jquery-ui-bg_glass_95_fef1ec_1x400.png -%%WWWDIR%%/app/view/img/lib/jquery-ui-bg_highlight-soft_75_cccccc_1x100.png -%%WWWDIR%%/app/view/img/lib/jquery-ui-icons_222222_256x240.png -%%WWWDIR%%/app/view/img/lib/jquery-ui-icons_2e83ff_256x240.png -%%WWWDIR%%/app/view/img/lib/jquery-ui-icons_454545_256x240.png -%%WWWDIR%%/app/view/img/lib/jquery-ui-icons_888888_256x240.png -%%WWWDIR%%/app/view/img/lib/jquery-ui-icons_cd0a0a_256x240.png -%%WWWDIR%%/app/view/img/lib/jquery-upl-loading.gif -%%WWWDIR%%/app/view/img/lib/jquery-upl-progressbar.gif -%%WWWDIR%%/app/view/img/lib/select2-select2-spinner.gif -%%WWWDIR%%/app/view/img/lib/select2-select2.png -%%WWWDIR%%/app/view/img/lib/select2-select2x2.png -%%WWWDIR%%/app/view/img/log.png -%%WWWDIR%%/app/view/img/pin_red.png -%%WWWDIR%%/app/view/img/queries.png -%%WWWDIR%%/app/view/img/server.png -%%WWWDIR%%/app/view/img/sidebarbg.png -%%WWWDIR%%/app/view/js/bolt.min.js -%%WWWDIR%%/app/view/js/ckeditor/ckeditor.js -%%WWWDIR%%/app/view/js/ckeditor/config.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/about/dialogs/about.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png -%%WWWDIR%%/app/view/js/ckeditor/plugins/about/dialogs/logo_ckeditor.png -%%WWWDIR%%/app/view/js/ckeditor/plugins/clipboard/dialogs/paste.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/css/codemirror.min.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/js/beautify.min.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/js/codemirror.addons.min.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/js/codemirror.addons.search.min.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/js/codemirror.min.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/js/codemirror.mode.bbcode.min.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/js/codemirror.mode.bbcodemixed.min.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/js/codemirror.mode.htmlmixed.min.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/js/codemirror.mode.javascript.min.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/js/codemirror.mode.php.min.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/plugins/clike.min.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/plugins/css.min.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/plugins/htmlmixed.min.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/plugins/javascript.min.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/plugins/markdown.min.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/plugins/matchbrackets.min.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/plugins/php.min.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/plugins/xml.min.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/plugins/yaml.min.js -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/3024-day.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/3024-night.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/ambiance-mobile.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/ambiance.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/base16-dark.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/base16-light.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/blackboard.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/cobalt.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/colorforth.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/eclipse.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/elegant.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/erlang-dark.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/lesser-dark.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/liquibyte.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/mbo.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/mdn-like.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/midnight.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/monokai.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/neat.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/neo.css -%%WWWDIR%%/app/view/js/ckeditor/plugins/codemirror/theme/night.css *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Fri Jun 9 15:13:43 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 CF646BF724A; Fri, 9 Jun 2017 15:13:43 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 017017066F; Fri, 9 Jun 2017 15:13:42 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v59FDgiM036950; Fri, 9 Jun 2017 15:13:42 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v59FDgVw036948; Fri, 9 Jun 2017 15:13:42 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201706091513.v59FDgVw036948@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Fri, 9 Jun 2017 15:13:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443011 - branches/2017Q2/x11-fonts/uw-ttyp0 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, 09 Jun 2017 15:13:43 -0000 Author: rakuco Date: Fri Jun 9 15:13:41 2017 New Revision: 443011 URL: https://svnweb.freebsd.org/changeset/ports/443011 Log: MFH: r443009 Fix plist. Approved by: ports-secteam (blanket approval) Modified: branches/2017Q2/x11-fonts/uw-ttyp0/Makefile branches/2017Q2/x11-fonts/uw-ttyp0/pkg-plist Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/x11-fonts/uw-ttyp0/Makefile ============================================================================== --- branches/2017Q2/x11-fonts/uw-ttyp0/Makefile Fri Jun 9 15:13:06 2017 (r443010) +++ branches/2017Q2/x11-fonts/uw-ttyp0/Makefile Fri Jun 9 15:13:41 2017 (r443011) @@ -2,6 +2,7 @@ PORTNAME= uw-ttyp0 PORTVERSION= 1.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= http://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/ Modified: branches/2017Q2/x11-fonts/uw-ttyp0/pkg-plist ============================================================================== --- branches/2017Q2/x11-fonts/uw-ttyp0/pkg-plist Fri Jun 9 15:13:06 2017 (r443010) +++ branches/2017Q2/x11-fonts/uw-ttyp0/pkg-plist Fri Jun 9 15:13:41 2017 (r443011) @@ -1,3 +1,5 @@ +share/fonts/uw-ttyp0/fonts.dir +share/fonts/uw-ttyp0/fonts.scale share/fonts/uw-ttyp0/t0-11-i01.pcf.gz share/fonts/uw-ttyp0/t0-11-i02.pcf.gz share/fonts/uw-ttyp0/t0-11-i07.pcf.gz From owner-svn-ports-branches@freebsd.org Fri Jun 9 15:33: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 AAD17BF7B33; Fri, 9 Jun 2017 15:33:30 +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 75F6E719AE; Fri, 9 Jun 2017 15:33:30 +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 v59FXT9v045382; Fri, 9 Jun 2017 15:33:29 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v59FXT4a045381; Fri, 9 Jun 2017 15:33:29 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201706091533.v59FXT4a045381@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 9 Jun 2017 15:33:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443014 - branches/2017Q2/www/bolt 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, 09 Jun 2017 15:33:30 -0000 Author: feld Date: Fri Jun 9 15:33:29 2017 New Revision: 443014 URL: https://svnweb.freebsd.org/changeset/ports/443014 Log: MFH: r443013 www/bolt: Fix pkg-message Accidentally changed pkg-message to be pkg-descr due to lack of caffeine. Pointyhat: me Approved by: ports-secteam (with hat) Modified: branches/2017Q2/www/bolt/pkg-message Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/www/bolt/pkg-message ============================================================================== --- branches/2017Q2/www/bolt/pkg-message Fri Jun 9 15:31:27 2017 (r443013) +++ branches/2017Q2/www/bolt/pkg-message Fri Jun 9 15:33:29 2017 (r443014) @@ -1,7 +1,7 @@ -Bolt is a tool for Content Management, which strives to be as simple and -straightforward as possible. It is quick to set up, easy to configure, -uses elegant templates, and above all: It's a joy to use. Bolt is -created using modern open source libraries, and is best suited to build -sites in HTML5 with modern markup. -WWW: https://bolt.cm/ + +Additional configuration documentation can be found at: + +https://docs.bolt.cm/installation + + From owner-svn-ports-branches@freebsd.org Fri Jun 9 15:58:14 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C03CBBF8458; Fri, 9 Jun 2017 15:58:14 +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 9ACA6729DA; Fri, 9 Jun 2017 15:58:14 +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 v59FwDFp054455; Fri, 9 Jun 2017 15:58:13 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v59FwDc2054452; Fri, 9 Jun 2017 15:58:13 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201706091558.v59FwDc2054452@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 9 Jun 2017 15:58:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443017 - in branches/2017Q2/security/heimdal: . 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, 09 Jun 2017 15:58:14 -0000 Author: feld Date: Fri Jun 9 15:58:13 2017 New Revision: 443017 URL: https://svnweb.freebsd.org/changeset/ports/443017 Log: MFH: r443016 security/heimdal: Backport security fix PR: 219657 Security: CVE-2017-6594 Approved by: ports-secteam (with hat) Added: branches/2017Q2/security/heimdal/files/patch-CVE-2017-6594 - copied unchanged from r443016, head/security/heimdal/files/patch-CVE-2017-6594 Modified: branches/2017Q2/security/heimdal/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/security/heimdal/Makefile ============================================================================== --- branches/2017Q2/security/heimdal/Makefile Fri Jun 9 15:57:30 2017 (r443016) +++ branches/2017Q2/security/heimdal/Makefile Fri Jun 9 15:58:13 2017 (r443017) @@ -3,7 +3,7 @@ PORTNAME= heimdal PORTVERSION= 7.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security ipv6 MASTER_SITES= http://www.h5l.org/dist/src/ \ http://ftp.pdc.kth.se/pub/heimdal/src/ \ Copied: branches/2017Q2/security/heimdal/files/patch-CVE-2017-6594 (from r443016, head/security/heimdal/files/patch-CVE-2017-6594) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/security/heimdal/files/patch-CVE-2017-6594 Fri Jun 9 15:58:13 2017 (r443017, copy of r443016, head/security/heimdal/files/patch-CVE-2017-6594) @@ -0,0 +1,168 @@ +diff -ru NEWS NEWS +--- NEWS 2016-11-29 01:35:27.000000000 +0000 ++++ NEWS 2017-06-03 15:23:36.264325000 +0000 +@@ -1,4 +1,18 @@ +-Release Notes - Heimdal - Version Heimdal 1.6 ++Release Notes - Heimdal - Version Heimdal 7.1.0,2 (FreeBSD port) ++ ++ Security ++ ++ - Fix transit path validation. Commit f469fc6 (2010-10-02) inadvertently ++ caused the previous hop realm to not be added to the transit path ++ of issued tickets. This may, in some cases, enable bypass of capath ++ policy in Heimdal versions 1.5 through 7.2. ++ ++ Note, this may break sites that rely on the bug. With the bug some ++ incomplete [capaths] worked, that should not have. These may now break ++ authentication in some cross-realm configurations. ++ (CVE-2017-6594) ++ ++Release Notes - Heimdal - Version Heimdal 7.1 + + Security + - ... +diff -ru kdc/krb5tgs.c kdc/krb5tgs.c +--- kdc/krb5tgs.c 2016-11-29 01:35:27.000000000 +0000 ++++ kdc/krb5tgs.c 2017-06-03 15:23:36.271738000 +0000 +@@ -655,8 +655,12 @@ + "Decoding transited encoding"); + return ret; + } ++ ++ /* ++ * If the realm of the presented tgt is neither the client nor the server ++ * realm, it is a transit realm and must be added to transited set. ++ */ + if(strcmp(client_realm, tgt_realm) && strcmp(server_realm, tgt_realm)) { +- /* not us, so add the previous realm to transited set */ + if (num_realms + 1 > UINT_MAX/sizeof(*realms)) { + ret = ERANGE; + goto free_realms; +@@ -737,6 +741,7 @@ + const char *server_name, + hdb_entry_ex *client, + krb5_principal client_principal, ++ const char *tgt_realm, + hdb_entry_ex *krbtgt, + krb5_enctype krbtgt_etype, + krb5_principals spp, +@@ -798,7 +803,7 @@ + &tgt->transited, &et, + krb5_principal_get_realm(context, client_principal), + krb5_principal_get_realm(context, server->entry.principal), +- krb5_principal_get_realm(context, krbtgt->entry.principal)); ++ tgt_realm); + if(ret) + goto out; + +@@ -1519,6 +1524,8 @@ + krb5_keyblock sessionkey; + krb5_kvno kvno; + krb5_data rspac; ++ const char *tgt_realm = /* Realm of TGT issuer */ ++ krb5_principal_get_realm(context, krbtgt->entry.principal); + const char *our_realm = /* Realm of this KDC */ + krb5_principal_get_comp_string(context, krbtgt->entry.principal, 1); + char **capath = NULL; +@@ -2324,6 +2331,7 @@ + spn, + client, + cp, ++ tgt_realm, + krbtgt_out, + tkey_sign->key.keytype, + spp, +diff -ru tests/kdc/check-kdc.in tests/kdc/check-kdc.in +--- tests/kdc/check-kdc.in 2016-12-14 18:01:18.000000000 +0000 ++++ tests/kdc/check-kdc.in 2017-06-03 15:23:36.276571000 +0000 +@@ -53,6 +53,7 @@ + R5=SOME-REALM5.FR + R6=SOME-REALM6.US + R7=SOME-REALM7.UK ++R8=SOME-REALM8.UK + + H1=H1.$R + H2=H2.$R +@@ -152,6 +153,12 @@ + init \ + --realm-max-ticket-life=1day \ + --realm-max-renewable-life=1month \ ++ ${R8} || exit 1 ++ ++${kadmin} \ ++ init \ ++ --realm-max-ticket-life=1day \ ++ --realm-max-renewable-life=1month \ + ${H1} || exit 1 + + ${kadmin} \ +@@ -191,6 +198,7 @@ + ${kadmin5} add -p foo --use-defaults foo@${R5} || exit 1 + ${kadmin} add -p foo --use-defaults foo@${R6} || exit 1 + ${kadmin} add -p foo --use-defaults foo@${R7} || exit 1 ++${kadmin} add -p foo --use-defaults foo@${R8} || exit 1 + ${kadmin} add -p foo --use-defaults foo@${H1} || exit 1 + ${kadmin} add -p foo --use-defaults foo/host.${h1}@${H1} || exit 1 + ${kadmin} add -p foo --use-defaults foo@${H2} || exit 1 +@@ -249,6 +257,9 @@ + ${kadmin} add -p cross1 --use-defaults krbtgt/${R7}@${R6} || exit 1 + ${kadmin} add -p cross2 --use-defaults krbtgt/${R6}@${R7} || exit 1 + ++${kadmin} add -p cross1 --use-defaults krbtgt/${R8}@${R6} || exit 1 ++${kadmin} add -p cross2 --use-defaults krbtgt/${R6}@${R8} || exit 1 ++ + ${kadmin} add -p cross1 --use-defaults krbtgt/${H1}@${R} || exit 1 + ${kadmin} add -p cross2 --use-defaults krbtgt/${R}@${H1} || exit 1 + +@@ -284,6 +295,7 @@ + ${kadmin5} check ${R5} || exit 1 + ${kadmin} check ${R6} || exit 1 + ${kadmin} check ${R7} || exit 1 ++${kadmin} check ${R8} || exit 1 + ${kadmin} check ${H1} || exit 1 + ${kadmin} check ${H2} || exit 1 + ${kadmin} check ${H3} || exit 1 +@@ -388,6 +400,8 @@ + ${kgetcred} foo@${R6} || { ec=1 ; eval "${testfailed}"; } + echo "Getting x-realm tickets with capaths for $R -> $R7" + ${kgetcred} foo@${R7} || { ec=1 ; eval "${testfailed}"; } ++echo "Should not get x-realm tickets with capaths for $R -> $R8" ++${kgetcred} foo@${R8} && { ec=1 ; eval "${testfailed}"; } + ${kdestroy} + + echo "Testing capaths logic (reverse order)" +@@ -418,10 +432,13 @@ + + echo "Getting x-realm tickets with hierarchical referrals for $H3 -> $H1" + ${kgetcred} --hostbased --canonicalize foo host.${h1} || { ec=1 ; eval "${testfailed}"; } ++fgrep "cross-realm ${H3} -> ${H1} via [${H2}, ${R}]" messages.log > /dev/null || { ec=1 ; eval "${testfailed}"; } + echo "Getting x-realm tickets with hierarchical referrals for $H3 -> $R" + ${kgetcred} --hostbased --canonicalize foo host.${r} || { ec=1 ; eval "${testfailed}"; } ++fgrep "cross-realm ${H3} -> ${R} via [${H2}]" messages.log > /dev/null || { ec=1 ; eval "${testfailed}"; } + echo "Getting x-realm tickets with hierarchical referrals for $H3 -> $H2" + ${kgetcred} --hostbased --canonicalize foo host.${h2} || { ec=1 ; eval "${testfailed}"; } ++fgrep "cross-realm ${H3} -> ${H2}" messages.log > /dev/null || { ec=1 ; eval "${testfailed}"; } + ${kdestroy} + + echo "Testing multi-hop [capaths] referral logic" +diff -ru tests/kdc/krb5.conf.in tests/kdc/krb5.conf.in +--- tests/kdc/krb5.conf.in 2016-11-29 01:35:28.000000000 +0000 ++++ tests/kdc/krb5.conf.in 2017-06-03 15:23:36.278848000 +0000 +@@ -40,6 +40,9 @@ + SOME-REALM7.UK = { + kdc = localhost:@port@ + } ++ SOME-REALM8.UK = { ++ kdc = localhost:@port@ ++ } + TEST-HTTP.H5L.SE = { + kdc = http/localhost:@port@ + } +@@ -147,6 +150,7 @@ + SOME-REALM6.US = SOME-REALM5.FR + SOME-REALM7.UK = SOME-REALM6.US + SOME-REALM7.UK = SOME-REALM5.FR ++ SOME-REALM8.UK = SOME-REALM6.US + } + H4.H2.TEST.H5L.SE = { + H1.TEST.H5L.SE = H3.H2.TEST.H5L.SE From owner-svn-ports-branches@freebsd.org Fri Jun 9 18:23: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 CE6AFBFA55C; Fri, 9 Jun 2017 18:23: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 188D576ADE; Fri, 9 Jun 2017 18:23: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 v59INJ6T016243; Fri, 9 Jun 2017 18:23:19 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v59INJ2N016241; Fri, 9 Jun 2017 18:23:19 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201706091823.v59INJ2N016241@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 9 Jun 2017 18:23:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443027 - branches/2017Q2/mail/roundcube 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, 09 Jun 2017 18:23:20 -0000 Author: feld Date: Fri Jun 9 18:23:18 2017 New Revision: 443027 URL: https://svnweb.freebsd.org/changeset/ports/443027 Log: mail/roundcube: Update to 1.2.5 PR: 219789 Security: CVE-2017-8114 Approved by: ports-secteam (with hat) Modified: branches/2017Q2/mail/roundcube/Makefile branches/2017Q2/mail/roundcube/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/mail/roundcube/Makefile ============================================================================== --- branches/2017Q2/mail/roundcube/Makefile Fri Jun 9 18:21:17 2017 (r443026) +++ branches/2017Q2/mail/roundcube/Makefile Fri Jun 9 18:23:18 2017 (r443027) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= roundcube -DISTVERSION= 1.2.3 +DISTVERSION= 1.2.5 PORTEPOCH= 1 CATEGORIES?= mail www MASTER_SITES= https://github.com/roundcube/roundcubemail/releases/download/${DISTVERSION}/ Modified: branches/2017Q2/mail/roundcube/distinfo ============================================================================== --- branches/2017Q2/mail/roundcube/distinfo Fri Jun 9 18:21:17 2017 (r443026) +++ branches/2017Q2/mail/roundcube/distinfo Fri Jun 9 18:23:18 2017 (r443027) @@ -1,3 +1,3 @@ -TIMESTAMP = 1480409130 -SHA256 (roundcubemail-1.2.3-complete.tar.gz) = d7f1d041557639c442691a1e5fa791ab77aa97327a0d328a22e0220f3cb2ca97 -SIZE (roundcubemail-1.2.3-complete.tar.gz) = 3894127 +TIMESTAMP = 1497032006 +SHA256 (roundcubemail-1.2.5-complete.tar.gz) = 5494f0a29ff1bc8542c6efc70fa3c35bba6229aebb9cd0d086fd552cb10bf4f3 +SIZE (roundcubemail-1.2.5-complete.tar.gz) = 3900925 From owner-svn-ports-branches@freebsd.org Fri Jun 9 19:40: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 DA832BFBB4A; Fri, 9 Jun 2017 19:40:18 +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 A593F79A7F; Fri, 9 Jun 2017 19:40:18 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v59JeHHS046290; Fri, 9 Jun 2017 19:40:17 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v59JeHYq046285; Fri, 9 Jun 2017 19:40:17 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201706091940.v59JeHYq046285@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 9 Jun 2017 19:40:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443038 - in branches/2017Q2/www/apache22: . 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, 09 Jun 2017 19:40:19 -0000 Author: feld Date: Fri Jun 9 19:40:17 2017 New Revision: 443038 URL: https://svnweb.freebsd.org/changeset/ports/443038 Log: MFH: r443037 www/apache22: Update to 2.2.32 Does not build with OpenSSL 1.1.x or LibreSSL 2.5.x which is a known issue. Changelog: http://www.apache.org/dist/httpd/CHANGES_2.2.32 PR: 219720 Security: CVE-2016-8743 Approved by: ports-secteam (with hat) Deleted: branches/2017Q2/www/apache22/files/patch-httpoxy Modified: branches/2017Q2/www/apache22/Makefile branches/2017Q2/www/apache22/distinfo branches/2017Q2/www/apache22/files/extra-patch-server_buildmark.c branches/2017Q2/www/apache22/files/patch-modules__ssl__ssl_engine_init.c branches/2017Q2/www/apache22/files/patch-support__ab.c Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/www/apache22/Makefile ============================================================================== --- branches/2017Q2/www/apache22/Makefile Fri Jun 9 19:39:30 2017 (r443037) +++ branches/2017Q2/www/apache22/Makefile Fri Jun 9 19:40:17 2017 (r443038) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= apache22 -PORTVERSION= 2.2.31 -PORTREVISION?= 1 +PORTVERSION= 2.2.32 +PORTREVISION?= 0 CATEGORIES= www ipv6 MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} @@ -16,7 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libexpat.so:textproc/expat2 \ libapr-1.so:devel/apr1 \ - libpcre.so:devel/pcre + libpcre.so:devel/pcre \ + libgdbm.so:databases/gdbm CONFLICTS_INSTALL= caudium14-1.* \ apache-*-2.2.* apache22-*-2.2.* \ @@ -26,7 +27,8 @@ DEPRECATED= Upstream propose EoL of apache 2.2.x duri EXPIRATION_DATE= 2017-07-01 USE_APACHE= common22 -USES= autoreconf cpe iconv libtool perl5 tar:bzip2 +USES= autoreconf bdb cpe iconv libtool perl5 tar:bzip2 + USE_PERL5= run USE_RC_SUBR= apache22 htcacheclean GNU_CONFIGURE= yes @@ -54,9 +56,9 @@ WITH_MPM?= prefork # or worker, event, itk, peruser WITH_HTTP_PORT?= 80 WITH_SSL_PORT?= 443 -.if !defined(WITH_DEBUG) -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-server_buildmark.c -.endif +#.if !defined(WITH_DEBUG) +#EXTRA_PATCHES+= ${FILESDIR}/extra-patch-server_buildmark.c +#.endif .include "${APACHEDIR}/Makefile.options" Modified: branches/2017Q2/www/apache22/distinfo ============================================================================== --- branches/2017Q2/www/apache22/distinfo Fri Jun 9 19:39:30 2017 (r443037) +++ branches/2017Q2/www/apache22/distinfo Fri Jun 9 19:40:17 2017 (r443038) @@ -1,2 +1,3 @@ -SHA256 (apache22/httpd-2.2.31.tar.bz2) = f32f9d19f535dac63b06cb55dfc023b40dcd28196b785f79f9346779e22f26ac -SIZE (apache22/httpd-2.2.31.tar.bz2) = 5610489 +TIMESTAMP = 1497032932 +SHA256 (apache22/httpd-2.2.32.tar.bz2) = 527bc9d8092d784daf08910dd6c9d2681d6a2325055b2cc69806a0a7df7ed650 +SIZE (apache22/httpd-2.2.32.tar.bz2) = 5777509 Modified: branches/2017Q2/www/apache22/files/extra-patch-server_buildmark.c ============================================================================== --- branches/2017Q2/www/apache22/files/extra-patch-server_buildmark.c Fri Jun 9 19:39:30 2017 (r443037) +++ branches/2017Q2/www/apache22/files/extra-patch-server_buildmark.c Fri Jun 9 19:40:17 2017 (r443038) @@ -1,7 +1,4 @@ -# disable build time stamp in favor of reproducible build -# except building with DEBUG -============================================================== ---- server/buildmark.c.orig 2016-07-03 16:09:18 UTC +--- server/buildmark.c.orig 2017-06-09 18:42:01 UTC +++ server/buildmark.c @@ -17,6 +17,9 @@ #include "ap_config.h" Modified: branches/2017Q2/www/apache22/files/patch-modules__ssl__ssl_engine_init.c ============================================================================== --- branches/2017Q2/www/apache22/files/patch-modules__ssl__ssl_engine_init.c Fri Jun 9 19:39:30 2017 (r443037) +++ branches/2017Q2/www/apache22/files/patch-modules__ssl__ssl_engine_init.c Fri Jun 9 19:40:17 2017 (r443038) @@ -1,6 +1,6 @@ ---- modules/ssl/ssl_engine_init.c.orig 2014-07-16 06:04:38 UTC +--- modules/ssl/ssl_engine_init.c.orig 2017-01-05 18:57:49 UTC +++ modules/ssl/ssl_engine_init.c -@@ -406,9 +406,11 @@ void ssl_init_Engine(server_rec *s, apr_ +@@ -251,9 +251,11 @@ void ssl_init_Engine(server_rec *s, apr_ ssl_die(); } @@ -12,26 +12,24 @@ if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, -@@ -584,6 +586,10 @@ static void ssl_init_ctx_protocol(server +@@ -446,6 +448,9 @@ static void ssl_init_ctx_protocol(server + } #endif - +#ifdef SSL_NO_COMP +#define OPENSSL_NO_COMP +#endif -+ + #ifndef OPENSSL_NO_COMP if (sc->compression != TRUE) { - #ifdef SSL_OP_NO_COMPRESSION -@@ -831,7 +837,11 @@ static void ssl_init_ctx_cert_chain(serv - } +@@ -708,7 +713,11 @@ static void ssl_init_ctx_cert_chain(serv } -- n = SSL_CTX_use_certificate_chain(mctx->ssl_ctx, + ERR_clear_error(); +#ifndef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN -+ n = SSL_CTX_use_certificate_chain(mctx->ssl_ctx, + n = SSL_CTX_use_certificate_chain(mctx->ssl_ctx, +#else -+ n = _SSL_CTX_use_certificate_chain(mctx->ssl_ctx, ++ n = _SSL_CTX_use_certificate_chain(mctx->ssl_ctx, +#endif (char *)chain, skip_first, NULL); Modified: branches/2017Q2/www/apache22/files/patch-support__ab.c ============================================================================== --- branches/2017Q2/www/apache22/files/patch-support__ab.c Fri Jun 9 19:39:30 2017 (r443037) +++ branches/2017Q2/www/apache22/files/patch-support__ab.c Fri Jun 9 19:40:17 2017 (r443038) @@ -1,6 +1,6 @@ Backport ab from apache 2.4.x (r1663405) ============================================================= ---- support/ab.c.orig 2014-03-12 11:53:12 UTC +--- support/ab.c.orig 2017-01-05 18:57:49 UTC +++ support/ab.c @@ -156,25 +156,8 @@ #include "ap_config_auto.h" @@ -29,7 +29,7 @@ Backport ab from apache 2.4.x (r1663405) #include #include #include -@@ -224,19 +207,25 @@ typedef STACK_OF(X509) X509_STACK_TYPE; +@@ -232,19 +215,25 @@ typedef STACK_OF(X509) X509_STACK_TYPE; /* maximum number of requests on a time limited test */ #define MAX_REQUESTS (INT_MAX > 50000 ? 50000 : INT_MAX) @@ -61,7 +61,7 @@ Backport ab from apache 2.4.x (r1663405) int state; apr_size_t read; /* amount of bytes read */ apr_size_t bread; /* amount of body read */ -@@ -267,8 +256,8 @@ struct data { +@@ -275,8 +264,8 @@ struct data { apr_interval_time_t time; /* time for connection */ }; @@ -72,7 +72,7 @@ Backport ab from apache 2.4.x (r1663405) #define ap_round_ms(a) ((apr_time_t)((a) + 500)/1000) #define ap_double_ms(a) ((double)(a)/1000.0) #define MAX_CONCURRENCY 20000 -@@ -277,35 +266,38 @@ struct data { +@@ -285,35 +274,38 @@ struct data { int verbosity = 0; /* no verbosity by default */ int recverrok = 0; /* ok to proceed after socket receive errors */ @@ -125,7 +125,7 @@ Backport ab from apache 2.4.x (r1663405) int isproxy = 0; apr_interval_time_t aprtimeout = apr_time_from_sec(30); /* timeout value */ -@@ -348,7 +340,7 @@ BIO *bio_out,*bio_err; +@@ -356,7 +348,7 @@ BIO *bio_out,*bio_err; apr_time_t start, lasttime, stoptime; /* global request (and its length) */ @@ -134,7 +134,7 @@ Backport ab from apache 2.4.x (r1663405) char *request = _request; apr_size_t reqlen; -@@ -364,6 +356,7 @@ apr_pool_t *cntxt; +@@ -372,6 +364,7 @@ apr_pool_t *cntxt; apr_pollset_t *readbits; @@ -142,7 +142,7 @@ Backport ab from apache 2.4.x (r1663405) apr_sockaddr_t *destsa; #ifdef NOT_ASCII -@@ -377,7 +370,7 @@ static void close_connection(struct conn +@@ -385,7 +378,7 @@ static void close_connection(struct conn /* simple little function to write an error string and exit */ @@ -151,7 +151,7 @@ Backport ab from apache 2.4.x (r1663405) { fprintf(stderr, "%s\n", s); if (done) -@@ -387,7 +380,7 @@ static void err(char *s) +@@ -395,7 +388,7 @@ static void err(char *s) /* simple little function to write an APR error string and exit */ @@ -160,7 +160,7 @@ Backport ab from apache 2.4.x (r1663405) { char buf[120]; -@@ -399,6 +392,87 @@ static void apr_err(char *s, apr_status_ +@@ -407,6 +400,87 @@ static void apr_err(char *s, apr_status_ exit(rv); } @@ -248,7 +248,7 @@ Backport ab from apache 2.4.x (r1663405) /* --------------------------------------------------------- */ /* write out request to a connection - assumes we can write * (small) request out in one go into our new socket buffer -@@ -464,7 +538,6 @@ static int ssl_rand_choosenum(int l, int +@@ -472,7 +546,6 @@ static int ssl_rand_choosenum(int l, int static void ssl_rand_seed(void) { @@ -256,7 +256,7 @@ Backport ab from apache 2.4.x (r1663405) int n, l; time_t t; pid_t pid; -@@ -476,7 +549,6 @@ static void ssl_rand_seed(void) +@@ -484,7 +557,6 @@ static void ssl_rand_seed(void) t = time(NULL); l = sizeof(time_t); RAND_seed((unsigned char *)&t, l); @@ -264,7 +264,7 @@ Backport ab from apache 2.4.x (r1663405) /* * seed in the current process id (usually just 4 bytes) -@@ -484,14 +556,12 @@ static void ssl_rand_seed(void) +@@ -492,14 +564,12 @@ static void ssl_rand_seed(void) pid = getpid(); l = sizeof(pid_t); RAND_seed((unsigned char *)&pid, l); @@ -279,7 +279,7 @@ Backport ab from apache 2.4.x (r1663405) } static int ssl_print_connection_info(BIO *bio, SSL *ssl) -@@ -514,6 +584,7 @@ static int ssl_print_connection_info(BIO +@@ -522,6 +592,7 @@ static int ssl_print_connection_info(BIO static void ssl_print_cert_info(BIO *bio, X509 *cert) { X509_NAME *dn; @@ -287,7 +287,7 @@ Backport ab from apache 2.4.x (r1663405) char buf[1024]; BIO_printf(bio, "Certificate version: %ld\n", X509_get_version(cert)+1); -@@ -525,8 +596,10 @@ static void ssl_print_cert_info(BIO *bio +@@ -533,8 +604,10 @@ static void ssl_print_cert_info(BIO *bio ASN1_UTCTIME_print(bio, X509_get_notAfter(cert)); BIO_printf(bio,"\n"); @@ -299,7 +299,7 @@ Backport ab from apache 2.4.x (r1663405) dn = X509_get_issuer_name(cert); X509_NAME_oneline(dn, buf, sizeof(buf)); -@@ -553,7 +626,6 @@ static void ssl_print_info(struct connec +@@ -561,7 +634,6 @@ static void ssl_print_info(struct connec for (i=1; issl); -@@ -574,7 +646,6 @@ static void ssl_proceed_handshake(struct +@@ -582,7 +654,6 @@ static void ssl_proceed_handshake(struct while (do_next) { int ret, ecode; @@ -315,7 +315,7 @@ Backport ab from apache 2.4.x (r1663405) ret = SSL_do_handshake(c->ssl); ecode = SSL_get_error(c->ssl, ret); -@@ -596,7 +667,7 @@ static void ssl_proceed_handshake(struct +@@ -604,7 +675,7 @@ static void ssl_proceed_handshake(struct else pk_bits = 0; /* Anon DH */ @@ -324,7 +324,7 @@ Backport ab from apache 2.4.x (r1663405) apr_snprintf(ssl_info, 128, "%s,%s,%d,%d", SSL_get_version(c->ssl), SSL_CIPHER_get_name(ci), -@@ -606,11 +677,7 @@ static void ssl_proceed_handshake(struct +@@ -614,11 +685,7 @@ static void ssl_proceed_handshake(struct do_next = 0; break; case SSL_ERROR_WANT_READ: @@ -337,7 +337,7 @@ Backport ab from apache 2.4.x (r1663405) do_next = 0; break; case SSL_ERROR_WANT_WRITE: -@@ -634,6 +701,10 @@ static void ssl_proceed_handshake(struct +@@ -642,6 +709,10 @@ static void ssl_proceed_handshake(struct static void write_request(struct connection * c) { @@ -348,7 +348,7 @@ Backport ab from apache 2.4.x (r1663405) do { apr_time_t tnow; apr_size_t l = c->rwrite; -@@ -649,7 +720,7 @@ static void write_request(struct connect +@@ -657,7 +728,7 @@ static void write_request(struct connect c->connect = tnow; c->rwrote = 0; c->rwrite = reqlen; @@ -357,7 +357,7 @@ Backport ab from apache 2.4.x (r1663405) c->rwrite += postlen; } else if (tnow > c->connect + aprtimeout) { -@@ -686,16 +757,9 @@ static void write_request(struct connect +@@ -694,16 +765,9 @@ static void write_request(struct connect c->rwrite -= l; } while (c->rwrite); @@ -376,7 +376,7 @@ Backport ab from apache 2.4.x (r1663405) } /* --------------------------------------------------------- */ -@@ -760,7 +824,10 @@ static void output_results(int sig) +@@ -768,7 +832,10 @@ static void output_results(int sig) #endif printf("\n"); printf("Document Path: %s\n", path); @@ -388,7 +388,7 @@ Backport ab from apache 2.4.x (r1663405) printf("\n"); printf("Concurrency Level: %d\n", concurrency); printf("Time taken for tests: %.3f seconds\n", timetaken); -@@ -769,16 +836,16 @@ static void output_results(int sig) +@@ -777,16 +844,16 @@ static void output_results(int sig) if (bad) printf(" (Connect: %d, Receive: %d, Length: %d, Exceptions: %d)\n", err_conn, err_recv, err_length, err_except); @@ -410,7 +410,7 @@ Backport ab from apache 2.4.x (r1663405) printf("HTML transferred: %" APR_INT64_T_FMT " bytes\n", totalbread); /* avoid divide by zero */ -@@ -791,11 +858,11 @@ static void output_results(int sig) +@@ -799,11 +866,11 @@ static void output_results(int sig) (double) timetaken * 1000 / done); printf("Transfer rate: %.2f [Kbytes/sec] received\n", (double) totalread / 1024 / timetaken); @@ -425,7 +425,7 @@ Backport ab from apache 2.4.x (r1663405) } } -@@ -943,9 +1010,8 @@ static void output_results(int sig) +@@ -951,9 +1018,8 @@ static void output_results(int sig) printf(" min avg max\n"); #define CONF_FMT_STRING "%5" APR_TIME_T_FMT " %5" APR_TIME_T_FMT "%5" APR_TIME_T_FMT "\n" printf("Connect: " CONF_FMT_STRING, mincon, meancon, maxcon); @@ -437,7 +437,7 @@ Backport ab from apache 2.4.x (r1663405) printf("Total: " CONF_FMT_STRING, mintot, meantot, maxtot); #undef CONF_FMT_STRING } -@@ -972,7 +1038,7 @@ static void output_results(int sig) +@@ -980,7 +1046,7 @@ static void output_results(int sig) exit(1); } fprintf(out, "" "Percentage served" "," "Time in ms" "\n"); @@ -446,7 +446,7 @@ Backport ab from apache 2.4.x (r1663405) double t; if (i == 0) t = ap_double_ms(stats[0].time); -@@ -1033,9 +1099,14 @@ static void output_html_results(void) +@@ -1041,9 +1107,14 @@ static void output_html_results(void) printf("Document Path:" "%s\n", trstring, tdstring, tdstring, path); @@ -464,7 +464,7 @@ Backport ab from apache 2.4.x (r1663405) printf("Concurrency Level:" "%d\n", trstring, tdstring, tdstring, concurrency); -@@ -1062,14 +1133,11 @@ static void output_html_results(void) +@@ -1070,14 +1141,11 @@ static void output_html_results(void) printf("Total transferred:" "%" APR_INT64_T_FMT " bytes\n", trstring, tdstring, tdstring, totalread); @@ -483,7 +483,7 @@ Backport ab from apache 2.4.x (r1663405) printf("HTML transferred:" "%" APR_INT64_T_FMT " bytes\n", trstring, tdstring, tdstring, totalbread); -@@ -1078,19 +1146,19 @@ static void output_html_results(void) +@@ -1086,19 +1154,19 @@ static void output_html_results(void) if (timetaken) { printf("Requests per second:" "%.2f\n", @@ -508,7 +508,7 @@ Backport ab from apache 2.4.x (r1663405) } } { -@@ -1154,7 +1222,7 @@ static void start_connect(struct connect +@@ -1162,7 +1230,7 @@ static void start_connect(struct connect apr_status_t rv; if (!(started < requests)) @@ -517,7 +517,7 @@ Backport ab from apache 2.4.x (r1663405) c->read = 0; c->bread = 0; -@@ -1171,18 +1239,30 @@ static void start_connect(struct connect +@@ -1179,18 +1247,30 @@ static void start_connect(struct connect SOCK_STREAM, 0, c->ctx)) != APR_SUCCESS) { apr_err("socket", rv); } @@ -550,7 +550,7 @@ Backport ab from apache 2.4.x (r1663405) windowsize); if (rv != APR_SUCCESS && rv != APR_ENOTIMPL) { apr_err("socket receive buffer", rv); -@@ -1215,21 +1295,12 @@ static void start_connect(struct connect +@@ -1223,21 +1303,12 @@ static void start_connect(struct connect #endif if ((rv = apr_socket_connect(c->aprsock, destsa)) != APR_SUCCESS) { if (APR_STATUS_IS_EINPROGRESS(rv)) { @@ -574,7 +574,7 @@ Backport ab from apache 2.4.x (r1663405) apr_socket_close(c->aprsock); err_conn++; if (bad++ > 10) { -@@ -1237,15 +1308,14 @@ static void start_connect(struct connect +@@ -1245,15 +1316,14 @@ static void start_connect(struct connect "\nTest aborted after 10 failures\n\n"); apr_err("apr_socket_connect()", rv); } @@ -592,7 +592,7 @@ Backport ab from apache 2.4.x (r1663405) #ifdef USE_SSL if (c->ssl) { ssl_proceed_handshake(c); -@@ -1274,7 +1344,7 @@ static void close_connection(struct conn +@@ -1282,7 +1352,7 @@ static void close_connection(struct conn /* first time here */ doclen = c->bread; } @@ -601,7 +601,7 @@ Backport ab from apache 2.4.x (r1663405) bad++; err_length++; } -@@ -1293,21 +1363,15 @@ static void close_connection(struct conn +@@ -1301,21 +1371,15 @@ static void close_connection(struct conn } } @@ -630,7 +630,7 @@ Backport ab from apache 2.4.x (r1663405) /* connect again */ start_connect(c); -@@ -1337,11 +1401,21 @@ static void read_connection(struct conne +@@ -1345,11 +1409,21 @@ static void read_connection(struct conne good++; close_connection(c); } @@ -653,7 +653,7 @@ Backport ab from apache 2.4.x (r1663405) ERR_print_errors(bio_err); close_connection(c); } -@@ -1425,10 +1499,7 @@ static void read_connection(struct conne +@@ -1433,10 +1507,7 @@ static void read_connection(struct conne } else { /* header is in invalid or too big - close connection */ @@ -665,7 +665,7 @@ Backport ab from apache 2.4.x (r1663405) apr_socket_close(c->aprsock); err_response++; if (bad++ > 10) { -@@ -1444,12 +1515,14 @@ static void read_connection(struct conne +@@ -1452,12 +1523,14 @@ static void read_connection(struct conne * this is first time, extract some interesting info */ char *p, *q; @@ -682,7 +682,7 @@ Backport ab from apache 2.4.x (r1663405) } *q = 0; } -@@ -1491,12 +1564,12 @@ static void read_connection(struct conne +@@ -1499,12 +1572,12 @@ static void read_connection(struct conne if (cl) { c->keepalive = 1; /* response to HEAD doesn't have entity body */ @@ -697,7 +697,7 @@ Backport ab from apache 2.4.x (r1663405) } } c->bread += c->cbx - (s + l - c->cbuff) + r - tocopy; -@@ -1517,7 +1590,7 @@ static void read_connection(struct conne +@@ -1525,7 +1598,7 @@ static void read_connection(struct conne /* first time here */ doclen = c->bread; } @@ -706,7 +706,7 @@ Backport ab from apache 2.4.x (r1663405) bad++; err_length++; } -@@ -1552,7 +1625,8 @@ static void read_connection(struct conne +@@ -1560,7 +1633,8 @@ static void read_connection(struct conne static void test(void) { apr_time_t stoptime; @@ -716,7 +716,7 @@ Backport ab from apache 2.4.x (r1663405) int i; apr_status_t status; int snprintf_res = 0; -@@ -1578,11 +1652,16 @@ static void test(void) +@@ -1586,11 +1660,16 @@ static void test(void) fflush(stdout); } @@ -736,7 +736,7 @@ Backport ab from apache 2.4.x (r1663405) apr_err("apr_pollset_create failed", status); } -@@ -1612,12 +1691,12 @@ static void test(void) +@@ -1620,12 +1699,12 @@ static void test(void) } /* setup request */ @@ -751,7 +751,7 @@ Backport ab from apache 2.4.x (r1663405) (isproxy) ? fullurl : path, keepalive ? "Connection: Keep-Alive\r\n" : "", cookie, auth, hdrs); -@@ -1630,32 +1709,28 @@ static void test(void) +@@ -1638,32 +1717,28 @@ static void test(void) "Content-type: %s\r\n" "%s" "\r\n", @@ -791,7 +791,7 @@ Backport ab from apache 2.4.x (r1663405) strcpy(buff, request); memcpy(buff + reqlen, postdata, postlen); request = buff; -@@ -1673,8 +1748,20 @@ static void test(void) +@@ -1681,8 +1756,20 @@ static void test(void) } #endif /* NOT_ASCII */ @@ -814,7 +814,7 @@ Backport ab from apache 2.4.x (r1663405) != APR_SUCCESS) { char buf[120]; apr_snprintf(buf, sizeof(buf), -@@ -1686,7 +1773,7 @@ static void test(void) +@@ -1694,7 +1781,7 @@ static void test(void) start = lasttime = apr_time_now(); stoptime = tlimit ? (start + apr_time_from_sec(tlimit)) : AB_MAX; @@ -823,7 +823,7 @@ Backport ab from apache 2.4.x (r1663405) /* Output the results if the user terminates the run early. */ apr_signal(SIGINT, output_results); #endif -@@ -1699,24 +1786,19 @@ static void test(void) +@@ -1707,24 +1794,19 @@ static void test(void) do { apr_int32_t n; @@ -853,7 +853,7 @@ Backport ab from apache 2.4.x (r1663405) /* * If the connection isn't connected how can we check it? -@@ -1724,7 +1806,7 @@ static void test(void) +@@ -1732,7 +1814,7 @@ static void test(void) if (c->state == STATE_UNCONNECTED) continue; @@ -862,7 +862,7 @@ Backport ab from apache 2.4.x (r1663405) #ifdef USE_SSL if (c->state == STATE_CONNECTED && c->ssl && SSL_in_init(c->ssl)) { -@@ -1745,22 +1827,25 @@ static void test(void) +@@ -1753,22 +1835,25 @@ static void test(void) * connection is done and we loop here endlessly calling * apr_poll(). */ @@ -896,7 +896,7 @@ Backport ab from apache 2.4.x (r1663405) apr_socket_close(c->aprsock); err_conn++; if (bad++ > 10) { -@@ -1768,13 +1853,11 @@ static void test(void) +@@ -1776,13 +1861,11 @@ static void test(void) "\nTest aborted after 10 failures\n\n"); apr_err("apr_socket_connect()", rv); } @@ -911,7 +911,7 @@ Backport ab from apache 2.4.x (r1663405) #ifdef USE_SSL if (c->ssl) ssl_proceed_handshake(c); -@@ -1787,25 +1870,9 @@ static void test(void) +@@ -1795,25 +1878,9 @@ static void test(void) write_request(c); } } @@ -938,7 +938,7 @@ Backport ab from apache 2.4.x (r1663405) if (heartbeatres) fprintf(stderr, "Finished %d requests\n", done); else -@@ -1823,14 +1890,14 @@ static void test(void) +@@ -1831,14 +1898,14 @@ static void test(void) static void copyright(void) { if (!use_html) { @@ -955,7 +955,7 @@ Backport ab from apache 2.4.x (r1663405) printf(" Copyright 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/
\n"); printf(" Licensed to The Apache Software Foundation, http://www.apache.org/
\n"); printf("

\n

\n"); -@@ -1849,12 +1916,16 @@ static void usage(const char *progname) +@@ -1857,12 +1924,16 @@ static void usage(const char *progname) */ fprintf(stderr, "Options are:\n"); fprintf(stderr, " -n requests Number of requests to perform\n"); @@ -975,7 +975,7 @@ Backport ab from apache 2.4.x (r1663405) fprintf(stderr, " 'application/x-www-form-urlencoded'\n"); fprintf(stderr, " Default is 'text/plain'\n"); fprintf(stderr, " -v verbosity How much troubleshooting info to print\n"); -@@ -1863,7 +1934,7 @@ static void usage(const char *progname) +@@ -1871,7 +1942,7 @@ static void usage(const char *progname) fprintf(stderr, " -x attributes String to insert as table attributes\n"); fprintf(stderr, " -y attributes String to insert as tr attributes\n"); fprintf(stderr, " -z attributes String to insert as td or th attributes\n"); @@ -984,7 +984,7 @@ Backport ab from apache 2.4.x (r1663405) fprintf(stderr, " -H attribute Add Arbitrary header line, eg. 'Accept-Encoding: gzip'\n"); fprintf(stderr, " Inserted after all normal header lines. (repeatable)\n"); fprintf(stderr, " -A attribute Add Basic WWW Authentication, the attributes\n"); -@@ -1875,9 +1946,12 @@ static void usage(const char *progname) +@@ -1883,9 +1954,12 @@ static void usage(const char *progname) fprintf(stderr, " -k Use HTTP KeepAlive feature\n"); fprintf(stderr, " -d Do not show percentiles served table.\n"); fprintf(stderr, " -S Do not show confidence estimators and warnings.\n"); @@ -997,8 +997,8 @@ Backport ab from apache 2.4.x (r1663405) fprintf(stderr, " -h Display usage information (this message)\n"); #ifdef USE_SSL -@@ -1887,6 +1961,12 @@ static void usage(const char *progname) - #define SSL2_HELP_MSG "" +@@ -1901,6 +1975,12 @@ static void usage(const char *progname) + #define SSL3_HELP_MSG "" #endif +#ifndef OPENSSL_NO_SSL3 @@ -1010,19 +1010,8 @@ Backport ab from apache 2.4.x (r1663405) #ifdef HAVE_TLSV1_X #define TLS1_X_HELP_MSG ", TLS1.1, TLS1.2" #else -@@ -1894,8 +1974,8 @@ static void usage(const char *progname) - #endif +@@ -1918,7 +1998,7 @@ static void usage(const char *progname) - fprintf(stderr, " -Z ciphersuite Specify SSL/TLS cipher suite (See openssl ciphers)\n"); -- fprintf(stderr, " -f protocol Specify SSL/TLS protocol\n"); -- fprintf(stderr, " (" SSL2_HELP_MSG "SSL3, TLS1" TLS1_X_HELP_MSG " or ALL)\n"); -+ fprintf(stderr, " -f protocol Specify SSL/TLS protocol\n"); -+ fprintf(stderr, " (" SSL2_HELP_MSG SSL3_HELP_MSG "TLS1" TLS1_X_HELP_MSG " or ALL)\n"); - #endif - exit(EINVAL); - } -@@ -1904,7 +1984,7 @@ static void usage(const char *progname) - /* split URL into parts */ -static int parse_url(char *url) @@ -1030,7 +1019,7 @@ Backport ab from apache 2.4.x (r1663405) { char *cp; char *h; -@@ -1935,9 +2015,7 @@ static int parse_url(char *url) +@@ -1949,9 +2029,7 @@ static int parse_url(char *url) if ((cp = strchr(url, '/')) == NULL) return 1; @@ -1041,7 +1030,7 @@ Backport ab from apache 2.4.x (r1663405) rv = apr_parse_addr_port(&hostname, &scope_id, &port, h, cntxt); if (rv != APR_SUCCESS || !hostname || scope_id) { return 1; -@@ -1974,9 +2052,9 @@ static int parse_url(char *url) +@@ -1988,9 +2066,9 @@ static int parse_url(char *url) /* ------------------------------------------------------- */ @@ -1053,7 +1042,7 @@ Backport ab from apache 2.4.x (r1663405) { apr_file_t *postfd; apr_finfo_t finfo; -@@ -1997,11 +2075,7 @@ static int open_postfile(const char *pfi +@@ -2011,11 +2089,7 @@ static int open_postfile(const char *pfi return rv; } postlen = (apr_size_t)finfo.size; @@ -1066,7 +1055,7 @@ Backport ab from apache 2.4.x (r1663405) rv = apr_file_read_full(postfd, postdata, postlen, NULL); if (rv != APR_SUCCESS) { fprintf(stderr, "ab: Could not read POST data file: %s\n", -@@ -2009,7 +2083,7 @@ static int open_postfile(const char *pfi +@@ -2023,7 +2097,7 @@ static int open_postfile(const char *pfi return rv; } apr_file_close(postfd); @@ -1075,7 +1064,7 @@ Backport ab from apache 2.4.x (r1663405) } /* ------------------------------------------------------- */ -@@ -2017,11 +2091,11 @@ static int open_postfile(const char *pfi +@@ -2031,11 +2105,11 @@ static int open_postfile(const char *pfi /* sort out command-line args and call test */ int main(int argc, const char * const argv[]) { @@ -1089,7 +1078,7 @@ Backport ab from apache 2.4.x (r1663405) char c; #ifdef USE_SSL AB_SSL_METHOD_CONST SSL_METHOD *meth = SSLv23_client_method(); -@@ -2033,12 +2107,13 @@ int main(int argc, const char * const ar +@@ -2047,12 +2121,13 @@ int main(int argc, const char * const ar tdstring = "bgcolor=white"; cookie = ""; auth = ""; @@ -1104,7 +1093,7 @@ Backport ab from apache 2.4.x (r1663405) #ifdef NOT_ASCII status = apr_xlate_open(&to_ascii, "ISO-8859-1", APR_DEFAULT_CHARSET, cntxt); -@@ -2058,15 +2133,17 @@ int main(int argc, const char * const ar +@@ -2072,15 +2147,17 @@ int main(int argc, const char * const ar } #endif @@ -1125,7 +1114,7 @@ Backport ab from apache 2.4.x (r1663405) if (requests <= 0) { err("Invalid number of requests\n"); } -@@ -2078,76 +2155,80 @@ int main(int argc, const char * const ar +@@ -2092,76 +2169,80 @@ int main(int argc, const char * const ar heartbeatres = 0; break; case 'c': @@ -1235,7 +1224,7 @@ Backport ab from apache 2.4.x (r1663405) tmp[l] = '\0'; auth = apr_pstrcat(cntxt, auth, "Authorization: Basic ", tmp, -@@ -2157,27 +2238,27 @@ int main(int argc, const char * const ar +@@ -2171,27 +2252,27 @@ int main(int argc, const char * const ar /* * assume username passwd already to be in colon separated form. */ @@ -1271,7 +1260,7 @@ Backport ab from apache 2.4.x (r1663405) opt_useragent = 1; } break; -@@ -2190,7 +2271,7 @@ int main(int argc, const char * const ar +@@ -2204,7 +2285,7 @@ int main(int argc, const char * const ar */ case 'x': use_html = 1; @@ -1280,7 +1269,7 @@ Backport ab from apache 2.4.x (r1663405) break; case 'X': { -@@ -2198,22 +2279,22 @@ int main(int argc, const char * const ar +@@ -2212,22 +2293,22 @@ int main(int argc, const char * const ar /* * assume proxy-name[:port] */ @@ -1307,7 +1296,7 @@ Backport ab from apache 2.4.x (r1663405) break; case 'h': usage(argv[0]); -@@ -2221,26 +2302,35 @@ int main(int argc, const char * const ar +@@ -2235,28 +2316,34 @@ int main(int argc, const char * const ar case 'V': copyright(); return 0; @@ -1318,11 +1307,10 @@ Backport ab from apache 2.4.x (r1663405) case 'Z': - ssl_cipher = strdup(optarg); + ssl_cipher = strdup(opt_arg); -+ break; + break; + case 'm': + method = CUSTOM_METHOD; + method_str[CUSTOM_METHOD] = strdup(opt_arg); - break; case 'f': - if (strncasecmp(optarg, "ALL", 3) == 0) { + if (strncasecmp(opt_arg, "ALL", 3) == 0) { @@ -1332,11 +1320,11 @@ Backport ab from apache 2.4.x (r1663405) + } else if (strncasecmp(opt_arg, "SSL2", 4) == 0) { meth = SSLv2_client_method(); #endif + #ifndef OPENSSL_NO_SSL3 - } else if (strncasecmp(optarg, "SSL3", 4) == 0) { -+#ifndef OPENSSL_NO_SSL3 + } else if (strncasecmp(opt_arg, "SSL3", 4) == 0) { meth = SSLv3_client_method(); -+#endif + #endif #ifdef HAVE_TLSV1_X - } else if (strncasecmp(optarg, "TLS1.1", 6) == 0) { + } else if (strncasecmp(opt_arg, "TLS1.1", 6) == 0) { @@ -1350,7 +1338,7 @@ Backport ab from apache 2.4.x (r1663405) meth = TLSv1_client_method(); } break; -@@ -2253,6 +2343,10 @@ int main(int argc, const char * const ar +@@ -2269,6 +2356,10 @@ int main(int argc, const char * const ar usage(argv[0]); } @@ -1361,7 +1349,7 @@ Backport ab from apache 2.4.x (r1663405) if (parse_url(apr_pstrdup(cntxt, opt->argv[opt->ind++]))) { fprintf(stderr, "%s: invalid URL\n", argv[0]); usage(argv[0]); -@@ -2296,6 +2390,10 @@ int main(int argc, const char * const ar +@@ -2312,6 +2403,10 @@ int main(int argc, const char * const ar exit(1); } SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL); From owner-svn-ports-branches@freebsd.org Fri Jun 9 19:46:12 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE33FBFBD98; Fri, 9 Jun 2017 19:46:12 +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 8998279FB2; Fri, 9 Jun 2017 19:46:12 +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 v59JkBTh050201; Fri, 9 Jun 2017 19:46:11 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v59JkB4D050200; Fri, 9 Jun 2017 19:46:11 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201706091946.v59JkB4D050200@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 9 Jun 2017 19:46:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443039 - branches/2017Q2 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, 09 Jun 2017 19:46:13 -0000 Author: feld Date: Fri Jun 9 19:46:11 2017 New Revision: 443039 URL: https://svnweb.freebsd.org/changeset/ports/443039 Log: MFH: r441865 Remove BROKEN_SSL PR: 217703 Submitted by: Melvyn Sopacua Modified: Directory Properties: branches/2017Q2/ (props changed) From owner-svn-ports-branches@freebsd.org Fri Jun 9 19:49:42 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 E9A52BFBE4D; Fri, 9 Jun 2017 19:49:42 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (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 C15457A0E6; Fri, 9 Jun 2017 19:49:42 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 321C52091F; Fri, 9 Jun 2017 15:49:41 -0400 (EDT) Received: from web3 ([10.202.2.213]) by compute3.internal (MEProxy); Fri, 09 Jun 2017 15:49:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=FjwQO5 rLICGe531776wG23KSx2Iv+lzCY7BZHtaIZOw=; b=Pfm/BeghkLzIqpHFehqBpV QNp0ZZ7x9Y6tgNs7YjTx208V7bNt+vajbDetyiRN7Xz99FTwEwgPIHNByGaDCuHi xhaAC2CmS30WHfk7gztxADgHDsos7FyHQWu8fWiG66oiemCgIkZsO8zgjEOFTjyy i6fBovJchb9jYeFoywCyhWBnoiSk/HVB6c1bT6MllhXIlXextI/6BSV72KU3WCUa tE58KQSB+rmuQ2EaIR/KrzQeZI/2/kefxQUkB5SrnttKV2YafTH7srVROqScYCUm UGGfw0TYsNRbhC/fS19rG7Hw0IyU8J2T0FvwQ5rjaoOyqDrMscV0049mEY+fEe6w == X-ME-Sender: Received: by mailuser.nyi.internal (Postfix, from userid 99) id 04E459EDD7; Fri, 9 Jun 2017 15:49:40 -0400 (EDT) Message-Id: <1497037780.167039.1004506896.6EE77BCC@webmail.messagingengine.com> From: Mark Felder To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Cc: portmgr@FreeBSD.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" X-Mailer: MessagingEngine.com Webmail Interface - ajax-72fcb609 References: <201706091946.v59JkB4D050200@repo.freebsd.org> Date: Fri, 09 Jun 2017 14:49:40 -0500 In-Reply-To: <201706091946.v59JkB4D050200@repo.freebsd.org> Subject: Re: svn commit: r443039 - branches/2017Q2 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, 09 Jun 2017 19:49:43 -0000 This was a no-op and was not supposed to be committed. I accidentally hit "yes" but did not fill in an "Approved by:" line and it allowed the commit anyway, so I believe the pre-commit hook is broken at the moment. CC'ing portmgr. On Fri, Jun 9, 2017, at 14:46, Mark Felder wrote: > Author: feld > Date: Fri Jun 9 19:46:11 2017 > New Revision: 443039 > URL: https://svnweb.freebsd.org/changeset/ports/443039 > > Log: > MFH: r441865 > > Remove BROKEN_SSL > > PR: 217703 > Submitted by: Melvyn Sopacua > > Modified: > Directory Properties: > branches/2017Q2/ (props changed) > -- Mark Felder ports-secteam & portmgr member feld@FreeBSD.org From owner-svn-ports-branches@freebsd.org Fri Jun 9 21:42: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 6884EBFDC49; Fri, 9 Jun 2017 21:42:09 +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 32C237D508; Fri, 9 Jun 2017 21:42:09 +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 v59Lg8hc098485; Fri, 9 Jun 2017 21:42:08 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v59Lg8kE098484; Fri, 9 Jun 2017 21:42:08 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201706092142.v59Lg8kE098484@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 9 Jun 2017 21:42:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443043 - branches/2017Q2/accessibility/redshift 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, 09 Jun 2017 21:42:09 -0000 Author: feld Date: Fri Jun 9 21:42:08 2017 New Revision: 443043 URL: https://svnweb.freebsd.org/changeset/ports/443043 Log: MFH: r443042 accessibility/redshift: fix shebangs - Also add LICENSE and LICENSE_FILE PR: 219526 Modified: branches/2017Q2/accessibility/redshift/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/accessibility/redshift/Makefile ============================================================================== --- branches/2017Q2/accessibility/redshift/Makefile Fri Jun 9 21:39:22 2017 (r443042) +++ branches/2017Q2/accessibility/redshift/Makefile Fri Jun 9 21:42:08 2017 (r443043) @@ -3,16 +3,20 @@ PORTNAME= redshift PORTVERSION= 1.7 -PORTREVISION= 2 +PORTREVISION= 4 CATEGORIES= accessibility MASTER_SITES= http://launchpad.net/redshift/trunk/${PORTVERSION}/+download/ MAINTAINER= feld@FreeBSD.org COMMENT= Adjusts the color temperature of your screen -USES= gmake pkgconfig tar:bzip2 +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= gmake pkgconfig shebangfix tar:bzip2 GNU_CONFIGURE= yes INSTALLS_ICONS= yes +SHEBANG_FILES= src/gtk-redshift/gtk-redshift CONFIGURE_ARGS+= --disable-wingdi From owner-svn-ports-branches@freebsd.org Sat Jun 10 17:38: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 A2578BF2C17; Sat, 10 Jun 2017 17:38:50 +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 7060780F2E; Sat, 10 Jun 2017 17:38:50 +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 v5AHcnmN090620; Sat, 10 Jun 2017 17:38:49 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5AHcnBX090619; Sat, 10 Jun 2017 17:38:49 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201706101738.v5AHcnBX090619@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sat, 10 Jun 2017 17:38:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443104 - branches/2017Q2/security/heimdal 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, 10 Jun 2017 17:38:50 -0000 Author: feld Date: Sat Jun 10 17:38:49 2017 New Revision: 443104 URL: https://svnweb.freebsd.org/changeset/ports/443104 Log: MFH: r443103 security/heimdal: Fix build Previous backported patch for CVE requires a new build dependency. PR: 219657 Reported by: Benjamin Woods Differential Revision: https://reviews.freebsd.org/D11125 Modified: branches/2017Q2/security/heimdal/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/security/heimdal/Makefile ============================================================================== --- branches/2017Q2/security/heimdal/Makefile Sat Jun 10 17:38:14 2017 (r443103) +++ branches/2017Q2/security/heimdal/Makefile Sat Jun 10 17:38:49 2017 (r443104) @@ -16,6 +16,8 @@ COMMENT= Popular BSD-licensed implementation of Kerber LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= p5-JSON>=0:converters/p5-JSON + CONFLICTS= krb4-[0-9]* krb5-[0-9]* krb5-maint-[0-9]* srp-[0-9]* \ wu-ftpd-[0-9]* wu-ftpd+ipv6-[0-9]* From owner-svn-ports-branches@freebsd.org Sat Jun 10 21:51: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 590ADBF7058; Sat, 10 Jun 2017 21:51:20 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "plouf.absolight.net", Issuer "CAcert Class 3 Root" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 1AD1564429; Sat, 10 Jun 2017 21:51:20 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id 1641CBDC89; Sat, 10 Jun 2017 23:51:17 +0200 (CEST) Received: from atuin.in.mat.cc (atuin.in.mat.cc [79.143.241.205]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by prod2.absolight.net (Postfix) with ESMTPSA id DE919BDC85; Sat, 10 Jun 2017 23:51:16 +0200 (CEST) Subject: Re: svn commit: r443039 - branches/2017Q2 To: Mark Felder , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Cc: portmgr@FreeBSD.org References: <201706091946.v59JkB4D050200@repo.freebsd.org> <1497037780.167039.1004506896.6EE77BCC@webmail.messagingengine.com> From: Mathieu Arnold Organization: Absolight / The FreeBSD Foundation Message-ID: <26f1138a-5b9d-1817-2ddc-a5f876df75df@FreeBSD.org> Date: Sat, 10 Jun 2017 23:51:15 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <1497037780.167039.1004506896.6EE77BCC@webmail.messagingengine.com> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="gkCTubvp9IItQr51LRGXV0sPwiI2FQQni" 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, 10 Jun 2017 21:51:20 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --gkCTubvp9IItQr51LRGXV0sPwiI2FQQni Content-Type: multipart/mixed; boundary="G8Ekts1SpcXImPU6wdDgvE65tKlfnIMkn"; protected-headers="v1" From: Mathieu Arnold To: Mark Felder , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Cc: portmgr@FreeBSD.org Message-ID: <26f1138a-5b9d-1817-2ddc-a5f876df75df@FreeBSD.org> Subject: Re: svn commit: r443039 - branches/2017Q2 References: <201706091946.v59JkB4D050200@repo.freebsd.org> <1497037780.167039.1004506896.6EE77BCC@webmail.messagingengine.com> In-Reply-To: <1497037780.167039.1004506896.6EE77BCC@webmail.messagingengine.com> --G8Ekts1SpcXImPU6wdDgvE65tKlfnIMkn Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Language: fr Le 09/06/2017 =C3=A0 21:49, Mark Felder a =C3=A9crit : > This was a no-op and was not supposed to be committed. I accidentally > hit "yes" but did not fill in an "Approved by:" line and it allowed the= > commit anyway, so I believe the pre-commit hook is broken at the moment= =2E The pre-commit hook is working just fine, the thing is, you *are* a member of portmgr, so you get the "I'm god" treatment, and subversion goes along with it :-) --=20 Mathieu Arnold --G8Ekts1SpcXImPU6wdDgvE65tKlfnIMkn-- --gkCTubvp9IItQr51LRGXV0sPwiI2FQQni Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQJ8BAEBCgBmBQJZPGnUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzQUI2OTc4OUQyRUQxMjEwNjQ0MEJBNUIz QTQ1MTZGMzUxODNDRTQ4AAoJEDpFFvNRg85IR2EP/RioA/ttiJPlEEwijTP7OqdO i4nPDROCFAjh97osaxB4//mgk3/UlLgw4WlrYOOAX7DYHL6PFd18IBybKP9DEv3v Ydmzko/Ex9cJDSuIOn6JcNd+xoq362UEzhdsY/uDqB7TMy8DPxx0eeCQeiJi2jyg fiOACHSXE3AxLhyG6aZRIhJKcDH2ISBzF6bJalm30za8gShE1eCyQ6xDDgyGUwdb Qd7sqVDmh3AGJaHkrhLUgeBqLG2ZmOGkhQwGV0bsghBEtILEI+gm7ZTMPEQTVvDX qHSywxOltylQJ5S5WQJVh5AIj/mwr/yPVZ04sPmugdxe6KI52b1PYJs8hxeSNMrR jA6nHdMBh4wgSzQFSPNAXd30pjqWECEcxoG4ar9j09JQR0cikUydLJ7Fqy6vZJug M42whH2aHC4n88BI9FN/Po7MEisw0kbDM5u5LmCoQwoZVocPzgDHgCrr/ZD3Q1NI 4yp6w/ZMWCmAD8P5kN2DnzwHqJs68AksmkD+sRYdUB/IfwxMf36dHWQiFGuPhc35 zRlQkCQGICsRvE8JWZqO0LwNTnceO+UNi2R5Pd5QtouVP8LjVCBm+Nt9NZOfniqZ V5LpnlzxDO00koflwZXXD4Uv7odKoh2Pu0VO3cJWvJgzzfuoXbCfDJ6gCQG9r5Xm LGWgSncnMFHhF9hfY10y =WX9I -----END PGP SIGNATURE----- --gkCTubvp9IItQr51LRGXV0sPwiI2FQQni-- From owner-svn-ports-branches@freebsd.org Sat Jun 10 23: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 0CCB1BF81DA; Sat, 10 Jun 2017 23:16:48 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E1775662D1; Sat, 10 Jun 2017 23:16:47 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1033) id 191775EC3; Sat, 10 Jun 2017 23:16:47 +0000 (UTC) Date: Sat, 10 Jun 2017 23:16:47 +0000 From: Alexey Dokuchaev To: Mathieu Arnold Cc: Mark Felder , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org, portmgr@FreeBSD.org Subject: Re: svn commit: r443039 - branches/2017Q2 Message-ID: <20170610231647.GA99407@FreeBSD.org> References: <201706091946.v59JkB4D050200@repo.freebsd.org> <1497037780.167039.1004506896.6EE77BCC@webmail.messagingengine.com> <26f1138a-5b9d-1817-2ddc-a5f876df75df@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <26f1138a-5b9d-1817-2ddc-a5f876df75df@FreeBSD.org> User-Agent: Mutt/1.8.2 (2017-04-18) 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, 10 Jun 2017 23:16:48 -0000 On Sat, Jun 10, 2017 at 11:51:15PM +0200, Mathieu Arnold wrote: > Le 09/06/2017 ?? 21:49, Mark Felder a ??crit : > > This was a no-op and was not supposed to be committed. I accidentally > > hit "yes" but did not fill in an "Approved by:" line and it allowed the > > commit anyway, so I believe the pre-commit hook is broken at the moment. > > The pre-commit hook is working just fine, the thing is, you *are* a > member of portmgr, so you get the "I'm god" treatment, and subversion > goes along with it :-) Shouldn't it still require an explicit "(implicit)" line in this case? ./danfe