From owner-svn-ports-branches@freebsd.org Sun Oct 28 00:58:30 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 82B7510DA853; Sun, 28 Oct 2018 00:58:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 38CE584E76; Sun, 28 Oct 2018 00:58:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 134FF17F17; Sun, 28 Oct 2018 00:58:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9S0wTI4066013; Sun, 28 Oct 2018 00:58:29 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9S0wThS066012; Sun, 28 Oct 2018 00:58:29 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201810280058.w9S0wThS066012@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 28 Oct 2018 00:58:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483210 - branches/2018Q4/misc/raspberrypi-userland X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q4/misc/raspberrypi-userland X-SVN-Commit-Revision: 483210 X-SVN-Commit-Repository: ports 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.29 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, 28 Oct 2018 00:58:30 -0000 Author: jbeich Date: Sun Oct 28 00:58:29 2018 New Revision: 483210 URL: https://svnweb.freebsd.org/changeset/ports/483210 Log: MFH: r483208 misc/raspberrypi-userland: adjust GL conflict after r440699 pkg-static: mesa-libs-18.2.3_1 conflicts with raspberrypi-userland-20161026 (installs files into the same place). Problematic file: /usr/local/include/EGL/egl.h Approved by: ports-secteam blanket Modified: branches/2018Q4/misc/raspberrypi-userland/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/misc/raspberrypi-userland/Makefile ============================================================================== --- branches/2018Q4/misc/raspberrypi-userland/Makefile Sun Oct 28 00:52:30 2018 (r483209) +++ branches/2018Q4/misc/raspberrypi-userland/Makefile Sun Oct 28 00:58:29 2018 (r483210) @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE ONLY_FOR_ARCHS= armv6 armv7 -CONFLICTS_INSTALL= libglesv2 libEGL +CONFLICTS_INSTALL= mesa-libs USES= cmake:outsource pkgconfig shebangfix From owner-svn-ports-branches@freebsd.org Sun Oct 28 00:59:08 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 866C110DA8F5; Sun, 28 Oct 2018 00:59:08 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2F0E38509E; Sun, 28 Oct 2018 00:59:08 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 100EB17F19; Sun, 28 Oct 2018 00:59:08 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9S0x7qx066225; Sun, 28 Oct 2018 00:59:07 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9S0x7cL066223; Sun, 28 Oct 2018 00:59:07 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201810280059.w9S0x7cL066223@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 28 Oct 2018 00:59:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483211 - branches/2018Q4/multimedia/omxplayer X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q4/multimedia/omxplayer X-SVN-Commit-Revision: 483211 X-SVN-Commit-Repository: ports 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.29 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, 28 Oct 2018 00:59:08 -0000 Author: jbeich Date: Sun Oct 28 00:59:07 2018 New Revision: 483211 URL: https://svnweb.freebsd.org/changeset/ports/483211 Log: MFH: r483209 multimedia/omxplayer: unbreak with ffmpeg 4 In file included from BitstreamConverter.cpp:26: In file included from ./BitstreamConverter.h:27: ./DllAvFormat.h:117:49: error: no member named 'url_feof' in the global namespace; did you mean simply 'url_feof'? virtual int url_feof(AVIOContext *s) { return ::url_feof(s); } ^~~~~~~~~~ url_feof ./DllAvFormat.h:117:15: note: 'url_feof' declared here virtual int url_feof(AVIOContext *s) { return ::url_feof(s); } ^ OMXReader.cpp:1028:42: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE' pkt->data = (uint8_t*) malloc(size + FF_INPUT_BUFFER_PADDING_SIZE); ^ OMXReader.cpp:1036:35: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE' memset(pkt->data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE); ^ PR: 227726 Obtained from: upstream Approved by: ports-secteam blanket Modified: branches/2018Q4/multimedia/omxplayer/Makefile branches/2018Q4/multimedia/omxplayer/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/multimedia/omxplayer/Makefile ============================================================================== --- branches/2018Q4/multimedia/omxplayer/Makefile Sun Oct 28 00:58:29 2018 (r483210) +++ branches/2018Q4/multimedia/omxplayer/Makefile Sun Oct 28 00:59:07 2018 (r483211) @@ -6,6 +6,9 @@ PORTVERSION= 20161004 PORTREVISION= 9 CATEGORIES= multimedia +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= 96800576209b.patch:-p1 + MAINTAINER= mikael.urankar@gmail.com COMMENT= Raspberry Pi video player Modified: branches/2018Q4/multimedia/omxplayer/distinfo ============================================================================== --- branches/2018Q4/multimedia/omxplayer/distinfo Sun Oct 28 00:58:29 2018 (r483210) +++ branches/2018Q4/multimedia/omxplayer/distinfo Sun Oct 28 00:59:07 2018 (r483211) @@ -1,3 +1,5 @@ TIMESTAMP = 1483038468 SHA256 (popcornmix-omxplayer-20161004-12b472e_GH0.tar.gz) = 8aabcc8a1665686dfb72e74b30b6f755a72b5e5577e235dad6c1c6d28dc79637 SIZE (popcornmix-omxplayer-20161004-12b472e_GH0.tar.gz) = 1218679 +SHA256 (96800576209b.patch) = d1bdcf27c4f4ab9b9d85ee26d126b3eb62af827498860d3e9c430f111708bb8e +SIZE (96800576209b.patch) = 3484 From owner-svn-ports-branches@freebsd.org Sun Oct 28 08:54:38 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7D8EC10ECDD0; Sun, 28 Oct 2018 08:54:38 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2FB9F76903; Sun, 28 Oct 2018 08:54:38 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0FB5E1D33E; Sun, 28 Oct 2018 08:54:38 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9S8sb8r014940; Sun, 28 Oct 2018 08:54:37 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9S8sbcU014938; Sun, 28 Oct 2018 08:54:37 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201810280854.w9S8sbcU014938@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 28 Oct 2018 08:54:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483243 - branches/2018Q4/databases/mariadb55-server X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: branches/2018Q4/databases/mariadb55-server X-SVN-Commit-Revision: 483243 X-SVN-Commit-Repository: ports 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.29 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, 28 Oct 2018 08:54:38 -0000 Author: brnrd Date: Sun Oct 28 08:54:37 2018 New Revision: 483243 URL: https://svnweb.freebsd.org/changeset/ports/483243 Log: MFH: r483172 databases/mariadb55-server: Security update to 5.5.62 Security: ec5072b0-d43a-11e8-a6d2-b499baebfeaf Approved by: ports-secteam (miwi) Modified: branches/2018Q4/databases/mariadb55-server/Makefile branches/2018Q4/databases/mariadb55-server/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/databases/mariadb55-server/Makefile ============================================================================== --- branches/2018Q4/databases/mariadb55-server/Makefile Sun Oct 28 08:52:57 2018 (r483242) +++ branches/2018Q4/databases/mariadb55-server/Makefile Sun Oct 28 08:54:37 2018 (r483243) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 5.5.61 -PORTREVISION?= 1 +PORTVERSION= 5.5.62 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ @@ -49,6 +49,7 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ DATADIR= ${PREFIX}/share/mysql +BROKEN_FreeBSD_12= Does not support OpenSSL 1.1 BROKEN_sparc64= Does not compile: Unsupported platform BROKEN_SSL= openssl-devel BROKEN_SSL_REASON_openssl-devel= incomplete definition of type 'struct dh_st' Modified: branches/2018Q4/databases/mariadb55-server/distinfo ============================================================================== --- branches/2018Q4/databases/mariadb55-server/distinfo Sun Oct 28 08:52:57 2018 (r483242) +++ branches/2018Q4/databases/mariadb55-server/distinfo Sun Oct 28 08:54:37 2018 (r483243) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533760198 -SHA256 (mariadb-5.5.61.tar.gz) = 57afd089e3b458cda26beeda63c0bfe125baa6fead2120478788f1945e551013 -SIZE (mariadb-5.5.61.tar.gz) = 45839038 +TIMESTAMP = 1540659088 +SHA256 (mariadb-5.5.62.tar.gz) = 56a365af71b8a9ec8bfee0801e2dec95011da8ee7507986ca329be11296411db +SIZE (mariadb-5.5.62.tar.gz) = 45938380 From owner-svn-ports-branches@freebsd.org Sun Oct 28 07:29:35 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C5A010EABFC; Sun, 28 Oct 2018 07:29:35 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 10FB173D20; Sun, 28 Oct 2018 07:29:35 +0000 (UTC) (envelope-from zeising@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E089A1C48A; Sun, 28 Oct 2018 07:29:34 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9S7TYIJ067940; Sun, 28 Oct 2018 07:29:34 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9S7TYfE067938; Sun, 28 Oct 2018 07:29:34 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201810280729.w9S7TYfE067938@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Sun, 28 Oct 2018 07:29:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483232 - branches/2018Q4/graphics/drm-devel-kmod X-SVN-Group: ports-branches X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: branches/2018Q4/graphics/drm-devel-kmod X-SVN-Commit-Revision: 483232 X-SVN-Commit-Repository: ports 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.29 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, 28 Oct 2018 07:29:35 -0000 Author: zeising Date: Sun Oct 28 07:29:34 2018 New Revision: 483232 URL: https://svnweb.freebsd.org/changeset/ports/483232 Log: MFH: r483130 graphics/drm-devel-kmod: Update snapshot Update graphics/drm-devel-kmod to the latest snapshot. This contains fixes for vaapi rendering and possibly also other rendering bugs. Approved by: jmd (maintainer, implicit) Obtained from: FreeBSD Graphics Team Approved by: ports-secteam (miwi) Modified: branches/2018Q4/graphics/drm-devel-kmod/Makefile branches/2018Q4/graphics/drm-devel-kmod/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/graphics/drm-devel-kmod/Makefile ============================================================================== --- branches/2018Q4/graphics/drm-devel-kmod/Makefile Sun Oct 28 07:28:19 2018 (r483231) +++ branches/2018Q4/graphics/drm-devel-kmod/Makefile Sun Oct 28 07:29:34 2018 (r483232) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= drm-devel-kmod -PORTVERSION= 4.16.g20180927 +PORTVERSION= 4.16.g20181027 CATEGORIES= graphics kld MAINTAINER= jmd@FreeBSD.org @@ -25,7 +25,7 @@ USES= kmod uidfix USE_GITHUB= yes GH_ACCOUNT= FreeBSDDesktop GH_PROJECT= kms-drm -GH_TAGNAME= acbbd53 +GH_TAGNAME= 96b490e .include Modified: branches/2018Q4/graphics/drm-devel-kmod/distinfo ============================================================================== --- branches/2018Q4/graphics/drm-devel-kmod/distinfo Sun Oct 28 07:28:19 2018 (r483231) +++ branches/2018Q4/graphics/drm-devel-kmod/distinfo Sun Oct 28 07:29:34 2018 (r483232) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538090411 -SHA256 (FreeBSDDesktop-kms-drm-4.16.g20180927-acbbd53_GH0.tar.gz) = 48b55718e15801ede66b550de0d92f26bb0f5cafc77ae0c5dc59e9e205cf7db4 -SIZE (FreeBSDDesktop-kms-drm-4.16.g20180927-acbbd53_GH0.tar.gz) = 12828737 +TIMESTAMP = 1540634185 +SHA256 (FreeBSDDesktop-kms-drm-4.16.g20181027-96b490e_GH0.tar.gz) = 9e3ee7fd02b275d851a7ddde7f498dee2a733f972f4b72757730fff0b14573db +SIZE (FreeBSDDesktop-kms-drm-4.16.g20181027-96b490e_GH0.tar.gz) = 12828910 From owner-svn-ports-branches@freebsd.org Sun Oct 28 07:31:59 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53C0210EAD5F; Sun, 28 Oct 2018 07:31:59 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0806374002; Sun, 28 Oct 2018 07:31:59 +0000 (UTC) (envelope-from zeising@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DD3EF1C5E8; Sun, 28 Oct 2018 07:31:58 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9S7VwHW072156; Sun, 28 Oct 2018 07:31:58 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9S7Vwdw072154; Sun, 28 Oct 2018 07:31:58 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201810280731.w9S7Vwdw072154@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Sun, 28 Oct 2018 07:31:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483233 - branches/2018Q4/graphics/drm-legacy-kmod X-SVN-Group: ports-branches X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: branches/2018Q4/graphics/drm-legacy-kmod X-SVN-Commit-Revision: 483233 X-SVN-Commit-Repository: ports 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.29 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, 28 Oct 2018 07:31:59 -0000 Author: zeising Date: Sun Oct 28 07:31:58 2018 New Revision: 483233 URL: https://svnweb.freebsd.org/changeset/ports/483233 Log: MFH: r483128 graphics/drm-legacy-kmod: Update snapshot Update graphics/drm-legacy-kmod to the latest snapshot, this contains some fixes for loading amd, ati and radeon firmware modules. Approved by: jmd (maintainer, implicit) Approved by: ports-secteam (miwi) Modified: branches/2018Q4/graphics/drm-legacy-kmod/Makefile branches/2018Q4/graphics/drm-legacy-kmod/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/graphics/drm-legacy-kmod/Makefile ============================================================================== --- branches/2018Q4/graphics/drm-legacy-kmod/Makefile Sun Oct 28 07:29:34 2018 (r483232) +++ branches/2018Q4/graphics/drm-legacy-kmod/Makefile Sun Oct 28 07:31:58 2018 (r483233) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= drm-legacy-kmod -PORTVERSION= g20180927 +PORTVERSION= g20181027 CATEGORIES= graphics MAINTAINER= jmd@FreeBSD.org @@ -22,7 +22,7 @@ CONFLICTS_INSTALL= drm-devel-kmod drm-stable-kmod drm- USE_GITHUB= yes GH_ACCOUNT= FreeBSDDesktop GH_PROJECT= drm-legacy -GH_TAGNAME= 226834b +GH_TAGNAME= 2bed932 .include Modified: branches/2018Q4/graphics/drm-legacy-kmod/distinfo ============================================================================== --- branches/2018Q4/graphics/drm-legacy-kmod/distinfo Sun Oct 28 07:29:34 2018 (r483232) +++ branches/2018Q4/graphics/drm-legacy-kmod/distinfo Sun Oct 28 07:31:58 2018 (r483233) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538019051 -SHA256 (FreeBSDDesktop-drm-legacy-g20180927-226834b_GH0.tar.gz) = dbff61e14d85264297861a780d65b007221db8d2bd6da467249faabc13c13541 -SIZE (FreeBSDDesktop-drm-legacy-g20180927-226834b_GH0.tar.gz) = 1742236 +TIMESTAMP = 1540633414 +SHA256 (FreeBSDDesktop-drm-legacy-g20181027-2bed932_GH0.tar.gz) = 9546818543554c6209b3f4bd422c22ab0342d41681b860cb250d86b939c89021 +SIZE (FreeBSDDesktop-drm-legacy-g20181027-2bed932_GH0.tar.gz) = 1742051 From owner-svn-ports-branches@freebsd.org Sun Oct 28 07:28:20 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E1A8C10EAB7E; Sun, 28 Oct 2018 07:28:20 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 971D273C14; Sun, 28 Oct 2018 07:28:20 +0000 (UTC) (envelope-from zeising@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 735CA1C489; Sun, 28 Oct 2018 07:28:20 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9S7SKSr067717; Sun, 28 Oct 2018 07:28:20 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9S7SJpS067715; Sun, 28 Oct 2018 07:28:19 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201810280728.w9S7SJpS067715@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Sun, 28 Oct 2018 07:28:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483231 - branches/2018Q4/graphics/drm-next-kmod X-SVN-Group: ports-branches X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: branches/2018Q4/graphics/drm-next-kmod X-SVN-Commit-Revision: 483231 X-SVN-Commit-Repository: ports 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.29 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, 28 Oct 2018 07:28:21 -0000 Author: zeising Date: Sun Oct 28 07:28:19 2018 New Revision: 483231 URL: https://svnweb.freebsd.org/changeset/ports/483231 Log: MFH: r483129 graphics/drm-next-kmod: Update snapshot Update graphics/drm-next-kmod to the latest snapshot. This contains fixes for vaapi rendering and possibly also other rendering bugs. Approved by: jmd (maintainer, implicit) Obtained from: FreeBSD Graphics Team Approved by: ports-secteam (miwi) Modified: branches/2018Q4/graphics/drm-next-kmod/Makefile branches/2018Q4/graphics/drm-next-kmod/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/graphics/drm-next-kmod/Makefile ============================================================================== --- branches/2018Q4/graphics/drm-next-kmod/Makefile Sun Oct 28 07:12:33 2018 (r483230) +++ branches/2018Q4/graphics/drm-next-kmod/Makefile Sun Oct 28 07:28:19 2018 (r483231) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= drm-next-kmod -PORTVERSION= 4.11.g20180822 +PORTVERSION= 4.11.g20181027 CATEGORIES= graphics MAINTAINER= jmd@FreeBSD.org @@ -25,7 +25,7 @@ USES= kmod uidfix USE_GITHUB= yes GH_ACCOUNT= FreeBSDDesktop GH_PROJECT= kms-drm -GH_TAGNAME= 22d72c2 +GH_TAGNAME= b545cc4 .include Modified: branches/2018Q4/graphics/drm-next-kmod/distinfo ============================================================================== --- branches/2018Q4/graphics/drm-next-kmod/distinfo Sun Oct 28 07:12:33 2018 (r483230) +++ branches/2018Q4/graphics/drm-next-kmod/distinfo Sun Oct 28 07:28:19 2018 (r483231) @@ -1,3 +1,3 @@ -TIMESTAMP = 1534995096 -SHA256 (FreeBSDDesktop-kms-drm-4.11.g20180822-22d72c2_GH0.tar.gz) = b1e2b273ba1c3a22636737303f1175a6433dfb7564b8f73c9fee47252aaf73cb -SIZE (FreeBSDDesktop-kms-drm-4.11.g20180822-22d72c2_GH0.tar.gz) = 7358243 +TIMESTAMP = 1540633673 +SHA256 (FreeBSDDesktop-kms-drm-4.11.g20181027-b545cc4_GH0.tar.gz) = cb896fd506425c5d6d5aadb47b30bc2f0ae35127d634e6cf3e72e6fb2bab0963 +SIZE (FreeBSDDesktop-kms-drm-4.11.g20181027-b545cc4_GH0.tar.gz) = 7357687 From owner-svn-ports-branches@freebsd.org Sun Oct 28 08:26:47 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53B5510EC2FF; Sun, 28 Oct 2018 08:26:47 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F33207598A; Sun, 28 Oct 2018 08:26:46 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D13C01CE42; Sun, 28 Oct 2018 08:26:46 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9S8Qkw6099103; Sun, 28 Oct 2018 08:26:46 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9S8QiUP099091; Sun, 28 Oct 2018 08:26:44 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201810280826.w9S8QiUP099091@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 28 Oct 2018 08:26:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483238 - in branches/2018Q4/databases: mariadb103-client mariadb103-client/files mariadb103-server mariadb103-server/files X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in branches/2018Q4/databases: mariadb103-client mariadb103-client/files mariadb103-server mariadb103-server/files X-SVN-Commit-Revision: 483238 X-SVN-Commit-Repository: ports 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.29 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, 28 Oct 2018 08:26:47 -0000 Author: brnrd Date: Sun Oct 28 08:26:44 2018 New Revision: 483238 URL: https://svnweb.freebsd.org/changeset/ports/483238 Log: MFH: r482974 r483143 databases/mariadb103-server: Update to 10.3.10 - Fix build on aarch64 [1] - Not broken in i386 [2] - WSREP only on amd64 PR: 230682 [1], 230027 [2] Submitted by: Naram Qashat [1] Reported by: [2] Security: 909be51b-9b3b-11e8-add2-b499baebfeaf databases/mariadb103-server: Fix plist issues - Resurect mysql_upgrade [1] - Move some files between -client and -server PR: 232735 [1] Reported by: Naram Qashat [1] Approved by: ports-secteam (miwi) Added: branches/2018Q4/databases/mariadb103-client/files/patch-MDEV-11790 - copied unchanged from r483143, head/databases/mariadb103-client/files/patch-MDEV-11790 branches/2018Q4/databases/mariadb103-client/files/patch-MDEV-15961 - copied unchanged from r482974, head/databases/mariadb103-client/files/patch-MDEV-15961 branches/2018Q4/databases/mariadb103-server/files/patch-MDEV-11790 - copied unchanged from r483143, head/databases/mariadb103-server/files/patch-MDEV-11790 branches/2018Q4/databases/mariadb103-server/files/patch-MDEV-15961 - copied unchanged from r482974, head/databases/mariadb103-server/files/patch-MDEV-15961 Deleted: branches/2018Q4/databases/mariadb103-server/files/patch-sql_CMakeLists.txt branches/2018Q4/databases/mariadb103-server/files/patch-sql_semisync__master__ack__receiver.cc branches/2018Q4/databases/mariadb103-server/files/patch-sql_share_CMakeLists.txt branches/2018Q4/databases/mariadb103-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc Modified: branches/2018Q4/databases/mariadb103-client/Makefile branches/2018Q4/databases/mariadb103-client/pkg-plist branches/2018Q4/databases/mariadb103-server/Makefile branches/2018Q4/databases/mariadb103-server/distinfo branches/2018Q4/databases/mariadb103-server/files/mysql-server.in branches/2018Q4/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake branches/2018Q4/databases/mariadb103-server/pkg-plist Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/databases/mariadb103-client/Makefile ============================================================================== --- branches/2018Q4/databases/mariadb103-client/Makefile Sun Oct 28 08:14:44 2018 (r483237) +++ branches/2018Q4/databases/mariadb103-client/Makefile Sun Oct 28 08:26:44 2018 (r483238) @@ -2,13 +2,10 @@ # $FreeBSD$ PORTNAME= mariadb -PORTREVISION= 0 PKGNAMESUFFIX= 103-client COMMENT= Multithreaded SQL database (client) -BROKEN_aarch64= fails to link: missing sbrk - MASTERDIR= ${.CURDIR}/../mariadb103-server FILESDIR= ${.CURDIR}/files @@ -24,14 +21,16 @@ USE_LDCONFIG= ${PREFIX}/lib/mysql CLIENT_ONLY= yes +CONFLICTS_INSTALL= databases/mytop + post-configure: ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \ -e 's|(#define LIBS.*)"\\ $$|\1 -L${PREFIX}/lib "\\|' \ ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c post-install: - ${RM} -r ${STAGEDIR}${DATADIR}/policy \ - ${STAGEDIR}${PREFIX}/include/mysql/server + ${RM} -r ${STAGEDIR}${DATADIR} + ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server post-install-GSSAPI_NONE: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so Copied: branches/2018Q4/databases/mariadb103-client/files/patch-MDEV-11790 (from r483143, head/databases/mariadb103-client/files/patch-MDEV-11790) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/databases/mariadb103-client/files/patch-MDEV-11790 Sun Oct 28 08:26:44 2018 (r483238, copy of r483143, head/databases/mariadb103-client/files/patch-MDEV-11790) @@ -0,0 +1,46 @@ +WITHOUT_SERVER installs server-only files + +https://jira.mariadb.org/browse/MDEV-11790 +--- extra/CMakeLists.txt.orig 2018-10-02 09:45:40 UTC ++++ extra/CMakeLists.txt +@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) + ADD_DEPENDENCIES(innochecksum GenError) + ENDIF() + +-MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) ++MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client) + TARGET_LINK_LIBRARIES(replace mysys) + + IF(UNIX) +--- scripts/CMakeLists.txt.orig 2018-10-02 09:45:42 UTC ++++ scripts/CMakeLists.txt +@@ -241,7 +241,10 @@ ENDIF() + SET(mysql_config_COMPONENT COMPONENT Development) + SET(msql2mysql_COMPONENT COMPONENT Client) + SET(mysqlaccess_COMPONENT COMPONENT Client) ++SET(mysqlhotcopy_COMPONENT COMPONENT Client) ++SET(mysql_convert_table_format_COMPONENT COMPONENT Client) + SET(mysql_find_rows_COMPONENT COMPONENT Client) ++SET(mysql_setpermission_COMPONENT COMPONENT Client) + SET(mytop_COMPONENT Mytop) + + IF(WIN32) +@@ -298,14 +301,14 @@ ELSE() + # On Unix, most of the files end up in the bin directory + SET(BIN_SCRIPTS + msql2mysql +- mysql_config +- mysql_setpermission +- mysql_secure_installation + mysqlaccess ++ mysqlhotcopy ++ mysql_config + mysql_convert_table_format + mysql_find_rows ++ mysql_secure_installation ++ mysql_setpermission + mytop +- mysqlhotcopy + ${SERVER_SCRIPTS} + ${WSREP_SCRIPTS} + ${SYSTEMD_SCRIPTS} Copied: branches/2018Q4/databases/mariadb103-client/files/patch-MDEV-15961 (from r482974, head/databases/mariadb103-client/files/patch-MDEV-15961) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/databases/mariadb103-client/files/patch-MDEV-15961 Sun Oct 28 08:26:44 2018 (r483238, copy of r482974, head/databases/mariadb103-client/files/patch-MDEV-15961) @@ -0,0 +1,50 @@ +MDEV-15961: Fix stacktraces under FreeBSD + +https://jira.mariadb.org/browse/MDEV-15961 +--- mysys/stacktrace.c.orig 2018-07-02 07:34:11 UTC ++++ mysys/stacktrace.c +@@ -34,19 +34,19 @@ + #include + #endif + ++#ifdef __linux__ + #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end) +- + static char *heap_start; +- +-#if(defined HAVE_BSS_START) && !(defined __linux__) + extern char *__bss_start; +-#endif ++#else ++#define PTR_SANE(p) (p) ++#endif /* __linux */ + + void my_init_stacktrace() + { +-#if(defined HAVE_BSS_START) && !(defined __linux__) ++#ifdef __linux__ + heap_start = (char*) &__bss_start; +-#endif ++#endif /* __linux__ */ + } + + #ifdef __linux__ +@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad + + int my_safe_print_str(const char* val, size_t max_len) + { ++#ifdef __linux__ ++/* Only needed by the linux version of PTR_SANE */ + char *heap_end; + +-#ifdef __linux__ + // Try and make use of /proc filesystem to safely print memory contents. + if (!safe_print_str(val, max_len)) + return 0; +-#endif + + heap_end= (char*) sbrk(0); ++#endif + + if (!PTR_SANE(val)) + { Modified: branches/2018Q4/databases/mariadb103-client/pkg-plist ============================================================================== --- branches/2018Q4/databases/mariadb103-client/pkg-plist Sun Oct 28 08:14:44 2018 (r483237) +++ branches/2018Q4/databases/mariadb103-client/pkg-plist Sun Oct 28 08:26:44 2018 (r483238) @@ -4,13 +4,9 @@ bin/mysql bin/mysql_config bin/mysql_convert_table_format bin/mysql_find_rows -@comment bin/mysql_install_db -@comment bin/mysql_plugin -@comment bin/mysql_secure_installation bin/mysql_setpermission -bin/mysql_upgrade +@comment bin/mysql_plugin bin/mysql_waitpid -@comment bin/mysqld_safe_helper bin/mysqlaccess bin/mysqladmin bin/mysqlbinlog @@ -21,12 +17,9 @@ bin/mysqlimport bin/mysqlshow bin/mysqlslap bin/mysqltest -bin/my_print_defaults -@comment bin/mytop -@comment bin/perror +bin/mytop bin/replace -@comment bin/resolve_stack_dump -@comment bin/resolveip +@comment bin/wsrep_sst_rsync_wan include/mysql/errmsg.h include/mysql/ma_list.h include/mysql/ma_pvio.h @@ -70,8 +63,10 @@ lib/mysql/plugin/sha256_password.so @comment man/man1/galera_recovery.1.gz @comment man/man1/innochecksum.1.gz @comment man/man1/mariadb-service-convert.1.gz +@comment man/man1/mariabackup.1.gz man/man1/msql2mysql.1.gz -man/man1/my_print_defaults.1.gz +@comment man/man1/mbstream.1.gz +@comment man/man1/my_print_defaults.1.gz man/man1/my_safe_process.1.gz @comment man/man1/myisam_ftdump.1.gz @comment man/man1/myisamchk.1.gz @@ -85,14 +80,16 @@ man/man1/mysql_client_test.1.gz man/man1/mysql_client_test_embedded.1.gz man/man1/mysql_config.1.gz man/man1/mysql_convert_table_format.1.gz +@comment man/man1/mysql_embedded.1.gz man/man1/mysql_find_rows.1.gz @comment man/man1/mysql_fix_extensions.1.gz @comment man/man1/mysql_install_db.1.gz +@comment man/man1/mysql_ldb.1.gz man/man1/mysql_plugin.1.gz @comment man/man1/mysql_secure_installation.1.gz man/man1/mysql_setpermission.1.gz man/man1/mysql_tzinfo_to_sql.1.gz -man/man1/mysql_upgrade.1.gz +@comment man/man1/mysql_upgrade.1.gz man/man1/mysql_waitpid.1.gz man/man1/mysqlaccess.1.gz man/man1/mysqladmin.1.gz @@ -113,80 +110,15 @@ man/man1/mysqltest_embedded.1.gz man/man1/replace.1.gz @comment man/man1/resolve_stack_dump.1.gz @comment man/man1/resolveip.1.gz -@comment man/man1/tokuft_logdump.1.gz +man/man1/tokuft_logprint.1.gz @comment man/man1/tokuftdump.1.gz @comment man/man1/wsrep_sst_common.1.gz +@comment man/man1/wsrep_sst_mariabackup.1.gz @comment man/man1/wsrep_sst_mysqldump.1.gz @comment man/man1/wsrep_sst_rsync.1.gz +@comment man/man1/wsrep_sst_rsync_wan.1.gz @comment man/man1/wsrep_sst_xtrabackup-v2.1.gz @comment man/man1/wsrep_sst_xtrabackup.1.gz @comment man/man8/mysqld.8.gz @comment share/aclocal/mysql.m4 -%%DATADIR%%/charsets/Index.xml -%%DATADIR%%/charsets/README -%%DATADIR%%/charsets/armscii8.xml -%%DATADIR%%/charsets/ascii.xml -%%DATADIR%%/charsets/cp1250.xml -%%DATADIR%%/charsets/cp1251.xml -%%DATADIR%%/charsets/cp1256.xml -%%DATADIR%%/charsets/cp1257.xml -%%DATADIR%%/charsets/cp850.xml -%%DATADIR%%/charsets/cp852.xml -%%DATADIR%%/charsets/cp866.xml -%%DATADIR%%/charsets/dec8.xml -%%DATADIR%%/charsets/geostd8.xml -%%DATADIR%%/charsets/greek.xml -%%DATADIR%%/charsets/hebrew.xml -%%DATADIR%%/charsets/hp8.xml -%%DATADIR%%/charsets/keybcs2.xml -%%DATADIR%%/charsets/koi8r.xml -%%DATADIR%%/charsets/koi8u.xml -%%DATADIR%%/charsets/latin1.xml -%%DATADIR%%/charsets/latin2.xml -%%DATADIR%%/charsets/latin5.xml -%%DATADIR%%/charsets/latin7.xml -%%DATADIR%%/charsets/macce.xml -%%DATADIR%%/charsets/macroman.xml -%%DATADIR%%/charsets/swe7.xml -%%DATADIR%%/czech/errmsg.sys -%%DATADIR%%/danish/errmsg.sys -%%DATADIR%%/dutch/errmsg.sys -%%DATADIR%%/english/errmsg.sys -%%DATADIR%%/errmsg-utf8.txt -%%DATADIR%%/estonian/errmsg.sys -%%DATADIR%%/french/errmsg.sys -%%DATADIR%%/german/errmsg.sys -%%DATADIR%%/greek/errmsg.sys -%%DATADIR%%/hindi/errmsg.sys -%%DATADIR%%/hungarian/errmsg.sys -%%DATADIR%%/italian/errmsg.sys -%%DATADIR%%/japanese/errmsg.sys -%%DATADIR%%/korean/errmsg.sys -%%DATADIR%%/norwegian-ny/errmsg.sys -%%DATADIR%%/norwegian/errmsg.sys -%%DATADIR%%/polish/errmsg.sys -%%DATADIR%%/portuguese/errmsg.sys -%%DATADIR%%/romanian/errmsg.sys -%%DATADIR%%/russian/errmsg.sys -%%DATADIR%%/serbian/errmsg.sys -%%DATADIR%%/slovak/errmsg.sys -%%DATADIR%%/spanish/errmsg.sys -%%DATADIR%%/swedish/errmsg.sys -%%DATADIR%%/ukrainian/errmsg.sys -@comment %%DATADIR%%/binary-configure -@comment %%DATADIR%%/fill_help_tables.sql -@comment %%DATADIR%%/magic -@comment %%DATADIR%%/maria_add_gis_sp.sql -@comment %%DATADIR%%/maria_add_gis_sp_bootstrap.sql -@comment %%DATADIR%%/mysql-log-rotate -@comment %%DATADIR%%/mysql.server -@comment %%DATADIR%%/mysql_performance_tables.sql -@comment %%DATADIR%%/mysql_system_tables.sql -@comment %%DATADIR%%/mysql_system_tables_data.sql -@comment %%DATADIR%%/mysql_test_data_timezone.sql -@comment %%DATADIR%%/mysql_test_db.sql -@comment %%DATADIR%%/mysql_to_mariadb.sql -@comment %%DATADIR%%/mysqld_multi.server -@comment %%DATADIR%%/wsrep.cnf -@comment %%DATADIR%%/wsrep_notify share/pkgconfig/mariadb.pc Modified: branches/2018Q4/databases/mariadb103-server/Makefile ============================================================================== --- branches/2018Q4/databases/mariadb103-server/Makefile Sun Oct 28 08:14:44 2018 (r483237) +++ branches/2018Q4/databases/mariadb103-server/Makefile Sun Oct 28 08:26:44 2018 (r483238) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.3.8 -PORTREVISION?= 2 +PORTVERSION= 10.3.10 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ @@ -41,7 +41,8 @@ OPTIONS_DEFAULT= GSSAPI_BASE # MySQL-Server options OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP OPTIONS_GROUP= COMPRESSION ENGINES GROONGA -OPTIONS_DEFINE= CONNECT_EXTRA WSREP DOCS +OPTIONS_DEFINE= CONNECT_EXTRA DOCS +OPTIONS_DEFINE_amd64= WSREP OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB XTRADB OPTIONS_GROUP_GROONGA= ZMQ MSGPACK @@ -120,9 +121,6 @@ USES+= readline GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF .else # MySQL-Server part -NOT_FOR_ARCHS= i386 -NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \ - https://jira.mariadb.org/browse/MDEV-9627 USES+= mysql:103m USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server @@ -135,8 +133,7 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ -DWITHOUT_CLIENT=1 .for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE} -${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO \ - -DWITHOUT_${ENGINE}=1 +${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC .endfor INNOBASE_CMAKE_OFF= -DPLUGIN_INNOBASE=NO -DWITHOUT_INNOBASE=1 @@ -162,14 +159,22 @@ TOKUDB_IMPLIES= SNAPPY TOKUDB_PORTDOCS= README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi WSREP_CMAKE_OFF= -DWITH_WSREP=OFF +WSREP_LIB_DEPENDS= libgalera.so:databases/galera ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 ZSTD_CMAKE_ON= -DWITH_ROCKSDB_ZSTD=ON ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 +SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" +.else +SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " +.endif + post-install: ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private - ${RM} -r `${FIND} ${STAGEDIR}${DATADIR} -type d -mindepth 1` .endif # defined(CLIENT_ONLY) .if defined(WITH_OPENSSL_PORT) @@ -177,6 +182,10 @@ GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with .endif .include + +.if ${ARCH} != amd64 +PLIST_SUB+= WSREP="@comment " +.endif .if ${OPSYS} == DragonFly CMAKE_ARGS+= -DWITHOUT_TOKUDB Modified: branches/2018Q4/databases/mariadb103-server/distinfo ============================================================================== --- branches/2018Q4/databases/mariadb103-server/distinfo Sun Oct 28 08:14:44 2018 (r483237) +++ branches/2018Q4/databases/mariadb103-server/distinfo Sun Oct 28 08:26:44 2018 (r483238) @@ -1,3 +1,3 @@ -TIMESTAMP = 1531382110 -SHA256 (mariadb-10.3.8.tar.gz) = 30bec17514d12d811a05757be46bd41724df28002cdec550d5c757b0b3f31ab8 -SIZE (mariadb-10.3.8.tar.gz) = 72152953 +TIMESTAMP = 1538732181 +SHA256 (mariadb-10.3.10.tar.gz) = 57767c048982811c7ab21d8527f6f36aa897386e8c7235f11b5505a924d68eda +SIZE (mariadb-10.3.10.tar.gz) = 70493771 Modified: branches/2018Q4/databases/mariadb103-server/files/mysql-server.in ============================================================================== --- branches/2018Q4/databases/mariadb103-server/files/mysql-server.in Sun Oct 28 08:14:44 2018 (r483237) +++ branches/2018Q4/databases/mariadb103-server/files/mysql-server.in Sun Oct 28 08:26:44 2018 (r483238) @@ -9,9 +9,9 @@ # Add the following line to /etc/rc.conf to enable mysql: # mysql_(instance_)?enable (bool): Set to "NO" by default. # Set it to "YES" to enable MySQL. -# mysql_(instance_)?limits (bool): Set to "NO" by default. -# Set it to yes to run `limits -e -U mysql` -# just before mysql starts. +%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool): Set to "NO" by default. +%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql` +%%LEGACY_LIMITS%%# just before mysql starts. # mysql_(instance_)?dbdir (str): Default to "/var/db/mysql" # Base database directory. # mysql_(instance_)?args (str): Custom additional arguments to be passed @@ -33,9 +33,9 @@ rcvar=mysql_enable load_rc_config $name : ${mysql_enable="NO"} -: ${mysql_limits="NO"} +%%LEGACY_LIMITS%%: ${mysql_limits="NO"} : ${mysql_user="mysql"} -: ${mysql_limits_args="-e -U $mysql_user"} +%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}" : ${mysql_dbdir="/var/db/mysql"} : ${mysql_optfile="${mysql_dbdir}/my.cnf"} @@ -51,9 +51,9 @@ if [ -n "$2" ]; then "$2 "*|*" $2 "*|*" $2"|"$2") eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}" eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}" - eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" + %%LEGACY_LIMITS%%eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}" - eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}" + %%LEGACY_LIMITS%%eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}" eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}" eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}" ;; @@ -119,11 +119,12 @@ mysql_prestart() if [ ! -d "${mysql_dbdir}/mysql/." ]; then mysql_create_auth_tables || return 1 fi - if checkyesno mysql_limits; then - eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 2>/dev/null - else - return 0 - fi +%%LEGACY_LIMITS%% if checkyesno mysql_limits; then +%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null +%%LEGACY_LIMITS%% else +%%LEGACY_LIMITS%% return 0 +%%LEGACY_LIMITS%% fi +%%MODERN_LIMITS%% return 0 } mysql_poststart() Copied: branches/2018Q4/databases/mariadb103-server/files/patch-MDEV-11790 (from r483143, head/databases/mariadb103-server/files/patch-MDEV-11790) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/databases/mariadb103-server/files/patch-MDEV-11790 Sun Oct 28 08:26:44 2018 (r483238, copy of r483143, head/databases/mariadb103-server/files/patch-MDEV-11790) @@ -0,0 +1,46 @@ +WITHOUT_SERVER installs server-only files + +https://jira.mariadb.org/browse/MDEV-11790 +--- extra/CMakeLists.txt.orig 2018-10-02 09:45:40 UTC ++++ extra/CMakeLists.txt +@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) + ADD_DEPENDENCIES(innochecksum GenError) + ENDIF() + +-MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) ++MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client) + TARGET_LINK_LIBRARIES(replace mysys) + + IF(UNIX) +--- scripts/CMakeLists.txt.orig 2018-10-02 09:45:42 UTC ++++ scripts/CMakeLists.txt +@@ -241,7 +241,10 @@ ENDIF() + SET(mysql_config_COMPONENT COMPONENT Development) + SET(msql2mysql_COMPONENT COMPONENT Client) + SET(mysqlaccess_COMPONENT COMPONENT Client) ++SET(mysqlhotcopy_COMPONENT COMPONENT Client) ++SET(mysql_convert_table_format_COMPONENT COMPONENT Client) + SET(mysql_find_rows_COMPONENT COMPONENT Client) ++SET(mysql_setpermission_COMPONENT COMPONENT Client) + SET(mytop_COMPONENT Mytop) + + IF(WIN32) +@@ -298,14 +301,14 @@ ELSE() + # On Unix, most of the files end up in the bin directory + SET(BIN_SCRIPTS + msql2mysql +- mysql_config +- mysql_setpermission +- mysql_secure_installation + mysqlaccess ++ mysqlhotcopy ++ mysql_config + mysql_convert_table_format + mysql_find_rows ++ mysql_secure_installation ++ mysql_setpermission + mytop +- mysqlhotcopy + ${SERVER_SCRIPTS} + ${WSREP_SCRIPTS} + ${SYSTEMD_SCRIPTS} Copied: branches/2018Q4/databases/mariadb103-server/files/patch-MDEV-15961 (from r482974, head/databases/mariadb103-server/files/patch-MDEV-15961) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/databases/mariadb103-server/files/patch-MDEV-15961 Sun Oct 28 08:26:44 2018 (r483238, copy of r482974, head/databases/mariadb103-server/files/patch-MDEV-15961) @@ -0,0 +1,50 @@ +MDEV-15961: Fix stacktraces under FreeBSD + +https://jira.mariadb.org/browse/MDEV-15961 +--- mysys/stacktrace.c.orig 2018-07-02 07:34:11 UTC ++++ mysys/stacktrace.c +@@ -34,19 +34,19 @@ + #include + #endif + ++#ifdef __linux__ + #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end) +- + static char *heap_start; +- +-#if(defined HAVE_BSS_START) && !(defined __linux__) + extern char *__bss_start; +-#endif ++#else ++#define PTR_SANE(p) (p) ++#endif /* __linux */ + + void my_init_stacktrace() + { +-#if(defined HAVE_BSS_START) && !(defined __linux__) ++#ifdef __linux__ + heap_start = (char*) &__bss_start; +-#endif ++#endif /* __linux__ */ + } + + #ifdef __linux__ +@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad + + int my_safe_print_str(const char* val, size_t max_len) + { ++#ifdef __linux__ ++/* Only needed by the linux version of PTR_SANE */ + char *heap_end; + +-#ifdef __linux__ + // Try and make use of /proc filesystem to safely print memory contents. + if (!safe_print_str(val, max_len)) + return 0; +-#endif + + heap_end= (char*) sbrk(0); ++#endif + + if (!PTR_SANE(val)) + { Modified: branches/2018Q4/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake ============================================================================== --- branches/2018Q4/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake Sun Oct 28 08:14:44 2018 (r483237) +++ branches/2018Q4/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake Sun Oct 28 08:26:44 2018 (r483238) @@ -1,6 +1,6 @@ ---- storage/rocksdb/build_rocksdb.cmake.orig 2018-06-25 11:13:28 UTC +--- storage/rocksdb/build_rocksdb.cmake.orig 2018-10-02 09:45:43 UTC +++ storage/rocksdb/build_rocksdb.cmake -@@ -69,15 +69,9 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD +@@ -69,10 +69,6 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD SET(CMAKE_REQUIRED_LIBRARIES zstd) CHECK_FUNCTION_EXISTS(ZDICT_trainFromBuffer ZSTD_VALID) UNSET(CMAKE_REQUIRED_LIBRARIES) @@ -8,11 +8,6 @@ - MESSAGE(FATAL_ERROR - "WITH_ROCKSDB_ZSTD is ON and ZSTD library was found, but the version needs to be >= 1.1.3") - endif() -- if (ZSTD_VALID) + if (ZSTD_VALID) add_definitions(-DZSTD) include_directories(${ZSTD_INCLUDE_DIR}) - list(APPEND THIRDPARTY_LIBS ${ZSTD_LIBRARY}) -- endif() - endif() - - add_definitions(-DZLIB) Modified: branches/2018Q4/databases/mariadb103-server/pkg-plist ============================================================================== --- branches/2018Q4/databases/mariadb103-server/pkg-plist Sun Oct 28 08:14:44 2018 (r483237) +++ branches/2018Q4/databases/mariadb103-server/pkg-plist Sun Oct 28 08:26:44 2018 (r483238) @@ -7,7 +7,7 @@ bin/innochecksum bin/mariabackup bin/mbstream @comment bin/msql2mysql -@comment bin/my_print_defaults +bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog @@ -25,8 +25,8 @@ bin/mysql_install_db bin/mysql_plugin bin/mysql_secure_installation @comment bin/mysql_setpermission -@comment bin/mysql_tzinfo_to_sql -@comment bin/mysql_upgrade +bin/mysql_tzinfo_to_sql +bin/mysql_upgrade @comment bin/mysqlaccess bin/mysqld_multi bin/mysqld_safe @@ -36,7 +36,7 @@ bin/mysqldumpslow @comment bin/mysqltest @comment bin/mysqltest_embedded @comment bin/mytop -@comment bin/perror +bin/perror @comment bin/replace bin/resolve_stack_dump bin/resolveip @@ -51,6 +51,7 @@ bin/resolveip %%WSREP%%bin/wsrep_sst_rsync_wan %%WSREP%%bin/wsrep_sst_xtrabackup %%WSREP%%bin/wsrep_sst_xtrabackup-v2 +@comment data/test/db.opt @comment include/mysql/my_config.h @comment include/mysql/my_global.h @comment include/mysql/my_sys.h @@ -206,7 +207,9 @@ man/man1/galera_new_cluster.1.gz man/man1/galera_recovery.1.gz man/man1/innochecksum.1.gz @comment man/man1/mariadb-service-convert.1.gz -@comment man/man1/my_print_defaults.1.gz +man/man1/mariabackup.1.gz +man/man1/mbstream.1.gz +man/man1/my_print_defaults.1.gz man/man1/myisam_ftdump.1.gz man/man1/myisamchk.1.gz man/man1/myisamlog.1.gz @@ -214,26 +217,29 @@ man/man1/myisampack.1.gz man/man1/mysql.server.1.gz @comment man/man1/mysql_convert_table_format.1.gz man/man1/mysql_fix_extensions.1.gz +%%ROCKSDB%%man/man1/mysql_ldb.1.gz man/man1/mysql_install_db.1.gz man/man1/mysql_secure_installation.1.gz @comment man/man1/mysql_setpermission.1.gz @comment man/man1/mysql_tzinfo_to_sql.1.gz -@comment man/man1/mysql_upgrade.1.gz +man/man1/mysql_upgrade.1.gz man/man1/mysqld_multi.1.gz man/man1/mysqld_safe.1.gz man/man1/mysqld_safe_helper.1.gz man/man1/mysqldumpslow.1.gz @comment man/man1/mysqlhotcopy.1.gz @comment man/man1/mysqltest.1.gz -@comment man/man1/perror.1.gz +man/man1/perror.1.gz @comment man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz -%%TOKUDB%%man/man1/tokuft_logdump.1.gz +%%TOKUDB%%man/man1/tokuft_logprint.1.gz %%TOKUDB%%man/man1/tokuftdump.1.gz %%WSREP%%man/man1/wsrep_sst_common.1.gz +%%WSREP%%man/man1/wsrep_sst_mariabackup.1.gz %%WSREP%%man/man1/wsrep_sst_mysqldump.1.gz %%WSREP%%man/man1/wsrep_sst_rsync.1.gz +%%WSREP%%man/man1/wsrep_sst_rsync_wan.1.gz %%WSREP%%man/man1/wsrep_sst_xtrabackup-v2.1.gz %%WSREP%%man/man1/wsrep_sst_xtrabackup.1.gz man/man8/mysqld.8.gz @@ -243,6 +249,9 @@ man/man8/mysqld.8.gz %%SPIDER%%%%DATADIR%%/install_spider.sql %%DATADIR%%/maria_add_gis_sp.sql %%DATADIR%%/maria_add_gis_sp_bootstrap.sql +%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS +%%MROONGA%%%%DATADIR%%/mroonga/install.sql +%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/mysql_performance_tables.sql @@ -252,6 +261,57 @@ man/man8/mysqld.8.gz %%DATADIR%%/mysql_test_db.sql %%DATADIR%%/mysql_to_mariadb.sql %%DATADIR%%/mysqld_multi.server +%%DATADIR%%/charsets/Index.xml +%%DATADIR%%/charsets/README +%%DATADIR%%/charsets/armscii8.xml +%%DATADIR%%/charsets/ascii.xml +%%DATADIR%%/charsets/cp1250.xml +%%DATADIR%%/charsets/cp1251.xml +%%DATADIR%%/charsets/cp1256.xml +%%DATADIR%%/charsets/cp1257.xml +%%DATADIR%%/charsets/cp850.xml +%%DATADIR%%/charsets/cp852.xml +%%DATADIR%%/charsets/cp866.xml +%%DATADIR%%/charsets/dec8.xml +%%DATADIR%%/charsets/geostd8.xml +%%DATADIR%%/charsets/greek.xml +%%DATADIR%%/charsets/hebrew.xml +%%DATADIR%%/charsets/hp8.xml +%%DATADIR%%/charsets/keybcs2.xml +%%DATADIR%%/charsets/koi8r.xml +%%DATADIR%%/charsets/koi8u.xml +%%DATADIR%%/charsets/latin1.xml +%%DATADIR%%/charsets/latin2.xml +%%DATADIR%%/charsets/latin5.xml +%%DATADIR%%/charsets/latin7.xml +%%DATADIR%%/charsets/macce.xml +%%DATADIR%%/charsets/macroman.xml +%%DATADIR%%/charsets/swe7.xml +%%DATADIR%%/czech/errmsg.sys +%%DATADIR%%/danish/errmsg.sys +%%DATADIR%%/dutch/errmsg.sys +%%DATADIR%%/english/errmsg.sys +%%DATADIR%%/errmsg-utf8.txt +%%DATADIR%%/estonian/errmsg.sys +%%DATADIR%%/french/errmsg.sys +%%DATADIR%%/german/errmsg.sys +%%DATADIR%%/greek/errmsg.sys +%%DATADIR%%/hindi/errmsg.sys +%%DATADIR%%/hungarian/errmsg.sys +%%DATADIR%%/italian/errmsg.sys +%%DATADIR%%/japanese/errmsg.sys +%%DATADIR%%/korean/errmsg.sys +%%DATADIR%%/norwegian-ny/errmsg.sys +%%DATADIR%%/norwegian/errmsg.sys +%%DATADIR%%/polish/errmsg.sys +%%DATADIR%%/portuguese/errmsg.sys +%%DATADIR%%/romanian/errmsg.sys +%%DATADIR%%/russian/errmsg.sys +%%DATADIR%%/serbian/errmsg.sys +%%DATADIR%%/slovak/errmsg.sys +%%DATADIR%%/spanish/errmsg.sys +%%DATADIR%%/swedish/errmsg.sys +%%DATADIR%%/ukrainian/errmsg.sys %%WSREP%%%%DATADIR%%/wsrep.cnf %%WSREP%%%%DATADIR%%/wsrep_notify @comment %%DOCSDIR%%/COPYING From owner-svn-ports-branches@freebsd.org Sun Oct 28 10:09:02 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1CD6510EF8DC; Sun, 28 Oct 2018 10:09:02 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BC59C7A61F; Sun, 28 Oct 2018 10:09:01 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9CDDC1DEA0; Sun, 28 Oct 2018 10:09:01 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9SA91L8053001; Sun, 28 Oct 2018 10:09:01 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9SA91ge052998; Sun, 28 Oct 2018 10:09:01 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201810281009.w9SA91ge052998@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 28 Oct 2018 10:09:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483261 - in branches/2018Q4: benchmarks/polygraph cad/freehdl devel/aegis X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q4: benchmarks/polygraph cad/freehdl devel/aegis X-SVN-Commit-Revision: 483261 X-SVN-Commit-Repository: ports 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.29 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, 28 Oct 2018 10:09:02 -0000 Author: jbeich Date: Sun Oct 28 10:09:00 2018 New Revision: 483261 URL: https://svnweb.freebsd.org/changeset/ports/483261 Log: MFH: r483260 Return subset of r483249 to GCC 4.2 to unbreak on mips* Approved by: ports-secteam blanket Modified: branches/2018Q4/benchmarks/polygraph/Makefile branches/2018Q4/cad/freehdl/Makefile branches/2018Q4/devel/aegis/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/benchmarks/polygraph/Makefile ============================================================================== --- branches/2018Q4/benchmarks/polygraph/Makefile Sun Oct 28 10:08:17 2018 (r483260) +++ branches/2018Q4/benchmarks/polygraph/Makefile Sun Oct 28 10:09:00 2018 (r483261) @@ -18,7 +18,7 @@ BROKEN_SSL_REASON_openssl-devel= configure: error: Ope WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= compiler:c++0x gmake ncurses shebangfix tar:tgz +USES= gmake ncurses shebangfix tar:tgz SHEBANG_FILES= tools/*.pl USE_GCC= any GNU_CONFIGURE= yes Modified: branches/2018Q4/cad/freehdl/Makefile ============================================================================== --- branches/2018Q4/cad/freehdl/Makefile Sun Oct 28 10:08:17 2018 (r483260) +++ branches/2018Q4/cad/freehdl/Makefile Sun Oct 28 10:09:00 2018 (r483261) @@ -10,7 +10,7 @@ MASTER_SITES= http://freehdl.seul.org/~enaroska/ MAINTAINER= ports@FreeBSD.org COMMENT= Free VHDL simulator -USES= compiler:c++0x gmake pathfix libtool makeinfo perl5 pkgconfig +USES= gmake pathfix libtool makeinfo perl5 pkgconfig USE_LDCONFIG= yes USE_GCC= any GNU_CONFIGURE= yes Modified: branches/2018Q4/devel/aegis/Makefile ============================================================================== --- branches/2018Q4/devel/aegis/Makefile Sun Oct 28 10:08:17 2018 (r483260) +++ branches/2018Q4/devel/aegis/Makefile Sun Oct 28 10:09:00 2018 (r483261) @@ -16,7 +16,7 @@ LICENSE= GPLv3 LIB_DEPENDS= libcurl.so:ftp/curl RUN_DEPENDS= tkdiff:textproc/tkdiff -USES= compiler:c++0x gettext ghostscript groff perl5 tk +USES= gettext ghostscript groff perl5 tk USE_GNOME= libxml2 USE_GCC= any GNU_CONFIGURE= yes From owner-svn-ports-branches@freebsd.org Sun Oct 28 11:28:21 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BC93A1087343; Sun, 28 Oct 2018 11:28:21 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 72BCE7D9B8; Sun, 28 Oct 2018 11:28:21 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4F68E1EBB7; Sun, 28 Oct 2018 11:28:21 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9SBSLMa097449; Sun, 28 Oct 2018 11:28:21 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9SBSLt9097448; Sun, 28 Oct 2018 11:28:21 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201810281128.w9SBSLt9097448@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 28 Oct 2018 11:28:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483280 - branches/2018Q4/games/alephone X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q4/games/alephone X-SVN-Commit-Revision: 483280 X-SVN-Commit-Repository: ports 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.29 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, 28 Oct 2018 11:28:22 -0000 Author: jbeich Date: Sun Oct 28 11:28:20 2018 New Revision: 483280 URL: https://svnweb.freebsd.org/changeset/ports/483280 Log: MFH: r483246 games/alephone: unbreak build with Clang 6 (C++14 by default) In file included from csdialogs_sdl.cpp:29: In file included from ../../Source_Files/Misc/sdl_dialogs.h:33: In file included from /usr/local/include/boost/function.hpp:70: In file included from /usr/local/include/boost/preprocessor/iteration/detail/iter/forward1.hpp:47: In file included from /usr/local/include/boost/function/detail/function_iterate.hpp:14: In file included from /usr/local/include/boost/function/detail/maybe_include.hpp:15: /usr/local/include/boost/function/function_template.hpp:158:33: error: called object type 'nullptr_t' is not a function or function pointer BOOST_FUNCTION_RETURN((*f)(BOOST_FUNCTION_ARGS)); ^~~~ /usr/local/include/boost/function/function_template.hpp:80:36: note: expanded from macro 'BOOST_FUNCTION_RETURN' # define BOOST_FUNCTION_RETURN(X) X ^ /usr/local/include/boost/function/function_template.hpp:935:53: note: in instantiation of member function 'boost::detail::function::void_function_obj_invoker0::invoke' requested here { { &manager_type::manage }, &invoker_type::invoke }; ^ /usr/local/include/boost/function/function_template.hpp:724:13: note: in instantiation of function template specialization 'boost::function0::assign_to' requested here this->assign_to(f); ^ /usr/local/include/boost/function/function_template.hpp:1073:5: note: in instantiation of function template specialization 'boost::function0::function0' requested here base_type(f) ^ ../../Source_Files/Misc/sdl_widgets.h:1082:5: note: in instantiation of function template specialization 'boost::function::function' requested here , m_callback (NULL) ^ interface.cpp:3114:25: error: non-constant-expression cannot be narrowed from type 'int' to 'Sint16' (aka 'short') in initializer list [-Wc++11-narrowing] SDL_Rect dst_rect = { (s->w - 640)/2, (s->h - 480)/2, 640, 480 }; ^~~~~~~~~~~~~~ interface.cpp:3114:25: note: insert an explicit cast to silence this issue SDL_Rect dst_rect = { (s->w - 640)/2, (s->h - 480)/2, 640, 480 }; ^~~~~~~~~~~~~~ static_cast( ) Approved by: ports-secteam blanket Modified: branches/2018Q4/games/alephone/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/games/alephone/Makefile ============================================================================== --- branches/2018Q4/games/alephone/Makefile Sun Oct 28 11:26:05 2018 (r483279) +++ branches/2018Q4/games/alephone/Makefile Sun Oct 28 11:28:20 2018 (r483280) @@ -14,6 +14,7 @@ COMMENT= The open source version of Bungie's Marathon BUILD_DEPENDS= ${LOCALBASE}/include/boost/function.hpp:devel/boost-libs USES= gmake localbase pkgconfig tar:bzip2 +USE_CXXSTD= gnu++98 USE_SDL= image net sdl ttf USE_GL= yes GNU_CONFIGURE= yes From owner-svn-ports-branches@freebsd.org Sun Oct 28 11:03:50 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 75BF3108656A; Sun, 28 Oct 2018 11:03:50 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 28CE27C9BB; Sun, 28 Oct 2018 11:03:50 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 09C0B1E867; Sun, 28 Oct 2018 11:03:50 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9SB3ncY086328; Sun, 28 Oct 2018 11:03:49 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9SB3nHN086327; Sun, 28 Oct 2018 11:03:49 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201810281103.w9SB3nHN086327@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 28 Oct 2018 11:03:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483273 - branches/2018Q4/graphics/inkscape/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q4/graphics/inkscape/files X-SVN-Commit-Revision: 483273 X-SVN-Commit-Repository: ports 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.29 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, 28 Oct 2018 11:03:50 -0000 Author: jbeich Date: Sun Oct 28 11:03:49 2018 New Revision: 483273 URL: https://svnweb.freebsd.org/changeset/ports/483273 Log: MFH: r483272 graphics/inkscape: unbreak on 32-bit archs after r474795 src/libavoid/connector.cpp:888:29: error: call to 'abs' is ambiguous COLA_ASSERT(abs((long)i->pathNext->id.objID - i->id.objID) != 2); ^~~ src/libavoid/assertions.h:41:39: note: expanded from macro 'COLA_ASSERT' #define COLA_ASSERT(expr) assert(expr) ^~~~ /usr/include/assert.h:56:21: note: expanded from macro 'assert' #define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \ ^ /usr/include/c++/v1/math.h:733:1: note: candidate function abs(float __lcpp_x) _NOEXCEPT {return ::fabsf(__lcpp_x);} ^ /usr/include/c++/v1/math.h:737:1: note: candidate function abs(double __lcpp_x) _NOEXCEPT {return ::fabs(__lcpp_x);} ^ /usr/include/c++/v1/math.h:741:1: note: candidate function abs(long double __lcpp_x) _NOEXCEPT {return ::fabsl(__lcpp_x);} ^ /usr/include/stdlib.h:87:6: note: candidate function int abs(int) __pure2; ^ /usr/include/c++/v1/stdlib.h:111:44: note: candidate function inline _LIBCPP_INLINE_VISIBILITY long abs( long __x) _NOEXCEPT {return labs(__x);} ^ /usr/include/c++/v1/stdlib.h:113:44: note: candidate function inline _LIBCPP_INLINE_VISIBILITY long long abs(long long __x) _NOEXCEPT {return llabs(__x);} ^ PR: 229844 Reported by: pkg-fallout Approved by: ports-secteam blanket Added: branches/2018Q4/graphics/inkscape/files/patch-src_libavoid_connector.cpp - copied unchanged from r483272, head/graphics/inkscape/files/patch-src_libavoid_connector.cpp Modified: Directory Properties: branches/2018Q4/ (props changed) Copied: branches/2018Q4/graphics/inkscape/files/patch-src_libavoid_connector.cpp (from r483272, head/graphics/inkscape/files/patch-src_libavoid_connector.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/graphics/inkscape/files/patch-src_libavoid_connector.cpp Sun Oct 28 11:03:49 2018 (r483273, copy of r483272, head/graphics/inkscape/files/patch-src_libavoid_connector.cpp) @@ -0,0 +1,39 @@ +src/libavoid/connector.cpp:888:29: error: call to 'abs' is ambiguous + COLA_ASSERT(abs((long)i->pathNext->id.objID - i->id.objID) != 2); + ^~~ +src/libavoid/assertions.h:41:39: note: expanded from macro 'COLA_ASSERT' + #define COLA_ASSERT(expr) assert(expr) + ^~~~ +/usr/include/assert.h:56:21: note: expanded from macro 'assert' +#define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \ + ^ +/usr/include/c++/v1/math.h:733:1: note: candidate function +abs(float __lcpp_x) _NOEXCEPT {return ::fabsf(__lcpp_x);} +^ +/usr/include/c++/v1/math.h:737:1: note: candidate function +abs(double __lcpp_x) _NOEXCEPT {return ::fabs(__lcpp_x);} +^ +/usr/include/c++/v1/math.h:741:1: note: candidate function +abs(long double __lcpp_x) _NOEXCEPT {return ::fabsl(__lcpp_x);} +^ +/usr/include/stdlib.h:87:6: note: candidate function +int abs(int) __pure2; + ^ +/usr/include/c++/v1/stdlib.h:111:44: note: candidate function +inline _LIBCPP_INLINE_VISIBILITY long abs( long __x) _NOEXCEPT {return labs(__x);} + ^ +/usr/include/c++/v1/stdlib.h:113:44: note: candidate function +inline _LIBCPP_INLINE_VISIBILITY long long abs(long long __x) _NOEXCEPT {return llabs(__x);} + ^ + +--- src/libavoid/connector.cpp.orig 2018-03-11 20:38:09 UTC ++++ src/libavoid/connector.cpp +@@ -885,7 +885,7 @@ bool ConnRef::generatePath(void) + { + // Check for consecutive points on opposite + // corners of two touching shapes. +- COLA_ASSERT(abs((long)i->pathNext->id.objID - i->id.objID) != 2); ++ COLA_ASSERT(abs((long)(i->pathNext->id.objID - i->id.objID)) != 2); + } + } + } From owner-svn-ports-branches@freebsd.org Sun Oct 28 07:12:34 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2175710EA4CA; Sun, 28 Oct 2018 07:12:34 +0000 (UTC) (envelope-from leres@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EBF9B735AA; Sun, 28 Oct 2018 07:12:33 +0000 (UTC) (envelope-from leres@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C5AAA1C2DC; Sun, 28 Oct 2018 07:12:33 +0000 (UTC) (envelope-from leres@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9S7CXvm061916; Sun, 28 Oct 2018 07:12:33 GMT (envelope-from leres@FreeBSD.org) Received: (from leres@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9S7CXdl061915; Sun, 28 Oct 2018 07:12:33 GMT (envelope-from leres@FreeBSD.org) Message-Id: <201810280712.w9S7CXdl061915@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: leres set sender to leres@FreeBSD.org using -f From: Craig Leres Date: Sun, 28 Oct 2018 07:12:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483230 - branches/2018Q4/www/mini_httpd X-SVN-Group: ports-branches X-SVN-Commit-Author: leres X-SVN-Commit-Paths: branches/2018Q4/www/mini_httpd X-SVN-Commit-Revision: 483230 X-SVN-Commit-Repository: ports 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.29 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, 28 Oct 2018 07:12:34 -0000 Author: leres Date: Sun Oct 28 07:12:33 2018 New Revision: 483230 URL: https://svnweb.freebsd.org/changeset/ports/483230 Log: MFH: r483152 Update to 1.30 which fixes a security hole that allowed arbitrary file disclosure in some circumstances. Announcement: http://acme.com/updates/archive/211.html Approved by: matthew (mentor, implicit) Security: 33c384f3-5af6-4662-9741-0acb21c7e499 Approved by: ports-secteam (riggs), matthew (mentor, implicit) Modified: branches/2018Q4/www/mini_httpd/Makefile branches/2018Q4/www/mini_httpd/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/www/mini_httpd/Makefile ============================================================================== --- branches/2018Q4/www/mini_httpd/Makefile Sun Oct 28 06:54:04 2018 (r483229) +++ branches/2018Q4/www/mini_httpd/Makefile Sun Oct 28 07:12:33 2018 (r483230) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mini_httpd -PORTVERSION= 1.29 +PORTVERSION= 1.30 CATEGORIES= www ipv6 MASTER_SITES= https://www.acme.com/software/mini_httpd/ Modified: branches/2018Q4/www/mini_httpd/distinfo ============================================================================== --- branches/2018Q4/www/mini_httpd/distinfo Sun Oct 28 06:54:04 2018 (r483229) +++ branches/2018Q4/www/mini_httpd/distinfo Sun Oct 28 07:12:33 2018 (r483230) @@ -1,3 +1,3 @@ -TIMESTAMP = 1529456298 -SHA256 (mini_httpd-1.29.tar.gz) = bdbd6226cbd105f537f67b5ad93ea69856426274bc5ada5124cca2785592ea6e -SIZE (mini_httpd-1.29.tar.gz) = 43830 +TIMESTAMP = 1540593543 +SHA256 (mini_httpd-1.30.tar.gz) = 9c4481802af8dde2e164062185c279e9274525c3af93d014fdc0b80cf30bca6e +SIZE (mini_httpd-1.30.tar.gz) = 43889 From owner-svn-ports-branches@freebsd.org Sun Oct 28 09:38:45 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3AED810EE5BA; Sun, 28 Oct 2018 09:38:45 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E316B7861E; Sun, 28 Oct 2018 09:38:44 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BF7E41D9B7; Sun, 28 Oct 2018 09:38:44 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9S9ci9k036627; Sun, 28 Oct 2018 09:38:44 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9S9cgv0036614; Sun, 28 Oct 2018 09:38:42 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201810280938.w9S9cgv0036614@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 28 Oct 2018 09:38:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483250 - in branches/2018Q4: benchmarks/polygraph cad/alliance cad/freehdl databases/fastdb devel/aegis devel/rhtvision emulators/pearpc graphics/animorph irc/ezbounce lang/cint math/m... X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q4: benchmarks/polygraph cad/alliance cad/freehdl databases/fastdb devel/aegis devel/rhtvision emulators/pearpc graphics/animorph irc/ezbounce lang/cint math/minisat net-p2p/verlihub-p... X-SVN-Commit-Revision: 483250 X-SVN-Commit-Repository: ports 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.29 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, 28 Oct 2018 09:38:45 -0000 Author: jbeich Date: Sun Oct 28 09:38:41 2018 New Revision: 483250 URL: https://svnweb.freebsd.org/changeset/ports/483250 Log: MFH: r483249 Downgrade C++03 to C++98, actual default for GCC < 6 GCC 4.2 in base system doesn't support C++03: cc1plus: error: unrecognized command line option "-std=gnu++03" Approved by: ports-secteam blanket Modified: branches/2018Q4/benchmarks/polygraph/Makefile branches/2018Q4/cad/alliance/Makefile branches/2018Q4/cad/freehdl/Makefile branches/2018Q4/databases/fastdb/Makefile branches/2018Q4/devel/aegis/Makefile branches/2018Q4/devel/rhtvision/Makefile branches/2018Q4/emulators/pearpc/Makefile branches/2018Q4/graphics/animorph/Makefile branches/2018Q4/irc/ezbounce/Makefile branches/2018Q4/lang/cint/Makefile branches/2018Q4/math/minisat/Makefile branches/2018Q4/net-p2p/verlihub-plugins-floodprotect/Makefile branches/2018Q4/www/anyterm/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/benchmarks/polygraph/Makefile ============================================================================== --- branches/2018Q4/benchmarks/polygraph/Makefile Sun Oct 28 09:36:56 2018 (r483249) +++ branches/2018Q4/benchmarks/polygraph/Makefile Sun Oct 28 09:38:41 2018 (r483250) @@ -24,7 +24,7 @@ USE_GCC= any GNU_CONFIGURE= yes # The port does not build with C++11 or later (bug 219275). -USE_CXXSTD= gnu++03 +USE_CXXSTD= gnu++98 CONFLICTS= ltrace-0* Modified: branches/2018Q4/cad/alliance/Makefile ============================================================================== --- branches/2018Q4/cad/alliance/Makefile Sun Oct 28 09:36:56 2018 (r483249) +++ branches/2018Q4/cad/alliance/Makefile Sun Oct 28 09:38:41 2018 (r483250) @@ -18,9 +18,6 @@ LICENSE_FILE= ${WRKSRC}/LICENCE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BROKEN_aarch64= fails to link: collect2: error: ld returned 1 exit status -BROKEN_mips= fails to build: cc1plus: error: unrecognized command line option "-std=gnu++03" -BROKEN_mips64= fails to build: cc1plus: error: unrecognized command line option "-std=gnu++03" -BROKEN_powerpc64= fails to build: cc1plus: error: unrecognized command line option "-std=gnu++03" CONFLICTS_INSTALL= fspclient-* @@ -38,7 +35,7 @@ CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man \ --prefix=${ALLIANCE_TOP} # The port does not build with C++11 or later (bug 219275). -USE_CXXSTD= gnu++03 +USE_CXXSTD= gnu++98 MAKE_JOBS_UNSAFE= yes Modified: branches/2018Q4/cad/freehdl/Makefile ============================================================================== --- branches/2018Q4/cad/freehdl/Makefile Sun Oct 28 09:36:56 2018 (r483249) +++ branches/2018Q4/cad/freehdl/Makefile Sun Oct 28 09:38:41 2018 (r483250) @@ -17,11 +17,11 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= SYSTEM_LIBTOOL=${FALSE} INSTALL_TARGET= install-strip -# Bug 219297: GCC 6 changed its default from -std=gnu++03 to -std=gnu++14, and +# Bug 219297: GCC 6 changed its default from -std=gnu++98 to -std=gnu++14, and # this port's code is not compatible with C++11. Since the project looks # abandoned upstream, it makes more sense to just continue building with an # older C++ standard. -USE_CXXSTD= gnu++03 +USE_CXXSTD= gnu++98 INFO= fire Modified: branches/2018Q4/databases/fastdb/Makefile ============================================================================== --- branches/2018Q4/databases/fastdb/Makefile Sun Oct 28 09:36:56 2018 (r483249) +++ branches/2018Q4/databases/fastdb/Makefile Sun Oct 28 09:38:41 2018 (r483250) @@ -12,10 +12,6 @@ COMMENT= Main Memory Relational Database Management Sy LICENSE= MIT -BROKEN_mips= fails to compile: unrecognized command line option "-std=gnu++03" -BROKEN_mips64= fails to compile: unrecognized command line option "-std=gnu++03" -BROKEN_powerpc64= fails to compile: unrecognized command line option "-std=gnu++03" - USES= gmake dos2unix USE_GCC= any MAKE_ENV= OSTYPE="${OPSYS}" @@ -31,7 +27,7 @@ OPTIONS_DEFINE= DOCS PORTDOCS= FastDB.htm # The port does not build with C++11 or later (bug 219275). -USE_CXXSTD= gnu++03 +USE_CXXSTD= gnu++98 post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: branches/2018Q4/devel/aegis/Makefile ============================================================================== --- branches/2018Q4/devel/aegis/Makefile Sun Oct 28 09:36:56 2018 (r483249) +++ branches/2018Q4/devel/aegis/Makefile Sun Oct 28 09:38:41 2018 (r483250) @@ -28,7 +28,7 @@ MAKE_JOBS_UNSAFE= yes # GCC 6 switched to -std=gnu++14 by default, which breaks the port (bug # 219284). Explicitly use the previous default to keep things going. -USE_CXXSTD= gnu++03 +USE_CXXSTD= gnu++98 OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes Modified: branches/2018Q4/devel/rhtvision/Makefile ============================================================================== --- branches/2018Q4/devel/rhtvision/Makefile Sun Oct 28 09:36:56 2018 (r483249) +++ branches/2018Q4/devel/rhtvision/Makefile Sun Oct 28 09:38:41 2018 (r483250) @@ -29,7 +29,7 @@ CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib # The port does not build with C++11 or later (bug 219275). -USE_CXXSTD= gnu++03 +USE_CXXSTD= gnu++98 PLIST_SUB= VERSION="${PORTVERSION:R}" Modified: branches/2018Q4/emulators/pearpc/Makefile ============================================================================== --- branches/2018Q4/emulators/pearpc/Makefile Sun Oct 28 09:36:56 2018 (r483249) +++ branches/2018Q4/emulators/pearpc/Makefile Sun Oct 28 09:38:41 2018 (r483250) @@ -33,7 +33,7 @@ SDL_CONFIGURE_OFF= --enable-ui=x11 .if ${ARCH} == "amd64" || ${ARCH} == "i386" USE_GCC= yes # The port does not build with C++11 or later (bug 219275). -USE_CXXSTD= gnu++03 +USE_CXXSTD= gnu++98 .else CONFIGURE_ARGS+= --enable-cpu=generic .endif Modified: branches/2018Q4/graphics/animorph/Makefile ============================================================================== --- branches/2018Q4/graphics/animorph/Makefile Sun Oct 28 09:36:56 2018 (r483249) +++ branches/2018Q4/graphics/animorph/Makefile Sun Oct 28 09:38:41 2018 (r483250) @@ -12,16 +12,12 @@ COMMENT= Morphing engine for MakeHuman LICENSE= LGPL21 -BROKEN_mips= fails to compile: unrecognized command line option "-std=gnu++03" -BROKEN_mips64= fails to compile: unrecognized command line option "-std=gnu++03" -BROKEN_powerpc64= fails to compile: unrecognized command line option "-std=gnu++03" - GNU_CONFIGURE= yes USES= pkgconfig gmake libtool USE_LDCONFIG= yes INSTALL_TARGET= install-strip USE_GCC= any # otherwise graphics/makehuman won't link -USE_CXXSTD= gnu++03 # The port is not compatible with C++11 and later. +USE_CXXSTD= gnu++98 # The port is not compatible with C++11 and later. CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Modified: branches/2018Q4/irc/ezbounce/Makefile ============================================================================== --- branches/2018Q4/irc/ezbounce/Makefile Sun Oct 28 09:36:56 2018 (r483249) +++ branches/2018Q4/irc/ezbounce/Makefile Sun Oct 28 09:38:41 2018 (r483250) @@ -28,7 +28,7 @@ USE_GCC= any # ezbounce 1.99.15 isn't compatible with C++11 and later, which some compilers # such as GCC 6 default to. -USE_CXXSTD= gnu++03 +USE_CXXSTD= gnu++98 SUB_FILES= pkg-message Modified: branches/2018Q4/lang/cint/Makefile ============================================================================== --- branches/2018Q4/lang/cint/Makefile Sun Oct 28 09:36:56 2018 (r483249) +++ branches/2018Q4/lang/cint/Makefile Sun Oct 28 09:38:41 2018 (r483250) @@ -24,7 +24,7 @@ ALL_TARGET= # The port does not build with C++11/C++14, so explicitly use an older # standard. -USE_CXXSTD= gnu++03 +USE_CXXSTD= gnu++98 INSTALL_ARGS= --bindir=${STAGEDIR}${PREFIX}/bin\ --libdir=${STAGEDIR}${PREFIX}/lib/cint\ Modified: branches/2018Q4/math/minisat/Makefile ============================================================================== --- branches/2018Q4/math/minisat/Makefile Sun Oct 28 09:36:56 2018 (r483249) +++ branches/2018Q4/math/minisat/Makefile Sun Oct 28 09:38:41 2018 (r483250) @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= gmake USE_LDCONFIG= yes -MAKE_ENV= prefix=${PREFIX} CFLAGS="-std=c++03" +MAKE_ENV= prefix=${PREFIX} CFLAGS="-std=gnu++98" post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} \ Modified: branches/2018Q4/net-p2p/verlihub-plugins-floodprotect/Makefile ============================================================================== --- branches/2018Q4/net-p2p/verlihub-plugins-floodprotect/Makefile Sun Oct 28 09:36:56 2018 (r483249) +++ branches/2018Q4/net-p2p/verlihub-plugins-floodprotect/Makefile Sun Oct 28 09:38:41 2018 (r483250) @@ -17,7 +17,7 @@ PLUGIN_DESC= Floodprotect # Bug 219281: the port fails to build in C++14 mode (the default in GCC 6), # switch back to the old default GCC used before. -USE_CXXSTD= gnu++03 +USE_CXXSTD= gnu++98 .include "../verlihub-plugins/Makefile.plugins" .include Modified: branches/2018Q4/www/anyterm/Makefile ============================================================================== --- branches/2018Q4/www/anyterm/Makefile Sun Oct 28 09:36:56 2018 (r483249) +++ branches/2018Q4/www/anyterm/Makefile Sun Oct 28 09:38:41 2018 (r483250) @@ -31,7 +31,7 @@ PLIST_FILES= man/man1/anytermd.1.gz \ # Force the use of an older C++ standard; anyterm 1.1.29 is not compatible with # C++11. -USE_CXXSTD= gnu++03 +USE_CXXSTD= gnu++98 post-patch: @${REINPLACE_CMD} -e 's|/private/etc/apache2|${FILESDIR}|' \ From owner-svn-ports-branches@freebsd.org Sun Oct 28 11:53:06 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 88B5510C91B5; Sun, 28 Oct 2018 11:53:06 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3DB547FBAF; Sun, 28 Oct 2018 11:53:06 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1F3EE1F0BB; Sun, 28 Oct 2018 11:53:06 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9SBr5ZS013430; Sun, 28 Oct 2018 11:53:05 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9SBr5Zx013429; Sun, 28 Oct 2018 11:53:05 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201810281153.w9SBr5Zx013429@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 28 Oct 2018 11:53:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483287 - branches/2018Q4/security/clamfs/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q4/security/clamfs/files X-SVN-Commit-Revision: 483287 X-SVN-Commit-Repository: ports 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.29 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, 28 Oct 2018 11:53:06 -0000 Author: jbeich Date: Sun Oct 28 11:53:05 2018 New Revision: 483287 URL: https://svnweb.freebsd.org/changeset/ports/483287 Log: MFH: r483286 security/clamfs: unbreak build with Clang 6 (C++14 by default) clamfs.cxx:963:26: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] rLog(Info, "ClamFS v"VERSION); ^ Reported by: pkg-fallout Approved by: ports-secteam blanket Added: branches/2018Q4/security/clamfs/files/patch-src_clamfs.cxx - copied unchanged from r483286, head/security/clamfs/files/patch-src_clamfs.cxx Modified: Directory Properties: branches/2018Q4/ (props changed) Copied: branches/2018Q4/security/clamfs/files/patch-src_clamfs.cxx (from r483286, head/security/clamfs/files/patch-src_clamfs.cxx) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/security/clamfs/files/patch-src_clamfs.cxx Sun Oct 28 11:53:05 2018 (r483287, copy of r483286, head/security/clamfs/files/patch-src_clamfs.cxx) @@ -0,0 +1,15 @@ +clamfs.cxx:963:26: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] + rLog(Info, "ClamFS v"VERSION); + ^ + +--- src/clamfs.cxx.orig 2009-11-29 21:04:33 UTC ++++ src/clamfs.cxx +@@ -960,7 +960,7 @@ int main(int argc, char *argv[]) + RLogInit(argc, argv); + RLogOpenStdio(); + +- rLog(Info, "ClamFS v"VERSION); ++ rLog(Info, "ClamFS v" VERSION); + rLog(Info, "Copyright (c) 2007,2008 Krzysztof Burghardt "); + rLog(Info, "http://clamfs.sourceforge.net/"); + From owner-svn-ports-branches@freebsd.org Sun Oct 28 14:11:23 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8497810D26F0; Sun, 28 Oct 2018 14:11:23 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3AA2B85EC7; Sun, 28 Oct 2018 14:11:23 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1D66C2060B; Sun, 28 Oct 2018 14:11:23 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9SEBMRJ084661; Sun, 28 Oct 2018 14:11:22 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9SEBMZ0084660; Sun, 28 Oct 2018 14:11:22 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201810281411.w9SEBMZ0084660@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Sun, 28 Oct 2018 14:11:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483295 - branches/2018Q4/sysutils/py-salt X-SVN-Group: ports-branches X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: branches/2018Q4/sysutils/py-salt X-SVN-Commit-Revision: 483295 X-SVN-Commit-Repository: ports 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.29 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, 28 Oct 2018 14:11:23 -0000 Author: woodsb02 Date: Sun Oct 28 14:11:22 2018 New Revision: 483295 URL: https://svnweb.freebsd.org/changeset/ports/483295 Log: MFH: r483114 sysutils/py-salt: Update to 2018.3.3 This is a security release, addressing the following CVE's: - CVE-2018-15751 - Remote command execution and incorrect access control when using salt-api. - CVE-2018-15750 - Directory traversal vulnerability using salt-api. Allows an attacker to determine what files exist on a server when querying /run or /events. Other changes this release: https://docs.saltstack.com/en/latest/topics/releases/2018.3.3.html PR: 232663 Submitted by: Christer Edwards Approved by: Christer Edwards (maintainer) Security: https://www.vuxml.org/freebsd/4f7c6af3-6a2c-4ead-8453-04e509688d45.html Approved by: ports-secteam (riggs) Modified: branches/2018Q4/sysutils/py-salt/Makefile branches/2018Q4/sysutils/py-salt/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/sysutils/py-salt/Makefile ============================================================================== --- branches/2018Q4/sysutils/py-salt/Makefile Sun Oct 28 13:50:41 2018 (r483294) +++ branches/2018Q4/sysutils/py-salt/Makefile Sun Oct 28 14:11:22 2018 (r483295) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= salt -PORTVERSION= 2018.3.2 +PORTVERSION= 2018.3.3 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: branches/2018Q4/sysutils/py-salt/distinfo ============================================================================== --- branches/2018Q4/sysutils/py-salt/distinfo Sun Oct 28 13:50:41 2018 (r483294) +++ branches/2018Q4/sysutils/py-salt/distinfo Sun Oct 28 14:11:22 2018 (r483295) @@ -1,3 +1,3 @@ -TIMESTAMP = 1534903119 -SHA256 (salt-2018.3.2.tar.gz) = d86eeea2e5387f4a64bbf0a11d103bfc8aac1122e19d39cc0945d33efdc797bd -SIZE (salt-2018.3.2.tar.gz) = 12996445 +TIMESTAMP = 1540613424 +SHA256 (salt-2018.3.3.tar.gz) = dcf30d2e8eae105a72977c51cfc253fbc4dc28b2f71277fdce9d35de1eb63e15 +SIZE (salt-2018.3.3.tar.gz) = 13953724 From owner-svn-ports-branches@freebsd.org Sun Oct 28 16:24:22 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6320C10D7ED4; Sun, 28 Oct 2018 16:24:22 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1704B8BC7B; Sun, 28 Oct 2018 16:24:22 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EBA0321C77; Sun, 28 Oct 2018 16:24:21 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9SGOLeC053929; Sun, 28 Oct 2018 16:24:21 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9SGOLau053926; Sun, 28 Oct 2018 16:24:21 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201810281624.w9SGOLau053926@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 28 Oct 2018 16:24:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483314 - branches/2018Q4/net/liveMedia X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2018Q4/net/liveMedia X-SVN-Commit-Revision: 483314 X-SVN-Commit-Repository: ports 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.29 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, 28 Oct 2018 16:24:22 -0000 Author: riggs Date: Sun Oct 28 16:24:21 2018 New Revision: 483314 URL: https://svnweb.freebsd.org/changeset/ports/483314 Log: MFH: r483312 Update to upstream version 2018.10.17 Details: - Fix potential remote exploit in the RTSP code (CVE-2018-4013) Security: CVE-2018-4013 Approved by: ports-secteam (riggs) Modified: branches/2018Q4/net/liveMedia/Makefile branches/2018Q4/net/liveMedia/distinfo branches/2018Q4/net/liveMedia/pkg-plist Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/net/liveMedia/Makefile ============================================================================== --- branches/2018Q4/net/liveMedia/Makefile Sun Oct 28 16:23:27 2018 (r483313) +++ branches/2018Q4/net/liveMedia/Makefile Sun Oct 28 16:24:21 2018 (r483314) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= liveMedia -PORTVERSION= 2018.02.28 +PORTVERSION= 2018.10.17 PORTEPOCH= 2 CATEGORIES= net devel MASTER_SITES= http://www.live555.com/liveMedia/public/ \ Modified: branches/2018Q4/net/liveMedia/distinfo ============================================================================== --- branches/2018Q4/net/liveMedia/distinfo Sun Oct 28 16:23:27 2018 (r483313) +++ branches/2018Q4/net/liveMedia/distinfo Sun Oct 28 16:24:21 2018 (r483314) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522698311 -SHA256 (live.2018.02.28.tar.gz) = 2db4f05616bdd21a609baf82c836486c44820c16a006315e02abe2b0b53a247e -SIZE (live.2018.02.28.tar.gz) = 635306 +TIMESTAMP = 1540736399 +SHA256 (live.2018.10.17.tar.gz) = 7c68d9c95b39acd309a2b6a4fc14c3837544a9be3f64062ed38d1ad6f68dc9e8 +SIZE (live.2018.10.17.tar.gz) = 634220 Modified: branches/2018Q4/net/liveMedia/pkg-plist ============================================================================== --- branches/2018Q4/net/liveMedia/pkg-plist Sun Oct 28 16:23:27 2018 (r483313) +++ branches/2018Q4/net/liveMedia/pkg-plist Sun Oct 28 16:24:21 2018 (r483314) @@ -179,6 +179,8 @@ include/liveMedia/RTSPCommon.hh include/liveMedia/RTSPRegisterSender.hh include/liveMedia/RTSPServer.hh include/liveMedia/RTSPServerSupportingHTTPStreaming.hh +include/liveMedia/RawVideoRTPSink.hh +include/liveMedia/RawVideoRTPSource.hh include/liveMedia/SIPClient.hh include/liveMedia/ServerMediaSession.hh include/liveMedia/SimpleRTPSink.hh From owner-svn-ports-branches@freebsd.org Sun Oct 28 17:52:05 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 620C610DB8CA; Sun, 28 Oct 2018 17:52:05 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 17A448F251; Sun, 28 Oct 2018 17:52:05 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D2D2222AE1; Sun, 28 Oct 2018 17:52:04 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9SHq4K7000318; Sun, 28 Oct 2018 17:52:04 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9SHq4H6000316; Sun, 28 Oct 2018 17:52:04 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201810281752.w9SHq4H6000316@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 28 Oct 2018 17:52:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483320 - in branches/2018Q4/multimedia/ffmpeg: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in branches/2018Q4/multimedia/ffmpeg: . files X-SVN-Commit-Revision: 483320 X-SVN-Commit-Repository: ports 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.29 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, 28 Oct 2018 17:52:05 -0000 Author: riggs Date: Sun Oct 28 17:52:04 2018 New Revision: 483320 URL: https://svnweb.freebsd.org/changeset/ports/483320 Log: MFH: r482030 r482658 r482928 r483316 Enable XCB option by default Rationale: - XCB offers a comfortable screen capturing function via ffmpeg -f x11grab - In the default package libxcb is installed as a dependency of libX11 anyway, hence no need to disable it for ffmpeg specifically PR: 231215 Reported by: vermaden@interia.pl multimedia/ffmpeg: unbreak ALSA=off after r468844 https://ffmpeg.org/pipermail/ffmpeg-devel/2018-September/234516.html PR: 232498 multimedia/ffmpeg: Do not set DATADIR twice PR: 232637 Unbreak build on 12-BETA after OpenSSL 1.1.1 import into base PR: 232707 Submitted by: fluffy Approved by: ports-secteam (riggs) Modified: branches/2018Q4/multimedia/ffmpeg/Makefile branches/2018Q4/multimedia/ffmpeg/files/patch-configure Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/multimedia/ffmpeg/Makefile ============================================================================== --- branches/2018Q4/multimedia/ffmpeg/Makefile Sun Oct 28 17:29:13 2018 (r483319) +++ branches/2018Q4/multimedia/ffmpeg/Makefile Sun Oct 28 17:52:04 2018 (r483320) @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 4.0.2 -PORTREVISION= 5 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= https://ffmpeg.org/releases/ @@ -39,7 +39,7 @@ OPTIONS_DEFINE= ALSA AMR_NB AMR_WB AOM ASS BEIGNET BS2 OPTIONS_DEFAULT= FONTCONFIG FREETYPE FREI0R GMP GNUTLS ICONV \ OPENCV OPTIMIZED_CFLAGS OPUS RTCPU THEORA V4L VAAPI VDPAU \ - VORBIS VPX X264 X265 XVID + VORBIS VPX X264 X265 XCB XVID .if !exists(${.CURDIR:H:H}/net/srt) # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/a2fc8dbae853 Modified: branches/2018Q4/multimedia/ffmpeg/files/patch-configure ============================================================================== --- branches/2018Q4/multimedia/ffmpeg/files/patch-configure Sun Oct 28 17:29:13 2018 (r483319) +++ branches/2018Q4/multimedia/ffmpeg/files/patch-configure Sun Oct 28 17:52:04 2018 (r483320) @@ -14,6 +14,14 @@ cpu="generic" intrinsics="none" +@@ -6122,6 +6117,7 @@ + die "ERROR: OpenMAX IL headers not found"; } && enable omx + enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl || + check_pkg_config openssl openssl openssl/ssl.h SSL_library_init || ++ check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto || + check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto || + check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 || + check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 || @@ -6234,8 +6229,10 @@ else EOF fi From owner-svn-ports-branches@freebsd.org Tue Oct 30 11:36:42 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07BEA10E06CC; Tue, 30 Oct 2018 11:36:42 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B14877F0AB; Tue, 30 Oct 2018 11:36:41 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8DB221CDCD; Tue, 30 Oct 2018 11:36:41 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9UBafxn093513; Tue, 30 Oct 2018 11:36:41 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9UBaegk093510; Tue, 30 Oct 2018 11:36:40 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201810301136.w9UBaegk093510@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Tue, 30 Oct 2018 11:36:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483469 - in branches/2018Q4/security/openssl111: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in branches/2018Q4/security/openssl111: . files X-SVN-Commit-Revision: 483469 X-SVN-Commit-Repository: ports 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.29 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, 30 Oct 2018 11:36:42 -0000 Author: brnrd Date: Tue Oct 30 11:36:40 2018 New Revision: 483469 URL: https://svnweb.freebsd.org/changeset/ports/483469 Log: MFH: r483393 security/openssl111: Fix vulnerabilities Security: 238ae7de-dba2-11e8-b713-b499baebfeaf Approved by: ports-secteam (miwi) Added: branches/2018Q4/security/openssl111/files/patch-CVE-2018-0734 - copied unchanged from r483393, head/security/openssl111/files/patch-CVE-2018-0734 branches/2018Q4/security/openssl111/files/patch-CVE-2018-0735 - copied unchanged from r483393, head/security/openssl111/files/patch-CVE-2018-0735 Modified: branches/2018Q4/security/openssl111/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/security/openssl111/Makefile ============================================================================== --- branches/2018Q4/security/openssl111/Makefile Tue Oct 30 11:31:17 2018 (r483468) +++ branches/2018Q4/security/openssl111/Makefile Tue Oct 30 11:36:40 2018 (r483469) @@ -3,7 +3,7 @@ PORTNAME= openssl DISTVERSION= 1.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/ Copied: branches/2018Q4/security/openssl111/files/patch-CVE-2018-0734 (from r483393, head/security/openssl111/files/patch-CVE-2018-0734) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/security/openssl111/files/patch-CVE-2018-0734 Tue Oct 30 11:36:40 2018 (r483469, copy of r483393, head/security/openssl111/files/patch-CVE-2018-0734) @@ -0,0 +1,98 @@ +Timing vulnerability in DSA signature generation (CVE-2018-0734). + +Avoid a timing attack that leaks information via a side channel that +triggers when a BN is resized. Increasing the size of the BNs +prior to doing anything with them suppresses the attack. + +Thanks due to Samuel Weiser for finding and locating this. + +Reviewed-by: Bernd Edlinger +(Merged from #7486) + +(cherry picked from commit a9cfb8c) + +https://github.com/openssl/openssl/commit/8abfe72e8c1de1b95f50aa0d9134803b4d00070f +--- crypto/dsa/dsa_ossl.c.orig 2018-09-11 12:48:21 UTC ++++ crypto/dsa/dsa_ossl.c +@@ -9,6 +9,7 @@ + + #include + #include "internal/cryptlib.h" ++#include "internal/bn_int.h" + #include + #include + #include "dsa_locl.h" +@@ -178,9 +179,9 @@ static int dsa_sign_setup(DSA *dsa, BN_C + { + BN_CTX *ctx = NULL; + BIGNUM *k, *kinv = NULL, *r = *rp; +- BIGNUM *l, *m; ++ BIGNUM *l; + int ret = 0; +- int q_bits; ++ int q_bits, q_words; + + if (!dsa->p || !dsa->q || !dsa->g) { + DSAerr(DSA_F_DSA_SIGN_SETUP, DSA_R_MISSING_PARAMETERS); +@@ -189,8 +190,7 @@ static int dsa_sign_setup(DSA *dsa, BN_C + + k = BN_new(); + l = BN_new(); +- m = BN_new(); +- if (k == NULL || l == NULL || m == NULL) ++ if (k == NULL || l == NULL) + goto err; + + if (ctx_in == NULL) { +@@ -201,9 +201,9 @@ static int dsa_sign_setup(DSA *dsa, BN_C + + /* Preallocate space */ + q_bits = BN_num_bits(dsa->q); +- if (!BN_set_bit(k, q_bits) +- || !BN_set_bit(l, q_bits) +- || !BN_set_bit(m, q_bits)) ++ q_words = bn_get_top(dsa->q); ++ if (!bn_wexpand(k, q_words + 2) ++ || !bn_wexpand(l, q_words + 2)) + goto err; + + /* Get random k */ +@@ -238,14 +238,17 @@ static int dsa_sign_setup(DSA *dsa, BN_C + * small timing information leakage. We then choose the sum that is + * one bit longer than the modulus. + * +- * TODO: revisit the BN_copy aiming for a memory access agnostic +- * conditional copy. ++ * There are some concerns about the efficacy of doing this. More ++ * specificly refer to the discussion starting with: ++ * https://github.com/openssl/openssl/pull/7486#discussion_r228323705 ++ * The fix is to rework BN so these gymnastics aren't required. + */ + if (!BN_add(l, k, dsa->q) +- || !BN_add(m, l, dsa->q) +- || !BN_copy(k, BN_num_bits(l) > q_bits ? l : m)) ++ || !BN_add(k, l, dsa->q)) + goto err; + ++ BN_consttime_swap(BN_is_bit_set(l, q_bits), k, l, q_words + 2); ++ + if ((dsa)->meth->bn_mod_exp != NULL) { + if (!dsa->meth->bn_mod_exp(dsa, r, dsa->g, k, dsa->p, ctx, + dsa->method_mont_p)) +@@ -258,7 +261,7 @@ static int dsa_sign_setup(DSA *dsa, BN_C + if (!BN_mod(r, r, dsa->q, ctx)) + goto err; + +- /* Compute part of 's = inv(k) (m + xr) mod q' */ ++ /* Compute part of 's = inv(k) (m + xr) mod q' */ + if ((kinv = BN_mod_inverse(NULL, k, dsa->q, ctx)) == NULL) + goto err; + +@@ -273,7 +276,6 @@ static int dsa_sign_setup(DSA *dsa, BN_C + BN_CTX_free(ctx); + BN_clear_free(k); + BN_clear_free(l); +- BN_clear_free(m); + return ret; + } + Copied: branches/2018Q4/security/openssl111/files/patch-CVE-2018-0735 (from r483393, head/security/openssl111/files/patch-CVE-2018-0735) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/security/openssl111/files/patch-CVE-2018-0735 Tue Oct 30 11:36:40 2018 (r483469, copy of r483393, head/security/openssl111/files/patch-CVE-2018-0735) @@ -0,0 +1,33 @@ +Timing vulnerability in ECDSA signature generation (CVE-2018-0735) + +Preallocate an extra limb for some of the big numbers to avoid a reallocation +that can potentially provide a side channel. + +Reviewed-by: Bernd Edlinger +(Merged from #7486) + +(cherry picked from commit 99540ec) + +https://www.openssl.org/news/secadv/20181029.txt +--- crypto/ec/ec_mult.c.orig 2018-09-11 12:48:21 UTC ++++ crypto/ec/ec_mult.c +@@ -206,8 +206,8 @@ int ec_scalar_mul_ladder(const EC_GROUP + */ + cardinality_bits = BN_num_bits(cardinality); + group_top = bn_get_top(cardinality); +- if ((bn_wexpand(k, group_top + 1) == NULL) +- || (bn_wexpand(lambda, group_top + 1) == NULL)) { ++ if ((bn_wexpand(k, group_top + 2) == NULL) ++ || (bn_wexpand(lambda, group_top + 2) == NULL)) { + ECerr(EC_F_EC_SCALAR_MUL_LADDER, ERR_R_BN_LIB); + goto err; + } +@@ -244,7 +244,7 @@ int ec_scalar_mul_ladder(const EC_GROUP + * k := scalar + 2*cardinality + */ + kbit = BN_is_bit_set(lambda, cardinality_bits); +- BN_consttime_swap(kbit, k, lambda, group_top + 1); ++ BN_consttime_swap(kbit, k, lambda, group_top + 2); + + group_top = bn_get_top(group->field); + if ((bn_wexpand(s->X, group_top) == NULL) From owner-svn-ports-branches@freebsd.org Tue Oct 30 16:37:50 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CBFAB10ED6F8; Tue, 30 Oct 2018 16:37:49 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 742716EBE5; Tue, 30 Oct 2018 16:37:49 +0000 (UTC) (envelope-from mfechner@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 50CD01FEFE; Tue, 30 Oct 2018 16:37:49 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9UGbnFg051042; Tue, 30 Oct 2018 16:37:49 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9UGbmtv051039; Tue, 30 Oct 2018 16:37:48 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201810301637.w9UGbmtv051039@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Tue, 30 Oct 2018 16:37:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483503 - in branches/2018Q4/www/gitlab-ce: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in branches/2018Q4/www/gitlab-ce: . files X-SVN-Commit-Revision: 483503 X-SVN-Commit-Repository: ports 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.29 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, 30 Oct 2018 16:37:50 -0000 Author: mfechner Date: Tue Oct 30 16:37:48 2018 New Revision: 483503 URL: https://svnweb.freebsd.org/changeset/ports/483503 Log: MFH: r483457 r483459 One of the last dependency updates gitlab-ce requires, has broken the Gemfile.lock generation for user git. I use now a work-around to generate the file as user root and change the ownership back to git. This commit can maybe be undone if the source of the problem is fixed. PR: 232791 Reported by: freebsd@felix.flornet.de Approved by: mentors (implicit) MFC after: 1 day www/gitlab-ce security update to version 11.3.8. Approved by: mentors (implicit) MFC after: 1 day Security: b9591212-dba7-11e8-9416-001b217b3468 Approved by: ports-secteam (miwi) Modified: branches/2018Q4/www/gitlab-ce/Makefile branches/2018Q4/www/gitlab-ce/distinfo branches/2018Q4/www/gitlab-ce/files/gitlab.in branches/2018Q4/www/gitlab-ce/pkg-plist Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/www/gitlab-ce/Makefile ============================================================================== --- branches/2018Q4/www/gitlab-ce/Makefile Tue Oct 30 16:24:34 2018 (r483502) +++ branches/2018Q4/www/gitlab-ce/Makefile Tue Oct 30 16:37:48 2018 (r483503) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-ce -PORTVERSION= 11.3.4 +PORTVERSION= 11.3.8 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -20,7 +20,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \ gitlab-workhorse>=6.1.0:www/gitlab-workhorse \ gitaly>=0.120.1:devel/gitaly \ gitlab-pages>=1.1.0:www/gitlab-pages \ - redis>=2.8.23:databases/redis \ + redis>=3.2.12:databases/redis \ npm>=4.3.0:www/npm \ yarn>=0.17.0:www/yarn \ rubygem-rails4>=4.2.10:www/rubygem-rails4 \ @@ -218,7 +218,7 @@ USE_RC_SUBR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags -GL_COMMIT= 30f019dca78bb64bcb8b355a267be006884e6d8f +GL_COMMIT= 0a6f6119fa3e6f708e745bba369ecba18c3d07cc USERS= git GROUPS= git Modified: branches/2018Q4/www/gitlab-ce/distinfo ============================================================================== --- branches/2018Q4/www/gitlab-ce/distinfo Tue Oct 30 16:24:34 2018 (r483502) +++ branches/2018Q4/www/gitlab-ce/distinfo Tue Oct 30 16:37:48 2018 (r483503) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538768604 -SHA256 (gitlab-org-gitlab-ce-30f019dca78bb64bcb8b355a267be006884e6d8f_GL0.tar.gz) = 160f74ee44d034ca5a2b804856d5b132951461b41bac6ac2a14324ee822641d5 -SIZE (gitlab-org-gitlab-ce-30f019dca78bb64bcb8b355a267be006884e6d8f_GL0.tar.gz) = 42469501 +TIMESTAMP = 1540838450 +SHA256 (gitlab-org-gitlab-ce-0a6f6119fa3e6f708e745bba369ecba18c3d07cc_GL0.tar.gz) = 679e5338e3d40f6db60472477c33fc0b974e2ed97218eb3b08fc6509d1a79472 +SIZE (gitlab-org-gitlab-ce-0a6f6119fa3e6f708e745bba369ecba18c3d07cc_GL0.tar.gz) = 42479125 Modified: branches/2018Q4/www/gitlab-ce/files/gitlab.in ============================================================================== --- branches/2018Q4/www/gitlab-ce/files/gitlab.in Tue Oct 30 16:24:34 2018 (r483502) +++ branches/2018Q4/www/gitlab-ce/files/gitlab.in Tue Oct 30 16:37:48 2018 (r483503) @@ -91,10 +91,11 @@ if [ "$USER" != "$app_user" ]; then # Regenerate the Gemfile.lock for all related products echo "Regenerate Gitlab Gemfile.lock" rm -f "${app_root}"/Gemfile.lock - if ! su -l ${app_user} -c "cd ${app_root} && %%LOCALBASE%%/bin/bundle install --local --quiet"; then + if ! su -l root -c "cd ${app_root} && %%LOCALBASE%%/bin/bundle install --local --quiet"; then echo "Could not create Gemfile.lock for gitlab, please report this using FreeBSD Bugtracker, https://bugs.freebsd.org/" exit 1 fi + chown git "${app_root}"/Gemfile.lock echo "Regenerate Gitaly Gemfile.lock" rm -f "${gitaly_dir}"/ruby/Gemfile.lock if ! su -l root -c "cd ${gitaly_dir}/ruby && %%LOCALBASE%%/bin/bundle install --local --quiet"; then Modified: branches/2018Q4/www/gitlab-ce/pkg-plist ============================================================================== --- branches/2018Q4/www/gitlab-ce/pkg-plist Tue Oct 30 16:24:34 2018 (r483502) +++ branches/2018Q4/www/gitlab-ce/pkg-plist Tue Oct 30 16:37:48 2018 (r483503) @@ -3812,6 +3812,7 @@ %%WWWDIR%%/app/models/concerns/protected_tag_access.rb %%WWWDIR%%/app/models/concerns/reactive_caching.rb %%WWWDIR%%/app/models/concerns/reactive_service.rb +%%WWWDIR%%/app/models/concerns/redactable.rb %%WWWDIR%%/app/models/concerns/redis_cacheable.rb %%WWWDIR%%/app/models/concerns/referable.rb %%WWWDIR%%/app/models/concerns/relative_positioning.rb @@ -3831,6 +3832,9 @@ %%WWWDIR%%/app/models/concerns/throttled_touch.rb %%WWWDIR%%/app/models/concerns/time_trackable.rb %%WWWDIR%%/app/models/concerns/token_authenticatable.rb +%%WWWDIR%%/app/models/concerns/token_authenticatable_strategies/base.rb +%%WWWDIR%%/app/models/concerns/token_authenticatable_strategies/digest.rb +%%WWWDIR%%/app/models/concerns/token_authenticatable_strategies/insecure.rb %%WWWDIR%%/app/models/concerns/triggerable_hooks.rb %%WWWDIR%%/app/models/concerns/uniquify.rb %%WWWDIR%%/app/models/concerns/updated_at_filterable.rb @@ -6067,6 +6071,7 @@ %%WWWDIR%%/config/initializers/grpc.rb %%WWWDIR%%/config/initializers/hamlit.rb %%WWWDIR%%/config/initializers/health_check.rb +%%WWWDIR%%/config/initializers/hipchat_client_patch.rb %%WWWDIR%%/config/initializers/kaminari_config.rb %%WWWDIR%%/config/initializers/kubeclient.rb %%WWWDIR%%/config/initializers/lograge.rb @@ -7035,6 +7040,8 @@ %%WWWDIR%%/db/migrate/20180901171833_add_project_config_source_status_index_to_pipeline.rb %%WWWDIR%%/db/migrate/20180901200537_add_resource_label_event_reference_fields.rb %%WWWDIR%%/db/migrate/20180906101639_add_user_ping_consent_to_application_settings.rb +%%WWWDIR%%/db/migrate/20180910153412_add_token_digest_to_personal_access_tokens.rb +%%WWWDIR%%/db/migrate/20180910153413_add_index_to_token_digest_on_personal_access_tokens.rb %%WWWDIR%%/db/migrate/gpg_keys_limits_to_mysql.rb %%WWWDIR%%/db/migrate/limits_ci_build_trace_chunks_raw_data_for_mysql.rb %%WWWDIR%%/db/migrate/limits_to_mysql.rb @@ -7198,6 +7205,8 @@ %%WWWDIR%%/db/post_migrate/20180816193530_rename_login_root_namespaces.rb %%WWWDIR%%/db/post_migrate/20180826111825_recalculate_site_statistics.rb %%WWWDIR%%/db/post_migrate/20180906051323_remove_orphaned_label_links.rb +%%WWWDIR%%/db/post_migrate/20180913142237_schedule_digest_personal_access_tokens.rb +%%WWWDIR%%/db/post_migrate/20181014121030_enqueue_redact_links.rb @(git,,) %%WWWDIR%%/db/schema.rb %%WWWDIR%%/db/seeds.rb %%WWWDIR%%/doc/README.md @@ -8920,6 +8929,7 @@ %%WWWDIR%%/lib/api/todos.rb %%WWWDIR%%/lib/api/triggers.rb %%WWWDIR%%/lib/api/users.rb +%%WWWDIR%%/lib/api/validations/types/safe_file.rb %%WWWDIR%%/lib/api/variables.rb %%WWWDIR%%/lib/api/version.rb %%WWWDIR%%/lib/api/wikis.rb @@ -9137,6 +9147,7 @@ %%WWWDIR%%/lib/gitlab/background_migration/delete_conflicting_redirect_routes_range.rb %%WWWDIR%%/lib/gitlab/background_migration/delete_diff_files.rb %%WWWDIR%%/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits.rb +%%WWWDIR%%/lib/gitlab/background_migration/digest_column.rb %%WWWDIR%%/lib/gitlab/background_migration/fill_file_store_job_artifact.rb %%WWWDIR%%/lib/gitlab/background_migration/fill_file_store_lfs_object.rb %%WWWDIR%%/lib/gitlab/background_migration/fill_store_upload.rb @@ -9157,6 +9168,7 @@ %%WWWDIR%%/lib/gitlab/background_migration/populate_untracked_uploads.rb %%WWWDIR%%/lib/gitlab/background_migration/populate_untracked_uploads_dependencies.rb %%WWWDIR%%/lib/gitlab/background_migration/prepare_untracked_uploads.rb +%%WWWDIR%%/lib/gitlab/background_migration/redact_links.rb %%WWWDIR%%/lib/gitlab/background_migration/remove_restricted_todos.rb %%WWWDIR%%/lib/gitlab/background_migration/rollback_import_state_data.rb %%WWWDIR%%/lib/gitlab/background_migration/schedule_diff_files_deletion.rb @@ -9343,6 +9355,7 @@ %%WWWDIR%%/lib/gitlab/cross_project_access/check_collection.rb %%WWWDIR%%/lib/gitlab/cross_project_access/check_info.rb %%WWWDIR%%/lib/gitlab/cross_project_access/class_methods.rb +%%WWWDIR%%/lib/gitlab/crypto_helper.rb %%WWWDIR%%/lib/gitlab/current_settings.rb %%WWWDIR%%/lib/gitlab/cycle_analytics/base_event_fetcher.rb %%WWWDIR%%/lib/gitlab/cycle_analytics/base_query.rb @@ -12352,6 +12365,7 @@ %%WWWDIR%%/spec/lib/gitlab/background_migration/delete_conflicting_redirect_routes_range_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/delete_diff_files_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb +%%WWWDIR%%/spec/lib/gitlab/background_migration/digest_column_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/fix_cross_project_label_links_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/migrate_build_stage_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/migrate_events_to_push_event_payloads_spec.rb @@ -12368,6 +12382,7 @@ %%WWWDIR%%/spec/lib/gitlab/background_migration/populate_untracked_uploads_dependencies/untracked_file_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb +%%WWWDIR%%/spec/lib/gitlab/background_migration/redact_links_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/remove_restricted_todos_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/rollback_import_state_data_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/schedule_diff_files_deletion_spec.rb @@ -13059,6 +13074,7 @@ %%WWWDIR%%/spec/migrations/delete_inconsistent_internal_id_records_spec.rb %%WWWDIR%%/spec/migrations/drop_duplicate_protected_tags_spec.rb %%WWWDIR%%/spec/migrations/enqueue_delete_diff_files_workers_spec.rb +%%WWWDIR%%/spec/migrations/enqueue_redact_links_spec.rb %%WWWDIR%%/spec/migrations/enqueue_verify_pages_domain_workers_spec.rb %%WWWDIR%%/spec/migrations/fill_file_store_spec.rb %%WWWDIR%%/spec/migrations/fix_wrongly_renamed_routes_spec.rb @@ -13106,6 +13122,7 @@ %%WWWDIR%%/spec/migrations/reschedule_builds_stages_migration_spec.rb %%WWWDIR%%/spec/migrations/reschedule_commits_count_for_merge_request_diff_spec.rb %%WWWDIR%%/spec/migrations/schedule_create_gpg_key_subkeys_from_gpg_keys_spec.rb +%%WWWDIR%%/spec/migrations/schedule_digest_personal_access_tokens_spec.rb %%WWWDIR%%/spec/migrations/schedule_merge_request_diff_migrations_spec.rb %%WWWDIR%%/spec/migrations/schedule_merge_request_diff_migrations_take_two_spec.rb %%WWWDIR%%/spec/migrations/schedule_merge_request_latest_merge_request_diff_id_migrations_spec.rb @@ -13216,6 +13233,7 @@ %%WWWDIR%%/spec/models/concerns/prometheus_adapter_spec.rb %%WWWDIR%%/spec/models/concerns/protected_ref_access_spec.rb %%WWWDIR%%/spec/models/concerns/reactive_caching_spec.rb +%%WWWDIR%%/spec/models/concerns/redactable_spec.rb %%WWWDIR%%/spec/models/concerns/redis_cacheable_spec.rb %%WWWDIR%%/spec/models/concerns/relative_positioning_spec.rb %%WWWDIR%%/spec/models/concerns/resolvable_discussion_spec.rb From owner-svn-ports-branches@freebsd.org Tue Oct 30 19:31:03 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3767610F2562; Tue, 30 Oct 2018 19:31:03 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C778A75EF7; Tue, 30 Oct 2018 19:31:02 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A860321B75; Tue, 30 Oct 2018 19:31:02 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9UJV2CZ040707; Tue, 30 Oct 2018 19:31:02 GMT (envelope-from cmt@FreeBSD.org) Received: (from cmt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9UJV1FK040698; Tue, 30 Oct 2018 19:31:01 GMT (envelope-from cmt@FreeBSD.org) Message-Id: <201810301931.w9UJV1FK040698@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cmt set sender to cmt@FreeBSD.org using -f From: Christoph Moench-Tegeder Date: Tue, 30 Oct 2018 19:31:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483518 - in branches/2018Q4/mail: thunderbird thunderbird-i18n thunderbird/files X-SVN-Group: ports-branches X-SVN-Commit-Author: cmt X-SVN-Commit-Paths: in branches/2018Q4/mail: thunderbird thunderbird-i18n thunderbird/files X-SVN-Commit-Revision: 483518 X-SVN-Commit-Repository: ports 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.29 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, 30 Oct 2018 19:31:03 -0000 Author: cmt Date: Tue Oct 30 19:31:01 2018 New Revision: 483518 URL: https://svnweb.freebsd.org/changeset/ports/483518 Log: MFH: r483514 mail/thunderbird: update to 60.3.0 PR: 232796 Approved by: gecko (jbeich@) Security: 7c3a02b9-3273-4426-a0ba-f90fad2ff72e Approved by: portmgr blanket (web browser alike) Deleted: branches/2018Q4/mail/thunderbird/files/patch-bug1479540 Modified: branches/2018Q4/mail/thunderbird-i18n/Makefile branches/2018Q4/mail/thunderbird-i18n/Makefile.option branches/2018Q4/mail/thunderbird-i18n/distinfo branches/2018Q4/mail/thunderbird/Makefile branches/2018Q4/mail/thunderbird/distinfo branches/2018Q4/mail/thunderbird/files/patch-u2f-hid-rs62 Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/mail/thunderbird-i18n/Makefile ============================================================================== --- branches/2018Q4/mail/thunderbird-i18n/Makefile Tue Oct 30 19:17:34 2018 (r483517) +++ branches/2018Q4/mail/thunderbird-i18n/Makefile Tue Oct 30 19:31:01 2018 (r483518) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= thunderbird-i18n -PORTVERSION= 60.2.1 +PORTVERSION= 60.3.0 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-x86_64/xpi \ - MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-x86_64/xpi + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-x86_64/xpi PKGNAMEPREFIX= DISTFILES= ${THUNDERBIRD_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} Modified: branches/2018Q4/mail/thunderbird-i18n/Makefile.option ============================================================================== --- branches/2018Q4/mail/thunderbird-i18n/Makefile.option Tue Oct 30 19:17:34 2018 (r483517) +++ branches/2018Q4/mail/thunderbird-i18n/Makefile.option Tue Oct 30 19:31:01 2018 (r483518) @@ -43,7 +43,6 @@ OPTIONS_DEFINE= LANG_AR \ LANG_NB \ LANG_NL \ LANG_NN \ - LANG_PA \ LANG_PL \ LANG_PBR \ LANG_PT \ @@ -63,7 +62,7 @@ OPTIONS_DEFINE= LANG_AR \ LANG_TW OPTIONS_DEFAULT=LANG_CN LANG_ES LANG_PBR LANG_RU LANG_JA LANG_DE LANG_FR \ - LANG_KO LANG_IT LANG_PA + LANG_KO LANG_IT LANG_DSB_DESC?= Lower Sorbian language support LANG_HSB_DESC?= Upper Sorbian language support Modified: branches/2018Q4/mail/thunderbird-i18n/distinfo ============================================================================== --- branches/2018Q4/mail/thunderbird-i18n/distinfo Tue Oct 30 19:17:34 2018 (r483517) +++ branches/2018Q4/mail/thunderbird-i18n/distinfo Tue Oct 30 19:31:01 2018 (r483518) @@ -1,117 +1,117 @@ -TIMESTAMP = 1538416483 -SHA256 (xpi/thunderbird-i18n-60.2.1/ar.xpi) = 8fc9e5766d39180ec47e0310a70eed7ce1d8f2e4510195506386bf6a9e7a8425 -SIZE (xpi/thunderbird-i18n-60.2.1/ar.xpi) = 627179 -SHA256 (xpi/thunderbird-i18n-60.2.1/ast.xpi) = e191ec5cafb71b46a02f64f02cdbc6117471b11c14e9876e688b1b774c1bd0e8 -SIZE (xpi/thunderbird-i18n-60.2.1/ast.xpi) = 560865 -SHA256 (xpi/thunderbird-i18n-60.2.1/be.xpi) = fe9cb445c45925f31a7a230ffdcd4757eae7d8ec0b8784632ee51ca42d55b00c -SIZE (xpi/thunderbird-i18n-60.2.1/be.xpi) = 659077 -SHA256 (xpi/thunderbird-i18n-60.2.1/bg.xpi) = f4e26a005298576f7ad4e2fc157ae0a6a5d674fe98aac89e7f287f9b2b922c5b -SIZE (xpi/thunderbird-i18n-60.2.1/bg.xpi) = 665511 -SHA256 (xpi/thunderbird-i18n-60.2.1/br.xpi) = a7d7a11c8a7d162b291d8423e6c02a38708c6c1ed3cae65f7be4b1af9fae72d5 -SIZE (xpi/thunderbird-i18n-60.2.1/br.xpi) = 581591 -SHA256 (xpi/thunderbird-i18n-60.2.1/ca.xpi) = c8c6ced20c48a46953c23f5f84ec6f3827babcf634f045e5f29caf90427055e1 -SIZE (xpi/thunderbird-i18n-60.2.1/ca.xpi) = 591970 -SHA256 (xpi/thunderbird-i18n-60.2.1/cs.xpi) = beb3eb4296900acba8d4462235cf4dd735cfd02774bc6da6801d53b6baa1f7fb -SIZE (xpi/thunderbird-i18n-60.2.1/cs.xpi) = 611201 -SHA256 (xpi/thunderbird-i18n-60.2.1/cy.xpi) = d6b598f4911d19b13b12afb9f2c7def02a161603aea4a9c3d963a9b153505a08 -SIZE (xpi/thunderbird-i18n-60.2.1/cy.xpi) = 582232 -SHA256 (xpi/thunderbird-i18n-60.2.1/da.xpi) = bd5644ec10d31c708b2c339a7ee7bb67100f2db0a29e53750cf7238e47ad88c0 -SIZE (xpi/thunderbird-i18n-60.2.1/da.xpi) = 570805 -SHA256 (xpi/thunderbird-i18n-60.2.1/de.xpi) = 3508f712676fabea01ecdfe06ed5e1d3b1fbf24d0ee70e9f00a16f0ea65957cf -SIZE (xpi/thunderbird-i18n-60.2.1/de.xpi) = 582574 -SHA256 (xpi/thunderbird-i18n-60.2.1/dsb.xpi) = 40620bc3504d9b64017c1cef55f5544f5cc27afcc217dc42359ec5c934e4cb7c -SIZE (xpi/thunderbird-i18n-60.2.1/dsb.xpi) = 613758 -SHA256 (xpi/thunderbird-i18n-60.2.1/el.xpi) = adebeb4d331c1c32b9a9218f8ab0a600dd09357f32116014dcbc08853fc9d045 -SIZE (xpi/thunderbird-i18n-60.2.1/el.xpi) = 691053 -SHA256 (xpi/thunderbird-i18n-60.2.1/en-GB.xpi) = 5221448e152276d407c82bef9c6fe028c476baf5e145476bcf14fa15e546414f -SIZE (xpi/thunderbird-i18n-60.2.1/en-GB.xpi) = 550353 -SHA256 (xpi/thunderbird-i18n-60.2.1/en-US.xpi) = 72c7c8ac179e0c9c1e9b4df57b134f8dd5e1387b1d2a3cb6886b9ad04a0fd610 -SIZE (xpi/thunderbird-i18n-60.2.1/en-US.xpi) = 546992 -SHA256 (xpi/thunderbird-i18n-60.2.1/es-AR.xpi) = 836b394097826c88f59238533821d10daba709fdf717dc480b834909d4fcf295 -SIZE (xpi/thunderbird-i18n-60.2.1/es-AR.xpi) = 595047 -SHA256 (xpi/thunderbird-i18n-60.2.1/es-ES.xpi) = 4e22fc941edc6176cab0b422d84d065fcce7a93479e42777d8c562c33773dacc -SIZE (xpi/thunderbird-i18n-60.2.1/es-ES.xpi) = 492210 -SHA256 (xpi/thunderbird-i18n-60.2.1/et.xpi) = d054fadcd56f524e2c406bcaead90a70eeca77935f0acc2f85cdd0b7d451e89d -SIZE (xpi/thunderbird-i18n-60.2.1/et.xpi) = 570866 -SHA256 (xpi/thunderbird-i18n-60.2.1/eu.xpi) = 91cc98b50628bd912f1dd38ce5af079f650a2477e16bef8f6907d0c4f3250e41 -SIZE (xpi/thunderbird-i18n-60.2.1/eu.xpi) = 577578 -SHA256 (xpi/thunderbird-i18n-60.2.1/fi.xpi) = 7b4c93bdc2a93f10a1d3a356a4e66d3bb6c4ffa54dbb76fdb8ca231adcd7dad7 -SIZE (xpi/thunderbird-i18n-60.2.1/fi.xpi) = 575754 -SHA256 (xpi/thunderbird-i18n-60.2.1/fr.xpi) = 954b029cbef725fcf474c57155baadc1f90d8f0f3815da8bdfe7724bbf9e2e84 -SIZE (xpi/thunderbird-i18n-60.2.1/fr.xpi) = 608465 -SHA256 (xpi/thunderbird-i18n-60.2.1/fy-NL.xpi) = 8ebac71d6d4000d37ee52f486f7f84a8c2ccaead392b0c663806897fa1fc8732 -SIZE (xpi/thunderbird-i18n-60.2.1/fy-NL.xpi) = 590033 -SHA256 (xpi/thunderbird-i18n-60.2.1/ga-IE.xpi) = 4fa6eb4bd1809b3821772add11cdd53806c44a61d30fdac492597a3945db9b4b -SIZE (xpi/thunderbird-i18n-60.2.1/ga-IE.xpi) = 603505 -SHA256 (xpi/thunderbird-i18n-60.2.1/gd.xpi) = ca0010e3e7bc58f6cba9d6565ef4e39ae470450c186b073874665953a2269708 -SIZE (xpi/thunderbird-i18n-60.2.1/gd.xpi) = 599259 -SHA256 (xpi/thunderbird-i18n-60.2.1/gl.xpi) = 524383ca36d03a431104fe00763ad7d72147d737a1ce2ab1ef16d8aea2d4d938 -SIZE (xpi/thunderbird-i18n-60.2.1/gl.xpi) = 576546 -SHA256 (xpi/thunderbird-i18n-60.2.1/he.xpi) = d6821298aa10dfd67f8d82410b8458410ad3fee79c47d819a6767e8361e79ade -SIZE (xpi/thunderbird-i18n-60.2.1/he.xpi) = 618364 -SHA256 (xpi/thunderbird-i18n-60.2.1/hr.xpi) = 067e9a6f1c23772502682143764fefe1e0d235e34fe15f9b2fee9694157e447d -SIZE (xpi/thunderbird-i18n-60.2.1/hr.xpi) = 583459 -SHA256 (xpi/thunderbird-i18n-60.2.1/hsb.xpi) = ed3c2eacda2b62a0381e31ca25f4a9cc0023c64cc64dbacc646c0621bc4850bb -SIZE (xpi/thunderbird-i18n-60.2.1/hsb.xpi) = 611322 -SHA256 (xpi/thunderbird-i18n-60.2.1/hu.xpi) = ba481b37d00a48a503e02fb537de3fe5e4d81e48f27dc1b72153060f44647ad2 -SIZE (xpi/thunderbird-i18n-60.2.1/hu.xpi) = 615344 -SHA256 (xpi/thunderbird-i18n-60.2.1/hy-AM.xpi) = 9b70fe835c16837d24857570fa987b97f4a0e84b6de3ac0a65e405c3d8f67719 -SIZE (xpi/thunderbird-i18n-60.2.1/hy-AM.xpi) = 649712 -SHA256 (xpi/thunderbird-i18n-60.2.1/id.xpi) = 70f45e73c7d793ae903bc7a52f68c1173bee4977e1cba54d5546a6f7e7dfc95c -SIZE (xpi/thunderbird-i18n-60.2.1/id.xpi) = 568859 -SHA256 (xpi/thunderbird-i18n-60.2.1/is.xpi) = b132a8f9864f42044494e9777cba56bdfbdb977bd4abdbdaa91f45e58cb1a30f -SIZE (xpi/thunderbird-i18n-60.2.1/is.xpi) = 579045 -SHA256 (xpi/thunderbird-i18n-60.2.1/it.xpi) = 3cc9d3e60453b3a430f483575436d4502a3ae262dde5eff4a08e250871effb77 -SIZE (xpi/thunderbird-i18n-60.2.1/it.xpi) = 477499 -SHA256 (xpi/thunderbird-i18n-60.2.1/ja.xpi) = 1658177df483dfa39f103d22195ae50c771851706f9d320519f1e884599497ca -SIZE (xpi/thunderbird-i18n-60.2.1/ja.xpi) = 653343 -SHA256 (xpi/thunderbird-i18n-60.2.1/kab.xpi) = fb92d59b2c99c13c2df50b75938140729de1ec516b4ca4fa4a3d257272f21dc2 -SIZE (xpi/thunderbird-i18n-60.2.1/kab.xpi) = 595238 -SHA256 (xpi/thunderbird-i18n-60.2.1/kk.xpi) = 7449cdef23fdf998b6b0e389f78bdb9dfef448160a92e904092ad00f6bf7a847 -SIZE (xpi/thunderbird-i18n-60.2.1/kk.xpi) = 670449 -SHA256 (xpi/thunderbird-i18n-60.2.1/ko.xpi) = 1db5ceae1a232ab756eecd5f48d584822f8b62335fd7730261e72ddca397966f -SIZE (xpi/thunderbird-i18n-60.2.1/ko.xpi) = 619729 -SHA256 (xpi/thunderbird-i18n-60.2.1/lt.xpi) = 1c5e2af5fc0ee50b065808142110bb3a5a7dd45c5de1e85d716288e5fed7f505 -SIZE (xpi/thunderbird-i18n-60.2.1/lt.xpi) = 605439 -SHA256 (xpi/thunderbird-i18n-60.2.1/ms.xpi) = ede6001cc574df38baaed9e629de0b027b86f288a5f2c5f6eda56f15e9d0e3f1 -SIZE (xpi/thunderbird-i18n-60.2.1/ms.xpi) = 574305 -SHA256 (xpi/thunderbird-i18n-60.2.1/nb-NO.xpi) = 7ef7427b2d692be29848afdc80e7e34e1fa05264f191a30d74dab27f7c5929a5 -SIZE (xpi/thunderbird-i18n-60.2.1/nb-NO.xpi) = 578233 -SHA256 (xpi/thunderbird-i18n-60.2.1/nl.xpi) = 2da1db53f2e5dcdc73309d597035425505a9f60abea1b832c395b8134e675ea8 -SIZE (xpi/thunderbird-i18n-60.2.1/nl.xpi) = 583912 -SHA256 (xpi/thunderbird-i18n-60.2.1/nn-NO.xpi) = aaef0707cc018e0727405970bd91879e78736be93b3f3fad5c8bba334c52dc4f -SIZE (xpi/thunderbird-i18n-60.2.1/nn-NO.xpi) = 577653 -SHA256 (xpi/thunderbird-i18n-60.2.1/pl.xpi) = 5558731b1603e4117a52d8212c4ff7fb8684a0c7c0618e7f22250306f31fd238 -SIZE (xpi/thunderbird-i18n-60.2.1/pl.xpi) = 480723 -SHA256 (xpi/thunderbird-i18n-60.2.1/pt-BR.xpi) = 8c5412fd8d059c9102b7bca6f56c35aa7fad9df07a9347037adae557679f7ef3 -SIZE (xpi/thunderbird-i18n-60.2.1/pt-BR.xpi) = 585016 -SHA256 (xpi/thunderbird-i18n-60.2.1/pt-PT.xpi) = 0aaf11e251e9867b903cf4453d34a8c97297de52fdcbbadbec6aadcc4b4b725c -SIZE (xpi/thunderbird-i18n-60.2.1/pt-PT.xpi) = 593184 -SHA256 (xpi/thunderbird-i18n-60.2.1/rm.xpi) = ca60d96703f05e21e152e56b169d84838aefad35a52a648d5e7341a24a5c17db -SIZE (xpi/thunderbird-i18n-60.2.1/rm.xpi) = 578381 -SHA256 (xpi/thunderbird-i18n-60.2.1/ro.xpi) = 3b71daf9cb501ac5aa131dca434a0b2949e0b7775de94e8fa68892985eae3db8 -SIZE (xpi/thunderbird-i18n-60.2.1/ro.xpi) = 584307 -SHA256 (xpi/thunderbird-i18n-60.2.1/ru.xpi) = 62e91004a4b329016e0e88784e6246344634954b4fa54c560167fec5b35cadc0 -SIZE (xpi/thunderbird-i18n-60.2.1/ru.xpi) = 694704 -SHA256 (xpi/thunderbird-i18n-60.2.1/si.xpi) = cffeb1fdba9e460bfa549a4f018c996a91e8b523a4ba2f0663ef6a8f19aa2198 -SIZE (xpi/thunderbird-i18n-60.2.1/si.xpi) = 643790 -SHA256 (xpi/thunderbird-i18n-60.2.1/sk.xpi) = 47229bfe0c71ec4b83978f81e87b887240fb36619c1a089e7071ce8871d934b7 -SIZE (xpi/thunderbird-i18n-60.2.1/sk.xpi) = 612216 -SHA256 (xpi/thunderbird-i18n-60.2.1/sl.xpi) = 6211cb69be41630f33cbfe3099655b4be144d9aa343540d90ac7099cd391db58 -SIZE (xpi/thunderbird-i18n-60.2.1/sl.xpi) = 589946 -SHA256 (xpi/thunderbird-i18n-60.2.1/sq.xpi) = 6fda75506398c98daf0660747bd2a6745383274df59c443d23c47c280bf9aee6 -SIZE (xpi/thunderbird-i18n-60.2.1/sq.xpi) = 593094 -SHA256 (xpi/thunderbird-i18n-60.2.1/sr.xpi) = e559d8713df0d3ecf0c07db24e6e695519202bea7d7cb5fd73fecbe74ae111e4 -SIZE (xpi/thunderbird-i18n-60.2.1/sr.xpi) = 637720 -SHA256 (xpi/thunderbird-i18n-60.2.1/sv-SE.xpi) = 1dd842c0b10f118d7bff3982f092632e21c88c7cb3446f8362718b8b734285a8 -SIZE (xpi/thunderbird-i18n-60.2.1/sv-SE.xpi) = 594077 -SHA256 (xpi/thunderbird-i18n-60.2.1/tr.xpi) = 1f864d604c5226cea7bfc538595d5cefb155d92e050966aaaadb00c9dfa89b34 -SIZE (xpi/thunderbird-i18n-60.2.1/tr.xpi) = 598009 -SHA256 (xpi/thunderbird-i18n-60.2.1/uk.xpi) = b3cfcb2ad78038d7f5ba0715bd02f374217b3ae9f9ca736cc1535b0beb07a39e -SIZE (xpi/thunderbird-i18n-60.2.1/uk.xpi) = 684153 -SHA256 (xpi/thunderbird-i18n-60.2.1/vi.xpi) = 829cc45aca41d346f5da63c512caa61e84213a5f5ab80a2fb811b68d89c5fe4f -SIZE (xpi/thunderbird-i18n-60.2.1/vi.xpi) = 638421 -SHA256 (xpi/thunderbird-i18n-60.2.1/zh-CN.xpi) = 0715e2c15f317e122451fd6919f63f420aff55750a67fda182f28b70cca22d7f -SIZE (xpi/thunderbird-i18n-60.2.1/zh-CN.xpi) = 622464 -SHA256 (xpi/thunderbird-i18n-60.2.1/zh-TW.xpi) = a7ccac0fc160bddf335dbb201d0588c753894dc9ca52a27f3e553b68375913a2 -SIZE (xpi/thunderbird-i18n-60.2.1/zh-TW.xpi) = 626188 +TIMESTAMP = 1540926093 +SHA256 (xpi/thunderbird-i18n-60.3.0/ar.xpi) = 71f73dda95678f86fbeb4350263d384bf390122cf6e7721c41477f88b1f55b51 +SIZE (xpi/thunderbird-i18n-60.3.0/ar.xpi) = 627180 +SHA256 (xpi/thunderbird-i18n-60.3.0/ast.xpi) = 9de79ef9793aecc2728045022e13067c71b53615f096f2f548fd9e290d1b947c +SIZE (xpi/thunderbird-i18n-60.3.0/ast.xpi) = 560865 +SHA256 (xpi/thunderbird-i18n-60.3.0/be.xpi) = bdcda9c81634cbf9bc9377bdfeb3f10add2d3ef57261e8e8e58a46ee928d4fa2 +SIZE (xpi/thunderbird-i18n-60.3.0/be.xpi) = 659078 +SHA256 (xpi/thunderbird-i18n-60.3.0/bg.xpi) = b2b0a4e67172ed215b20a0c553404ff02f67ae67fb009660c4bc08a196517c03 +SIZE (xpi/thunderbird-i18n-60.3.0/bg.xpi) = 665511 +SHA256 (xpi/thunderbird-i18n-60.3.0/br.xpi) = c51f3c145a0af881d854072acd2d4525b66e1b995284dc3e90446ac1da22ed02 +SIZE (xpi/thunderbird-i18n-60.3.0/br.xpi) = 581591 +SHA256 (xpi/thunderbird-i18n-60.3.0/ca.xpi) = c01891462b8a8c3cb5404dba79618612c4c086df3248e99070720db7bcff763d +SIZE (xpi/thunderbird-i18n-60.3.0/ca.xpi) = 591970 +SHA256 (xpi/thunderbird-i18n-60.3.0/cs.xpi) = 9b23e45618cfab64a830736fb648dded25ca8798c96c407bc2928001e04347c3 +SIZE (xpi/thunderbird-i18n-60.3.0/cs.xpi) = 611201 +SHA256 (xpi/thunderbird-i18n-60.3.0/cy.xpi) = bb7adef6f9ee6d464c0f9cec9c2e67ae962ce0f9e351004e497845b2516ee57a +SIZE (xpi/thunderbird-i18n-60.3.0/cy.xpi) = 582232 +SHA256 (xpi/thunderbird-i18n-60.3.0/da.xpi) = 04394f70b35de2effc2fcf85b8b5a4cf3d186758d49aa2696bec3a8603145e74 +SIZE (xpi/thunderbird-i18n-60.3.0/da.xpi) = 570805 +SHA256 (xpi/thunderbird-i18n-60.3.0/de.xpi) = d6b8282c16588bb09d09ae906f5297a787fd3ad259711c4a20fb92f2cd20f042 +SIZE (xpi/thunderbird-i18n-60.3.0/de.xpi) = 582573 +SHA256 (xpi/thunderbird-i18n-60.3.0/dsb.xpi) = 9158225cfebb0e99b5d63055411807dda625b6e8c546e26c0e98b43cb9fc32dc +SIZE (xpi/thunderbird-i18n-60.3.0/dsb.xpi) = 613758 +SHA256 (xpi/thunderbird-i18n-60.3.0/el.xpi) = a6dbb139dcbbdc3f57ff4f785528e6fd142dad8c8e0db09933c93c918a599850 +SIZE (xpi/thunderbird-i18n-60.3.0/el.xpi) = 691054 +SHA256 (xpi/thunderbird-i18n-60.3.0/en-GB.xpi) = 0d1413f4dc6c30a03f2226c641f6a01bc4737628810c449358bc766e404cdf6c +SIZE (xpi/thunderbird-i18n-60.3.0/en-GB.xpi) = 550354 +SHA256 (xpi/thunderbird-i18n-60.3.0/en-US.xpi) = cd56bc94753ba4d3a594514ad2ee048334c043f90f1878fb28cf2da2bb86a3e0 +SIZE (xpi/thunderbird-i18n-60.3.0/en-US.xpi) = 546991 +SHA256 (xpi/thunderbird-i18n-60.3.0/es-AR.xpi) = d60a0d8e621247322f76fef16b9d8aec2d69ead6b4904024e6faa630cfad80c6 +SIZE (xpi/thunderbird-i18n-60.3.0/es-AR.xpi) = 595046 +SHA256 (xpi/thunderbird-i18n-60.3.0/es-ES.xpi) = a5504264aea22b41037c22189e9dfb286ac9374a053e89c79be17f5902efa8ee +SIZE (xpi/thunderbird-i18n-60.3.0/es-ES.xpi) = 492210 +SHA256 (xpi/thunderbird-i18n-60.3.0/et.xpi) = d3d39b34f21043a76e0f5ddb7feac37dd5e87e950c916ad1d8e3e28369548731 +SIZE (xpi/thunderbird-i18n-60.3.0/et.xpi) = 570866 +SHA256 (xpi/thunderbird-i18n-60.3.0/eu.xpi) = a908300f74ca810738594f8d9ba60a15e5de063644eb177a09fbf7d7030ccc34 +SIZE (xpi/thunderbird-i18n-60.3.0/eu.xpi) = 577578 +SHA256 (xpi/thunderbird-i18n-60.3.0/fi.xpi) = d6813c1f7153410dbb12726f7091edafb04fc1ea17c588c1602f5c2e31c6e614 +SIZE (xpi/thunderbird-i18n-60.3.0/fi.xpi) = 575754 +SHA256 (xpi/thunderbird-i18n-60.3.0/fr.xpi) = 414a170065cb4da4683117e72a0db91e8e38b55b5148ae5c55ff36bd09fa5b0d +SIZE (xpi/thunderbird-i18n-60.3.0/fr.xpi) = 608465 +SHA256 (xpi/thunderbird-i18n-60.3.0/fy-NL.xpi) = 9fb0a7973f6bd2db88ff752fdfd2c3f84304af5a72b4619763208b37484cbc0f +SIZE (xpi/thunderbird-i18n-60.3.0/fy-NL.xpi) = 590033 +SHA256 (xpi/thunderbird-i18n-60.3.0/ga-IE.xpi) = 1ed59a104b09f00b8ed724d9f6a5f418f6420244d690a482e49a42693fd32dd6 +SIZE (xpi/thunderbird-i18n-60.3.0/ga-IE.xpi) = 603506 +SHA256 (xpi/thunderbird-i18n-60.3.0/gd.xpi) = 943f29b221fec02cf067793f156dfd955fc56deb73fa23416c75ee704dfb166f +SIZE (xpi/thunderbird-i18n-60.3.0/gd.xpi) = 599261 +SHA256 (xpi/thunderbird-i18n-60.3.0/gl.xpi) = dac3b1ff0ae36ed916222aed439bd42f33d199e6d1ccd209b4504d450e7c62a9 +SIZE (xpi/thunderbird-i18n-60.3.0/gl.xpi) = 576546 +SHA256 (xpi/thunderbird-i18n-60.3.0/he.xpi) = afb2c28024587fc7f529304c4ea204882434fbeec5f0efd974a68a31b384c6a7 +SIZE (xpi/thunderbird-i18n-60.3.0/he.xpi) = 618365 +SHA256 (xpi/thunderbird-i18n-60.3.0/hr.xpi) = 7becce398dd3fa2c9cbf404b6f179bc25f7ac4970b8b0d3b763cb849f00c9795 +SIZE (xpi/thunderbird-i18n-60.3.0/hr.xpi) = 583460 +SHA256 (xpi/thunderbird-i18n-60.3.0/hsb.xpi) = e943762efad0cbd0c1f36bfb14a267657cb7fc607140f3e086d092c1e979adb6 +SIZE (xpi/thunderbird-i18n-60.3.0/hsb.xpi) = 611322 +SHA256 (xpi/thunderbird-i18n-60.3.0/hu.xpi) = b8ff07e7dae3b41de451c78d828468fd4144fffbd51efbad1fc41ee339990a03 +SIZE (xpi/thunderbird-i18n-60.3.0/hu.xpi) = 615345 +SHA256 (xpi/thunderbird-i18n-60.3.0/hy-AM.xpi) = 85d1c077ade5e16b66af4d554a632b74671d6ffabbba9aac357fa87e6e6b4281 +SIZE (xpi/thunderbird-i18n-60.3.0/hy-AM.xpi) = 649712 +SHA256 (xpi/thunderbird-i18n-60.3.0/id.xpi) = 59a0e909bb602e0f15b7aee784a8306a53657105f9409652064a8150706071bf +SIZE (xpi/thunderbird-i18n-60.3.0/id.xpi) = 568859 +SHA256 (xpi/thunderbird-i18n-60.3.0/is.xpi) = 3ff1b15d662d5f24d5639c5ce76d7716027f9747429931d49d8ee29e564958f8 +SIZE (xpi/thunderbird-i18n-60.3.0/is.xpi) = 579046 +SHA256 (xpi/thunderbird-i18n-60.3.0/it.xpi) = e87806e2fcee1b1b3bdc64d4cbccb57d0b82bffce6f73a747151b5b4ac0d10d2 +SIZE (xpi/thunderbird-i18n-60.3.0/it.xpi) = 477499 +SHA256 (xpi/thunderbird-i18n-60.3.0/ja.xpi) = 57bb29e92f3e7a417c059dd11527ac542cbadc23275824f8b210325b50d94e31 +SIZE (xpi/thunderbird-i18n-60.3.0/ja.xpi) = 653343 +SHA256 (xpi/thunderbird-i18n-60.3.0/kab.xpi) = 541f8276d9416d35ddc75022fd566f60971d0ec4879671e27f97e9508722b4ff +SIZE (xpi/thunderbird-i18n-60.3.0/kab.xpi) = 595238 +SHA256 (xpi/thunderbird-i18n-60.3.0/kk.xpi) = 132d029b8207ae107befc49dda4654770fdcde8bc311024effb73297fd8c1438 +SIZE (xpi/thunderbird-i18n-60.3.0/kk.xpi) = 670449 +SHA256 (xpi/thunderbird-i18n-60.3.0/ko.xpi) = 051bbaf9627c3bc6f009ac2076d11e81a58f9ed0112b0fc251920c75195b9816 +SIZE (xpi/thunderbird-i18n-60.3.0/ko.xpi) = 619729 +SHA256 (xpi/thunderbird-i18n-60.3.0/lt.xpi) = 42a148a37b3077213c465d6eb55233aa1aae6cfa6844e3060feba68d03ea0a71 +SIZE (xpi/thunderbird-i18n-60.3.0/lt.xpi) = 605440 +SHA256 (xpi/thunderbird-i18n-60.3.0/ms.xpi) = b83fe5f7bd0f0a1d439692e13a9887262c685e2118e6171da7a5e5615796a763 +SIZE (xpi/thunderbird-i18n-60.3.0/ms.xpi) = 574305 +SHA256 (xpi/thunderbird-i18n-60.3.0/nb-NO.xpi) = 59a4b71ad6bdaef38582e57bd8c8db407b4f66f16a0d3990fe51ccea8b1b08dc +SIZE (xpi/thunderbird-i18n-60.3.0/nb-NO.xpi) = 578234 +SHA256 (xpi/thunderbird-i18n-60.3.0/nl.xpi) = 850607f63e5f000b407523ccc8a7a99c543611e524af1a446510a906254e8a89 +SIZE (xpi/thunderbird-i18n-60.3.0/nl.xpi) = 583912 +SHA256 (xpi/thunderbird-i18n-60.3.0/nn-NO.xpi) = 0a27b6d92cfc3b49a9fdd0d65565af11a2298bfc8fdc0821c531d18138aaad8f +SIZE (xpi/thunderbird-i18n-60.3.0/nn-NO.xpi) = 577653 +SHA256 (xpi/thunderbird-i18n-60.3.0/pl.xpi) = 6e34524a1a7723976810648474fd54f08d23552cdd4e289f302308bda566633e +SIZE (xpi/thunderbird-i18n-60.3.0/pl.xpi) = 480724 +SHA256 (xpi/thunderbird-i18n-60.3.0/pt-BR.xpi) = 6bd9c89f16c8276efbb37ddd374ba37a6cef5ec1a5b31e26febd14366376aa7d +SIZE (xpi/thunderbird-i18n-60.3.0/pt-BR.xpi) = 585016 +SHA256 (xpi/thunderbird-i18n-60.3.0/pt-PT.xpi) = 81e181e660be34a3365ac21a8806c031144decca078c60b4f1210b57c044588c +SIZE (xpi/thunderbird-i18n-60.3.0/pt-PT.xpi) = 593184 +SHA256 (xpi/thunderbird-i18n-60.3.0/rm.xpi) = fe21f5dc03257d7cc22f3d56cb499d733953d6124e76690c5016bda06a85c6c3 +SIZE (xpi/thunderbird-i18n-60.3.0/rm.xpi) = 578383 +SHA256 (xpi/thunderbird-i18n-60.3.0/ro.xpi) = 0f9745d904de63a2b4f01ecdd0e08b9568f3de29eb300baf6e4aa28ded92ec7a +SIZE (xpi/thunderbird-i18n-60.3.0/ro.xpi) = 584307 +SHA256 (xpi/thunderbird-i18n-60.3.0/ru.xpi) = fc7fb27b329cd551e41bf5280e2f2ce83b1a91ad546d428d4d27d042e53aacd3 +SIZE (xpi/thunderbird-i18n-60.3.0/ru.xpi) = 694704 +SHA256 (xpi/thunderbird-i18n-60.3.0/si.xpi) = 27106f150b5cda3ad8d81931542bbf43713a1da593f1a4bed6f536a713968eba +SIZE (xpi/thunderbird-i18n-60.3.0/si.xpi) = 643791 +SHA256 (xpi/thunderbird-i18n-60.3.0/sk.xpi) = ac9d5a0d8111882ef7bf1c2e27dfde756633c75c572276aa1b8a29848cd54e7b +SIZE (xpi/thunderbird-i18n-60.3.0/sk.xpi) = 612215 +SHA256 (xpi/thunderbird-i18n-60.3.0/sl.xpi) = c29daa532adb3c74bc0cdb999d76e999c038022db361cae0bead9b5e191bee84 +SIZE (xpi/thunderbird-i18n-60.3.0/sl.xpi) = 589945 +SHA256 (xpi/thunderbird-i18n-60.3.0/sq.xpi) = 32053c86b78107094df04dc7c7dc8b9ecc312b9784ff7ff2571212da86643c92 +SIZE (xpi/thunderbird-i18n-60.3.0/sq.xpi) = 593095 +SHA256 (xpi/thunderbird-i18n-60.3.0/sr.xpi) = 119f5e6c219140f8b196a9126b69abe9cffae2d182e20c2612f8fdd59cb5c12f +SIZE (xpi/thunderbird-i18n-60.3.0/sr.xpi) = 637719 +SHA256 (xpi/thunderbird-i18n-60.3.0/sv-SE.xpi) = 5919b3e989ff1957d6776cf5a84512fba7f78401925b9f156a079a0fbd420ad3 +SIZE (xpi/thunderbird-i18n-60.3.0/sv-SE.xpi) = 594077 +SHA256 (xpi/thunderbird-i18n-60.3.0/tr.xpi) = eabf536f861916d26c0e08025947580886cd88ddeb65285da50170260ebb43ce +SIZE (xpi/thunderbird-i18n-60.3.0/tr.xpi) = 598009 +SHA256 (xpi/thunderbird-i18n-60.3.0/uk.xpi) = e41030344b5da03b38624e90d88fe5cd821bb6859d9ed3d7b448341d9eac951d +SIZE (xpi/thunderbird-i18n-60.3.0/uk.xpi) = 684153 +SHA256 (xpi/thunderbird-i18n-60.3.0/vi.xpi) = cc3d683635d099f3904853ac3d5b16d0eb05859da5c59b28e85dd8b5d761d326 +SIZE (xpi/thunderbird-i18n-60.3.0/vi.xpi) = 638421 +SHA256 (xpi/thunderbird-i18n-60.3.0/zh-CN.xpi) = 94fc4bb9b2fedff99fd78f5b0f7ee16c69ca31a1a66d36e709a3ecd67cf225f0 +SIZE (xpi/thunderbird-i18n-60.3.0/zh-CN.xpi) = 622465 +SHA256 (xpi/thunderbird-i18n-60.3.0/zh-TW.xpi) = 28631091060510566586c0dde31d1b43b7fafb762c8c7e28db76dcdd048f824a +SIZE (xpi/thunderbird-i18n-60.3.0/zh-TW.xpi) = 626188 Modified: branches/2018Q4/mail/thunderbird/Makefile ============================================================================== --- branches/2018Q4/mail/thunderbird/Makefile Tue Oct 30 19:17:34 2018 (r483517) +++ branches/2018Q4/mail/thunderbird/Makefile Tue Oct 30 19:31:01 2018 (r483518) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 60.2.1 -PORTREVISION= 1 +DISTVERSION= 60.3.0 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org Modified: branches/2018Q4/mail/thunderbird/distinfo ============================================================================== --- branches/2018Q4/mail/thunderbird/distinfo Tue Oct 30 19:17:34 2018 (r483517) +++ branches/2018Q4/mail/thunderbird/distinfo Tue Oct 30 19:31:01 2018 (r483518) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538415530 -SHA256 (thunderbird-60.2.1.source.tar.xz) = d313f25cd7ddc016bf8e4d4115f14b34a66621c0feabbc0dd72f9304cb93d7bf -SIZE (thunderbird-60.2.1.source.tar.xz) = 284570000 +TIMESTAMP = 1540925327 +SHA256 (thunderbird-60.3.0.source.tar.xz) = 23fc097a5aa62006919029df890e5e2bec38c2c3e6081723040ef702ff6e4a7b +SIZE (thunderbird-60.3.0.source.tar.xz) = 285211708 Modified: branches/2018Q4/mail/thunderbird/files/patch-u2f-hid-rs62 ============================================================================== --- branches/2018Q4/mail/thunderbird/files/patch-u2f-hid-rs62 Tue Oct 30 19:17:34 2018 (r483517) +++ branches/2018Q4/mail/thunderbird/files/patch-u2f-hid-rs62 Tue Oct 30 19:31:01 2018 (r483518) @@ -13,7 +13,7 @@ index 4bfba0eb2f52..cd4d80035d81 100644 +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", + "nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -40,7 +40,7 @@ index 4bfba0eb2f52..cd4d80035d81 100644 "boxfnonce 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "devd-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", "libudev 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2220,6 +2238,7 @@ dependencies = [ From owner-svn-ports-branches@freebsd.org Wed Oct 31 14:26:31 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA34210DB6BE; Wed, 31 Oct 2018 14:26:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 94C8877E32; Wed, 31 Oct 2018 14:26:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 75D0B5B1D; Wed, 31 Oct 2018 14:26:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9VEQUAT028765; Wed, 31 Oct 2018 14:26:30 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9VEQUcD028764; Wed, 31 Oct 2018 14:26:30 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201810311426.w9VEQUcD028764@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 31 Oct 2018 14:26:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483585 - branches/2018Q4/cad/freecad X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q4/cad/freecad X-SVN-Commit-Revision: 483585 X-SVN-Commit-Repository: ports 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.29 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, 31 Oct 2018 14:26:31 -0000 Author: jbeich Date: Wed Oct 31 14:26:29 2018 New Revision: 483585 URL: https://svnweb.freebsd.org/changeset/ports/483585 Log: MFH: r483569 cad/freecad: update to 0.17.13541 - Restore revision number lost in r467912 but not other bits as those aren't available/useful outside of VCS Changes: https://github.com/FreeCAD/FreeCAD/compare/0.17...9948ee4f1 PR: 232696 Requested by: kunda (upstream) Approved by: ports-secteam (miwi) Modified: branches/2018Q4/cad/freecad/Makefile branches/2018Q4/cad/freecad/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/cad/freecad/Makefile ============================================================================== --- branches/2018Q4/cad/freecad/Makefile Wed Oct 31 14:24:09 2018 (r483584) +++ branches/2018Q4/cad/freecad/Makefile Wed Oct 31 14:26:29 2018 (r483585) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= FreeCAD -DISTVERSION= 0.17.13509 -PORTREVISION= 4 +DISTVERSION= 0.17-13541 # git rev-list --count +DISTVERSIONSUFFIX= -g9948ee4f1 CATEGORIES= cad MAINTAINER= ports@FreeBSD.org @@ -33,6 +33,7 @@ RUN_DEPENDS= pivy>0:graphics/py-pivy@${PY_FLAVOR} USES= dos2unix compiler:c++11-lib cmake:outsource eigen:3 fortran jpeg \ python:2.7 localbase qt:4 +USE_GITHUB= yes USE_XORG= ice sm x11 xext xt USE_GL= gl glu USE_QT= qmake_build corelib gui moc_build network opengl rcc_build \ @@ -52,9 +53,6 @@ CFLAGS+= -I${LOCALBASE}/include/hdf5-18 CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME} -USE_GITHUB= yes -GH_TAGNAME= 0.17 - OPTIONS_DEFINE= COLLADA COLLADA_DESC= Install pycollada for Collada files import @@ -64,8 +62,12 @@ DESKTOP_ENTRIES=${PORTNAME} "" "${PREFIX}/FreeCAD/data ${PORTNAME} "Engineering;" false post-patch: + @${REINPLACE_CMD} -e '/sed/s,-i,& \\"\\",' \ + ${WRKSRC}/cMake/FindPySide*Tools.cmake @${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' \ ${WRKSRC}/src/Gui/CMakeLists.txt + @${REINPLACE_CMD} -e '/self\.rev/s/Unknown/${DISTVERSION:C/.*-//}/' \ + ${WRKSRC}/src/Tools/SubWCRev.py pre-configure: # To be removed when french/med will be built against science/hdf5 Modified: branches/2018Q4/cad/freecad/distinfo ============================================================================== --- branches/2018Q4/cad/freecad/distinfo Wed Oct 31 14:24:09 2018 (r483584) +++ branches/2018Q4/cad/freecad/distinfo Wed Oct 31 14:26:29 2018 (r483585) @@ -1,3 +1,3 @@ -TIMESTAMP = 1524363465 -SHA256 (FreeCAD-FreeCAD-0.17.13509-0.17_GH0.tar.gz) = ae017393476b6dc7f1192bcaf91ceedc2f9b791f2495307ce7c45efadb5266fb -SIZE (FreeCAD-FreeCAD-0.17.13509-0.17_GH0.tar.gz) = 192379828 +TIMESTAMP = 1534399137 +SHA256 (FreeCAD-FreeCAD-0.17-13541-g9948ee4f1_GH0.tar.gz) = 9193b071ad92be3324a8dbb388e9f458f6e04989661cec30b736e0fb1bc914e9 +SIZE (FreeCAD-FreeCAD-0.17-13541-g9948ee4f1_GH0.tar.gz) = 192398607 From owner-svn-ports-branches@freebsd.org Wed Oct 31 14:38:32 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AFE4110DBC73; Wed, 31 Oct 2018 14:38:32 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 656CA7867E; Wed, 31 Oct 2018 14:38:32 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 409185D1C; Wed, 31 Oct 2018 14:38:32 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9VEcWje033964; Wed, 31 Oct 2018 14:38:32 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9VEcVQm033962; Wed, 31 Oct 2018 14:38:31 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201810311438.w9VEcVQm033962@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 31 Oct 2018 14:38:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483587 - in branches/2018Q4/net-mgmt/net-snmp: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in branches/2018Q4/net-mgmt/net-snmp: . files X-SVN-Commit-Revision: 483587 X-SVN-Commit-Repository: ports 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.29 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, 31 Oct 2018 14:38:32 -0000 Author: mat Date: Wed Oct 31 14:38:31 2018 New Revision: 483587 URL: https://svnweb.freebsd.org/changeset/ports/483587 Log: MFH: r483586 Fix build with OpenSSL 1.1.1 in base. PR: 228898 Submitted by: w.schwarzenfeld@utanet.at Reported by: brnrd Approved by: maintainer Added: branches/2018Q4/net-mgmt/net-snmp/files/extra-patch-openssl11 - copied unchanged from r483586, head/net-mgmt/net-snmp/files/extra-patch-openssl11 Modified: branches/2018Q4/net-mgmt/net-snmp/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/net-mgmt/net-snmp/Makefile ============================================================================== --- branches/2018Q4/net-mgmt/net-snmp/Makefile Wed Oct 31 14:35:16 2018 (r483586) +++ branches/2018Q4/net-mgmt/net-snmp/Makefile Wed Oct 31 14:38:31 2018 (r483587) @@ -77,6 +77,10 @@ TLS_CONFIGURE_ON= --with-security-modules=tsm --with-t .include +.if ${OSVERSION} >= 1200085 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-openssl11 +.endif + .if ${PORT_OPTIONS:MPYTHON} PYDISTUTILS_PKGNAME?= netsnmp-python PYDISTUTILS_PKGVERSION?= 1.0a1 Copied: branches/2018Q4/net-mgmt/net-snmp/files/extra-patch-openssl11 (from r483586, head/net-mgmt/net-snmp/files/extra-patch-openssl11) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/net-mgmt/net-snmp/files/extra-patch-openssl11 Wed Oct 31 14:38:31 2018 (r483587, copy of r483586, head/net-mgmt/net-snmp/files/extra-patch-openssl11) @@ -0,0 +1,223 @@ +--- apps/snmpusm.c ++++ apps/snmpusm.c +@@ -125,6 +125,32 @@ char *usmUserPublic_val = NULL + int docreateandwait = 0; + + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++ ++#include ++#include ++ ++void DH_get0_pqg(const DH *dh, ++ const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) ++{ ++ if (p != NULL) ++ *p = dh->p; ++ if (q != NULL) ++ *q = dh->q; ++ if (g != NULL) ++ *g = dh->g; ++} ++ ++void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key) ++{ ++ if (pub_key != NULL) ++ *pub_key = dh->pub_key; ++ if (priv_key != NULL) ++ *priv_key = dh->priv_key; ++} ++ ++#endif ++ + void + usage(void) + { +@@ -190,7 +216,7 @@ get_USM_DH_key(netsnmp_variable_list *va + oid *keyoid, size_t keyoid_len) { + u_char *dhkeychange; + DH *dh; +- BIGNUM *other_pub; ++ BIGNUM *p, *g, *pub_key, *other_pub; + u_char *key; + size_t key_len; + +@@ -205,25 +231,29 @@ get_USM_DH_key(netsnmp_variable_list *va + dh = d2i_DHparams(NULL, &cp, dhvar->val_len); + } + +- if (!dh || !dh->g || !dh->p) { ++ if (dh) ++ DH_get0_pqg(dh, &p, NULL, &g); ++ ++ if (!dh || !g || !p) { + SNMP_FREE(dhkeychange); + return SNMPERR_GENERR; + } + +- DH_generate_key(dh); +- if (!dh->pub_key) { ++ if (!DH_generate_key(dh)) { + SNMP_FREE(dhkeychange); + return SNMPERR_GENERR; + } + +- if (vars->val_len != (unsigned int)BN_num_bytes(dh->pub_key)) { ++ DH_get0_key(dh, &pub_key, NULL); ++ ++ if (vars->val_len != (unsigned int)BN_num_bytes(pub_key)) { + SNMP_FREE(dhkeychange); + fprintf(stderr,"incorrect diffie-helman lengths (%lu != %d)\n", +- (unsigned long)vars->val_len, BN_num_bytes(dh->pub_key)); ++ (unsigned long)vars->val_len, BN_num_bytes(pub_key)); + return SNMPERR_GENERR; + } + +- BN_bn2bin(dh->pub_key, dhkeychange + vars->val_len); ++ BN_bn2bin(pub_key, dhkeychange + vars->val_len); + + key_len = DH_size(dh); + if (!key_len) { +--- configure.d/config_os_libs2 ++++ configure.d/config_os_libs2 +@@ -291,12 +291,6 @@ if test "x$tryopenssl" != "xno" -a "x$tr + AC_CHECK_LIB(${CRYPTO}, AES_cfb128_encrypt, + AC_DEFINE(HAVE_AES_CFB128_ENCRYPT, 1, + [Define to 1 if you have the `AES_cfb128_encrypt' function.])) +- +- AC_CHECK_LIB(${CRYPTO}, EVP_MD_CTX_create, +- AC_DEFINE([HAVE_EVP_MD_CTX_CREATE], [], +- [Define to 1 if you have the `EVP_MD_CTX_create' function.]) +- AC_DEFINE([HAVE_EVP_MD_CTX_DESTROY], [], +- [Define to 1 if you have the `EVP_MD_CTX_destroy' function.])) + fi + if echo " $transport_result_list " | $GREP "DTLS" > /dev/null; then + AC_CHECK_LIB(ssl, DTLSv1_method, +--- snmplib/keytools.c ++++ snmplib/keytools.c +@@ -149,13 +149,13 @@ generate_Ku(const oid * hashtype, u_int + */ + #ifdef NETSNMP_USE_OPENSSL + +-#ifdef HAVE_EVP_MD_CTX_CREATE ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + ctx = EVP_MD_CTX_create(); + #else +- ctx = malloc(sizeof(*ctx)); +- if (!EVP_MD_CTX_init(ctx)) +- return SNMPERR_GENERR; ++ ctx = EVP_MD_CTX_new(); + #endif ++ if (!ctx) ++ return SNMPERR_GENERR; + #ifndef NETSNMP_DISABLE_MD5 + if (ISTRANSFORM(hashtype, HMACMD5Auth)) { + if (!EVP_DigestInit(ctx, EVP_md5())) +@@ -259,11 +259,10 @@ generate_Ku(const oid * hashtype, u_int + memset(buf, 0, sizeof(buf)); + #ifdef NETSNMP_USE_OPENSSL + if (ctx) { +-#ifdef HAVE_EVP_MD_CTX_DESTROY ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + EVP_MD_CTX_destroy(ctx); + #else +- EVP_MD_CTX_cleanup(ctx); +- free(ctx); ++ EVP_MD_CTX_free(ctx); + #endif + } + #endif +--- snmplib/scapi.c ++++ snmplib/scapi.c +@@ -486,15 +486,10 @@ sc_hash(const oid * hashtype, size_t has + } + + /** initialize the pointer */ +-#ifdef HAVE_EVP_MD_CTX_CREATE ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + cptr = EVP_MD_CTX_create(); + #else +- cptr = malloc(sizeof(*cptr)); +-#if defined(OLD_DES) +- memset(cptr, 0, sizeof(*cptr)); +-#else +- EVP_MD_CTX_init(cptr); +-#endif ++ cptr = EVP_MD_CTX_new(); + #endif + if (!EVP_DigestInit(cptr, hashfn)) { + /* requested hash function is not available */ +@@ -507,13 +502,11 @@ sc_hash(const oid * hashtype, size_t has + /** do the final pass */ + EVP_DigestFinal(cptr, MAC, &tmp_len); + *MAC_len = tmp_len; +-#ifdef HAVE_EVP_MD_CTX_DESTROY ++ ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + EVP_MD_CTX_destroy(cptr); + #else +-#if !defined(OLD_DES) +- EVP_MD_CTX_cleanup(cptr); +-#endif +- free(cptr); ++ EVP_MD_CTX_free(cptr); + #endif + return (rval); + + +--- snmplib/snmp_openssl.c 2014-12-08 21:23:22.000000000 +0100 ++++ snmplib/snmp_openssl.c 2017-02-20 12:46:00.059727928 +0100 +@@ -47,7 +47,7 @@ void netsnmp_init_openssl(void) { + DEBUGMSGTL(("snmp_openssl", "initializing\n")); + + /* Initializing OpenSSL */ +- SSL_library_init(); ++ OPENSSL_init_ssl(0, NULL); + SSL_load_error_strings(); + ERR_load_BIO_strings(); + OpenSSL_add_all_algorithms(); +@@ -164,11 +164,11 @@ netsnmp_openssl_cert_dump_names(X509 *oc + oname_entry = X509_NAME_get_entry(osubj_name, i); + netsnmp_assert(NULL != oname_entry); + +- if (oname_entry->value->type != V_ASN1_PRINTABLESTRING) ++ if (X509_NAME_ENTRY_get_data(oname_entry)->type != V_ASN1_PRINTABLESTRING) + continue; + + /** get NID */ +- onid = OBJ_obj2nid(oname_entry->object); ++ onid = OBJ_obj2nid(X509_NAME_ENTRY_get_object(oname_entry)); + if (onid == NID_undef) { + prefix_long = prefix_short = "UNKNOWN"; + } +@@ -179,9 +179,9 @@ netsnmp_openssl_cert_dump_names(X509 *oc + + DEBUGMSGT(("9:cert:dump:names", + "[%02d] NID type %d, ASN type %d\n", i, onid, +- oname_entry->value->type)); ++ X509_NAME_ENTRY_get_data(oname_entry)->type)); + DEBUGMSGT(("9:cert:dump:names", "%s/%s: '%s'\n", prefix_long, +- prefix_short, ASN1_STRING_data(oname_entry->value))); ++ prefix_short, ASN1_STRING_data(X509_NAME_ENTRY_get_data(oname_entry)))); + } + } + #endif /* NETSNMP_FEATURE_REMOVE_CERT_DUMP_NAMES */ +@@ -470,7 +470,7 @@ netsnmp_openssl_cert_get_hash_type(X509 + if (NULL == ocert) + return 0; + +- return _nid2ht(OBJ_obj2nid(ocert->sig_alg->algorithm)); ++ return _nid2ht(X509_get_signature_nid(ocert)); + } + + /** +@@ -487,7 +487,7 @@ netsnmp_openssl_cert_get_fingerprint(X50 + if (NULL == ocert) + return NULL; + +- nid = OBJ_obj2nid(ocert->sig_alg->algorithm); ++ nid = X509_get_signature_nid(ocert); + DEBUGMSGT(("9:openssl:fingerprint", "alg %d, cert nid %d (%d)\n", alg, nid, + _nid2ht(nid))); + + From owner-svn-ports-branches@freebsd.org Wed Oct 31 17:50:28 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A2E6910E0847; Wed, 31 Oct 2018 17:50:28 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 55565809E3; Wed, 31 Oct 2018 17:50:28 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 327457C80; Wed, 31 Oct 2018 17:50:28 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9VHoSJx039775; Wed, 31 Oct 2018 17:50:28 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9VHoRwv039772; Wed, 31 Oct 2018 17:50:27 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201810311750.w9VHoRwv039772@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Wed, 31 Oct 2018 17:50:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483601 - in branches/2018Q4/security/openssl-devel: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in branches/2018Q4/security/openssl-devel: . files X-SVN-Commit-Revision: 483601 X-SVN-Commit-Repository: ports 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.29 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, 31 Oct 2018 17:50:29 -0000 Author: brnrd Date: Wed Oct 31 17:50:27 2018 New Revision: 483601 URL: https://svnweb.freebsd.org/changeset/ports/483601 Log: MFH: r483493 security/openssl-devel: Move patches - Add fix from upstream [1] 1: https://github.com/openssl/openssl/commit/003f1bfd Approved by: ports-secteam (miwi) Added: branches/2018Q4/security/openssl-devel/files/patch-CVE-2018-0734 - copied unchanged from r483493, head/security/openssl-devel/files/patch-CVE-2018-0734 branches/2018Q4/security/openssl-devel/files/patch-CVE-2018-0735 - copied unchanged from r483493, head/security/openssl-devel/files/patch-CVE-2018-0735 Modified: branches/2018Q4/security/openssl-devel/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/security/openssl-devel/Makefile ============================================================================== --- branches/2018Q4/security/openssl-devel/Makefile Wed Oct 31 17:45:46 2018 (r483600) +++ branches/2018Q4/security/openssl-devel/Makefile Wed Oct 31 17:50:27 2018 (r483601) @@ -3,6 +3,7 @@ PORTNAME= openssl PORTVERSION= 1.1.0i +PORTREVISION= 1 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/ Copied: branches/2018Q4/security/openssl-devel/files/patch-CVE-2018-0734 (from r483493, head/security/openssl-devel/files/patch-CVE-2018-0734) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/security/openssl-devel/files/patch-CVE-2018-0734 Wed Oct 31 17:50:27 2018 (r483601, copy of r483493, head/security/openssl-devel/files/patch-CVE-2018-0734) @@ -0,0 +1,98 @@ +Timing vulnerability in DSA signature generation (CVE-2018-0734). + +Avoid a timing attack that leaks information via a side channel that +triggers when a BN is resized. Increasing the size of the BNs +prior to doing anything with them suppresses the attack. + +Thanks due to Samuel Weiser for finding and locating this. + +Reviewed-by: Bernd Edlinger +(Merged from #7486) + +(cherry picked from commit a9cfb8c) + +https://github.com/openssl/openssl/commit/8abfe72e8c1de1b95f50aa0d9134803b4d00070f +--- crypto/dsa/dsa_ossl.c.orig 2018-09-11 12:48:21 UTC ++++ crypto/dsa/dsa_ossl.c +@@ -9,6 +9,7 @@ + + #include + #include "internal/cryptlib.h" ++#include "internal/bn_int.h" + #include + #include + #include "dsa_locl.h" +@@ -178,9 +179,9 @@ static int dsa_sign_setup(DSA *dsa, BN_C + { + BN_CTX *ctx = NULL; + BIGNUM *k, *kinv = NULL, *r = *rp; +- BIGNUM *l, *m; ++ BIGNUM *l; + int ret = 0; +- int q_bits; ++ int q_bits, q_words; + + if (!dsa->p || !dsa->q || !dsa->g) { + DSAerr(DSA_F_DSA_SIGN_SETUP, DSA_R_MISSING_PARAMETERS); +@@ -189,8 +190,7 @@ static int dsa_sign_setup(DSA *dsa, BN_C + + k = BN_new(); + l = BN_new(); +- m = BN_new(); +- if (k == NULL || l == NULL || m == NULL) ++ if (k == NULL || l == NULL) + goto err; + + if (ctx_in == NULL) { +@@ -201,9 +201,9 @@ static int dsa_sign_setup(DSA *dsa, BN_C + + /* Preallocate space */ + q_bits = BN_num_bits(dsa->q); +- if (!BN_set_bit(k, q_bits) +- || !BN_set_bit(l, q_bits) +- || !BN_set_bit(m, q_bits)) ++ q_words = bn_get_top(dsa->q); ++ if (!bn_wexpand(k, q_words + 2) ++ || !bn_wexpand(l, q_words + 2)) + goto err; + + /* Get random k */ +@@ -238,14 +238,17 @@ static int dsa_sign_setup(DSA *dsa, BN_C + * small timing information leakage. We then choose the sum that is + * one bit longer than the modulus. + * +- * TODO: revisit the BN_copy aiming for a memory access agnostic +- * conditional copy. ++ * There are some concerns about the efficacy of doing this. More ++ * specificly refer to the discussion starting with: ++ * https://github.com/openssl/openssl/pull/7486#discussion_r228323705 ++ * The fix is to rework BN so these gymnastics aren't required. + */ + if (!BN_add(l, k, dsa->q) +- || !BN_add(m, l, dsa->q) +- || !BN_copy(k, BN_num_bits(l) > q_bits ? l : m)) ++ || !BN_add(k, l, dsa->q)) + goto err; + ++ BN_consttime_swap(BN_is_bit_set(l, q_bits), k, l, q_words + 2); ++ + if ((dsa)->meth->bn_mod_exp != NULL) { + if (!dsa->meth->bn_mod_exp(dsa, r, dsa->g, k, dsa->p, ctx, + dsa->method_mont_p)) +@@ -258,7 +261,7 @@ static int dsa_sign_setup(DSA *dsa, BN_C + if (!BN_mod(r, r, dsa->q, ctx)) + goto err; + +- /* Compute part of 's = inv(k) (m + xr) mod q' */ ++ /* Compute part of 's = inv(k) (m + xr) mod q' */ + if ((kinv = BN_mod_inverse(NULL, k, dsa->q, ctx)) == NULL) + goto err; + +@@ -273,7 +276,6 @@ static int dsa_sign_setup(DSA *dsa, BN_C + BN_CTX_free(ctx); + BN_clear_free(k); + BN_clear_free(l); +- BN_clear_free(m); + return ret; + } + Copied: branches/2018Q4/security/openssl-devel/files/patch-CVE-2018-0735 (from r483493, head/security/openssl-devel/files/patch-CVE-2018-0735) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/security/openssl-devel/files/patch-CVE-2018-0735 Wed Oct 31 17:50:27 2018 (r483601, copy of r483493, head/security/openssl-devel/files/patch-CVE-2018-0735) @@ -0,0 +1,33 @@ +Timing vulnerability in ECDSA signature generation (CVE-2018-0735) + +Preallocate an extra limb for some of the big numbers to avoid a reallocation +that can potentially provide a side channel. + +Reviewed-by: Bernd Edlinger +(Merged from #7486) + +(cherry picked from commit 99540ec) + +https://www.openssl.org/news/secadv/20181029.txt +--- crypto/ec/ec_mult.c.orig 2018-08-14 12:45:07 UTC ++++ crypto/ec/ec_mult.c +@@ -177,8 +177,8 @@ static int ec_mul_consttime(const EC_GRO + */ + cardinality_bits = BN_num_bits(cardinality); + group_top = bn_get_top(cardinality); +- if ((bn_wexpand(k, group_top + 1) == NULL) +- || (bn_wexpand(lambda, group_top + 1) == NULL)) ++ if ((bn_wexpand(k, group_top + 2) == NULL) ++ || (bn_wexpand(lambda, group_top + 2) == NULL)) + goto err; + + if (!BN_copy(k, scalar)) +@@ -205,7 +205,7 @@ static int ec_mul_consttime(const EC_GRO + * k := scalar + 2*cardinality + */ + kbit = BN_is_bit_set(lambda, cardinality_bits); +- BN_consttime_swap(kbit, k, lambda, group_top + 1); ++ BN_consttime_swap(kbit, k, lambda, group_top + 2); + + group_top = bn_get_top(group->field); + if ((bn_wexpand(s->X, group_top) == NULL) From owner-svn-ports-branches@freebsd.org Wed Oct 31 18:49:08 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B92DC10E1EB3; Wed, 31 Oct 2018 18:49:07 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6B94A83314; Wed, 31 Oct 2018 18:49:07 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4978310641; Wed, 31 Oct 2018 18:49:07 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9VIn7c5070382; Wed, 31 Oct 2018 18:49:07 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9VIn4Ze070363; Wed, 31 Oct 2018 18:49:04 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201810311849.w9VIn4Ze070363@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 31 Oct 2018 18:49:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483602 - in branches/2018Q4/devel: llvm-devel llvm-devel/files llvm60 llvm60/files llvm60/files/clang llvm60/files/lld llvm60/files/lldb X-SVN-Group: ports-branches X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in branches/2018Q4/devel: llvm-devel llvm-devel/files llvm60 llvm60/files llvm60/files/clang llvm60/files/lld llvm60/files/lldb X-SVN-Commit-Revision: 483602 X-SVN-Commit-Repository: ports 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.29 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, 31 Oct 2018 18:49:08 -0000 Author: dim (src committer) Date: Wed Oct 31 18:49:04 2018 New Revision: 483602 URL: https://svnweb.freebsd.org/changeset/ports/483602 Log: MFH: r481120 Update to a new snapshot. Update LICENSE data per mailing list feedback and move to a seperate Makefile.LICENSE for use by other llvm ports. MFH: r483054 Add all patches from base llvm/clang/lld/lldb 6.0 to devel/llvm60 This adds all the patches that were applied in the past to head, under contrib/llvm. After these, there only minimal diffs left between the port sources and the base sources. Most of these remaining diffs are due to #ifdef shortcuts in the base sources, because we don't compile certain features in. Other diffs are because the port has applied a few changes that we don't have in base. While here, use Makefile.LICENSE from the devel/llvm-devel port. Approved by: portmgr (miwi) Reviewed by: brooks PR: 212343, 225128, 225471, 226388, 226658, 226872, 229050, 230444, 230604, 231355 Differential Revision: https://reviews.freebsd.org/D17702 Added: branches/2018Q4/devel/llvm-devel/Makefile.LICENSE - copied unchanged from r481120, head/devel/llvm-devel/Makefile.LICENSE branches/2018Q4/devel/llvm60/files/clang/patch-head-r331066.diff - copied unchanged from r483054, head/devel/llvm60/files/clang/patch-head-r331066.diff branches/2018Q4/devel/llvm60/files/clang/patch-head-r336227.diff - copied unchanged from r483054, head/devel/llvm60/files/clang/patch-head-r336227.diff branches/2018Q4/devel/llvm60/files/clang/patch-head-r338697.diff - copied unchanged from r483054, head/devel/llvm60/files/clang/patch-head-r338697.diff branches/2018Q4/devel/llvm60/files/clang/patch-head-r339019.diff - copied unchanged from r483054, head/devel/llvm60/files/clang/patch-head-r339019.diff branches/2018Q4/devel/llvm60/files/lld/ - copied from r483054, head/devel/llvm60/files/lld/ branches/2018Q4/devel/llvm60/files/lldb/ - copied from r483054, head/devel/llvm60/files/lldb/ branches/2018Q4/devel/llvm60/files/patch-head-r308867.diff - copied unchanged from r483054, head/devel/llvm60/files/patch-head-r308867.diff branches/2018Q4/devel/llvm60/files/patch-head-r330686.diff - copied unchanged from r483054, head/devel/llvm60/files/patch-head-r330686.diff branches/2018Q4/devel/llvm60/files/patch-head-r331065.diff - copied unchanged from r483054, head/devel/llvm60/files/patch-head-r331065.diff branches/2018Q4/devel/llvm60/files/patch-head-r331366.diff - copied unchanged from r483054, head/devel/llvm60/files/patch-head-r331366.diff branches/2018Q4/devel/llvm60/files/patch-head-r336969.diff - copied unchanged from r483054, head/devel/llvm60/files/patch-head-r336969.diff branches/2018Q4/devel/llvm60/files/patch-head-r336970.diff - copied unchanged from r483054, head/devel/llvm60/files/patch-head-r336970.diff branches/2018Q4/devel/llvm60/files/patch-head-r337615.diff - copied unchanged from r483054, head/devel/llvm60/files/patch-head-r337615.diff branches/2018Q4/devel/llvm60/files/patch-head-r338689.diff - copied unchanged from r483054, head/devel/llvm60/files/patch-head-r338689.diff Deleted: branches/2018Q4/devel/llvm-devel/files/lldb-patch-tools_lldb_source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp Modified: branches/2018Q4/devel/llvm-devel/Makefile branches/2018Q4/devel/llvm-devel/Makefile.snapshot branches/2018Q4/devel/llvm-devel/distinfo branches/2018Q4/devel/llvm-devel/pkg-plist branches/2018Q4/devel/llvm60/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/devel/llvm-devel/Makefile ============================================================================== --- branches/2018Q4/devel/llvm-devel/Makefile Wed Oct 31 17:50:27 2018 (r483601) +++ branches/2018Q4/devel/llvm-devel/Makefile Wed Oct 31 18:49:04 2018 (r483602) @@ -10,23 +10,7 @@ PKGNAMESUFFIX= -devel MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang -# License are listed in the order they appear in LICENSE.TXT -LICENSE= LLVM GTEST REGEX MIT ARM PD -LICENSE_COMB= multi -LICENSE_NAME_LLVM= LLVM Release License -LICENSE_PERMS_LLVM= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LICENSE_FILE_LLVM= ${WRKSRC}/LICENSE.TXT -LICENSE_NAME_GTEST= Google test license -LICENSE_PERMS_GTEST= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LICENSE_FILE_GTEST= ${WRKSRC}/utils/unittest/googletest/LICENSE.TXT -LICENSE_NAME_REGEX= OpenBSD Regex License -LICENSE_PERMS_REGEX= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LICENSE_FILE_REGEX= ${WRKSRC}/lib/Support/COPYRIGHT.regex -# pyyaml tests are under the MIT license -LICENSE_NAME_ARM= ARM Limited license -LICENSE_PERMS_ARM= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LICENSE_FILE_ARM= ${WRKSRC}/lib/Target/ARM/LICENSE.TXT -# md5 is in the public domain +.include "Makefile.LICENSE" LLVM_SUFFIX= -devel LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} @@ -118,7 +102,6 @@ LLD_GH_SUBDIR= tools/lld:lld LLD_GH_TAGNAME= ${LLD_COMMIT}:lld LLDB_BUILD_DEPENDS= swig3.0:devel/swig30 LLDB_DESC= Install lldb, the LLVM debugger -LLDB_EXTRA_PATCHES= ${PATCHDIR}/lldb-patch-tools_lldb_source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp LLDB_GH_PROJECT= lldb:lldb LLDB_GH_SUBDIR= tools/lldb:lldb LLDB_GH_TAGNAME= ${LLDB_COMMIT}:lldb @@ -285,6 +268,7 @@ MAN1SRCS+= clang.1 \ diagtool.1 \ scan-build.1 CLANG_PATTERN= (c-index-test|clang|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer) +USES+= gnome .endif .if ${PORT_OPTIONS:MCOMPILER_RT} @@ -350,6 +334,8 @@ _COMPILER_RT_LIBS= \ libclang_rt.asan_cxx-x86_64.a \ libclang_rt.asan_cxx-x86_64.a.syms \ libclang_rt.builtins-x86_64.a \ + libclang_rt.cfi-x86_64.a \ + libclang_rt.cfi_diag-x86_64.a \ libclang_rt.dd-x86_64.a \ libclang_rt.dyndd-x86_64.so \ libclang_rt.fuzzer-x86_64.a \ Copied: branches/2018Q4/devel/llvm-devel/Makefile.LICENSE (from r481120, head/devel/llvm-devel/Makefile.LICENSE) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/devel/llvm-devel/Makefile.LICENSE Wed Oct 31 18:49:04 2018 (r483602, copy of r481120, head/devel/llvm-devel/Makefile.LICENSE) @@ -0,0 +1,29 @@ +# $FreeBSD$ +# +# The "LLVM Release License" is largely a copy of the NCSA license, but +# it contains extra verbiage about its interaction with third party +# licenses so it is handled as a seperate license. +# +# Third party software licenses in the LLVM tree include: +# Program License +# ------- ------- +# Google Test BSD3CLAUSE +# OpenBSD regex REGEX +# pyyaml tests MIT +# ARM contributions ARM +# md5 contributions PD + +LICENSE= ARM BSD3CLAUSE LLVM MIT PD REGEX +LICENSE_COMB= multi + +LICENSE_FILE_ARM= ${WRKSRC}/lib/Target/ARM/LICENSE.TXT +LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/utils/unittest/googletest/LICENSE.TXT +LICENSE_FILE_LLVM= ${WRKSRC}/LICENSE.TXT +LICENSE_FILE_MIT= ${WRKSRC}/test/YAMLParser/LICENSE.txt +LICENSE_FILE_REGEX= ${WRKSRC}/lib/Support/COPYRIGHT.regex +LICENSE_NAME_ARM= ARM Limited license +LICENSE_NAME_LLVM= LLVM Release License +LICENSE_NAME_REGEX= OpenBSD Regex License +LICENSE_PERMS_ARM= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE_PERMS_LLVM= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE_PERMS_REGEX= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept Modified: branches/2018Q4/devel/llvm-devel/Makefile.snapshot ============================================================================== --- branches/2018Q4/devel/llvm-devel/Makefile.snapshot Wed Oct 31 17:50:27 2018 (r483601) +++ branches/2018Q4/devel/llvm-devel/Makefile.snapshot Wed Oct 31 18:49:04 2018 (r483602) @@ -6,12 +6,12 @@ # LLVM_MAJOR= 8 LLVM_RELEASE= ${LLVM_MAJOR}.0.0 -SNAPDATE= 20180925 +SNAPDATE= 20181001 -LLVM_COMMIT= b418c2351b1fdf6faf6a2d010d804e895ef49932 -CLANG_COMMIT= d6cae43ad5a45c099fa3917def61170a9fdf6c97 -COMPILER_RT_COMMIT= c5cf78381530dda36a14ef2eef0d94f8c87ae674 -EXTRAS_COMMIT= 0eddbe908913429e4f69b4a877f9c0ca28e08382 -LLD_COMMIT= bc9e188d140ff03d5851a6bebe76e486d389d856 -LLDB_COMMIT= 12046a6124750689bba1c3eb881e366be4030a77 -OPENMP_COMMIT= e1688b470b8ef3441983d333a6642e7b19d29b90 +LLVM_COMMIT= 5877e4ed63ba21fb57f2c7fb4ed4950288e2a28c +CLANG_COMMIT= a866fe7bf7c577b698229106f0ddc2d31b285de8 +COMPILER_RT_COMMIT= 87620816074a8059648940d59dd0a37d30089a0a +EXTRAS_COMMIT= 35eb918a95a05e7d91bc7cf026f19db869354eaa +LLD_COMMIT= df3e3050ef26292a8c7d2d16b073588eba28db6c +LLDB_COMMIT= b062a1225880b697f79ca92afb986e2b59be65c8 +OPENMP_COMMIT= be73d23db2027fdb14e4cfa3b35fc17fd50558a3 Modified: branches/2018Q4/devel/llvm-devel/distinfo ============================================================================== --- branches/2018Q4/devel/llvm-devel/distinfo Wed Oct 31 17:50:27 2018 (r483601) +++ branches/2018Q4/devel/llvm-devel/distinfo Wed Oct 31 18:49:04 2018 (r483602) @@ -1,15 +1,15 @@ -TIMESTAMP = 1537891825 -SHA256 (llvm-mirror-llvm-8.0.d20180925-b418c2351b1fdf6faf6a2d010d804e895ef49932_GH0.tar.gz) = f70fea382b3058b06416925f3a796f72e0b1bdc72f5a68283daadbb68b851c50 -SIZE (llvm-mirror-llvm-8.0.d20180925-b418c2351b1fdf6faf6a2d010d804e895ef49932_GH0.tar.gz) = 43610028 -SHA256 (llvm-mirror-clang-d6cae43ad5a45c099fa3917def61170a9fdf6c97_GH0.tar.gz) = 9f4bec9fe0f739a19f88ae2ae2414d6f8bde13c6ee9ce495db77475ed5d41de8 -SIZE (llvm-mirror-clang-d6cae43ad5a45c099fa3917def61170a9fdf6c97_GH0.tar.gz) = 17743175 -SHA256 (llvm-mirror-compiler-rt-c5cf78381530dda36a14ef2eef0d94f8c87ae674_GH0.tar.gz) = b5537492aa4fef086c8782db33d17fbfcca110900626c2f40a3baa0643fd698d -SIZE (llvm-mirror-compiler-rt-c5cf78381530dda36a14ef2eef0d94f8c87ae674_GH0.tar.gz) = 3169979 -SHA256 (llvm-mirror-clang-tools-extra-0eddbe908913429e4f69b4a877f9c0ca28e08382_GH0.tar.gz) = ba1fd5634240facd766958a83642aa4563a210cb83ed8b470cad50a21c66d4ed -SIZE (llvm-mirror-clang-tools-extra-0eddbe908913429e4f69b4a877f9c0ca28e08382_GH0.tar.gz) = 1284915 -SHA256 (llvm-mirror-lld-bc9e188d140ff03d5851a6bebe76e486d389d856_GH0.tar.gz) = dc0bec0ee38e45fff568d1a096c791a435ce5aaaad5049cd108fd8073d5cb326 -SIZE (llvm-mirror-lld-bc9e188d140ff03d5851a6bebe76e486d389d856_GH0.tar.gz) = 1311086 -SHA256 (llvm-mirror-lldb-12046a6124750689bba1c3eb881e366be4030a77_GH0.tar.gz) = 809923ab8aef405c1529b40a7f37eb8506a328cca305f56e858474156a912173 -SIZE (llvm-mirror-lldb-12046a6124750689bba1c3eb881e366be4030a77_GH0.tar.gz) = 24534585 -SHA256 (llvm-mirror-openmp-e1688b470b8ef3441983d333a6642e7b19d29b90_GH0.tar.gz) = 434e57ba3cf4c6aef50905f66529595c2f45742155b8403631cfd59084454efa -SIZE (llvm-mirror-openmp-e1688b470b8ef3441983d333a6642e7b19d29b90_GH0.tar.gz) = 1446924 +TIMESTAMP = 1538434534 +SHA256 (llvm-mirror-llvm-8.0.d20181001-5877e4ed63ba21fb57f2c7fb4ed4950288e2a28c_GH0.tar.gz) = d0c117be40576264eb8efd34640b5dbb607bec8781155c0e97a9b5aec9d943fb +SIZE (llvm-mirror-llvm-8.0.d20181001-5877e4ed63ba21fb57f2c7fb4ed4950288e2a28c_GH0.tar.gz) = 43693701 +SHA256 (llvm-mirror-clang-a866fe7bf7c577b698229106f0ddc2d31b285de8_GH0.tar.gz) = 07493d309ce4cd8410d8d14da97c7f911e23bb7b1de85f65d23584d59a615e0d +SIZE (llvm-mirror-clang-a866fe7bf7c577b698229106f0ddc2d31b285de8_GH0.tar.gz) = 17763531 +SHA256 (llvm-mirror-compiler-rt-87620816074a8059648940d59dd0a37d30089a0a_GH0.tar.gz) = 445f052008b38252ef856a5ea343fddc21eb919b6cfc927c9253662ef7071a24 +SIZE (llvm-mirror-compiler-rt-87620816074a8059648940d59dd0a37d30089a0a_GH0.tar.gz) = 3178030 +SHA256 (llvm-mirror-clang-tools-extra-35eb918a95a05e7d91bc7cf026f19db869354eaa_GH0.tar.gz) = 15d2ac8d0e8e1c7d3f71364a4a61be01cc36c9956fe98878f5fb5365899d6686 +SIZE (llvm-mirror-clang-tools-extra-35eb918a95a05e7d91bc7cf026f19db869354eaa_GH0.tar.gz) = 1290314 +SHA256 (llvm-mirror-lld-df3e3050ef26292a8c7d2d16b073588eba28db6c_GH0.tar.gz) = b7431fd2ce11a88b06f4b456cffac1cb747bea075a47480c706edcd6b59d189d +SIZE (llvm-mirror-lld-df3e3050ef26292a8c7d2d16b073588eba28db6c_GH0.tar.gz) = 1314749 +SHA256 (llvm-mirror-lldb-b062a1225880b697f79ca92afb986e2b59be65c8_GH0.tar.gz) = 27dfab3fe813b169295f5d9b6207750ae378bade4db152abd30487e71942b96d +SIZE (llvm-mirror-lldb-b062a1225880b697f79ca92afb986e2b59be65c8_GH0.tar.gz) = 24541049 +SHA256 (llvm-mirror-openmp-be73d23db2027fdb14e4cfa3b35fc17fd50558a3_GH0.tar.gz) = 63c4c05f9aad0178b91e1617ef5d7619d1dae7c19a5432a974248496aab49d51 +SIZE (llvm-mirror-openmp-be73d23db2027fdb14e4cfa3b35fc17fd50558a3_GH0.tar.gz) = 1453322 Modified: branches/2018Q4/devel/llvm-devel/pkg-plist ============================================================================== --- branches/2018Q4/devel/llvm-devel/pkg-plist Wed Oct 31 17:50:27 2018 (r483601) +++ branches/2018Q4/devel/llvm-devel/pkg-plist Wed Oct 31 18:49:04 2018 (r483602) @@ -1812,17 +1812,21 @@ llvm-devel/include/llvm/DebugInfo/PDB/Native/InfoStrea llvm-devel/include/llvm/DebugInfo/PDB/Native/ModuleDebugStream.h llvm-devel/include/llvm/DebugInfo/PDB/Native/NamedStreamMap.h llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeCompilandSymbol.h +llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeEnumGlobals.h llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeEnumModules.h llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeEnumTypes.h llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeExeSymbol.h llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeRawSymbol.h llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeSession.h llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeSymbolEnumerator.h +llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypeArray.h llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypeBuiltin.h llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypeEnum.h llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypeFunctionSig.h llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypePointer.h +llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypeTypedef.h llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypeUDT.h +llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypeVTShape.h llvm-devel/include/llvm/DebugInfo/PDB/Native/PDBFile.h llvm-devel/include/llvm/DebugInfo/PDB/Native/PDBFileBuilder.h llvm-devel/include/llvm/DebugInfo/PDB/Native/PDBStringTable.h @@ -1898,10 +1902,12 @@ llvm-devel/include/llvm/ExecutionEngine/Orc/GlobalMapp llvm-devel/include/llvm/ExecutionEngine/Orc/IRCompileLayer.h llvm-devel/include/llvm/ExecutionEngine/Orc/IRTransformLayer.h llvm-devel/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h +llvm-devel/include/llvm/ExecutionEngine/Orc/JITTargetMachineBuilder.h llvm-devel/include/llvm/ExecutionEngine/Orc/LLJIT.h llvm-devel/include/llvm/ExecutionEngine/Orc/LambdaResolver.h llvm-devel/include/llvm/ExecutionEngine/Orc/Layer.h llvm-devel/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h +llvm-devel/include/llvm/ExecutionEngine/Orc/LazyReexports.h llvm-devel/include/llvm/ExecutionEngine/Orc/Legacy.h llvm-devel/include/llvm/ExecutionEngine/Orc/NullResolver.h llvm-devel/include/llvm/ExecutionEngine/Orc/ObjectTransformLayer.h @@ -1916,6 +1922,7 @@ llvm-devel/include/llvm/ExecutionEngine/Orc/RTDyldObje llvm-devel/include/llvm/ExecutionEngine/Orc/RawByteChannel.h llvm-devel/include/llvm/ExecutionEngine/Orc/RemoteObjectLayer.h llvm-devel/include/llvm/ExecutionEngine/Orc/SymbolStringPool.h +llvm-devel/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h llvm-devel/include/llvm/ExecutionEngine/OrcMCJITReplacement.h llvm-devel/include/llvm/ExecutionEngine/RTDyldMemoryManager.h llvm-devel/include/llvm/ExecutionEngine/RuntimeDyld.h @@ -2266,6 +2273,7 @@ llvm-devel/include/llvm/Support/Locale.h llvm-devel/include/llvm/Support/LockFileManager.h llvm-devel/include/llvm/Support/LowLevelTypeImpl.h llvm-devel/include/llvm/Support/MD5.h +llvm-devel/include/llvm/Support/MSVCErrorWorkarounds.h llvm-devel/include/llvm/Support/MachineValueType.h llvm-devel/include/llvm/Support/ManagedStatic.h llvm-devel/include/llvm/Support/MathExtras.h Modified: branches/2018Q4/devel/llvm60/Makefile ============================================================================== --- branches/2018Q4/devel/llvm60/Makefile Wed Oct 31 17:50:27 2018 (r483601) +++ branches/2018Q4/devel/llvm60/Makefile Wed Oct 31 18:49:04 2018 (r483602) @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 6.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel lang MASTER_SITES= http://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -12,10 +12,7 @@ DISTFILES= ${PORTNAME}-${DISTVERSION}.src${EXTRACT_SUF MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang -LICENSE= LLVM -LICENSE_NAME= LLVM Release License -LICENSE_FILE= ${WRKSRC}/LICENSE.TXT -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +.include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LLVM_RELEASE= ${DISTVERSION:C/rc.*//} LLVM_MAJOR= ${LLVM_RELEASE:C/\.[0-9]$//} @@ -84,10 +81,12 @@ LIT_DESC= Install lit and FileCheck test tools LIT_VARS= _USES_PYTHON=python:2.7 LLD_DESC= Install lld, the LLVM linker LLD_DISTFILES= lld-${DISTVERSION}.src${EXTRACT_SUFX} +LLD_EXTRA_PATCHES= ${PATCHDIR}/lld LLDB_BUILD_DEPENDS= swig3.0:devel/swig30 \ ${PY_ENUM34} LLDB_DESC= Install lldb, the LLVM debugger LLDB_DISTFILES= lldb-${DISTVERSION}.src${EXTRACT_SUFX} +LLDB_EXTRA_PATCHES= ${PATCHDIR}/lldb LLDB_IMPLIES= CLANG LLDB_VARS= _USES_PYTHON=python:2.7 OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library @@ -228,6 +227,7 @@ CLANG_PATTERN= (c-index-test|clang|scan-|Reporter.py|S SHEBANG_FILES+= tools/clang/tools/scan-view/bin/scan-view \ tools/clang/tools/clang-format/git-clang-format \ tools/clang/tools/clang-format/clang-format-diff.py +USES+= gnome .endif .if ${PORT_OPTIONS:MCOMPILER_RT} Copied: branches/2018Q4/devel/llvm60/files/clang/patch-head-r331066.diff (from r483054, head/devel/llvm60/files/clang/patch-head-r331066.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/devel/llvm60/files/clang/patch-head-r331066.diff Wed Oct 31 18:49:04 2018 (r483602, copy of r483054, head/devel/llvm60/files/clang/patch-head-r331066.diff) @@ -0,0 +1,40 @@ +r331066 | dim | 2018-03-16 19:04:13 +0100 (Fri, 16 Mar 2018) | 19 lines + +Pull in r321999 from upstream clang trunk (by Ivan A. Kosarev): + + [CodeGen] Fix TBAA info for accesses to members of base classes + + Resolves: + Bug 35724 - regression (r315984): fatal error: error in backend: + Broken function found (Did not see access type in access path!) + https://bugs.llvm.org/show_bug.cgi?id=35724 + + Differential Revision: https://reviews.llvm.org/D41547 + +This fixes "Did not see access type in access path" fatal errors when +building the devel/gdb port (version 8.1). + +Reported by: jbeich +PR: 226658 +MFC after: 3 months +X-MFC-With: r327952 + +Index: tools/clang/lib/CodeGen/CGExpr.cpp +=================================================================== +--- tools/clang/lib/CodeGen/CGExpr.cpp (revision 331065) ++++ tools/clang/lib/CodeGen/CGExpr.cpp (revision 331066) +@@ -1034,8 +1034,12 @@ Address CodeGenFunction::EmitPointerWithAlignment( + // Derived-to-base conversions. + case CK_UncheckedDerivedToBase: + case CK_DerivedToBase: { +- Address Addr = EmitPointerWithAlignment(CE->getSubExpr(), BaseInfo, +- TBAAInfo); ++ // TODO: Support accesses to members of base classes in TBAA. For now, we ++ // conservatively pretend that the complete object is of the base class ++ // type. ++ if (TBAAInfo) ++ *TBAAInfo = CGM.getTBAAAccessInfo(E->getType()); ++ Address Addr = EmitPointerWithAlignment(CE->getSubExpr(), BaseInfo); + auto Derived = CE->getSubExpr()->getType()->getPointeeCXXRecordDecl(); + return GetAddressOfBaseClass(Addr, Derived, + CE->path_begin(), CE->path_end(), Copied: branches/2018Q4/devel/llvm60/files/clang/patch-head-r336227.diff (from r483054, head/devel/llvm60/files/clang/patch-head-r336227.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/devel/llvm60/files/clang/patch-head-r336227.diff Wed Oct 31 18:49:04 2018 (r483602, copy of r483054, head/devel/llvm60/files/clang/patch-head-r336227.diff) @@ -0,0 +1,42 @@ +r336227 | dim | 2018-07-12 21:02:59 +0200 (Thu, 12 Jul 2018) | 27 lines + +Pull in r336008 from upstream clang trunk: + + Request init/fini array on FreeBSD 12 and later + + Summary: + + It seems a bad idea to change the default in the middle of a release + branch due to possible changes in global ctor / dtor ordering between + .ctors and .init_array. With FreeBSD 11.0's release imminent lets + change the default now for FreeBSD 12 (the current development + stream) and later. + + FreeBSD rtld has supported .init_array / .fini_array for many years. + As of Jan 1 2017 all supported FreeBSD releases and branches will + have support. + + Reviewers: dim, brooks, arichardson + + Reviewed By: dim, brooks, arichardson + + Subscribers: bsdjhb, krytarowski, emaste, cfe-commits + + Differential Revision: https://reviews.llvm.org/D24867 + +Requested by: jhb +MFC after: 3 days + +Index: tools/clang/lib/Driver/ToolChains/Gnu.cpp +=================================================================== +--- tools/clang/lib/Driver/ToolChains/Gnu.cpp (revision 336226) ++++ tools/clang/lib/Driver/ToolChains/Gnu.cpp (revision 336227) +@@ -2375,6 +2375,8 @@ void Generic_ELF::addClangTargetOptions(const ArgL + bool UseInitArrayDefault = + getTriple().getArch() == llvm::Triple::aarch64 || + getTriple().getArch() == llvm::Triple::aarch64_be || ++ (getTriple().getOS() == llvm::Triple::FreeBSD && ++ getTriple().getOSMajorVersion() >= 12) || + (getTriple().getOS() == llvm::Triple::Linux && + ((!GCCInstallation.isValid() || !V.isOlderThan(4, 7, 0)) || + getTriple().isAndroid())) || Copied: branches/2018Q4/devel/llvm60/files/clang/patch-head-r338697.diff (from r483054, head/devel/llvm60/files/clang/patch-head-r338697.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/devel/llvm60/files/clang/patch-head-r338697.diff Wed Oct 31 18:49:04 2018 (r483602, copy of r483054, head/devel/llvm60/files/clang/patch-head-r338697.diff) @@ -0,0 +1,104 @@ +r338697 | dim | 2018-09-15 23:22:50 +0200 (Sat, 15 Sep 2018) | 21 lines + +Pull in r325478 from upstream clang trunk (by Ivan A. Kosarev): + + [CodeGen] Initialize large arrays by copying from a global + + Currently, clang compiles explicit initializers for array elements + into series of store instructions. For large arrays of built-in types + this results in bloated output code and significant amount of time + spent on the instruction selection phase. This patch fixes the issue + by initializing such arrays with global constants that store the + binary image of the initializer. + + Differential Revision: https://reviews.llvm.org/D43181 + +This should fix a compiler hang (and excessive memory usage) while +building the science/rmg port. + +Approved by: re (kib) +Reported by: yuri@tsoft.com +See also: https://bugs.llvm.org/show_bug.cgi?id=38798 +MFC after: 3 days + +Index: tools/clang/lib/CodeGen/CGExprAgg.cpp +=================================================================== +--- tools/clang/lib/CodeGen/CGExprAgg.cpp (revision 338696) ++++ tools/clang/lib/CodeGen/CGExprAgg.cpp (revision 338697) +@@ -14,6 +14,7 @@ + #include "CodeGenFunction.h" + #include "CGObjCRuntime.h" + #include "CodeGenModule.h" ++#include "ConstantEmitter.h" + #include "clang/AST/ASTContext.h" + #include "clang/AST/DeclCXX.h" + #include "clang/AST/DeclTemplate.h" +@@ -85,7 +86,7 @@ class AggExprEmitter : public StmtVisitorgetNumInits(); + + uint64_t NumArrayElements = AType->getNumElements(); + assert(NumInitElements <= NumArrayElements); + ++ QualType elementType = ++ CGF.getContext().getAsArrayType(ArrayQTy)->getElementType(); ++ + // DestPtr is an array*. Construct an elementType* by drilling + // down a level. + llvm::Value *zero = llvm::ConstantInt::get(CGF.SizeTy, 0); +@@ -409,6 +413,29 @@ void AggExprEmitter::EmitArrayInit(Address DestPtr + CharUnits elementAlign = + DestPtr.getAlignment().alignmentOfArrayElement(elementSize); + ++ // Consider initializing the array by copying from a global. For this to be ++ // more efficient than per-element initialization, the size of the elements ++ // with explicit initializers should be large enough. ++ if (NumInitElements * elementSize.getQuantity() > 16 && ++ elementType.isTriviallyCopyableType(CGF.getContext())) { ++ CodeGen::CodeGenModule &CGM = CGF.CGM; ++ ConstantEmitter Emitter(CGM); ++ LangAS AS = ArrayQTy.getAddressSpace(); ++ if (llvm::Constant *C = Emitter.tryEmitForInitializer(E, AS, ArrayQTy)) { ++ auto GV = new llvm::GlobalVariable( ++ CGM.getModule(), C->getType(), ++ CGM.isTypeConstant(ArrayQTy, /* ExcludeCtorDtor= */ true), ++ llvm::GlobalValue::PrivateLinkage, C, "constinit", ++ /* InsertBefore= */ nullptr, llvm::GlobalVariable::NotThreadLocal, ++ CGM.getContext().getTargetAddressSpace(AS)); ++ Emitter.finalize(GV); ++ CharUnits Align = CGM.getContext().getTypeAlignInChars(ArrayQTy); ++ GV->setAlignment(Align.getQuantity()); ++ EmitFinalDestCopy(ArrayQTy, CGF.MakeAddrLValue(GV, ArrayQTy, Align)); ++ return; ++ } ++ } ++ + // Exception safety requires us to destroy all the + // already-constructed members if an initializer throws. + // For that, we'll need an EH cleanup. +@@ -1156,11 +1183,8 @@ void AggExprEmitter::VisitInitListExpr(InitListExp + + // Handle initialization of an array. + if (E->getType()->isArrayType()) { +- QualType elementType = +- CGF.getContext().getAsArrayType(E->getType())->getElementType(); +- + auto AType = cast(Dest.getAddress().getElementType()); +- EmitArrayInit(Dest.getAddress(), AType, elementType, E); ++ EmitArrayInit(Dest.getAddress(), AType, E->getType(), E); + return; + } + Copied: branches/2018Q4/devel/llvm60/files/clang/patch-head-r339019.diff (from r483054, head/devel/llvm60/files/clang/patch-head-r339019.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/devel/llvm60/files/clang/patch-head-r339019.diff Wed Oct 31 18:49:04 2018 (r483602, copy of r483054, head/devel/llvm60/files/clang/patch-head-r339019.diff) @@ -0,0 +1,30 @@ +r339019 | emaste | 2018-09-29 22:01:23 +0200 (Sat, 29 Sep 2018) | 15 lines + +clang: allow ifunc resolvers to accept arguments + +Previously Clang required ifunc resolution functions to take no +arguments, presumably because GCC documented ifunc resolvers as taking +no arguments. However, GCC accepts resolvers accepting arguments, and +our rtld passes CPU ID information (cpuid, hwcap, etc.) to ifunc +resolvers. Just remove the check from the in-tree compiler for our in- +tree compiler; a different (per-OS) approach may be required upstream. + +Reported by: mjg +Approved by: re (rgrimes) +MFC after: 1 week +Relnotes: Yes +Sponsored by: The FreeBSD Foundation + +Index: tools/clang/lib/CodeGen/CodeGenModule.cpp +=================================================================== +--- tools/clang/lib/CodeGen/CodeGenModule.cpp (revision 339018) ++++ tools/clang/lib/CodeGen/CodeGenModule.cpp (revision 339019) +@@ -321,8 +321,6 @@ void CodeGenModule::checkAliases() { + assert(FTy); + if (!FTy->getReturnType()->isPointerTy()) + Diags.Report(Location, diag::err_ifunc_resolver_return); +- if (FTy->getNumParams()) +- Diags.Report(Location, diag::err_ifunc_resolver_params); + } + + llvm::Constant *Aliasee = Alias->getIndirectSymbol(); Copied: branches/2018Q4/devel/llvm60/files/patch-head-r308867.diff (from r483054, head/devel/llvm60/files/patch-head-r308867.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/devel/llvm60/files/patch-head-r308867.diff Wed Oct 31 18:49:04 2018 (r483602, copy of r483054, head/devel/llvm60/files/patch-head-r308867.diff) @@ -0,0 +1,33 @@ +r308867 | dim | 2016-11-19 22:05:17 +0100 (Sat, 19 Nov 2016) | 15 lines + +Work around LLVM PR30879, which is about a bad interaction between X86 +Call Frame Optimization on i386 and libunwind, by disallowing the +optimization for i386-freebsd12. + +This should fix some instances of broken exception handling when frame +pointers are omitted, in particular some unittests run during the build +of editors/libreoffice. + +This hack will be removed as soon as upstream has implemented a more +permanent fix for this problem. + +Upstream PR: https://llvm.org/bugs/show_bug.cgi?id=30879 +Reviewed by: emaste +PR: 212343 + +Index: lib/Target/X86/X86CallFrameOptimization.cpp +=================================================================== +--- lib/Target/X86/X86CallFrameOptimization.cpp (revision 308866) ++++ lib/Target/X86/X86CallFrameOptimization.cpp (revision 308867) +@@ -125,6 +125,11 @@ bool X86CallFrameOptimization::isLegal(MachineFunc + if (NoX86CFOpt.getValue()) + return false; + ++ // Work around LLVM PR30879 (bad interaction between CFO and libunwind) ++ if (STI->isTargetFreeBSD() && STI->is32Bit() && ++ STI->getTargetTriple().getOSMajorVersion() >= 12) ++ return false; ++ + // We can't encode multiple DW_CFA_GNU_args_size or DW_CFA_def_cfa_offset + // in the compact unwind encoding that Darwin uses. So, bail if there + // is a danger of that being generated. Copied: branches/2018Q4/devel/llvm60/files/patch-head-r330686.diff (from r483054, head/devel/llvm60/files/patch-head-r330686.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/devel/llvm60/files/patch-head-r330686.diff Wed Oct 31 18:49:04 2018 (r483602, copy of r483054, head/devel/llvm60/files/patch-head-r330686.diff) @@ -0,0 +1,80 @@ +r330686 | dim | 2018-03-09 10:21:22 +0100 (Fri, 09 Mar 2018) | 20 lines + +Pull in r326882 from upstream llvm trunk (by Sjoerd Meijer): + + [ARM] Fix for PR36577 + + Don't PerformSHLSimplify if the given node is used by a node that + also uses a constant because we may get stuck in an infinite combine + loop. + + bugzilla: https://bugs.llvm.org/show_bug.cgi?id=36577 + + Patch by Sam Parker. + + Differential Revision: https://reviews.llvm.org/D44097 + +This fixes a hang when compiling one particular file in java/openjdk8 +for armv6 and armv7. + +Reported by: swills +PR: 226388 + +Index: lib/Target/ARM/ARMISelLowering.cpp +=================================================================== +--- lib/Target/ARM/ARMISelLowering.cpp (revision 330685) ++++ lib/Target/ARM/ARMISelLowering.cpp (revision 330686) +@@ -10201,7 +10201,14 @@ static SDValue PerformSHLSimplify(SDNode *N, + case ISD::XOR: + case ISD::SETCC: + case ARMISD::CMP: +- // Check that its not already using a shl. ++ // Check that the user isn't already using a constant because there ++ // aren't any instructions that support an immediate operand and a ++ // shifted operand. ++ if (isa(U->getOperand(0)) || ++ isa(U->getOperand(1))) ++ return SDValue(); ++ ++ // Check that it's not already using a shift. + if (U->getOperand(0).getOpcode() == ISD::SHL || + U->getOperand(1).getOpcode() == ISD::SHL) + return SDValue(); +@@ -10223,8 +10230,6 @@ static SDValue PerformSHLSimplify(SDNode *N, + if (!C1ShlC2 || !C2) + return SDValue(); + +- DEBUG(dbgs() << "Trying to simplify shl: "; N->dump()); +- + APInt C2Int = C2->getAPIntValue(); + APInt C1Int = C1ShlC2->getAPIntValue(); + +@@ -10238,12 +10243,12 @@ static SDValue PerformSHLSimplify(SDNode *N, + C1Int.lshrInPlace(C2Int); + + // The immediates are encoded as an 8-bit value that can be rotated. +- unsigned Zeros = C1Int.countLeadingZeros() + C1Int.countTrailingZeros(); +- if (C1Int.getBitWidth() - Zeros > 8) +- return SDValue(); ++ auto LargeImm = [](const APInt &Imm) { ++ unsigned Zeros = Imm.countLeadingZeros() + Imm.countTrailingZeros(); ++ return Imm.getBitWidth() - Zeros > 8; ++ }; + +- Zeros = C2Int.countLeadingZeros() + C2Int.countTrailingZeros(); +- if (C2Int.getBitWidth() - Zeros > 8) ++ if (LargeImm(C1Int) || LargeImm(C2Int)) + return SDValue(); + + SelectionDAG &DAG = DCI.DAG; +@@ -10254,6 +10259,10 @@ static SDValue PerformSHLSimplify(SDNode *N, + // Shift left to compensate for the lshr of C1Int. + SDValue Res = DAG.getNode(ISD::SHL, dl, MVT::i32, BinOp, SHL.getOperand(1)); + ++ DEBUG(dbgs() << "Simplify shl use:\n"; SHL.getOperand(0).dump(); SHL.dump(); ++ N->dump()); ++ DEBUG(dbgs() << "Into:\n"; X.dump(); BinOp.dump(); Res.dump()); ++ + DAG.ReplaceAllUsesWith(SDValue(N, 0), Res); + return SDValue(N, 0); + } Copied: branches/2018Q4/devel/llvm60/files/patch-head-r331065.diff (from r483054, head/devel/llvm60/files/patch-head-r331065.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/devel/llvm60/files/patch-head-r331065.diff Wed Oct 31 18:49:04 2018 (r483602, copy of r483054, head/devel/llvm60/files/patch-head-r331065.diff) @@ -0,0 +1,88 @@ +r331065 | dim | 2018-03-16 18:50:44 +0100 (Fri, 16 Mar 2018) | 17 lines + +Pull in r327638 from upstream llvm trunk (by Matthew Simpson): + + [ConstantFolding, InstSimplify] Handle more vector GEPs + + This patch addresses some additional cases where the compiler crashes + upon encountering vector GEPs. This should fix PR36116. + + Differential Revision: https://reviews.llvm.org/D44219 + Reference: https://bugs.llvm.org/show_bug.cgi?id=36116 + +This fixes an assertion when building the emulators/snes9x port. + +Reported by: jbeich +PR: 225471 +MFC after: 3 months +X-MFC-With: r327952 + +Index: lib/Analysis/InstructionSimplify.cpp +=================================================================== +--- lib/Analysis/InstructionSimplify.cpp (revision 331064) ++++ lib/Analysis/InstructionSimplify.cpp (revision 331065) +@@ -3697,7 +3697,7 @@ static Value *SimplifyGEPInst(Type *SrcTy, ArrayRe + + if (Ops.size() == 2) { + // getelementptr P, 0 -> P. +- if (match(Ops[1], m_Zero())) ++ if (match(Ops[1], m_Zero()) && Ops[0]->getType() == GEPTy) + return Ops[0]; + + Type *Ty = SrcTy; +@@ -3706,7 +3706,7 @@ static Value *SimplifyGEPInst(Type *SrcTy, ArrayRe + uint64_t C; + uint64_t TyAllocSize = Q.DL.getTypeAllocSize(Ty); + // getelementptr P, N -> P if P points to a type of zero size. +- if (TyAllocSize == 0) ++ if (TyAllocSize == 0 && Ops[0]->getType() == GEPTy) + return Ops[0]; + + // The following transforms are only safe if the ptrtoint cast +Index: lib/IR/ConstantFold.cpp +=================================================================== +--- lib/IR/ConstantFold.cpp (revision 331064) ++++ lib/IR/ConstantFold.cpp (revision 331065) +@@ -2018,8 +2018,16 @@ static bool isInBoundsIndices(ArrayRef Id + + // If the first index is one and all the rest are zero, it's in bounds, + // by the one-past-the-end rule. +- if (!cast(Idxs[0])->isOne()) +- return false; ++ if (auto *CI = dyn_cast(Idxs[0])) { ++ if (!CI->isOne()) ++ return false; ++ } else { ++ auto *CV = cast(Idxs[0]); ++ CI = dyn_cast_or_null(CV->getSplatValue()); ++ if (!CI || !CI->isOne()) ++ return false; ++ } ++ + for (unsigned i = 1, e = Idxs.size(); i != e; ++i) + if (!cast(Idxs[i])->isNullValue()) + return false; +@@ -2049,15 +2057,18 @@ Constant *llvm::ConstantFoldGetElementPtr(Type *Po + ArrayRef Idxs) { + if (Idxs.empty()) return C; + +- if (isa(C)) { +- Type *GEPTy = GetElementPtrInst::getGEPReturnType( +- C, makeArrayRef((Value * const *)Idxs.data(), Idxs.size())); ++ Type *GEPTy = GetElementPtrInst::getGEPReturnType( ++ C, makeArrayRef((Value *const *)Idxs.data(), Idxs.size())); ++ ++ if (isa(C)) + return UndefValue::get(GEPTy); +- } + + Constant *Idx0 = cast(Idxs[0]); + if (Idxs.size() == 1 && (Idx0->isNullValue() || isa(Idx0))) +- return C; ++ return GEPTy->isVectorTy() && !C->getType()->isVectorTy() ++ ? ConstantVector::getSplat( ++ cast(GEPTy)->getNumElements(), C) ++ : C; + + if (C->isNullValue()) { + bool isNull = true; Copied: branches/2018Q4/devel/llvm60/files/patch-head-r331366.diff (from r483054, head/devel/llvm60/files/patch-head-r331366.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/devel/llvm60/files/patch-head-r331366.diff Wed Oct 31 18:49:04 2018 (r483602, copy of r483054, head/devel/llvm60/files/patch-head-r331366.diff) @@ -0,0 +1,609 @@ +r331366 | dim | 2018-03-22 19:58:34 +0100 (Thu, 22 Mar 2018) | 61 lines + +Pull in r327101 from upstream llvm trunk (by Rafael Espindola): + + Don't treat .symver as a regular alias definition. + + This patch starts simplifying the handling of .symver. + + For now it just moves the responsibility for creating an alias down to + the streamer. With that the asm streamer can pass a .symver unchanged, + which is nice since gas cannot parse "foo@bar = zed". + + In a followup I hope to move the handling down to the writer so that + we don't need special hacks for avoiding breaking names with @@@ on + windows. + +Pull in r327160 from upstream llvm trunk (by Rafael Espindola): + + Delay creating an alias for @@@. + + With this we only create an alias for @@@ once we know if it should + use @ or @@. This avoids last minutes renames and hacks to handle MS + names. + + This only handles the ELF writer. LTO still has issues with @@@ + aliases. + +Pull in r327928 from upstream llvm trunk (by Vitaly Buka): + + Object: Move attribute calculation into RecordStreamer. NFC + + Summary: Preparation for D44274 + + Reviewers: pcc, espindola + + Subscribers: hiraditya + + Differential Revision: https://reviews.llvm.org/D44276 + +Pull in r327930 from upstream llvm trunk (by Vitaly Buka): + + Object: Fix handling of @@@ in .symver directive + + Summary: + name@@@nodename is going to be replaced with name@@nodename if symbols is + defined in the assembled file, or name@nodename if undefined. + https://sourceware.org/binutils/docs/as/Symver.html + + Fixes PR36623 + + Reviewers: pcc, espindola + + Subscribers: mehdi_amini, hiraditya + + Differential Revision: https://reviews.llvm.org/D44274 + +Together, these changes fix handling of @@@ in .symver directives when +doing Link Time Optimization. + +Reported by: Shawn Webb +MFC after: 3 months +X-MFC-With: r327952 + +Index: include/llvm/MC/MCAssembler.h +=================================================================== +--- include/llvm/MC/MCAssembler.h (revision 331365) ++++ include/llvm/MC/MCAssembler.h (revision 331366) +@@ -206,6 +206,8 @@ class MCAssembler { + handleFixup(const MCAsmLayout &Layout, MCFragment &F, const MCFixup &Fixup); + + public: ++ std::vector> Symvers; ++ + /// Construct a new assembler instance. + // + // FIXME: How are we going to parameterize this? Two obvious options are stay +Index: include/llvm/MC/MCELFStreamer.h +=================================================================== +--- include/llvm/MC/MCELFStreamer.h (revision 331365) ++++ include/llvm/MC/MCELFStreamer.h (revision 331366) +@@ -51,6 +51,8 @@ class MCELFStreamer : public MCObjectStreamer { + unsigned ByteAlignment) override; + + void emitELFSize(MCSymbol *Symbol, const MCExpr *Value) override; ++ void emitELFSymverDirective(StringRef AliasName, ++ const MCSymbol *Aliasee) override; + + void EmitLocalCommonSymbol(MCSymbol *Symbol, uint64_t Size, + unsigned ByteAlignment) override; +Index: include/llvm/MC/MCStreamer.h +=================================================================== +--- include/llvm/MC/MCStreamer.h (revision 331365) ++++ include/llvm/MC/MCStreamer.h (revision 331366) +@@ -519,9 +519,10 @@ class MCStreamer { + /// + /// This corresponds to an assembler statement such as: + /// .symver _start, foo@@SOME_VERSION +- /// \param Alias - The versioned alias (i.e. "foo@@SOME_VERSION") ++ /// \param AliasName - The versioned alias (i.e. "foo@@SOME_VERSION") + /// \param Aliasee - The aliased symbol (i.e. "_start") +- virtual void emitELFSymverDirective(MCSymbol *Alias, const MCSymbol *Aliasee); ++ virtual void emitELFSymverDirective(StringRef AliasName, ++ const MCSymbol *Aliasee); + + /// \brief Emit a Linker Optimization Hint (LOH) directive. + /// \param Args - Arguments of the LOH. +Index: lib/MC/ELFObjectWriter.cpp +=================================================================== +--- lib/MC/ELFObjectWriter.cpp (revision 331365) ++++ lib/MC/ELFObjectWriter.cpp (revision 331366) +@@ -128,8 +128,6 @@ class ELFObjectWriter : public MCObjectWriter { + /// @name Symbol Table Data + /// @{ + +- BumpPtrAllocator Alloc; +- StringSaver VersionSymSaver{Alloc}; + StringTableBuilder StrTabBuilder{StringTableBuilder::ELF}; + + /// @} +@@ -391,27 +389,29 @@ void ELFObjectWriter::executePostLayoutBinding(MCA + const MCAsmLayout &Layout) { + // The presence of symbol versions causes undefined symbols and + // versions declared with @@@ to be renamed. +- for (const MCSymbol &A : Asm.symbols()) { +- const auto &Alias = cast(A); +- // Not an alias. +- if (!Alias.isVariable()) +- continue; +- auto *Ref = dyn_cast(Alias.getVariableValue()); +- if (!Ref) +- continue; +- const auto &Symbol = cast(Ref->getSymbol()); +- +- StringRef AliasName = Alias.getName(); ++ for (const std::pair &P : Asm.Symvers) { ++ StringRef AliasName = P.first; ++ const auto &Symbol = cast(*P.second); + size_t Pos = AliasName.find('@'); +- if (Pos == StringRef::npos) +- continue; ++ assert(Pos != StringRef::npos); + ++ StringRef Prefix = AliasName.substr(0, Pos); ++ StringRef Rest = AliasName.substr(Pos); ++ StringRef Tail = Rest; ++ if (Rest.startswith("@@@")) ++ Tail = Rest.substr(Symbol.isUndefined() ? 2 : 1); ++ ++ auto *Alias = ++ cast(Asm.getContext().getOrCreateSymbol(Prefix + Tail)); ++ Asm.registerSymbol(*Alias); ++ const MCExpr *Value = MCSymbolRefExpr::create(&Symbol, Asm.getContext()); ++ Alias->setVariableValue(Value); ++ + // Aliases defined with .symvar copy the binding from the symbol they alias. + // This is the first place we are able to copy this information. +- Alias.setExternal(Symbol.isExternal()); +- Alias.setBinding(Symbol.getBinding()); ++ Alias->setExternal(Symbol.isExternal()); ++ Alias->setBinding(Symbol.getBinding()); + +- StringRef Rest = AliasName.substr(Pos); + if (!Symbol.isUndefined() && !Rest.startswith("@@@")) + continue; + +@@ -420,7 +420,7 @@ void ELFObjectWriter::executePostLayoutBinding(MCA + !Rest.startswith("@@@")) + report_fatal_error("A @@ version cannot be undefined"); + +- Renames.insert(std::make_pair(&Symbol, &Alias)); ++ Renames.insert(std::make_pair(&Symbol, Alias)); + } + } + +@@ -836,44 +836,7 @@ void ELFObjectWriter::computeSymbolTable( + HasLargeSectionIndex = true; + } + +- // The @@@ in symbol version is replaced with @ in undefined symbols and @@ +- // in defined ones. +- // +- // FIXME: All name handling should be done before we get to the writer, +- // including dealing with GNU-style version suffixes. Fixing this isn't +- // trivial. +- // +- // We thus have to be careful to not perform the symbol version replacement +- // blindly: +- // +- // The ELF format is used on Windows by the MCJIT engine. Thus, on +- // Windows, the ELFObjectWriter can encounter symbols mangled using the MS +- // Visual Studio C++ name mangling scheme. Symbols mangled using the MSVC +- // C++ name mangling can legally have "@@@" as a sub-string. In that case, +- // the EFLObjectWriter should not interpret the "@@@" sub-string as +- // specifying GNU-style symbol versioning. The ELFObjectWriter therefore +- // checks for the MSVC C++ name mangling prefix which is either "?", "@?", +- // "__imp_?" or "__imp_@?". +- // +- // It would have been interesting to perform the MS mangling prefix check +- // only when the target triple is of the form *-pc-windows-elf. But, it +- // seems that this information is not easily accessible from the +- // ELFObjectWriter. + StringRef Name = Symbol.getName(); +- SmallString<32> Buf; +- if (!Name.startswith("?") && !Name.startswith("@?") && +- !Name.startswith("__imp_?") && !Name.startswith("__imp_@?")) { +- // This symbol isn't following the MSVC C++ name mangling convention. We +- // can thus safely interpret the @@@ in symbol names as specifying symbol +- // versioning. +- size_t Pos = Name.find("@@@"); +- if (Pos != StringRef::npos) { +- Buf += Name.substr(0, Pos); +- unsigned Skip = MSD.SectionIndex == ELF::SHN_UNDEF ? 2 : 1; +- Buf += Name.substr(Pos + Skip); +- Name = VersionSymSaver.save(Buf.c_str()); +- } +- } + + // Sections have their own string table + if (Symbol.getType() != ELF::STT_SECTION) { +Index: lib/MC/MCAsmStreamer.cpp +=================================================================== +--- lib/MC/MCAsmStreamer.cpp (revision 331365) ++++ lib/MC/MCAsmStreamer.cpp (revision 331366) +@@ -129,6 +129,9 @@ class MCAsmStreamer final : public MCStreamer { + + void ChangeSection(MCSection *Section, const MCExpr *Subsection) override; + ++ void emitELFSymverDirective(StringRef AliasName, ++ const MCSymbol *Aliasee) override; ++ + void EmitLOHDirective(MCLOHType Kind, const MCLOHArgs &Args) override; + void EmitLabel(MCSymbol *Symbol, SMLoc Loc = SMLoc()) override; + +@@ -411,6 +414,14 @@ void MCAsmStreamer::ChangeSection(MCSection *Secti + } + } + ++void MCAsmStreamer::emitELFSymverDirective(StringRef AliasName, ++ const MCSymbol *Aliasee) { ++ OS << ".symver "; ++ Aliasee->print(OS, MAI); ++ OS << ", " << AliasName; ++ EmitEOL(); ++} ++ + void MCAsmStreamer::EmitLabel(MCSymbol *Symbol, SMLoc Loc) { + MCStreamer::EmitLabel(Symbol, Loc); + +Index: lib/MC/MCELFStreamer.cpp +=================================================================== +--- lib/MC/MCELFStreamer.cpp (revision 331365) ++++ lib/MC/MCELFStreamer.cpp (revision 331366) +@@ -337,6 +337,11 @@ void MCELFStreamer::emitELFSize(MCSymbol *Symbol, + cast(Symbol)->setSize(Value); + } + ++void MCELFStreamer::emitELFSymverDirective(StringRef AliasName, ++ const MCSymbol *Aliasee) { ++ getAssembler().Symvers.push_back({AliasName, Aliasee}); ++} ++ + void MCELFStreamer::EmitLocalCommonSymbol(MCSymbol *S, uint64_t Size, + unsigned ByteAlignment) { + auto *Symbol = cast(S); +Index: lib/MC/MCParser/ELFAsmParser.cpp +=================================================================== +--- lib/MC/MCParser/ELFAsmParser.cpp (revision 331365) ++++ lib/MC/MCParser/ELFAsmParser.cpp (revision 331366) +@@ -767,12 +767,8 @@ bool ELFAsmParser::ParseDirectiveSymver(StringRef, + if (AliasName.find('@') == StringRef::npos) + return TokError("expected a '@' in the name"); + +- MCSymbol *Alias = getContext().getOrCreateSymbol(AliasName); + MCSymbol *Sym = getContext().getOrCreateSymbol(Name); +- const MCExpr *Value = MCSymbolRefExpr::create(Sym, getContext()); +- +- getStreamer().EmitAssignment(Alias, Value); +- getStreamer().emitELFSymverDirective(Alias, Sym); ++ getStreamer().emitELFSymverDirective(AliasName, Sym); + return false; + } + +Index: lib/MC/MCStreamer.cpp +=================================================================== +--- lib/MC/MCStreamer.cpp (revision 331365) ++++ lib/MC/MCStreamer.cpp (revision 331366) +@@ -925,7 +925,7 @@ void MCStreamer::EmitCOFFSymbolType(int Type) { + llvm_unreachable("this directive only supported on COFF targets"); + } + void MCStreamer::emitELFSize(MCSymbol *Symbol, const MCExpr *Value) {} +-void MCStreamer::emitELFSymverDirective(MCSymbol *Alias, ++void MCStreamer::emitELFSymverDirective(StringRef AliasName, + const MCSymbol *Aliasee) {} + void MCStreamer::EmitLocalCommonSymbol(MCSymbol *Symbol, uint64_t Size, + unsigned ByteAlignment) {} +Index: lib/Object/ModuleSymbolTable.cpp +=================================================================== +--- lib/Object/ModuleSymbolTable.cpp (revision 331365) ++++ lib/Object/ModuleSymbolTable.cpp (revision 331366) +@@ -24,7 +24,6 @@ + #include "llvm/IR/GlobalAlias.h" + #include "llvm/IR/GlobalValue.h" + #include "llvm/IR/GlobalVariable.h" +-#include "llvm/IR/Mangler.h" + #include "llvm/IR/Module.h" + #include "llvm/MC/MCAsmInfo.h" + #include "llvm/MC/MCContext.h" +@@ -69,81 +68,6 @@ void ModuleSymbolTable::addModule(Module *M) { + }); + } + +-// Ensure ELF .symver aliases get the same binding as the defined symbol +-// they alias with. +-static void handleSymverAliases(const Module &M, RecordStreamer &Streamer) { +- if (Streamer.symverAliases().empty()) +- return; +- +- // The name in the assembler will be mangled, but the name in the IR +- // might not, so we first compute a mapping from mangled name to GV. +- Mangler Mang; +- SmallString<64> MangledName; +- StringMap MangledNameMap; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Wed Oct 31 19:30:32 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5271810E334A; Wed, 31 Oct 2018 19:30:32 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 06E8B852C6; Wed, 31 Oct 2018 19:30:32 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DBE3310CE0; Wed, 31 Oct 2018 19:30:31 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9VJUVjl091957; Wed, 31 Oct 2018 19:30:31 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9VJUVas091953; Wed, 31 Oct 2018 19:30:31 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201810311930.w9VJUVas091953@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 31 Oct 2018 19:30:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483608 - in branches/2018Q4/www: firefox firefox-i18n X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q4/www: firefox firefox-i18n X-SVN-Commit-Revision: 483608 X-SVN-Commit-Repository: ports 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.29 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, 31 Oct 2018 19:30:32 -0000 Author: jbeich Date: Wed Oct 31 19:30:30 2018 New Revision: 483608 URL: https://svnweb.freebsd.org/changeset/ports/483608 Log: MFH: r483567 www/firefox: update to 63.0.1 Changes: https://www.mozilla.org/firefox/63.0.1/releasenotes/ PR: 229893 Approved by: ports-secteam blanket Modified: branches/2018Q4/www/firefox-i18n/Makefile branches/2018Q4/www/firefox-i18n/distinfo branches/2018Q4/www/firefox/Makefile branches/2018Q4/www/firefox/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/www/firefox-i18n/Makefile ============================================================================== --- branches/2018Q4/www/firefox-i18n/Makefile Wed Oct 31 19:20:14 2018 (r483607) +++ branches/2018Q4/www/firefox-i18n/Makefile Wed Oct 31 19:30:30 2018 (r483608) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= firefox-i18n -PORTVERSION= 63.0 -PORTREVISION= 1 +PORTVERSION= 63.0.1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ - MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-i686/xpi + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build4/linux-i686/xpi PKGNAMEPREFIX= DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} Modified: branches/2018Q4/www/firefox-i18n/distinfo ============================================================================== --- branches/2018Q4/www/firefox-i18n/distinfo Wed Oct 31 19:20:14 2018 (r483607) +++ branches/2018Q4/www/firefox-i18n/distinfo Wed Oct 31 19:30:30 2018 (r483608) @@ -1,199 +1,199 @@ -TIMESTAMP = 1539893202 -SHA256 (xpi/firefox-i18n-63.0/ach.xpi) = a69e98b2480da786f412f44028d9066491186a9ebf8d1d0e4ed33869c44a1d83 -SIZE (xpi/firefox-i18n-63.0/ach.xpi) = 455084 -SHA256 (xpi/firefox-i18n-63.0/af.xpi) = d43e7ee53e3e3aa585e53b2db42a4ed3bc358fdb9bd265e1d2b47baf7b3a9398 -SIZE (xpi/firefox-i18n-63.0/af.xpi) = 437912 -SHA256 (xpi/firefox-i18n-63.0/an.xpi) = f3add5fdc9daae03c18a29aa0e5dc5ae584ccba12102fec68e45c29a0eb484b8 -SIZE (xpi/firefox-i18n-63.0/an.xpi) = 474545 -SHA256 (xpi/firefox-i18n-63.0/ar.xpi) = bd51fb9a473da43f51d99377ad8ab6823dfe3034ca736ee54b2fd228378ecd1c -SIZE (xpi/firefox-i18n-63.0/ar.xpi) = 513464 -SHA256 (xpi/firefox-i18n-63.0/as.xpi) = 7976beb3686d0208104e0cd837c7d35e1a384d948c6350f525b7225c167f3b97 -SIZE (xpi/firefox-i18n-63.0/as.xpi) = 482195 -SHA256 (xpi/firefox-i18n-63.0/ast.xpi) = a321c4595f866173bd4ab636a849b5fac9558ea2668081151e7197007f057178 -SIZE (xpi/firefox-i18n-63.0/ast.xpi) = 465656 -SHA256 (xpi/firefox-i18n-63.0/az.xpi) = 6f7e39ac4c4905f75578f5133770916c6e4ad888b304261c1722da9a73f4018c -SIZE (xpi/firefox-i18n-63.0/az.xpi) = 490944 -SHA256 (xpi/firefox-i18n-63.0/be.xpi) = db439229c94d61a28002705a971287f865b9cfaa28089baf0f935ab1dd896c99 -SIZE (xpi/firefox-i18n-63.0/be.xpi) = 549300 -SHA256 (xpi/firefox-i18n-63.0/bg.xpi) = 0d1db6696eafe92d75a03b1298f750f0a69f0496484491cbe15107ea016b5f47 -SIZE (xpi/firefox-i18n-63.0/bg.xpi) = 523523 -SHA256 (xpi/firefox-i18n-63.0/bn-BD.xpi) = 23113a55a258040467be0d60ceb38600b165969bd319380dbcee13d7510920de -SIZE (xpi/firefox-i18n-63.0/bn-BD.xpi) = 548594 -SHA256 (xpi/firefox-i18n-63.0/bn-IN.xpi) = ba7e5a2022b7fe7391e47c5319e4eb0678a477e5573b4f6eecfd6260797d9d9e -SIZE (xpi/firefox-i18n-63.0/bn-IN.xpi) = 516020 -SHA256 (xpi/firefox-i18n-63.0/br.xpi) = b245cb6e8868b1e0c77005b74083772c13f61b84cd968233eb41fceba05d61d2 -SIZE (xpi/firefox-i18n-63.0/br.xpi) = 474388 -SHA256 (xpi/firefox-i18n-63.0/bs.xpi) = 46d6937c29b1946c12c514f18f4460140994087e8163c92b82405e673f6897a1 -SIZE (xpi/firefox-i18n-63.0/bs.xpi) = 472888 -SHA256 (xpi/firefox-i18n-63.0/ca.xpi) = 26a94dcf8a6c95dccf6f788784a5a99d41a5970c343956cc9ca825cd90df5d5c -SIZE (xpi/firefox-i18n-63.0/ca.xpi) = 469245 -SHA256 (xpi/firefox-i18n-63.0/cak.xpi) = 271f15f5a06b982ffb4d16f5609ce67301f2b7e8d76db41a87e29df75e7f0138 -SIZE (xpi/firefox-i18n-63.0/cak.xpi) = 502728 -SHA256 (xpi/firefox-i18n-63.0/cs.xpi) = 25b63e1bff3e36a7f17b71c05ec03d7dedc9775325936e9ac19c30226eb45878 -SIZE (xpi/firefox-i18n-63.0/cs.xpi) = 489306 -SHA256 (xpi/firefox-i18n-63.0/cy.xpi) = b2e0130b6c2cc45c62c108633c9185126edfa7381bb954312a20b2f3a343d4d0 -SIZE (xpi/firefox-i18n-63.0/cy.xpi) = 481078 -SHA256 (xpi/firefox-i18n-63.0/da.xpi) = 0ba63df1c715944ddea493282587266acf24c1b721a76d679ef37f0252b43fb3 -SIZE (xpi/firefox-i18n-63.0/da.xpi) = 481835 -SHA256 (xpi/firefox-i18n-63.0/de.xpi) = b6b089a88ee788e684e87368d542024c5398e431ecd182b2271906bca5549593 -SIZE (xpi/firefox-i18n-63.0/de.xpi) = 491998 -SHA256 (xpi/firefox-i18n-63.0/dsb.xpi) = 061ea25bcec87edb0a551458df540ba4ab6cbb9fb4470a934d30bfd94a42bf11 -SIZE (xpi/firefox-i18n-63.0/dsb.xpi) = 500887 -SHA256 (xpi/firefox-i18n-63.0/el.xpi) = a149896c0e77c7fe082ae91e4d287bb8898f57df956bcc09986e144cc69be21b -SIZE (xpi/firefox-i18n-63.0/el.xpi) = 558442 -SHA256 (xpi/firefox-i18n-63.0/en-CA.xpi) = 12b04a11a095f3bac9610320704964f2f4f99e4b297fd7a9cde0ad44048f02f7 -SIZE (xpi/firefox-i18n-63.0/en-CA.xpi) = 450713 -SHA256 (xpi/firefox-i18n-63.0/en-GB.xpi) = 14163a81d51138a06d760c582b76126007f3ebc06436983e9628b03471bfb006 -SIZE (xpi/firefox-i18n-63.0/en-GB.xpi) = 442413 -SHA256 (xpi/firefox-i18n-63.0/en-US.xpi) = dc6759bec52d1c370b5c31912f0a05b1508c450b900f913fbfab310b488d1d0e -SIZE (xpi/firefox-i18n-63.0/en-US.xpi) = 425480 -SHA256 (xpi/firefox-i18n-63.0/en-ZA.xpi) = ed6a0cf39b1f5d8a56874079f96c12159b89a83252afca56d77acc783d8c7c7d -SIZE (xpi/firefox-i18n-63.0/en-ZA.xpi) = 427845 -SHA256 (xpi/firefox-i18n-63.0/eo.xpi) = 02db1f348d44799c86c176b894c8c7b88709e174777a9886c43542aefd59c69b -SIZE (xpi/firefox-i18n-63.0/eo.xpi) = 478961 -SHA256 (xpi/firefox-i18n-63.0/es-AR.xpi) = 2cd376f06150875d257b43f6996acc13a1ffb4a5b7b8110e9b64bc7a9fb00cd8 -SIZE (xpi/firefox-i18n-63.0/es-AR.xpi) = 486912 -SHA256 (xpi/firefox-i18n-63.0/es-CL.xpi) = 3bcfa60faf4a0dd772a123a6763f88968f2ffa5fc6cb49147dbef875a8e26b45 -SIZE (xpi/firefox-i18n-63.0/es-CL.xpi) = 487567 -SHA256 (xpi/firefox-i18n-63.0/es-ES.xpi) = 8de17ed09a99ff891254e77e87a1a50f4d4c0f1ee662137337e2ab6803310bc5 -SIZE (xpi/firefox-i18n-63.0/es-ES.xpi) = 431428 -SHA256 (xpi/firefox-i18n-63.0/es-MX.xpi) = 4ebb349374fab6929d84c970430e3aed1bfc4daba182bd0caa6b32252cba3084 -SIZE (xpi/firefox-i18n-63.0/es-MX.xpi) = 490502 -SHA256 (xpi/firefox-i18n-63.0/et.xpi) = 7cd41fd6686fa58d4f8545168dbf3c9763845824a72834c316f500aea88787e4 -SIZE (xpi/firefox-i18n-63.0/et.xpi) = 469981 -SHA256 (xpi/firefox-i18n-63.0/eu.xpi) = aa9a585e3e39c5d962b143db588f6b70604bf75dfdad5f5b56bc1fe10e26435a -SIZE (xpi/firefox-i18n-63.0/eu.xpi) = 478606 -SHA256 (xpi/firefox-i18n-63.0/fa.xpi) = b2a079b24c3c2d5c533ce955b8d7ecf42ac495712cd1a9095f80c5342b5d540d -SIZE (xpi/firefox-i18n-63.0/fa.xpi) = 529588 -SHA256 (xpi/firefox-i18n-63.0/ff.xpi) = 95cca64459bff725f813a138a9f6f6c6a0aa9f96b031369f77eae69fc928056c -SIZE (xpi/firefox-i18n-63.0/ff.xpi) = 467968 -SHA256 (xpi/firefox-i18n-63.0/fi.xpi) = 0554c8541e59728670907d2f7f4ee0748fdc32fecacb572fc45a3fab329e39f3 -SIZE (xpi/firefox-i18n-63.0/fi.xpi) = 467882 -SHA256 (xpi/firefox-i18n-63.0/fr.xpi) = d1af3f796be2d3e055b3c405a78e73556eec8b04576fe50ffba3856ee4f7538a -SIZE (xpi/firefox-i18n-63.0/fr.xpi) = 496627 -SHA256 (xpi/firefox-i18n-63.0/fy-NL.xpi) = af5ccd80813b2322ac098ca32f7651cf8a4f07453eb49a8782ec6fe3d7a2efe9 -SIZE (xpi/firefox-i18n-63.0/fy-NL.xpi) = 485367 -SHA256 (xpi/firefox-i18n-63.0/ga-IE.xpi) = 1ae5656d1f6aa8dc1e4b3ed26839e45144d983421b0c265e07c77a7dcd22662c -SIZE (xpi/firefox-i18n-63.0/ga-IE.xpi) = 479146 -SHA256 (xpi/firefox-i18n-63.0/gd.xpi) = 22751ad7308aedbfc0ed47d31f85b3779508c0b1da5862fd3e6a6fd6b895ee3e -SIZE (xpi/firefox-i18n-63.0/gd.xpi) = 484600 -SHA256 (xpi/firefox-i18n-63.0/gl.xpi) = 3c01a5d680659b44d1bce70fa3e327f18523f50591b3ea00febe05b9f2d86f42 -SIZE (xpi/firefox-i18n-63.0/gl.xpi) = 455900 -SHA256 (xpi/firefox-i18n-63.0/gn.xpi) = 52d7baf9f862e46ac21812740b180701277879e22e85a3d9a90192846c1d3d45 -SIZE (xpi/firefox-i18n-63.0/gn.xpi) = 496363 -SHA256 (xpi/firefox-i18n-63.0/gu-IN.xpi) = 350464c32817b3c6783ed678d932fe6bab565399ce2d40d2d20f7418f0b22c35 -SIZE (xpi/firefox-i18n-63.0/gu-IN.xpi) = 556299 -SHA256 (xpi/firefox-i18n-63.0/he.xpi) = 1b7f2bf099958ffb8eecbf12b6398e3b89171df0d9aed422cf389f200a66a449 -SIZE (xpi/firefox-i18n-63.0/he.xpi) = 486232 -SHA256 (xpi/firefox-i18n-63.0/hi-IN.xpi) = c69c85c370ab9899fa29e56c1ccda238f4e1179208525b4e80616cc347eacf0e -SIZE (xpi/firefox-i18n-63.0/hi-IN.xpi) = 545388 -SHA256 (xpi/firefox-i18n-63.0/hr.xpi) = 5ba54566294d2a0b370ac58bcef41d149b87caf2e28056328ecf420f215abd54 -SIZE (xpi/firefox-i18n-63.0/hr.xpi) = 468490 -SHA256 (xpi/firefox-i18n-63.0/hsb.xpi) = 426fe28f8ff6df8407e4a48a9a77c248637fcfb68e38cd73e9ecb0347e7f6303 -SIZE (xpi/firefox-i18n-63.0/hsb.xpi) = 500688 -SHA256 (xpi/firefox-i18n-63.0/hu.xpi) = e8336fb6f9049d9febc9f9cfb8803adc937c1f9621f8679c9bb911b3dbdd24cb -SIZE (xpi/firefox-i18n-63.0/hu.xpi) = 497767 -SHA256 (xpi/firefox-i18n-63.0/hy-AM.xpi) = 5cbb4fb78f61ea88908a8384982094393491ad75a7e468cd82c121a8f1c6f116 -SIZE (xpi/firefox-i18n-63.0/hy-AM.xpi) = 525183 -SHA256 (xpi/firefox-i18n-63.0/ia.xpi) = 8e6c9ed8472c5af292b08fdd2c31dbb8e6849138a1763c1935eb84b33c821ab5 -SIZE (xpi/firefox-i18n-63.0/ia.xpi) = 474996 -SHA256 (xpi/firefox-i18n-63.0/id.xpi) = e7148242a2503c18fb5868c52c0bacb10bb4fe4b386d6b6195c86113f4c5ab04 -SIZE (xpi/firefox-i18n-63.0/id.xpi) = 468258 -SHA256 (xpi/firefox-i18n-63.0/is.xpi) = d9065fc2b849f86779313622b2d5c714ee65318a7f5829a95d4c254aede4ac2b -SIZE (xpi/firefox-i18n-63.0/is.xpi) = 467334 -SHA256 (xpi/firefox-i18n-63.0/it.xpi) = b499d73ad829e60faecad492d10c7ccd3af7ba386aeadd0777e9fa22c586d934 -SIZE (xpi/firefox-i18n-63.0/it.xpi) = 351091 -SHA256 (xpi/firefox-i18n-63.0/ja.xpi) = cdf1a2b83718a4fb68a18fe99dd388f02670f3658556a0f61ebc88a0db7c32f1 -SIZE (xpi/firefox-i18n-63.0/ja.xpi) = 502001 -SHA256 (xpi/firefox-i18n-63.0/ka.xpi) = de6256998bfc4abe95f5eae7398875d681fb6c83173d991b9cbd8354edbd9ed4 -SIZE (xpi/firefox-i18n-63.0/ka.xpi) = 517228 -SHA256 (xpi/firefox-i18n-63.0/kab.xpi) = f71eb16cdd5bb983fdfbed956f573399f966a85bba7d69ccebd31e4231413eb7 -SIZE (xpi/firefox-i18n-63.0/kab.xpi) = 490513 -SHA256 (xpi/firefox-i18n-63.0/kk.xpi) = 42206775623375d7db880e2728895ed2b4525400dd622909bdb410cbec54c4db -SIZE (xpi/firefox-i18n-63.0/kk.xpi) = 546399 -SHA256 (xpi/firefox-i18n-63.0/km.xpi) = 9d0ec0b215c43e355e72e1b65b76d59716d7aae06dfcd2fb8ecdbd288a0878e2 -SIZE (xpi/firefox-i18n-63.0/km.xpi) = 530622 -SHA256 (xpi/firefox-i18n-63.0/kn.xpi) = 07bfdb38665a09ca8c1c3afdf741391cfe44a9277934aeb676c43a244c124f46 -SIZE (xpi/firefox-i18n-63.0/kn.xpi) = 536458 -SHA256 (xpi/firefox-i18n-63.0/ko.xpi) = dbca2a53b4cd2e1f3e94532ef358e4044cfc60b350d46e58f146979b902e0f7e -SIZE (xpi/firefox-i18n-63.0/ko.xpi) = 496524 -SHA256 (xpi/firefox-i18n-63.0/lij.xpi) = 37fbefc91cb215eeee131ef3f5dd8a33c608af7209c364521d8afa0d0e54064e -SIZE (xpi/firefox-i18n-63.0/lij.xpi) = 478454 -SHA256 (xpi/firefox-i18n-63.0/lt.xpi) = 3679a669bb8a3935dfa49efdf0819e38f2e79c93c02d52ddaadcfb0dcdc5a459 -SIZE (xpi/firefox-i18n-63.0/lt.xpi) = 501126 -SHA256 (xpi/firefox-i18n-63.0/lv.xpi) = c5e3a13ed57e3e924b89b6c25f21b78df7a05a18d84203baffb52c13111285bd -SIZE (xpi/firefox-i18n-63.0/lv.xpi) = 489159 -SHA256 (xpi/firefox-i18n-63.0/mai.xpi) = 551363ed61e2dfb066623b152c670f399a49337fdf929b7c91a91492b21a5004 -SIZE (xpi/firefox-i18n-63.0/mai.xpi) = 498749 -SHA256 (xpi/firefox-i18n-63.0/mk.xpi) = 1deba0e0f817b1a83971dc16f996b3e7302ebf3b69c4c78f2477432928ba07cc -SIZE (xpi/firefox-i18n-63.0/mk.xpi) = 463726 -SHA256 (xpi/firefox-i18n-63.0/ml.xpi) = 2f47f51ac59b240df89b5918b056f5f277865832793d430e50b0e86f16eee9d1 -SIZE (xpi/firefox-i18n-63.0/ml.xpi) = 546422 -SHA256 (xpi/firefox-i18n-63.0/mr.xpi) = 7de54cd97ebe1f7fb19688b487df1559abb39c2b0b8a3cb8445edac3cfcebf5d -SIZE (xpi/firefox-i18n-63.0/mr.xpi) = 538968 -SHA256 (xpi/firefox-i18n-63.0/ms.xpi) = e272fcb3d762388c2f101f4848d16bd711076729c49201f046581f797cb1c7a0 -SIZE (xpi/firefox-i18n-63.0/ms.xpi) = 471525 -SHA256 (xpi/firefox-i18n-63.0/my.xpi) = 85100b8664000a46c4dbc808490798b38c0eab477b7aa3648edd0150f6ae84d8 -SIZE (xpi/firefox-i18n-63.0/my.xpi) = 516689 -SHA256 (xpi/firefox-i18n-63.0/nb-NO.xpi) = b08bda2c5a4591e46b87cb35e18a5dfdb88cbee699e635be5e76281dd78656b8 -SIZE (xpi/firefox-i18n-63.0/nb-NO.xpi) = 470897 -SHA256 (xpi/firefox-i18n-63.0/ne-NP.xpi) = d95112ae58819916a848bec185866c79b21298936b42dfcbdf4bfa4b5ea51661 -SIZE (xpi/firefox-i18n-63.0/ne-NP.xpi) = 508081 -SHA256 (xpi/firefox-i18n-63.0/nl.xpi) = e49ddf7be8fb8a0b32115232eafff247d26958eec45eb2195bad3158f191cdf8 -SIZE (xpi/firefox-i18n-63.0/nl.xpi) = 460037 -SHA256 (xpi/firefox-i18n-63.0/nn-NO.xpi) = 8b993b416fe591f57615472ea364b6af95382834e1483f763e6e228be242971e -SIZE (xpi/firefox-i18n-63.0/nn-NO.xpi) = 469109 -SHA256 (xpi/firefox-i18n-63.0/oc.xpi) = 2f27c4cf5ac2688b0d3e422b6f3c342efe6442f9eb5c7842402ec0eed5aa2415 -SIZE (xpi/firefox-i18n-63.0/oc.xpi) = 482911 -SHA256 (xpi/firefox-i18n-63.0/or.xpi) = 1b447c5681dcf06fc9870a2381c0953c753c03c9659947902596c663959c5b65 -SIZE (xpi/firefox-i18n-63.0/or.xpi) = 489354 -SHA256 (xpi/firefox-i18n-63.0/pa-IN.xpi) = 1101d192d4bc567f01e3c5bb3b63aaf773c16f74ef073550eba26aa68edb7638 -SIZE (xpi/firefox-i18n-63.0/pa-IN.xpi) = 508197 -SHA256 (xpi/firefox-i18n-63.0/pl.xpi) = b5c7b6845448842180b3ea15aba922af434cbeea0dd3910b911aa19e41daf65d -SIZE (xpi/firefox-i18n-63.0/pl.xpi) = 379299 -SHA256 (xpi/firefox-i18n-63.0/pt-BR.xpi) = 1d4ba9430633aa32968a2a4f383f887b1db9cb109b24660261a9fa0618d94995 -SIZE (xpi/firefox-i18n-63.0/pt-BR.xpi) = 471906 -SHA256 (xpi/firefox-i18n-63.0/pt-PT.xpi) = 4ad7dd84703169e355cc238c4c0dccf2b975ee2120ef1550691bd005848cc08a -SIZE (xpi/firefox-i18n-63.0/pt-PT.xpi) = 485591 -SHA256 (xpi/firefox-i18n-63.0/rm.xpi) = 92395fb384a1a58738cbd6fbc0db7d5974679f0b00386e9d24f4e25b5650ef56 -SIZE (xpi/firefox-i18n-63.0/rm.xpi) = 475831 -SHA256 (xpi/firefox-i18n-63.0/ro.xpi) = 4e799db3a5f6b8f79751350e776985d9731c842f6422f45511d81fba18dfe94f -SIZE (xpi/firefox-i18n-63.0/ro.xpi) = 472561 -SHA256 (xpi/firefox-i18n-63.0/ru.xpi) = 3074eb8e58daf6230539bf6f67bb165e87913e436311cc0f88a8eb9b4f682327 -SIZE (xpi/firefox-i18n-63.0/ru.xpi) = 543422 -SHA256 (xpi/firefox-i18n-63.0/si.xpi) = 4f2cc5b1380ecb71a7cb4047714b3038858891ac9fc7a964fb3947846cb1cb8d -SIZE (xpi/firefox-i18n-63.0/si.xpi) = 492571 -SHA256 (xpi/firefox-i18n-63.0/sk.xpi) = 203e22e920fc56b83670684760fefbbad9f8213689c5779dadf5b632e1265f23 -SIZE (xpi/firefox-i18n-63.0/sk.xpi) = 500222 -SHA256 (xpi/firefox-i18n-63.0/sl.xpi) = 11ae17d8b93576d8903e7367fc9db202ff90ec538031032adb9d7b559f06b070 -SIZE (xpi/firefox-i18n-63.0/sl.xpi) = 481996 -SHA256 (xpi/firefox-i18n-63.0/son.xpi) = 3a417697edad6beed0f4936eaf671446974c710170b638c778df06c620b88a5b -SIZE (xpi/firefox-i18n-63.0/son.xpi) = 452801 -SHA256 (xpi/firefox-i18n-63.0/sq.xpi) = 01baac2afed251b5ccc88af790060c31857dbefe267566a08d7a26b0326e2bd0 -SIZE (xpi/firefox-i18n-63.0/sq.xpi) = 492310 -SHA256 (xpi/firefox-i18n-63.0/sr.xpi) = ace8ddf31e4515001508eaec46227794eba71fa793eb31220f7e71e9e3252a6d -SIZE (xpi/firefox-i18n-63.0/sr.xpi) = 507258 -SHA256 (xpi/firefox-i18n-63.0/sv-SE.xpi) = d56b23466243b795faba71b6ddebae522ceadd84c99310b07d02bd974b855d3e -SIZE (xpi/firefox-i18n-63.0/sv-SE.xpi) = 481626 -SHA256 (xpi/firefox-i18n-63.0/ta.xpi) = 0539b820ec979161c114986ee351fa28c172c40df5928ddda537cea2e8742495 -SIZE (xpi/firefox-i18n-63.0/ta.xpi) = 533414 -SHA256 (xpi/firefox-i18n-63.0/te.xpi) = 1c86c62f137535fd87d055ba6618c11e05cdba186032bdf533839e778f4e3a0b -SIZE (xpi/firefox-i18n-63.0/te.xpi) = 545784 -SHA256 (xpi/firefox-i18n-63.0/th.xpi) = 48f81b87e8dabf6fee1d8559ef29d219212505bafc30ebeb937d01dc3f1d04ad -SIZE (xpi/firefox-i18n-63.0/th.xpi) = 519005 -SHA256 (xpi/firefox-i18n-63.0/tr.xpi) = 0a583a3c6f43d9db6c6915dc4abfaf0a78e6a3d5ca1dc7b9301d5f89c8973386 -SIZE (xpi/firefox-i18n-63.0/tr.xpi) = 491287 -SHA256 (xpi/firefox-i18n-63.0/uk.xpi) = a6ba79767f24623303a8c703398ab62a11073152b9b90c4d0a6ff19933cad0cd -SIZE (xpi/firefox-i18n-63.0/uk.xpi) = 548370 -SHA256 (xpi/firefox-i18n-63.0/ur.xpi) = 288bb00ac5d0bb98afcadbc23093e2e33828973d6dea5f608ce028d1ecc4f472 -SIZE (xpi/firefox-i18n-63.0/ur.xpi) = 525514 -SHA256 (xpi/firefox-i18n-63.0/uz.xpi) = ed6b734780c8ba7cda38e56b118012d940fba95a759fe68b00de339d96e9a1c4 -SIZE (xpi/firefox-i18n-63.0/uz.xpi) = 469357 -SHA256 (xpi/firefox-i18n-63.0/vi.xpi) = e637173435efc2174a0801db45834317e78d0899c5a99dd42a648c7963b893a4 -SIZE (xpi/firefox-i18n-63.0/vi.xpi) = 489043 -SHA256 (xpi/firefox-i18n-63.0/xh.xpi) = ead4173f344b7e8971c3f28f45ba87e1779dab8ad8e48bda120fee8e23b3da17 -SIZE (xpi/firefox-i18n-63.0/xh.xpi) = 466845 -SHA256 (xpi/firefox-i18n-63.0/zh-CN.xpi) = c6ae07e75a383152916ba09bcd3539d5f2ad022105c362904e9ca5196ee0a5ac -SIZE (xpi/firefox-i18n-63.0/zh-CN.xpi) = 504058 -SHA256 (xpi/firefox-i18n-63.0/zh-TW.xpi) = a379d849c067f33dd703669861d71a7e38400d4393ef6f5e5cab4815e6182cc5 -SIZE (xpi/firefox-i18n-63.0/zh-TW.xpi) = 507002 +TIMESTAMP = 1540944520 +SHA256 (xpi/firefox-i18n-63.0.1/ach.xpi) = 0f914fa0f491867f8be796b8f2f4a342fad4c0fa7412441aa4584b36d4e7da8b +SIZE (xpi/firefox-i18n-63.0.1/ach.xpi) = 455078 +SHA256 (xpi/firefox-i18n-63.0.1/af.xpi) = 0567a65a7fe4a4ecf95ffb643b35c4a142f8d0494923db8303b23dad17718dfc +SIZE (xpi/firefox-i18n-63.0.1/af.xpi) = 437918 +SHA256 (xpi/firefox-i18n-63.0.1/an.xpi) = 3f8e086a50cfacfeb29d3661c8baaddbcdc079834b9042a9f459759c3004371d +SIZE (xpi/firefox-i18n-63.0.1/an.xpi) = 474545 +SHA256 (xpi/firefox-i18n-63.0.1/ar.xpi) = cb3172c4d86f6e68183da67978d12d6783012b8f265abc045ca0c97c6a3b60ff +SIZE (xpi/firefox-i18n-63.0.1/ar.xpi) = 513464 +SHA256 (xpi/firefox-i18n-63.0.1/as.xpi) = c94beed4245796e00a8b5b559d325d6fa5c21dbad416b31794f3d67dd0d00ca4 +SIZE (xpi/firefox-i18n-63.0.1/as.xpi) = 482192 +SHA256 (xpi/firefox-i18n-63.0.1/ast.xpi) = 8b208db732d0ae7e65a986a078385c4704162913c625d39f46711e6cf543723e +SIZE (xpi/firefox-i18n-63.0.1/ast.xpi) = 465657 +SHA256 (xpi/firefox-i18n-63.0.1/az.xpi) = d4415b881b7adab4b14e2bcf9fe97794c2a6c322b6eb59a7f29c7cef8ddd5c1f +SIZE (xpi/firefox-i18n-63.0.1/az.xpi) = 490940 +SHA256 (xpi/firefox-i18n-63.0.1/be.xpi) = d24e7abb25ce7acb3aad7089e30188a3e904107c6897eb3bdf4c0e26aff4af23 +SIZE (xpi/firefox-i18n-63.0.1/be.xpi) = 549300 +SHA256 (xpi/firefox-i18n-63.0.1/bg.xpi) = 39403c25e2d1eb4c2669e432c1c0062135138076c52aa209d60147ca5de5cc85 +SIZE (xpi/firefox-i18n-63.0.1/bg.xpi) = 523520 +SHA256 (xpi/firefox-i18n-63.0.1/bn-BD.xpi) = a5b321a199502965768e1520705a7e24ce5851c3224cec3f7b35795b445d7ea6 +SIZE (xpi/firefox-i18n-63.0.1/bn-BD.xpi) = 548602 +SHA256 (xpi/firefox-i18n-63.0.1/bn-IN.xpi) = 453be2e8d8fcd38f8bdc160ec5a709b5dfb693f8ae811cb88fee4cd893635c66 +SIZE (xpi/firefox-i18n-63.0.1/bn-IN.xpi) = 516021 +SHA256 (xpi/firefox-i18n-63.0.1/br.xpi) = 90ded1900cfa73b5a3d30c5e948fcb7ca8721f4de98f9df2ef0da8c00cb73073 +SIZE (xpi/firefox-i18n-63.0.1/br.xpi) = 474387 +SHA256 (xpi/firefox-i18n-63.0.1/bs.xpi) = 92041e8972911f5bead4ff32c7586741d0053c3af976354c9773a713072d2762 +SIZE (xpi/firefox-i18n-63.0.1/bs.xpi) = 472879 +SHA256 (xpi/firefox-i18n-63.0.1/ca.xpi) = 458a35b79e4e3e73dcffa41e48201d18d331710dc4deffa05f2a4a27027fbeea +SIZE (xpi/firefox-i18n-63.0.1/ca.xpi) = 469248 +SHA256 (xpi/firefox-i18n-63.0.1/cak.xpi) = 694aaac040b39858fdb6c7a1b5defb33199c3399c61dc1cc3afc4a463b95ebe4 +SIZE (xpi/firefox-i18n-63.0.1/cak.xpi) = 502723 +SHA256 (xpi/firefox-i18n-63.0.1/cs.xpi) = 7577d13ea090e2214629ad43b525a3d42cf44d1f405d711e90388a0df72af7bc +SIZE (xpi/firefox-i18n-63.0.1/cs.xpi) = 489306 +SHA256 (xpi/firefox-i18n-63.0.1/cy.xpi) = 0c9e668258c6454120302ad458369442bfcf799cd8d2187f4c77c206500cae06 +SIZE (xpi/firefox-i18n-63.0.1/cy.xpi) = 481078 +SHA256 (xpi/firefox-i18n-63.0.1/da.xpi) = cc1147da953e65c8ae803c684efac3b6358e8e6589ef9172a479aa40c25dc59b +SIZE (xpi/firefox-i18n-63.0.1/da.xpi) = 481843 +SHA256 (xpi/firefox-i18n-63.0.1/de.xpi) = a9062df17d7ca170dc0f52a5093ed899bc75d003b0224f7a430e247c02625042 +SIZE (xpi/firefox-i18n-63.0.1/de.xpi) = 491997 +SHA256 (xpi/firefox-i18n-63.0.1/dsb.xpi) = 2dd0e523bf92fe62b58770bddc5dd10fd08799824ba82c30bf8cbd897a5d4877 +SIZE (xpi/firefox-i18n-63.0.1/dsb.xpi) = 500882 +SHA256 (xpi/firefox-i18n-63.0.1/el.xpi) = 566fa764f71c95c257cb0702fcb3d28379fb74205d3a8a1e61819182b84221f5 +SIZE (xpi/firefox-i18n-63.0.1/el.xpi) = 558437 +SHA256 (xpi/firefox-i18n-63.0.1/en-CA.xpi) = 18054e70013a8833f849fd3232e1242ff354b37ef4fd4d5aa0493de991753713 +SIZE (xpi/firefox-i18n-63.0.1/en-CA.xpi) = 450712 +SHA256 (xpi/firefox-i18n-63.0.1/en-GB.xpi) = 9a2b48d1d61c555c9018bae357ed26ccc62ed1d70e948ef064b4ec449cb5c819 +SIZE (xpi/firefox-i18n-63.0.1/en-GB.xpi) = 442422 +SHA256 (xpi/firefox-i18n-63.0.1/en-US.xpi) = 142e625ade206be6845f8d943cdabc8bc4049a36a03ba7f6cfb7a978bd72b407 +SIZE (xpi/firefox-i18n-63.0.1/en-US.xpi) = 425483 +SHA256 (xpi/firefox-i18n-63.0.1/en-ZA.xpi) = e14081e40b7a7b63c384a9a26a2a843ee5a4651b7733eb4d3728fedbf03c7386 +SIZE (xpi/firefox-i18n-63.0.1/en-ZA.xpi) = 427849 +SHA256 (xpi/firefox-i18n-63.0.1/eo.xpi) = 5dbb2a8cf83fd2b773b2fce3b7ff0e7224ae8ec6b22964c83438caa09aab3852 +SIZE (xpi/firefox-i18n-63.0.1/eo.xpi) = 478962 +SHA256 (xpi/firefox-i18n-63.0.1/es-AR.xpi) = 7516e97650011059014122c440655bf7d916dafd75f14854718ff28c3c596a5d +SIZE (xpi/firefox-i18n-63.0.1/es-AR.xpi) = 486912 +SHA256 (xpi/firefox-i18n-63.0.1/es-CL.xpi) = 3c316d79df7833a8c646ad92d1b46f2582e45ad91fac6371531a6f1689858737 +SIZE (xpi/firefox-i18n-63.0.1/es-CL.xpi) = 487571 +SHA256 (xpi/firefox-i18n-63.0.1/es-ES.xpi) = d1d32484475c2c800ee60d5b51f5f72ceb3ba785366c9eaa5a2c076bbcebfcfc +SIZE (xpi/firefox-i18n-63.0.1/es-ES.xpi) = 431434 +SHA256 (xpi/firefox-i18n-63.0.1/es-MX.xpi) = 7ca49f273c4ef8d5713a7ecc1046eb61085f263deb1ba4ab7ea99e8143d81b0c +SIZE (xpi/firefox-i18n-63.0.1/es-MX.xpi) = 490502 +SHA256 (xpi/firefox-i18n-63.0.1/et.xpi) = 55c377a361e422101c2b0597b9107efc8c92bd5e42f31bb2302077699f80bf4d +SIZE (xpi/firefox-i18n-63.0.1/et.xpi) = 469972 +SHA256 (xpi/firefox-i18n-63.0.1/eu.xpi) = 15f98844708497b106c502ff2152a2cd8cc57c701487ace3838ed265207095f5 +SIZE (xpi/firefox-i18n-63.0.1/eu.xpi) = 478608 +SHA256 (xpi/firefox-i18n-63.0.1/fa.xpi) = 229063ca5bc3fb4e35b1b53be704802d9bc4e575a1a2e8fb208fe92aaa03640f +SIZE (xpi/firefox-i18n-63.0.1/fa.xpi) = 529581 +SHA256 (xpi/firefox-i18n-63.0.1/ff.xpi) = 93790bd7dc4b30b5e400d31a411e3348df7219f72e0572c5278e87d68d3c91a5 +SIZE (xpi/firefox-i18n-63.0.1/ff.xpi) = 467974 +SHA256 (xpi/firefox-i18n-63.0.1/fi.xpi) = 63f4cf0c1f0e3c7682331827b366402941b9e30cfe5013366f32d9de3b40f3e7 +SIZE (xpi/firefox-i18n-63.0.1/fi.xpi) = 467886 +SHA256 (xpi/firefox-i18n-63.0.1/fr.xpi) = 9a5dcd61b424a44aaea7472ec3afb781c691c0a711f32ed2e262ee10c7cc99d6 +SIZE (xpi/firefox-i18n-63.0.1/fr.xpi) = 496625 +SHA256 (xpi/firefox-i18n-63.0.1/fy-NL.xpi) = ba63f10eeac674fd3ffa3c7fc28d1f12614ca2415acf3fc75ea179d92b858aac +SIZE (xpi/firefox-i18n-63.0.1/fy-NL.xpi) = 485373 +SHA256 (xpi/firefox-i18n-63.0.1/ga-IE.xpi) = d064ada193e3836e84bb4520dcd9c676165b551c94cd9524be8662931bb6537d +SIZE (xpi/firefox-i18n-63.0.1/ga-IE.xpi) = 479147 +SHA256 (xpi/firefox-i18n-63.0.1/gd.xpi) = d930524a249a9e8d5fd450881b75be041d006a48536cf066b985d0a8bfc3af66 +SIZE (xpi/firefox-i18n-63.0.1/gd.xpi) = 484600 +SHA256 (xpi/firefox-i18n-63.0.1/gl.xpi) = e4c0c6e60732a417ead3537e0b577b94c725fb98ca719b06a9809c988e51df20 +SIZE (xpi/firefox-i18n-63.0.1/gl.xpi) = 455902 +SHA256 (xpi/firefox-i18n-63.0.1/gn.xpi) = 5354c98e170323e99ecc4431e556ee18aedea55d5ddc074ed5e431c12aaff80c +SIZE (xpi/firefox-i18n-63.0.1/gn.xpi) = 496363 +SHA256 (xpi/firefox-i18n-63.0.1/gu-IN.xpi) = d3be1367d0d3d29eb2c2e5408577f2775236877c1210aa0c64f9b54a2529b8cd +SIZE (xpi/firefox-i18n-63.0.1/gu-IN.xpi) = 556301 +SHA256 (xpi/firefox-i18n-63.0.1/he.xpi) = c0a57551644eb2eeb90485daa185540a01750580b32c2ac33c6e8df4f04f2801 +SIZE (xpi/firefox-i18n-63.0.1/he.xpi) = 486236 +SHA256 (xpi/firefox-i18n-63.0.1/hi-IN.xpi) = 88c8099538920bc708bc2c2babc99601331c1c134b2dec333fb1a2dcbea3667f +SIZE (xpi/firefox-i18n-63.0.1/hi-IN.xpi) = 545386 +SHA256 (xpi/firefox-i18n-63.0.1/hr.xpi) = 450f6ad9312720a37cca5ee9099a7d78079faf54f956a9fe9633c6a1921b6b14 +SIZE (xpi/firefox-i18n-63.0.1/hr.xpi) = 468495 +SHA256 (xpi/firefox-i18n-63.0.1/hsb.xpi) = e1b603540e7e579e47910956888efa520531470dc5dd8406b43e12d396d7d5b1 +SIZE (xpi/firefox-i18n-63.0.1/hsb.xpi) = 500686 +SHA256 (xpi/firefox-i18n-63.0.1/hu.xpi) = a3254f83cc1fab0e4b726c650b64764d25b02cdfa4bd1bb7961839f937462bb1 +SIZE (xpi/firefox-i18n-63.0.1/hu.xpi) = 497766 +SHA256 (xpi/firefox-i18n-63.0.1/hy-AM.xpi) = 3bd0e030aef9ce9a0b04f268eb92477413e40ea4f9293d8ba961d3fa366bee0c +SIZE (xpi/firefox-i18n-63.0.1/hy-AM.xpi) = 525185 +SHA256 (xpi/firefox-i18n-63.0.1/ia.xpi) = 4162da29c7dae025cf1cd55206503463519f60307412bc39309fe0e58dacbf61 +SIZE (xpi/firefox-i18n-63.0.1/ia.xpi) = 474987 +SHA256 (xpi/firefox-i18n-63.0.1/id.xpi) = 3dc241ee5ba4a777e21a276b2cc5e2d4d4dfb5ec0c2050d1ec739803a60279c6 +SIZE (xpi/firefox-i18n-63.0.1/id.xpi) = 468252 +SHA256 (xpi/firefox-i18n-63.0.1/is.xpi) = 58ea1212f3eb319f26d6c3a16602c914d99ca9f051305033ad976a1fb9890430 +SIZE (xpi/firefox-i18n-63.0.1/is.xpi) = 467339 +SHA256 (xpi/firefox-i18n-63.0.1/it.xpi) = 4572b12ef2df363fec1023dffa93e05a660aa02b3fcee3b3493e53feb42ffed6 +SIZE (xpi/firefox-i18n-63.0.1/it.xpi) = 351090 +SHA256 (xpi/firefox-i18n-63.0.1/ja.xpi) = e53f1096b7074c51c92c4a0b168deff20db224bcc0d3785c53b9c1afef3be928 +SIZE (xpi/firefox-i18n-63.0.1/ja.xpi) = 501997 +SHA256 (xpi/firefox-i18n-63.0.1/ka.xpi) = 155dd8a9610655b4d0ea9b41396d9dbc24fb9df4f578bb024567819e1cd02fa6 +SIZE (xpi/firefox-i18n-63.0.1/ka.xpi) = 517232 +SHA256 (xpi/firefox-i18n-63.0.1/kab.xpi) = 4aae1ad2b211bdfaca45c7ca4aefff2a373c882877245e8c36806892ec4d66a8 +SIZE (xpi/firefox-i18n-63.0.1/kab.xpi) = 490515 +SHA256 (xpi/firefox-i18n-63.0.1/kk.xpi) = cdc82192eed5f0c8a6c49f4de1f4f617e5037c50dec2d3cd15672d6146b3e5cf +SIZE (xpi/firefox-i18n-63.0.1/kk.xpi) = 546396 +SHA256 (xpi/firefox-i18n-63.0.1/km.xpi) = 163db0c3f9c229b032620b3ecbbab1655a2806392be8ae591c6c5cbffc9b86e7 +SIZE (xpi/firefox-i18n-63.0.1/km.xpi) = 530624 +SHA256 (xpi/firefox-i18n-63.0.1/kn.xpi) = f689fa0064f1be961b05d198150df100e805eeb9264ab676c897b7b62c7ca684 +SIZE (xpi/firefox-i18n-63.0.1/kn.xpi) = 536457 +SHA256 (xpi/firefox-i18n-63.0.1/ko.xpi) = 747ab30b9125f6c6d4e06f5ff601fc636afef73c42141be0ac440d92ca47b353 +SIZE (xpi/firefox-i18n-63.0.1/ko.xpi) = 496528 +SHA256 (xpi/firefox-i18n-63.0.1/lij.xpi) = fc9eb8bcc2eec05d17f743b647e4bf119559ca9d37b4d24bb20e07095e5d23ce +SIZE (xpi/firefox-i18n-63.0.1/lij.xpi) = 478452 +SHA256 (xpi/firefox-i18n-63.0.1/lt.xpi) = 10d4698e6fbcdfc0dfed1e3036a64c9887b7f749601393087516e8196444ac2f +SIZE (xpi/firefox-i18n-63.0.1/lt.xpi) = 501124 +SHA256 (xpi/firefox-i18n-63.0.1/lv.xpi) = 1db8839a231609afbdfc4aa5c81b6c285f82674e2dee225d6f9342ac48f4e77b +SIZE (xpi/firefox-i18n-63.0.1/lv.xpi) = 489153 +SHA256 (xpi/firefox-i18n-63.0.1/mai.xpi) = ab29a777e6b8ae6d2dcc0f7e13d985272c1c198fa8d734ed79a16d339ef217c3 +SIZE (xpi/firefox-i18n-63.0.1/mai.xpi) = 498745 +SHA256 (xpi/firefox-i18n-63.0.1/mk.xpi) = 33e9114883c191e80f9fe6c9a27327bb15d9f1138ddb118ba1974e448f23f879 +SIZE (xpi/firefox-i18n-63.0.1/mk.xpi) = 463723 +SHA256 (xpi/firefox-i18n-63.0.1/ml.xpi) = ab61211dde8c18b75bbcbc69de451c4cbefadf529717e7772f775c009f7b5a03 +SIZE (xpi/firefox-i18n-63.0.1/ml.xpi) = 546430 +SHA256 (xpi/firefox-i18n-63.0.1/mr.xpi) = ac84ff7fe713d8a7c7e6e467015bf62567ff21378454f82221d41783370c7a94 +SIZE (xpi/firefox-i18n-63.0.1/mr.xpi) = 538969 +SHA256 (xpi/firefox-i18n-63.0.1/ms.xpi) = 7926b3c07ac4312a392a52b04cdd88e213b267da9d27bc2a10b40d4bda41b983 +SIZE (xpi/firefox-i18n-63.0.1/ms.xpi) = 471523 +SHA256 (xpi/firefox-i18n-63.0.1/my.xpi) = 6ae2ad5e68db71a9cdf66712a2f2c0034c5156f0e0c634bacda7ac098701abb2 +SIZE (xpi/firefox-i18n-63.0.1/my.xpi) = 516688 +SHA256 (xpi/firefox-i18n-63.0.1/nb-NO.xpi) = c1ced778af8aedc1d7bd019c949dbc8e0ea20cbbb9f94cfe337902df40314537 +SIZE (xpi/firefox-i18n-63.0.1/nb-NO.xpi) = 470898 +SHA256 (xpi/firefox-i18n-63.0.1/ne-NP.xpi) = 3f166035b7ec69a76422d9f2a9ee99e1594ee97e0281dd5d0ba4a26c18ab0500 +SIZE (xpi/firefox-i18n-63.0.1/ne-NP.xpi) = 508084 +SHA256 (xpi/firefox-i18n-63.0.1/nl.xpi) = 62d109c8ff9ae0ef0964b12257f7375e2cd3ea9b6cfee4aed3b4610542bce2a6 +SIZE (xpi/firefox-i18n-63.0.1/nl.xpi) = 460034 +SHA256 (xpi/firefox-i18n-63.0.1/nn-NO.xpi) = 05253ae1f4b7b7c836c9f6852350b80a963a6851fc78c96cb59dd204600bc35e +SIZE (xpi/firefox-i18n-63.0.1/nn-NO.xpi) = 469117 +SHA256 (xpi/firefox-i18n-63.0.1/oc.xpi) = 480f84c74b936adb007f2d93d411198c8339dc5944456e6086904623be68b479 +SIZE (xpi/firefox-i18n-63.0.1/oc.xpi) = 482904 +SHA256 (xpi/firefox-i18n-63.0.1/or.xpi) = 5f5dfd4961027751fe014673ecb6fb9311ba163589cb7da316321eddd0702f87 +SIZE (xpi/firefox-i18n-63.0.1/or.xpi) = 489356 +SHA256 (xpi/firefox-i18n-63.0.1/pa-IN.xpi) = 51bb6a8797a11d756b4bcada5bfc227d3a630212e20f3d0727cc2fe4862b634a +SIZE (xpi/firefox-i18n-63.0.1/pa-IN.xpi) = 508197 +SHA256 (xpi/firefox-i18n-63.0.1/pl.xpi) = 702c9030b0f3a821ce481db2e1700aedaa88ccc60b6922d2422a1706b2e67ba9 +SIZE (xpi/firefox-i18n-63.0.1/pl.xpi) = 379298 +SHA256 (xpi/firefox-i18n-63.0.1/pt-BR.xpi) = 9a6ab8995c22ea85c331194a7e18c4787da87702a59b7005ae6f4ce3b70adc34 +SIZE (xpi/firefox-i18n-63.0.1/pt-BR.xpi) = 471903 +SHA256 (xpi/firefox-i18n-63.0.1/pt-PT.xpi) = 01bcac0ee9580047525452eca7718bd84a2c86a445fc7ff1f4a2a1ec763be91e +SIZE (xpi/firefox-i18n-63.0.1/pt-PT.xpi) = 485600 +SHA256 (xpi/firefox-i18n-63.0.1/rm.xpi) = 6d8bb3c2ce2dc02057b8979414058b46aa4ac2d5adaa7ec4991828a3f5a164e0 +SIZE (xpi/firefox-i18n-63.0.1/rm.xpi) = 475829 +SHA256 (xpi/firefox-i18n-63.0.1/ro.xpi) = 7af09fb4c80961a914d999c324e8fd5fe94b68709c6a677aa69ab51fd7adacd8 +SIZE (xpi/firefox-i18n-63.0.1/ro.xpi) = 472563 +SHA256 (xpi/firefox-i18n-63.0.1/ru.xpi) = 77d03be6acdbf72ce0866db9d98626283dd567b133ab45df6439071d241226a3 +SIZE (xpi/firefox-i18n-63.0.1/ru.xpi) = 543427 +SHA256 (xpi/firefox-i18n-63.0.1/si.xpi) = 454d5f723b66667add9aee3f15c98f4e89fdba2b3cf645a4e31196472cbc6cd4 +SIZE (xpi/firefox-i18n-63.0.1/si.xpi) = 492578 +SHA256 (xpi/firefox-i18n-63.0.1/sk.xpi) = 809fa9830a2322819415e0660e37b006e75b734dd97299d42bb2cb08af7e4f8d +SIZE (xpi/firefox-i18n-63.0.1/sk.xpi) = 500222 +SHA256 (xpi/firefox-i18n-63.0.1/sl.xpi) = 36de5bfbb82d798faa2cb90bf40f91b7ae5de45267fa0fccb98fcc1c43b2c409 +SIZE (xpi/firefox-i18n-63.0.1/sl.xpi) = 481997 +SHA256 (xpi/firefox-i18n-63.0.1/son.xpi) = 467a640bc41fb14b509411404dcc60d3d2f659df5c08d6472931087825639912 +SIZE (xpi/firefox-i18n-63.0.1/son.xpi) = 452805 +SHA256 (xpi/firefox-i18n-63.0.1/sq.xpi) = 9110e660dfca7e6e149ccc659f936cef0d95dc1de9719d45d2cc10ccfc69b71a +SIZE (xpi/firefox-i18n-63.0.1/sq.xpi) = 492303 +SHA256 (xpi/firefox-i18n-63.0.1/sr.xpi) = 26f425d8a95a0128bed8f497877014b16f4f133f4d6920fca642db9a19ddb40f +SIZE (xpi/firefox-i18n-63.0.1/sr.xpi) = 507260 +SHA256 (xpi/firefox-i18n-63.0.1/sv-SE.xpi) = 2423b3f25d34a4c4c2b1f6eb1b420cb44df14960000973fa1c80770942abfefd +SIZE (xpi/firefox-i18n-63.0.1/sv-SE.xpi) = 481622 +SHA256 (xpi/firefox-i18n-63.0.1/ta.xpi) = 236ba6a2409f44f4c2da2f209e0ed1516a0202cfa1a88feba7a44f265b130aa3 +SIZE (xpi/firefox-i18n-63.0.1/ta.xpi) = 533413 +SHA256 (xpi/firefox-i18n-63.0.1/te.xpi) = 41386f23a18185c41f28ed2cac34ff56bb1bfbfab02b80f11ddc6d0ce850c2ed +SIZE (xpi/firefox-i18n-63.0.1/te.xpi) = 545793 +SHA256 (xpi/firefox-i18n-63.0.1/th.xpi) = a07db59670d92b69b500c755d42cbcd8596fb2598c51a927198c899ae5fd2871 +SIZE (xpi/firefox-i18n-63.0.1/th.xpi) = 519000 +SHA256 (xpi/firefox-i18n-63.0.1/tr.xpi) = e2646ae1959a5e5f6440edb67171aa3d7d9a9f8521463ccb650b19fae752fff5 +SIZE (xpi/firefox-i18n-63.0.1/tr.xpi) = 491285 +SHA256 (xpi/firefox-i18n-63.0.1/uk.xpi) = 8583130c0090615b7f6e656d13ef5a0bde2bff6bf9b25480bf8ed1763bedb4f2 +SIZE (xpi/firefox-i18n-63.0.1/uk.xpi) = 548372 +SHA256 (xpi/firefox-i18n-63.0.1/ur.xpi) = 1940bf560bc41108a61be6c46dcde287c5b6a03e599178b54c61fc49aff5e17d +SIZE (xpi/firefox-i18n-63.0.1/ur.xpi) = 525512 +SHA256 (xpi/firefox-i18n-63.0.1/uz.xpi) = 0b20bc9b31b0d5db84c5d399dfd2115acc8d123cde06edd0caf3e9eb3bed2f3f +SIZE (xpi/firefox-i18n-63.0.1/uz.xpi) = 469366 +SHA256 (xpi/firefox-i18n-63.0.1/vi.xpi) = 485abdd974496c02b58462a49ffa79e5c45d55400c8cada15f1d345b3cd8fbd1 +SIZE (xpi/firefox-i18n-63.0.1/vi.xpi) = 489047 +SHA256 (xpi/firefox-i18n-63.0.1/xh.xpi) = fcc18842716318c1ee3ed3c033fab5694fca3333f02bdc74cad8d458d3b5f87a +SIZE (xpi/firefox-i18n-63.0.1/xh.xpi) = 466849 +SHA256 (xpi/firefox-i18n-63.0.1/zh-CN.xpi) = bdc1363e4dcc88f93e4e0399b4c4b638c3e2fca057b3cb034c0a446d44bbe472 +SIZE (xpi/firefox-i18n-63.0.1/zh-CN.xpi) = 504058 +SHA256 (xpi/firefox-i18n-63.0.1/zh-TW.xpi) = 6b0fd73b797ddc31c096f7a867c6a476d69a28f5d3cedabbed97e6f313040144 +SIZE (xpi/firefox-i18n-63.0.1/zh-TW.xpi) = 507003 Modified: branches/2018Q4/www/firefox/Makefile ============================================================================== --- branches/2018Q4/www/firefox/Makefile Wed Oct 31 19:20:14 2018 (r483607) +++ branches/2018Q4/www/firefox/Makefile Wed Oct 31 19:30:30 2018 (r483608) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 63.0 -PORTREVISION= 1 +DISTVERSION= 63.0.1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build4/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org Modified: branches/2018Q4/www/firefox/distinfo ============================================================================== --- branches/2018Q4/www/firefox/distinfo Wed Oct 31 19:20:14 2018 (r483607) +++ branches/2018Q4/www/firefox/distinfo Wed Oct 31 19:30:30 2018 (r483608) @@ -1,3 +1,3 @@ -TIMESTAMP = 1539893202 -SHA256 (firefox-63.0.source.tar.xz) = 3f95b028571ab9ffb3bf637761534a685aed224de3b87eb8ad7e1d0831995c07 -SIZE (firefox-63.0.source.tar.xz) = 265957640 +TIMESTAMP = 1540944520 +SHA256 (firefox-63.0.1.source.tar.xz) = c42c60ee9789058d4aca2c9673b45255d29767cc087bf6acbb57f4a2211fd7e9 +SIZE (firefox-63.0.1.source.tar.xz) = 265358784 From owner-svn-ports-branches@freebsd.org Wed Oct 31 19:56:53 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2369B10E80BA; Wed, 31 Oct 2018 19:56:53 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C8E9486623; Wed, 31 Oct 2018 19:56:52 +0000 (UTC) (envelope-from zeising@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9EBE3111CB; Wed, 31 Oct 2018 19:56:52 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9VJuqPQ007583; Wed, 31 Oct 2018 19:56:52 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9VJuqDh007581; Wed, 31 Oct 2018 19:56:52 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201810311956.w9VJuqDh007581@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Wed, 31 Oct 2018 19:56:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483610 - in branches/2018Q4/x11/xkeyboard-config: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in branches/2018Q4/x11/xkeyboard-config: . files X-SVN-Commit-Revision: 483610 X-SVN-Commit-Repository: ports 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.29 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, 31 Oct 2018 19:56:53 -0000 Author: zeising Date: Wed Oct 31 19:56:51 2018 New Revision: 483610 URL: https://svnweb.freebsd.org/changeset/ports/483610 Log: MFH: r483538 x11/xkeyboard-config: Fix typo in Armenian layout Fix two typos in the Armenian layout in xkeyboard-config, preventing the use of two Armenian capital letters. This was reported on the x11@ mailing list. Upstream PR: https://bugs.freedesktop.org/show_bug.cgi?id=108545 Reported by: Sergey Manucharian Approved by: ports-secteam (miwi) Added: branches/2018Q4/x11/xkeyboard-config/files/patch-symbols_am - copied unchanged from r483538, head/x11/xkeyboard-config/files/patch-symbols_am Modified: branches/2018Q4/x11/xkeyboard-config/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/x11/xkeyboard-config/Makefile ============================================================================== --- branches/2018Q4/x11/xkeyboard-config/Makefile Wed Oct 31 19:40:15 2018 (r483609) +++ branches/2018Q4/x11/xkeyboard-config/Makefile Wed Oct 31 19:56:51 2018 (r483610) @@ -2,6 +2,7 @@ PORTNAME= xkeyboard-config PORTVERSION= 2.24 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= XORG/individual/${XORG_CAT}/${PORTNAME} Copied: branches/2018Q4/x11/xkeyboard-config/files/patch-symbols_am (from r483538, head/x11/xkeyboard-config/files/patch-symbols_am) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/x11/xkeyboard-config/files/patch-symbols_am Wed Oct 31 19:56:51 2018 (r483610, copy of r483538, head/x11/xkeyboard-config/files/patch-symbols_am) @@ -0,0 +1,13 @@ +--- symbols/am.orig 2018-10-30 21:22:31 UTC ++++ symbols/am +@@ -80,8 +80,8 @@ xkb_symbols "phonetic" { + key { [ Armenian_vyun, Armenian_VYUN ] }; + key { [ Armenian_ligature_ew, 0x100058f ] }; + key { [ Armenian_ra, Armenian_RA ] }; +- key { [ Armenian_cha, rmenian_CHA ] }; +- key { [ Armenian_tche, rmenian_TCHE ] }; ++ key { [ Armenian_cha, Armenian_CHA ] }; ++ key { [ Armenian_tche, Armenian_TCHE ] }; + key { [ Armenian_hyphen, 0x1002015 ] }; + key { [ Armenian_zhe, Armenian_ZHE ] }; + From owner-svn-ports-branches@freebsd.org Wed Oct 31 20:50:57 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8BF4710E98F7; Wed, 31 Oct 2018 20:50:57 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 40EA76B765; Wed, 31 Oct 2018 20:50:57 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2202611B2A; Wed, 31 Oct 2018 20:50:57 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9VKovnB035985; Wed, 31 Oct 2018 20:50:57 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9VKou5W035984; Wed, 31 Oct 2018 20:50:56 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201810312050.w9VKou5W035984@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 31 Oct 2018 20:50:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483616 - branches/2018Q4/emulators/rpcs3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q4/emulators/rpcs3 X-SVN-Commit-Revision: 483616 X-SVN-Commit-Repository: ports 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.29 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, 31 Oct 2018 20:50:57 -0000 Author: jbeich Date: Wed Oct 31 20:50:56 2018 New Revision: 483616 URL: https://svnweb.freebsd.org/changeset/ports/483616 Log: MFH: r483614 emulators/rpcs3: update to 0.0.5.1006 Changes: https://github.com/RPCS3/rpcs3/compare/1cf62e9de...7056b5fc7 Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q4/emulators/rpcs3/Makefile branches/2018Q4/emulators/rpcs3/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q4/emulators/rpcs3/Makefile Wed Oct 31 20:49:34 2018 (r483615) +++ branches/2018Q4/emulators/rpcs3/Makefile Wed Oct 31 20:50:56 2018 (r483616) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.5-999 -DISTVERSIONSUFFIX= -g1cf62e9de +DISTVERSION= 0.0.5-1006 +DISTVERSIONSUFFIX= -g7056b5fc7 CATEGORIES= emulators PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ Modified: branches/2018Q4/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q4/emulators/rpcs3/distinfo Wed Oct 31 20:49:34 2018 (r483615) +++ branches/2018Q4/emulators/rpcs3/distinfo Wed Oct 31 20:50:56 2018 (r483616) @@ -1,6 +1,6 @@ -TIMESTAMP = 1540600679 -SHA256 (RPCS3-rpcs3-v0.0.5-999-g1cf62e9de_GH0.tar.gz) = 8c7f1ac3b006880ba3bb2036e52ff7f4e88aa09f193582151a4fadc01c021665 -SIZE (RPCS3-rpcs3-v0.0.5-999-g1cf62e9de_GH0.tar.gz) = 5013484 +TIMESTAMP = 1540928039 +SHA256 (RPCS3-rpcs3-v0.0.5-1006-g7056b5fc7_GH0.tar.gz) = 9d0ca2e75fc84dbaee0784e6edc90241c5866abc2f4cf413b20c771e38d9b9d0 +SIZE (RPCS3-rpcs3-v0.0.5-1006-g7056b5fc7_GH0.tar.gz) = 5013733 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-26-g4c27501_GH0.tar.gz) = 4f58ba2a51136cc6af0f1d833688b55f78468c4f5429a4bf9b38bb51c9d212b1 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-26-g4c27501_GH0.tar.gz) = 105372 SHA256 (RPCS3-llvm-5c906fd1694e_GH0.tar.gz) = 8bbe95fbbea545ebb03e73d526add64e2853f86176ad42690f8ce5846bd419ce From owner-svn-ports-branches@freebsd.org Wed Oct 31 20:51:58 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6D57410E9953; Wed, 31 Oct 2018 20:51:58 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 22EB76B8E4; Wed, 31 Oct 2018 20:51:58 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 04D5511B72; Wed, 31 Oct 2018 20:51:58 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9VKpvqw038030; Wed, 31 Oct 2018 20:51:57 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9VKpvXF038029; Wed, 31 Oct 2018 20:51:57 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201810312051.w9VKpvXF038029@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 31 Oct 2018 20:51:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483617 - branches/2018Q4/emulators/citra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q4/emulators/citra X-SVN-Commit-Revision: 483617 X-SVN-Commit-Repository: ports 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.29 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, 31 Oct 2018 20:51:58 -0000 Author: jbeich Date: Wed Oct 31 20:51:57 2018 New Revision: 483617 URL: https://svnweb.freebsd.org/changeset/ports/483617 Log: MFH: r483613 emulators/citra: update to s20181030 Changes: https://github.com/citra-emu/citra/compare/f3ee5feb0...a753b9c6c Approved by: ports-secteam (swills, implicit for snapshots) Modified: branches/2018Q4/emulators/citra/Makefile branches/2018Q4/emulators/citra/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/emulators/citra/Makefile ============================================================================== --- branches/2018Q4/emulators/citra/Makefile Wed Oct 31 20:50:56 2018 (r483616) +++ branches/2018Q4/emulators/citra/Makefile Wed Oct 31 20:51:57 2018 (r483617) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20181026 +PORTVERSION= s20181030 PORTREVISION?= 0 CATEGORIES= emulators @@ -23,7 +23,7 @@ BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= f3ee5feb0 +GH_TAGNAME= a753b9c6c GH_TUPLE= citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ MerryMage:dynarmic:r1-992-g4e6848d1:dynarmic/externals/dynarmic \ Modified: branches/2018Q4/emulators/citra/distinfo ============================================================================== --- branches/2018Q4/emulators/citra/distinfo Wed Oct 31 20:50:56 2018 (r483616) +++ branches/2018Q4/emulators/citra/distinfo Wed Oct 31 20:51:57 2018 (r483617) @@ -1,6 +1,6 @@ -TIMESTAMP = 1540583496 -SHA256 (citra-emu-citra-s20181026-f3ee5feb0_GH0.tar.gz) = c2beaf37575365d4d085c2b38f0bdeeb8337db688fa5f76928890e8627cc802a -SIZE (citra-emu-citra-s20181026-f3ee5feb0_GH0.tar.gz) = 4499921 +TIMESTAMP = 1540941491 +SHA256 (citra-emu-citra-s20181030-a753b9c6c_GH0.tar.gz) = f065e3d3f58565498634b3a23e25f6d8b2b06cf155016a0dcdc32b57f0448235 +SIZE (citra-emu-citra-s20181030-a753b9c6c_GH0.tar.gz) = 4501844 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3 SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c From owner-svn-ports-branches@freebsd.org Thu Nov 1 06:08:05 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AC343112F569; Thu, 1 Nov 2018 06:08:05 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5FC6D8BEAE; Thu, 1 Nov 2018 06:08:05 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3CB8A17BC8; Thu, 1 Nov 2018 06:08:05 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA1685Ja027349; Thu, 1 Nov 2018 06:08:05 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA167w3u027312; Thu, 1 Nov 2018 06:07:58 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201811010607.wA167w3u027312@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 1 Nov 2018 06:07:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483640 - in branches/2018Q4: databases/puppetdb-cli devel/bingrep devel/pijul devel/racer devel/racerd devel/rust-bindgen devel/rust-cbindgen devel/tokei dns/doh-proxy editors/xi-core ... X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q4: databases/puppetdb-cli devel/bingrep devel/pijul devel/racer devel/racerd devel/rust-bindgen devel/rust-cbindgen devel/tokei dns/doh-proxy editors/xi-core games/genact lang/rust la... X-SVN-Commit-Revision: 483640 X-SVN-Commit-Repository: ports 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.29 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, 01 Nov 2018 06:08:05 -0000 Author: jbeich Date: Thu Nov 1 06:07:58 2018 New Revision: 483640 URL: https://svnweb.freebsd.org/changeset/ports/483640 Log: MFH: r482993 lang/rust: update to 1.30.0 - Force rebuild all consumers to catch regressions early Changes: https://blog.rust-lang.org/2018/10/25/Rust-1.30.0.html Approved by: rust (tobik) Approved by: ports-secteam (miwi) Differential Revision: https://reviews.freebsd.org/D17695 Modified: branches/2018Q4/databases/puppetdb-cli/Makefile branches/2018Q4/devel/bingrep/Makefile branches/2018Q4/devel/pijul/Makefile branches/2018Q4/devel/racer/Makefile branches/2018Q4/devel/racerd/Makefile branches/2018Q4/devel/rust-bindgen/Makefile branches/2018Q4/devel/rust-cbindgen/Makefile branches/2018Q4/devel/tokei/Makefile branches/2018Q4/dns/doh-proxy/Makefile branches/2018Q4/editors/xi-core/Makefile branches/2018Q4/games/genact/Makefile branches/2018Q4/lang/rust/Makefile branches/2018Q4/lang/rust/distinfo branches/2018Q4/lang/rust/files/patch-src_libstd_os_raw_mod.rs branches/2018Q4/mail/thunderbird/Makefile branches/2018Q4/security/kr/Makefile branches/2018Q4/sysutils/exa/Makefile branches/2018Q4/sysutils/fd/Makefile branches/2018Q4/sysutils/flowgger/Makefile branches/2018Q4/sysutils/potnet/Makefile branches/2018Q4/textproc/bat/Makefile branches/2018Q4/textproc/ripgrep/Makefile branches/2018Q4/textproc/xsv-rs/Makefile branches/2018Q4/www/firefox-esr/Makefile branches/2018Q4/www/firefox/Makefile branches/2018Q4/www/geckodriver/Makefile branches/2018Q4/www/seamonkey/Makefile branches/2018Q4/www/websocat/Makefile branches/2018Q4/x11/admiral/Makefile branches/2018Q4/x11/alacritty/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/databases/puppetdb-cli/Makefile ============================================================================== --- branches/2018Q4/databases/puppetdb-cli/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/databases/puppetdb-cli/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -2,7 +2,7 @@ PORTNAME= puppetdb-cli PORTVERSION= 1.2.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MAINTAINER= puppet@FreeBSD.org Modified: branches/2018Q4/devel/bingrep/Makefile ============================================================================== --- branches/2018Q4/devel/bingrep/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/devel/bingrep/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -2,7 +2,7 @@ PORTNAME= bingrep PORTVERSION= g20171111 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MAINTAINER= ports@FreeBSD.org Modified: branches/2018Q4/devel/pijul/Makefile ============================================================================== --- branches/2018Q4/devel/pijul/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/devel/pijul/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -3,7 +3,7 @@ PORTNAME= pijul PORTVERSION= 0.10.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= https://pijul.org/releases/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Modified: branches/2018Q4/devel/racer/Makefile ============================================================================== --- branches/2018Q4/devel/racer/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/devel/racer/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -4,7 +4,7 @@ PORTNAME= racer DISTVERSIONPREFIX= v DISTVERSION= 2.1.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MAINTAINER= beyert@cs.ucr.edu Modified: branches/2018Q4/devel/racerd/Makefile ============================================================================== --- branches/2018Q4/devel/racerd/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/devel/racerd/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -5,7 +5,7 @@ PORTNAME= racerd DISTVERSIONPREFIX= v DISTVERSION= 0.1.1-56 DISTVERSIONSUFFIX= -g29cd4c6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MAINTAINER= ultima@FreeBSD.org Modified: branches/2018Q4/devel/rust-bindgen/Makefile ============================================================================== --- branches/2018Q4/devel/rust-bindgen/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/devel/rust-bindgen/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -3,7 +3,7 @@ PORTNAME= rust-bindgen DISTVERSIONPREFIX= v DISTVERSION= 0.40.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MAINTAINER= gecko@FreeBSD.org Modified: branches/2018Q4/devel/rust-cbindgen/Makefile ============================================================================== --- branches/2018Q4/devel/rust-cbindgen/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/devel/rust-cbindgen/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -3,6 +3,7 @@ PORTNAME= cbindgen DISTVERSIONPREFIX= v DISTVERSION= 0.6.4 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= rust- Modified: branches/2018Q4/devel/tokei/Makefile ============================================================================== --- branches/2018Q4/devel/tokei/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/devel/tokei/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -3,7 +3,7 @@ PORTNAME= tokei DISTVERSIONPREFIX= v DISTVERSION= 8.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MAINTAINER= tobik@FreeBSD.org Modified: branches/2018Q4/dns/doh-proxy/Makefile ============================================================================== --- branches/2018Q4/dns/doh-proxy/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/dns/doh-proxy/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -3,7 +3,7 @@ PORTNAME= doh-proxy DISTVERSION= 0.1.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= dns MAINTAINER= mat@FreeBSD.org Modified: branches/2018Q4/editors/xi-core/Makefile ============================================================================== --- branches/2018Q4/editors/xi-core/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/editors/xi-core/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -3,7 +3,7 @@ PORTNAME= xi-core PORTVERSION= g20170612 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= editors MAINTAINER= ports@FreeBSD.org Modified: branches/2018Q4/games/genact/Makefile ============================================================================== --- branches/2018Q4/games/genact/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/games/genact/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -2,7 +2,7 @@ PORTNAME= genact DISTVERSION= 0.6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MAINTAINER= 0mp@FreeBSD.org Modified: branches/2018Q4/lang/rust/Makefile ============================================================================== --- branches/2018Q4/lang/rust/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/lang/rust/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rust -PORTVERSION?= 1.29.2 +PORTVERSION?= 1.30.0 PORTREVISION?= 0 CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/:src \ @@ -47,13 +47,13 @@ BROKEN_aarch64= fails to build: bootstrap compiler cr CONFLICTS_INSTALL?= rust-nightly # See WRKSRC/src/stage0.txt for this date and version values. -BOOTSTRAPS_DATE?= 2018-08-02 +BOOTSTRAPS_DATE?= 2018-10-12 -RUST_BOOTSTRAP_VERSION?= 1.28.0 +RUST_BOOTSTRAP_VERSION?= 1.29.2 RUSTC_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz RUST_STD_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz -CARGO_BOOTSTRAP_VERSION?= 0.29.0 +CARGO_BOOTSTRAP_VERSION?= 0.30.0 CARGO_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz RUST_CHANNEL= ${PKGNAMESUFFIX:Ustable:S/^-//} Modified: branches/2018Q4/lang/rust/distinfo ============================================================================== --- branches/2018Q4/lang/rust/distinfo Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/lang/rust/distinfo Thu Nov 1 06:07:58 2018 (r483640) @@ -1,15 +1,15 @@ -TIMESTAMP = 1538782876 -SHA256 (rust/rustc-1.29.2-src.tar.xz) = bc7b9d4c041fe8454892a4211a116a4d5243cb04583a18c5292914fc829cb2f6 -SIZE (rust/rustc-1.29.2-src.tar.xz) = 61888912 -SHA256 (rust/2018-08-02/rustc-1.28.0-x86_64-unknown-freebsd.tar.gz) = 5eeaa17844f87e59aab821dc98dd15a920df0d1d7da3ef5808d2c586331c92a7 -SIZE (rust/2018-08-02/rustc-1.28.0-x86_64-unknown-freebsd.tar.gz) = 65434056 -SHA256 (rust/2018-08-02/rust-std-1.28.0-x86_64-unknown-freebsd.tar.gz) = 1fabaf71d21c1cdcddfb564950152ef862b519a175f7ee88d7e22bab31c4733e -SIZE (rust/2018-08-02/rust-std-1.28.0-x86_64-unknown-freebsd.tar.gz) = 66920885 -SHA256 (rust/2018-08-02/cargo-0.29.0-x86_64-unknown-freebsd.tar.gz) = b61f65929d40a0bf08ae37274192e32e14dd455667881c09b680234c6b684a89 -SIZE (rust/2018-08-02/cargo-0.29.0-x86_64-unknown-freebsd.tar.gz) = 6836676 -SHA256 (rust/2018-08-02/rustc-1.28.0-i686-unknown-freebsd.tar.gz) = 9de3c2e0e4ff054628597183bbf25629aa68c0e411069048d7e9be4514487315 -SIZE (rust/2018-08-02/rustc-1.28.0-i686-unknown-freebsd.tar.gz) = 66458301 -SHA256 (rust/2018-08-02/rust-std-1.28.0-i686-unknown-freebsd.tar.gz) = 6765ff30ef047d03b6b8107c8aa1b8388f1877d991a0a5c315764808cce03bf1 -SIZE (rust/2018-08-02/rust-std-1.28.0-i686-unknown-freebsd.tar.gz) = 67392915 -SHA256 (rust/2018-08-02/cargo-0.29.0-i686-unknown-freebsd.tar.gz) = e553f1ee3867017fd53efe2f0e5b10fbb8ff43ce801ee70fd38bdfabfb8b6799 -SIZE (rust/2018-08-02/cargo-0.29.0-i686-unknown-freebsd.tar.gz) = 6654215 +TIMESTAMP = 1540416848 +SHA256 (rust/rustc-1.30.0-src.tar.xz) = b9fc7304fd48d6d6a23fa4565d94353c7cc2659db452f34d69fbc01c4f67021d +SIZE (rust/rustc-1.30.0-src.tar.xz) = 96083280 +SHA256 (rust/2018-10-12/rustc-1.29.2-x86_64-unknown-freebsd.tar.gz) = 94fba7a7b88ca86c037a48376b7e09bb4ca66e1268fc8d664796cdbdee97c0fa +SIZE (rust/2018-10-12/rustc-1.29.2-x86_64-unknown-freebsd.tar.gz) = 66548519 +SHA256 (rust/2018-10-12/rust-std-1.29.2-x86_64-unknown-freebsd.tar.gz) = ddde8a33ddd902471c51f273087d90e9f7f184b7f09f5d14cab454c8c4965ec2 +SIZE (rust/2018-10-12/rust-std-1.29.2-x86_64-unknown-freebsd.tar.gz) = 64503048 +SHA256 (rust/2018-10-12/cargo-0.30.0-x86_64-unknown-freebsd.tar.gz) = cdee0b90aedc51a239bbd44ed788111393da227d2950005f3730df938aa8303e +SIZE (rust/2018-10-12/cargo-0.30.0-x86_64-unknown-freebsd.tar.gz) = 7411378 +SHA256 (rust/2018-10-12/rustc-1.29.2-i686-unknown-freebsd.tar.gz) = 8115f4c9958623589746dbe7cc61bcd1998077af086ca2242d1d7a771a6202ab +SIZE (rust/2018-10-12/rustc-1.29.2-i686-unknown-freebsd.tar.gz) = 67556724 +SHA256 (rust/2018-10-12/rust-std-1.29.2-i686-unknown-freebsd.tar.gz) = 31806e3fb30d48e18661af14aea920caa3a322388711a5a6f6998d22878d29c0 +SIZE (rust/2018-10-12/rust-std-1.29.2-i686-unknown-freebsd.tar.gz) = 64847326 +SHA256 (rust/2018-10-12/cargo-0.30.0-i686-unknown-freebsd.tar.gz) = e62e26635f1ee70bcbe5d6bef69dea938668ba6933fa96f32df84d2f47d131c3 +SIZE (rust/2018-10-12/cargo-0.30.0-i686-unknown-freebsd.tar.gz) = 7198097 Modified: branches/2018Q4/lang/rust/files/patch-src_libstd_os_raw_mod.rs ============================================================================== --- branches/2018Q4/lang/rust/files/patch-src_libstd_os_raw_mod.rs Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/lang/rust/files/patch-src_libstd_os_raw_mod.rs Thu Nov 1 06:07:58 2018 (r483640) @@ -1,18 +1,18 @@ ---- src/libstd/os/raw/mod.rs.orig 2018-06-19 04:35:53 UTC +--- src/libstd/os/raw/mod.rs.orig 2018-10-24 20:00:01 UTC +++ src/libstd/os/raw/mod.rs -@@ -29,6 +29,7 @@ use fmt; +@@ -27,6 +27,7 @@ all(target_os = "android", any(target_arch = "aarch64", target_arch = "arm")), all(target_os = "l4re", target_arch = "x86_64"), + all(target_os = "freebsd", target_arch = "aarch64"), - all(target_os = "openbsd", target_arch = "aarch64"), - all(target_os = "fuchsia", target_arch = "aarch64")))] - #[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = u8; -@@ -41,6 +42,7 @@ use fmt; + all(target_os = "netbsd", any(target_arch = "aarch64", + target_arch = "arm", + target_arch = "powerpc")), +@@ -42,6 +43,7 @@ all(target_os = "android", any(target_arch = "aarch64", target_arch = "arm")), all(target_os = "l4re", target_arch = "x86_64"), + all(target_os = "freebsd", target_arch = "aarch64"), - all(target_os = "openbsd", target_arch = "aarch64"), - all(target_os = "fuchsia", target_arch = "aarch64"))))] - #[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = i8; + all(target_os = "netbsd", any(target_arch = "aarch64", + target_arch = "arm", + target_arch = "powerpc")), Modified: branches/2018Q4/mail/thunderbird/Makefile ============================================================================== --- branches/2018Q4/mail/thunderbird/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/mail/thunderbird/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -3,6 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 60.3.0 +PORTREVISION= 1 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source Modified: branches/2018Q4/security/kr/Makefile ============================================================================== --- branches/2018Q4/security/kr/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/security/kr/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -3,7 +3,7 @@ PORTNAME= kr PORTVERSION= 2.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MAINTAINER= feld@FreeBSD.org Modified: branches/2018Q4/sysutils/exa/Makefile ============================================================================== --- branches/2018Q4/sysutils/exa/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/sysutils/exa/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -3,7 +3,7 @@ PORTNAME= exa DISTVERSIONPREFIX= v DISTVERSION= 0.8.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MAINTAINER= tobik@FreeBSD.org Modified: branches/2018Q4/sysutils/fd/Makefile ============================================================================== --- branches/2018Q4/sysutils/fd/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/sysutils/fd/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -4,7 +4,7 @@ PORTNAME= fd DISTVERSIONPREFIX= v DISTVERSION= 7.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils PKGNAMESUFFIX= -find Modified: branches/2018Q4/sysutils/flowgger/Makefile ============================================================================== --- branches/2018Q4/sysutils/flowgger/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/sysutils/flowgger/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -3,7 +3,7 @@ PORTNAME= flowgger DISTVERSION= 0.2.6-28 DISTVERSIONSUFFIX= -gab572a0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MAINTAINER= ports@FreeBSD.org Modified: branches/2018Q4/sysutils/potnet/Makefile ============================================================================== --- branches/2018Q4/sysutils/potnet/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/sysutils/potnet/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -2,7 +2,7 @@ PORTNAME= potnet DISTVERSION= 0.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MAINTAINER= pizzamig@FreeBSD.org Modified: branches/2018Q4/textproc/bat/Makefile ============================================================================== --- branches/2018Q4/textproc/bat/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/textproc/bat/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -3,7 +3,7 @@ PORTNAME= bat DISTVERSIONPREFIX= v DISTVERSION= 0.7.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MAINTAINER= pizzamig@FreeBSD.org Modified: branches/2018Q4/textproc/ripgrep/Makefile ============================================================================== --- branches/2018Q4/textproc/ripgrep/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/textproc/ripgrep/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -5,7 +5,7 @@ PORTNAME= ripgrep DISTVERSION= 0.9.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MAINTAINER= petteri.valkonen@iki.fi Modified: branches/2018Q4/textproc/xsv-rs/Makefile ============================================================================== --- branches/2018Q4/textproc/xsv-rs/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/textproc/xsv-rs/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -2,7 +2,7 @@ PORTNAME= xsv DISTVERSION= 0.13.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc PKGNAMESUFFIX= -rs Modified: branches/2018Q4/www/firefox-esr/Makefile ============================================================================== --- branches/2018Q4/www/firefox-esr/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/www/firefox-esr/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -3,6 +3,7 @@ PORTNAME= firefox DISTVERSION= 60.3.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ Modified: branches/2018Q4/www/firefox/Makefile ============================================================================== --- branches/2018Q4/www/firefox/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/www/firefox/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -3,6 +3,7 @@ PORTNAME= firefox DISTVERSION= 63.0.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Modified: branches/2018Q4/www/geckodriver/Makefile ============================================================================== --- branches/2018Q4/www/geckodriver/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/www/geckodriver/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -3,7 +3,7 @@ PORTNAME= geckodriver DISTVERSIONPREFIX= v DISTVERSION= 0.21.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MAINTAINER= daniel@blodan.se Modified: branches/2018Q4/www/seamonkey/Makefile ============================================================================== --- branches/2018Q4/www/seamonkey/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/www/seamonkey/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -3,7 +3,7 @@ PORTNAME= seamonkey DISTVERSION= 2.49.4 -PORTREVISION= 13 +PORTREVISION= 14 MOZILLA_VER= 52 # above + 3 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Modified: branches/2018Q4/www/websocat/Makefile ============================================================================== --- branches/2018Q4/www/websocat/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/www/websocat/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -4,7 +4,7 @@ PORTNAME= websocat DISTVERSION= 1.1.0 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MAINTAINER= osa@FreeBSD.org Modified: branches/2018Q4/x11/admiral/Makefile ============================================================================== --- branches/2018Q4/x11/admiral/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/x11/admiral/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -4,7 +4,7 @@ PORTNAME= admiral DISTVERSIONPREFIX= v DISTVERSION= 1.0.0-7 DISTVERSIONSUFFIX= -g5a9f33b -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MAINTAINER= lebarondemerde@privacychain.ch Modified: branches/2018Q4/x11/alacritty/Makefile ============================================================================== --- branches/2018Q4/x11/alacritty/Makefile Thu Nov 1 06:02:33 2018 (r483639) +++ branches/2018Q4/x11/alacritty/Makefile Thu Nov 1 06:07:58 2018 (r483640) @@ -3,7 +3,7 @@ PORTNAME= alacritty PORTVERSION= 0.2.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MAINTAINER= zeising@FreeBSD.org From owner-svn-ports-branches@freebsd.org Thu Nov 1 06:15:31 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 21904113016F; Thu, 1 Nov 2018 06:15:31 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EA4208D020; Thu, 1 Nov 2018 06:15:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C8D7017D5E; Thu, 1 Nov 2018 06:15:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA16FUUv032476; Thu, 1 Nov 2018 06:15:30 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA16FUr8032473; Thu, 1 Nov 2018 06:15:30 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201811010615.wA16FUr8032473@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 1 Nov 2018 06:15:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483641 - in branches/2018Q4: devel/rust-cbindgen www/firefox/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q4: devel/rust-cbindgen www/firefox/files X-SVN-Commit-Revision: 483641 X-SVN-Commit-Repository: ports 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.29 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, 01 Nov 2018 06:15:31 -0000 Author: jbeich Date: Thu Nov 1 06:15:29 2018 New Revision: 483641 URL: https://svnweb.freebsd.org/changeset/ports/483641 Log: MFH: r482291 r482348 r483566 r483606 r483638 devel/rust-cbindgen: update to 0.6.7 Changes: https://github.com/eqrion/cbindgen/compare/v0.6.4...v0.6.7 Approved by: ports-secteam blanket (required by Firefox 65, merge conflicts) Added: branches/2018Q4/www/firefox/files/patch-bug1503401 - copied unchanged from r483640, head/www/firefox/files/patch-bug1503401 Modified: branches/2018Q4/devel/rust-cbindgen/Makefile branches/2018Q4/devel/rust-cbindgen/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/devel/rust-cbindgen/Makefile ============================================================================== --- branches/2018Q4/devel/rust-cbindgen/Makefile Thu Nov 1 06:07:58 2018 (r483640) +++ branches/2018Q4/devel/rust-cbindgen/Makefile Thu Nov 1 06:15:29 2018 (r483641) @@ -2,8 +2,7 @@ PORTNAME= cbindgen DISTVERSIONPREFIX= v -DISTVERSION= 0.6.4 -PORTREVISION= 1 +DISTVERSION= 0.6.7 CATEGORIES= devel PKGNAMEPREFIX= rust- Modified: branches/2018Q4/devel/rust-cbindgen/distinfo ============================================================================== --- branches/2018Q4/devel/rust-cbindgen/distinfo Thu Nov 1 06:07:58 2018 (r483640) +++ branches/2018Q4/devel/rust-cbindgen/distinfo Thu Nov 1 06:15:29 2018 (r483641) @@ -1,4 +1,4 @@ -TIMESTAMP = 1538679190 +TIMESTAMP = 1540923699 SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087 SHA256 (rust/crates/atty-0.2.10.tar.gz) = 2fc4a1aa4c24c0718a250f0681885c1af91419d242f29eb8f2ab28502d80dbd1 @@ -73,5 +73,5 @@ SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.t SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998 -SHA256 (eqrion-cbindgen-v0.6.4_GH0.tar.gz) = 058a6b31c3559a20edec5ec383cbdd8b0a5ed0914579fddedd4d0454aaefd300 -SIZE (eqrion-cbindgen-v0.6.4_GH0.tar.gz) = 85437 +SHA256 (eqrion-cbindgen-v0.6.7_GH0.tar.gz) = ceafbe2c6d8f7d473db39fb8458081fee2d15b7699ebd114396d5247fb029532 +SIZE (eqrion-cbindgen-v0.6.7_GH0.tar.gz) = 89831 Copied: branches/2018Q4/www/firefox/files/patch-bug1503401 (from r483640, head/www/firefox/files/patch-bug1503401) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/www/firefox/files/patch-bug1503401 Thu Nov 1 06:15:29 2018 (r483641, copy of r483640, head/www/firefox/files/patch-bug1503401) @@ -0,0 +1,27 @@ +commit b85791110fe6 +Author: Emilio Cobos Ãlvarez +Date: Tue Oct 30 22:21:52 2018 +0100 + + Keep mozilla-release building with newer cbindgen versions. +--- + servo/components/style/cbindgen.toml | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git servo/components/style/cbindgen.toml servo/components/style/cbindgen.toml +index 46162e43db5e..49872e88b7d9 100644 +--- servo/components/style/cbindgen.toml ++++ servo/components/style/cbindgen.toml +@@ -28,6 +28,12 @@ include = [ + "StyleDisplay", + "StyleDisplayMode", + "StyleFillRule", +- "StylePathCommand" ++ "StylePathCommand", ++ ++ "Appearance", ++ "Display", ++ "DisplayMode", ++ "FillRule", ++ "PathCommand" + ] + item_types = ["enums", "structs", "typedefs"] From owner-svn-ports-branches@freebsd.org Thu Nov 1 06:55:13 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 217B410DDE6E; Thu, 1 Nov 2018 06:55:13 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EC9C56C1F4; Thu, 1 Nov 2018 06:55:12 +0000 (UTC) (envelope-from zeising@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C93E7183D0; Thu, 1 Nov 2018 06:55:12 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA16tCoe052773; Thu, 1 Nov 2018 06:55:12 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA16tCDO052771; Thu, 1 Nov 2018 06:55:12 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201811010655.wA16tCDO052771@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Thu, 1 Nov 2018 06:55:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483642 - branches/2018Q4/graphics/drm-legacy-kmod X-SVN-Group: ports-branches X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: branches/2018Q4/graphics/drm-legacy-kmod X-SVN-Commit-Revision: 483642 X-SVN-Commit-Repository: ports 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.29 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, 01 Nov 2018 06:55:13 -0000 Author: zeising Date: Thu Nov 1 06:55:12 2018 New Revision: 483642 URL: https://svnweb.freebsd.org/changeset/ports/483642 Log: MFH: r483619 graphics/drm-legacy-kmod: Update snapshot Update graphics/drm-legacy-kmod to the latest snapshot, which should improve handling and loading of firmware modules. Approved by: ports-secteam (miwi) Modified: branches/2018Q4/graphics/drm-legacy-kmod/Makefile branches/2018Q4/graphics/drm-legacy-kmod/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/graphics/drm-legacy-kmod/Makefile ============================================================================== --- branches/2018Q4/graphics/drm-legacy-kmod/Makefile Thu Nov 1 06:15:29 2018 (r483641) +++ branches/2018Q4/graphics/drm-legacy-kmod/Makefile Thu Nov 1 06:55:12 2018 (r483642) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= drm-legacy-kmod -PORTVERSION= g20181027 +PORTVERSION= g20181031 CATEGORIES= graphics MAINTAINER= jmd@FreeBSD.org @@ -22,7 +22,7 @@ CONFLICTS_INSTALL= drm-devel-kmod drm-stable-kmod drm- USE_GITHUB= yes GH_ACCOUNT= FreeBSDDesktop GH_PROJECT= drm-legacy -GH_TAGNAME= 2bed932 +GH_TAGNAME= ed220ea .include Modified: branches/2018Q4/graphics/drm-legacy-kmod/distinfo ============================================================================== --- branches/2018Q4/graphics/drm-legacy-kmod/distinfo Thu Nov 1 06:15:29 2018 (r483641) +++ branches/2018Q4/graphics/drm-legacy-kmod/distinfo Thu Nov 1 06:55:12 2018 (r483642) @@ -1,3 +1,3 @@ -TIMESTAMP = 1540633414 -SHA256 (FreeBSDDesktop-drm-legacy-g20181027-2bed932_GH0.tar.gz) = 9546818543554c6209b3f4bd422c22ab0342d41681b860cb250d86b939c89021 -SIZE (FreeBSDDesktop-drm-legacy-g20181027-2bed932_GH0.tar.gz) = 1742051 +TIMESTAMP = 1541020288 +SHA256 (FreeBSDDesktop-drm-legacy-g20181031-ed220ea_GH0.tar.gz) = 71b2a8fd662cde5c44482c7ff7f4cca61d2d54a416dbf3d15ecd01965c7a586d +SIZE (FreeBSDDesktop-drm-legacy-g20181031-ed220ea_GH0.tar.gz) = 1741770 From owner-svn-ports-branches@freebsd.org Thu Nov 1 12:56:02 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8037F10F1E54; Thu, 1 Nov 2018 12:56:02 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 361E174AD5; Thu, 1 Nov 2018 12:56:02 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 173161BF98; Thu, 1 Nov 2018 12:56:02 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA1Cu1or035757; Thu, 1 Nov 2018 12:56:01 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA1Cu1Pg035755; Thu, 1 Nov 2018 12:56:01 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201811011256.wA1Cu1Pg035755@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Thu, 1 Nov 2018 12:56:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483662 - branches/2018Q4/audio/musicpd X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2018Q4/audio/musicpd X-SVN-Commit-Revision: 483662 X-SVN-Commit-Repository: ports 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.29 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, 01 Nov 2018 12:56:02 -0000 Author: riggs Date: Thu Nov 1 12:56:01 2018 New Revision: 483662 URL: https://svnweb.freebsd.org/changeset/ports/483662 Log: MFH: r483576 r483661 Now builds on powerpc64. Reported by: Piotr Kubaj Update to upstream version 0.20.23 Details: - Upstream changelog see: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.20.23/NEWS - Includes new bug fixes for crashes due to clang/llvm optimisation bug Approved by: ports-secteam (riggs) Modified: branches/2018Q4/audio/musicpd/Makefile branches/2018Q4/audio/musicpd/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/audio/musicpd/Makefile ============================================================================== --- branches/2018Q4/audio/musicpd/Makefile Thu Nov 1 12:51:51 2018 (r483661) +++ branches/2018Q4/audio/musicpd/Makefile Thu Nov 1 12:56:01 2018 (r483662) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= musicpd -PORTVERSION= 0.20.22 +PORTVERSION= 0.20.23 CATEGORIES= audio ipv6 MASTER_SITES= http://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} @@ -11,8 +11,6 @@ COMMENT= Remote-controllable music daemon LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING - -BROKEN_powerpc64= Does not build on powerpc64 LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs \ libicudata.so:devel/icu Modified: branches/2018Q4/audio/musicpd/distinfo ============================================================================== --- branches/2018Q4/audio/musicpd/distinfo Thu Nov 1 12:51:51 2018 (r483661) +++ branches/2018Q4/audio/musicpd/distinfo Thu Nov 1 12:56:01 2018 (r483662) @@ -1,3 +1,3 @@ -TIMESTAMP = 1540622257 -SHA256 (mpd-0.20.22.tar.xz) = 78f4c4e2b5b5b4c542037f970c9253486b24e4a52e122d5859cd615b3b9a7cdd -SIZE (mpd-0.20.22.tar.xz) = 807084 +TIMESTAMP = 1541060556 +SHA256 (mpd-0.20.23.tar.xz) = 503e5f9f237290f568ff7956ab2f9aed563594bf749f19b8fe994fb21434afea +SIZE (mpd-0.20.23.tar.xz) = 806784 From owner-svn-ports-branches@freebsd.org Thu Nov 1 13:00:22 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8C8E610F1FC3; Thu, 1 Nov 2018 13:00:22 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 40EAF74D78; Thu, 1 Nov 2018 13:00:22 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2212F1BFB1; Thu, 1 Nov 2018 13:00:22 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA1D0MTb036281; Thu, 1 Nov 2018 13:00:22 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA1D0Lfp036279; Thu, 1 Nov 2018 13:00:21 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201811011300.wA1D0Lfp036279@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Thu, 1 Nov 2018 13:00:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483664 - branches/2018Q4/net/traefik X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2018Q4/net/traefik X-SVN-Commit-Revision: 483664 X-SVN-Commit-Repository: ports 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.29 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, 01 Nov 2018 13:00:22 -0000 Author: riggs Date: Thu Nov 1 13:00:21 2018 New Revision: 483664 URL: https://svnweb.freebsd.org/changeset/ports/483664 Log: MFH: r483663 Update to upstream version 1.7.4 Details: - Bug fixes and documentation improvements, see https://github.com/containous/traefik/releases/tag/v1.7.4 Approved by: ports-secteam (riggs) Modified: branches/2018Q4/net/traefik/Makefile branches/2018Q4/net/traefik/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/net/traefik/Makefile ============================================================================== --- branches/2018Q4/net/traefik/Makefile Thu Nov 1 12:58:21 2018 (r483663) +++ branches/2018Q4/net/traefik/Makefile Thu Nov 1 13:00:21 2018 (r483664) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= traefik -PORTVERSION= 1.7.3 +PORTVERSION= 1.7.4 DISTVERSIONPREFIX= v CATEGORIES= net MASTER_SITES= LOCAL/riggs/${PORTNAME}:webui Modified: branches/2018Q4/net/traefik/distinfo ============================================================================== --- branches/2018Q4/net/traefik/distinfo Thu Nov 1 12:58:21 2018 (r483663) +++ branches/2018Q4/net/traefik/distinfo Thu Nov 1 13:00:21 2018 (r483664) @@ -1,5 +1,5 @@ -TIMESTAMP = 1540109016 -SHA256 (traefik-webui-static-1.7.3.tar.gz) = 4081ae402d4f188786949a7cfe8d051a592bb94e92218cd89189825bc2ee7af7 -SIZE (traefik-webui-static-1.7.3.tar.gz) = 923377 -SHA256 (containous-traefik-v1.7.3_GH0.tar.gz) = 64dd9704d633bb21733ffabe27c6f1fa460291cb01c43b9f575014619f5b35e9 -SIZE (containous-traefik-v1.7.3_GH0.tar.gz) = 10511048 +TIMESTAMP = 1541061559 +SHA256 (traefik-webui-static-1.7.4.tar.gz) = 05064259df51de1c7eeddc4c28748d0752b5fdf59fbf4f3d0e5dae616df5f686 +SIZE (traefik-webui-static-1.7.4.tar.gz) = 1088875 +SHA256 (containous-traefik-v1.7.4_GH0.tar.gz) = 0de6bdfc1c760bdf5ecd983d50e217beaa7e26e97a4229b81c7682d45351c197 +SIZE (containous-traefik-v1.7.4_GH0.tar.gz) = 10536671 From owner-svn-ports-branches@freebsd.org Thu Nov 1 17:54:32 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 92FEF10FA087; Thu, 1 Nov 2018 17:54:32 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4932B82EB8; Thu, 1 Nov 2018 17:54:32 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2A44A1F22B; Thu, 1 Nov 2018 17:54:32 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA1HsVDb093188; Thu, 1 Nov 2018 17:54:31 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA1HsVrX093183; Thu, 1 Nov 2018 17:54:31 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811011754.wA1HsVrX093183@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 1 Nov 2018 17:54:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483691 - in branches/2018Q4/sysutils/bulk_extractor: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q4/sysutils/bulk_extractor: . files X-SVN-Commit-Revision: 483691 X-SVN-Commit-Repository: ports 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.29 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, 01 Nov 2018 17:54:32 -0000 Author: antoine Date: Thu Nov 1 17:54:30 2018 New Revision: 483691 URL: https://svnweb.freebsd.org/changeset/ports/483691 Log: MFH: r482745 - Fix build with OpenSSL 1.1.1. [*] - Add dependencies to pass 'make stage-qa'. PR: 232164 [*] Submitted by: antoine [*] Added: branches/2018Q4/sysutils/bulk_extractor/files/patch-plugins_dfxml_src_dfxml__configure.m4 - copied unchanged from r482745, head/sysutils/bulk_extractor/files/patch-plugins_dfxml_src_dfxml__configure.m4 branches/2018Q4/sysutils/bulk_extractor/files/patch-plugins_dfxml_src_hash__t.h - copied unchanged from r482745, head/sysutils/bulk_extractor/files/patch-plugins_dfxml_src_hash__t.h branches/2018Q4/sysutils/bulk_extractor/files/patch-src_dfxml_src_dfxml__configure.m4 - copied unchanged from r482745, head/sysutils/bulk_extractor/files/patch-src_dfxml_src_dfxml__configure.m4 branches/2018Q4/sysutils/bulk_extractor/files/patch-src_dfxml_src_hash__t.h - copied unchanged from r482745, head/sysutils/bulk_extractor/files/patch-src_dfxml_src_hash__t.h Modified: branches/2018Q4/sysutils/bulk_extractor/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/sysutils/bulk_extractor/Makefile ============================================================================== --- branches/2018Q4/sysutils/bulk_extractor/Makefile Thu Nov 1 17:47:32 2018 (r483690) +++ branches/2018Q4/sysutils/bulk_extractor/Makefile Thu Nov 1 17:54:30 2018 (r483691) @@ -3,7 +3,7 @@ PORTNAME= bulk_extractor PORTVERSION= 1.5.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://digitalcorpora.org/downloads/bulk_extractor/ @@ -13,8 +13,10 @@ COMMENT= Program that scans a disk image and extracts LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -USES= sqlite ssl +USES= autoreconf iconv:wchar_t sqlite ssl +USE_GNOME= libxml2 LIB_DEPENDS= libafflib.so:sysutils/afflib \ + libboost_system.so:devel/boost-libs \ libewf.so:devel/libewf \ libexiv2.so:graphics/exiv2 \ libexpat.so:textproc/expat2 Copied: branches/2018Q4/sysutils/bulk_extractor/files/patch-plugins_dfxml_src_dfxml__configure.m4 (from r482745, head/sysutils/bulk_extractor/files/patch-plugins_dfxml_src_dfxml__configure.m4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/sysutils/bulk_extractor/files/patch-plugins_dfxml_src_dfxml__configure.m4 Thu Nov 1 17:54:30 2018 (r483691, copy of r482745, head/sysutils/bulk_extractor/files/patch-plugins_dfxml_src_dfxml__configure.m4) @@ -0,0 +1,8 @@ +--- plugins/dfxml/src/dfxml_configure.m4.orig 2014-09-16 18:34:02 UTC ++++ plugins/dfxml/src/dfxml_configure.m4 +@@ -59,4 +59,5 @@ AC_CHECK_LIB([crypto],[EVP_get_digestbyn + AC_CHECK_LIB([ssl],[SSL_library_init]) + AC_CHECK_FUNCS([EVP_get_digestbyname],, + AC_MSG_ERROR([SSL/OpenSSL support required])) ++AC_CHECK_FUNCS([EVP_MD_CTX_new EVP_MD_CTX_free]) + Copied: branches/2018Q4/sysutils/bulk_extractor/files/patch-plugins_dfxml_src_hash__t.h (from r482745, head/sysutils/bulk_extractor/files/patch-plugins_dfxml_src_hash__t.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/sysutils/bulk_extractor/files/patch-plugins_dfxml_src_hash__t.h Thu Nov 1 17:54:30 2018 (r483691, copy of r482745, head/sysutils/bulk_extractor/files/patch-plugins_dfxml_src_hash__t.h) @@ -0,0 +1,78 @@ +--- plugins/dfxml/src/hash_t.h.orig 2014-09-16 18:34:02 UTC ++++ plugins/dfxml/src/hash_t.h +@@ -189,7 +189,8 @@ inline std::string digest_name + + template + class hash_generator__ { /* generates the hash */ +- EVP_MD_CTX mdctx; /* the context for computing the value */ ++ private: ++ EVP_MD_CTX* mdctx; /* the context for computing the value */ + bool initialized; /* has the context been initialized? */ + bool finalized; + /* Static function to determine if something is zero */ +@@ -199,24 +200,36 @@ class hash_generator__ { /* generates + } + return true; + } ++ /* Not allowed to copy; these are prototyped but not defined, so any attempt to use them will fail, but we won't get the -Weffc++ warnings */ ++ hash_generator__ & operator=(const hash_generator__ &); ++ hash_generator__(const hash_generator__ &); + public: + int64_t hashed_bytes; + /* This function takes advantage of the fact that different hash functions produce residues with different sizes */ +- hash_generator__():mdctx(),initialized(false),finalized(false),hashed_bytes(0){ } ++ hash_generator__():mdctx(NULL),initialized(false),finalized(false),hashed_bytes(0){ } + ~hash_generator__(){ + release(); + } + void release(){ /* free allocated memory */ + if(initialized){ +- EVP_MD_CTX_cleanup(&mdctx); ++#ifdef HAVE_EVP_MD_CTX_FREE ++ EVP_MD_CTX_free(mdctx); ++#else ++ EVP_MD_CTX_destroy(mdctx); ++#endif + initialized = false; + hashed_bytes = 0; + } + } + void init(){ + if(initialized==false){ +- EVP_MD_CTX_init(&mdctx); +- EVP_DigestInit_ex(&mdctx, md(), NULL); ++#ifdef HAVE_EVP_MD_CTX_NEW ++ mdctx = EVP_MD_CTX_new(); ++#else ++ mdctx = EVP_MD_CTX_create(); ++#endif ++ if (!mdctx) throw std::bad_alloc(); ++ EVP_DigestInit_ex(mdctx, md(), NULL); + initialized = true; + finalized = false; + hashed_bytes = 0; +@@ -228,21 +241,21 @@ public: + std::cerr << "hashgen_t::update called after finalized\n"; + exit(1); + } +- EVP_DigestUpdate(&mdctx,buf,bufsize); ++ EVP_DigestUpdate(mdctx,buf,bufsize); + hashed_bytes += bufsize; + } + hash__ final() { + if(finalized){ + std::cerr << "currently friendly_geneator does not cache the final value\n"; + assert(0); +- /* code below will never be executed after assert(0) */ ++ exit(1); // in case compiled with assertions disabled + } + if(!initialized){ + init(); /* do it now! */ + } + hash__ val; + unsigned int len = sizeof(val.digest); +- EVP_DigestFinal(&mdctx,val.digest,&len); ++ EVP_DigestFinal(mdctx,val.digest,&len); + finalized = true; + return val; + } Copied: branches/2018Q4/sysutils/bulk_extractor/files/patch-src_dfxml_src_dfxml__configure.m4 (from r482745, head/sysutils/bulk_extractor/files/patch-src_dfxml_src_dfxml__configure.m4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/sysutils/bulk_extractor/files/patch-src_dfxml_src_dfxml__configure.m4 Thu Nov 1 17:54:30 2018 (r483691, copy of r482745, head/sysutils/bulk_extractor/files/patch-src_dfxml_src_dfxml__configure.m4) @@ -0,0 +1,8 @@ +--- src/dfxml/src/dfxml_configure.m4.orig 2018-10-10 21:44:10 UTC ++++ src/dfxml/src/dfxml_configure.m4 +@@ -59,4 +59,5 @@ AC_CHECK_LIB([crypto],[EVP_get_digestbyn + AC_CHECK_LIB([ssl],[SSL_library_init]) + AC_CHECK_FUNCS([EVP_get_digestbyname],, + AC_MSG_ERROR([SSL/OpenSSL support required])) ++AC_CHECK_FUNCS([EVP_MD_CTX_new EVP_MD_CTX_free]) + Copied: branches/2018Q4/sysutils/bulk_extractor/files/patch-src_dfxml_src_hash__t.h (from r482745, head/sysutils/bulk_extractor/files/patch-src_dfxml_src_hash__t.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/sysutils/bulk_extractor/files/patch-src_dfxml_src_hash__t.h Thu Nov 1 17:54:30 2018 (r483691, copy of r482745, head/sysutils/bulk_extractor/files/patch-src_dfxml_src_hash__t.h) @@ -0,0 +1,78 @@ +--- src/dfxml/src/hash_t.h.orig 2014-09-16 18:34:02 UTC ++++ src/dfxml/src/hash_t.h +@@ -189,7 +189,8 @@ inline std::string digest_name + + template + class hash_generator__ { /* generates the hash */ +- EVP_MD_CTX mdctx; /* the context for computing the value */ ++ private: ++ EVP_MD_CTX* mdctx; /* the context for computing the value */ + bool initialized; /* has the context been initialized? */ + bool finalized; + /* Static function to determine if something is zero */ +@@ -199,24 +200,36 @@ class hash_generator__ { /* generates + } + return true; + } ++ /* Not allowed to copy; these are prototyped but not defined, so any attempt to use them will fail, but we won't get the -Weffc++ warnings */ ++ hash_generator__ & operator=(const hash_generator__ &); ++ hash_generator__(const hash_generator__ &); + public: + int64_t hashed_bytes; + /* This function takes advantage of the fact that different hash functions produce residues with different sizes */ +- hash_generator__():mdctx(),initialized(false),finalized(false),hashed_bytes(0){ } ++ hash_generator__():mdctx(NULL),initialized(false),finalized(false),hashed_bytes(0){ } + ~hash_generator__(){ + release(); + } + void release(){ /* free allocated memory */ + if(initialized){ +- EVP_MD_CTX_cleanup(&mdctx); ++#ifdef HAVE_EVP_MD_CTX_FREE ++ EVP_MD_CTX_free(mdctx); ++#else ++ EVP_MD_CTX_destroy(mdctx); ++#endif + initialized = false; + hashed_bytes = 0; + } + } + void init(){ + if(initialized==false){ +- EVP_MD_CTX_init(&mdctx); +- EVP_DigestInit_ex(&mdctx, md(), NULL); ++#ifdef HAVE_EVP_MD_CTX_NEW ++ mdctx = EVP_MD_CTX_new(); ++#else ++ mdctx = EVP_MD_CTX_create(); ++#endif ++ if (!mdctx) throw std::bad_alloc(); ++ EVP_DigestInit_ex(mdctx, md(), NULL); + initialized = true; + finalized = false; + hashed_bytes = 0; +@@ -228,21 +241,21 @@ public: + std::cerr << "hashgen_t::update called after finalized\n"; + exit(1); + } +- EVP_DigestUpdate(&mdctx,buf,bufsize); ++ EVP_DigestUpdate(mdctx,buf,bufsize); + hashed_bytes += bufsize; + } + hash__ final() { + if(finalized){ + std::cerr << "currently friendly_geneator does not cache the final value\n"; + assert(0); +- /* code below will never be executed after assert(0) */ ++ exit(1); // in case compiled with assertions disabled + } + if(!initialized){ + init(); /* do it now! */ + } + hash__ val; + unsigned int len = sizeof(val.digest); +- EVP_DigestFinal(&mdctx,val.digest,&len); ++ EVP_DigestFinal(mdctx,val.digest,&len); + finalized = true; + return val; + } From owner-svn-ports-branches@freebsd.org Thu Nov 1 17:58:47 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C346A10FA157; Thu, 1 Nov 2018 17:58:47 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 771C48307F; Thu, 1 Nov 2018 17:58:47 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 586EA1F25B; Thu, 1 Nov 2018 17:58:47 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA1HwlXZ093541; Thu, 1 Nov 2018 17:58:47 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA1HwkVI093539; Thu, 1 Nov 2018 17:58:46 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811011758.wA1HwkVI093539@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 1 Nov 2018 17:58:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483692 - in branches/2018Q4/net-mgmt/kismet: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q4/net-mgmt/kismet: . files X-SVN-Commit-Revision: 483692 X-SVN-Commit-Repository: ports 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.29 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, 01 Nov 2018 17:58:48 -0000 Author: antoine Date: Thu Nov 1 17:58:46 2018 New Revision: 483692 URL: https://svnweb.freebsd.org/changeset/ports/483692 Log: MFH: r483399 net-mgmt/kismet: fix build on 12 with OpenSSL 1.1.1 PR: 232140 Submitted by: Nathan Added: branches/2018Q4/net-mgmt/kismet/files/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc - copied unchanged from r483399, head/net-mgmt/kismet/files/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc Deleted: branches/2018Q4/net-mgmt/kismet/files/patch-restricted-plugin-ptw_aircrack-crypto.cc Modified: branches/2018Q4/net-mgmt/kismet/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/net-mgmt/kismet/Makefile ============================================================================== --- branches/2018Q4/net-mgmt/kismet/Makefile Thu Nov 1 17:54:30 2018 (r483691) +++ branches/2018Q4/net-mgmt/kismet/Makefile Thu Nov 1 17:58:46 2018 (r483692) @@ -3,7 +3,7 @@ PORTNAME= kismet DISTVERSION= 2016-07-R1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= http://www.kismetwireless.net/code/ @@ -13,8 +13,9 @@ COMMENT= 802.11 layer2 wireless network detector, snif LICENSE= GPLv2 -GNU_CONFIGURE= yes USES= gmake tar:xz + +GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -63,6 +64,12 @@ PLIST_SUB+= PLUGINS="" PLIST_SUB+= PLUGINS="@comment " .endif +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 +EXTRA_PATCHES=${FILESDIR}/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc +.endif + post-patch: @${REINPLACE_CMD} -e "/gps=/s/true/false/" \ -e "/ouifile=/{/wireshark/d;s|/etc|${DOCSDIR}|;}" \ @@ -99,4 +106,4 @@ post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/kismet_drone.conf \ ${STAGEDIR}${PREFIX}/etc/kismet_drone.conf.sample -.include +.include Copied: branches/2018Q4/net-mgmt/kismet/files/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc (from r483399, head/net-mgmt/kismet/files/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/net-mgmt/kismet/files/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc Thu Nov 1 17:58:46 2018 (r483692, copy of r483399, head/net-mgmt/kismet/files/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc) @@ -0,0 +1,66 @@ +--- restricted-plugin-ptw/aircrack-crypto.cc.orig 2018-10-10 00:29:38 UTC ++++ restricted-plugin-ptw/aircrack-crypto.cc +@@ -232,7 +232,7 @@ void calc_pmk( char *key, char *essid_pre, uchar pmk[4 + // void calc_ptk (struct WPA_hdsk *wpa, unsigned char bssid[6], unsigned char pmk[32], unsigned char ptk[80]) { + // int i; + // uchar pke[100]; +-// HMAC_CTX ctx; ++// HMAC_CTX *ctx; + // + // memcpy( pke, "Pairwise key expansion", 23 ); + // +@@ -258,23 +258,23 @@ void calc_pmk( char *key, char *essid_pre, uchar pmk[4 + // memcpy( pke + 67, wpa->snonce, 32 ); + // } + // +-// HMAC_CTX_init(&ctx); +-// HMAC_Init_ex(&ctx, pmk, 32, EVP_sha1(), NULL); ++// ctx = HMAC_CTX_new(); ++// HMAC_Init_ex(ctx, pmk, 32, EVP_sha1(), NULL); + // for(i = 0; i < 4; i++ ) + // { + // pke[99] = i; + // //HMAC(EVP_sha1(), values[0], 32, pke, 100, ptk + i * 20, NULL); +-// HMAC_Init_ex(&ctx, 0, 0, 0, 0); +-// HMAC_Update(&ctx, pke, 100); +-// HMAC_Final(&ctx, ptk + i*20, NULL); ++// HMAC_Init_ex(ctx, 0, 0, 0, 0); ++// HMAC_Update(ctx, pke, 100); ++// HMAC_Final(ctx, ptk + i*20, NULL); + // } +-// HMAC_CTX_cleanup(&ctx); ++// HMAC_CTX_free(ctx); + // } + + void calc_mic (struct AP_info *ap, unsigned char pmk[32], unsigned char ptk[80], unsigned char mic[20]) { + int i; + uchar pke[100]; +- HMAC_CTX ctx; ++ HMAC_CTX *ctx; + + memcpy( pke, "Pairwise key expansion", 23 ); + +@@ -300,17 +300,17 @@ void calc_mic (struct AP_info *ap, unsigned char pmk[3 + memcpy( pke + 67, ap->wpa.snonce, 32 ); + } + +- HMAC_CTX_init(&ctx); +- HMAC_Init_ex(&ctx, pmk, 32, EVP_sha1(), NULL); ++ ctx = HMAC_CTX_new(); ++ HMAC_Init_ex(ctx, pmk, 32, EVP_sha1(), NULL); + for(i = 0; i < 4; i++ ) + { + pke[99] = i; + //HMAC(EVP_sha1(), values[0], 32, pke, 100, ptk + i * 20, NULL); +- HMAC_Init_ex(&ctx, 0, 0, 0, 0); +- HMAC_Update(&ctx, pke, 100); +- HMAC_Final(&ctx, ptk + i*20, NULL); ++ HMAC_Init_ex(ctx, 0, 0, 0, 0); ++ HMAC_Update(ctx, pke, 100); ++ HMAC_Final(ctx, ptk + i*20, NULL); + } +- HMAC_CTX_cleanup(&ctx); ++ HMAC_CTX_free(ctx); + + if( ap->wpa.keyver == 1 ) + { From owner-svn-ports-branches@freebsd.org Thu Nov 1 18:02:53 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C506510FA378; Thu, 1 Nov 2018 18:02:52 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 794528346A; Thu, 1 Nov 2018 18:02:52 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5A3F81F3F1; Thu, 1 Nov 2018 18:02:52 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA1I2qLj098825; Thu, 1 Nov 2018 18:02:52 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA1I2lw6098799; Thu, 1 Nov 2018 18:02:47 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811011802.wA1I2lw6098799@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 1 Nov 2018 18:02:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483693 - in branches/2018Q4/japanese/jmode: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q4/japanese/jmode: . files X-SVN-Commit-Revision: 483693 X-SVN-Commit-Repository: ports 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.29 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, 01 Nov 2018 18:02:53 -0000 Author: antoine Date: Thu Nov 1 18:02:47 2018 New Revision: 483693 URL: https://svnweb.freebsd.org/changeset/ports/483693 Log: MFH: r483145 - Fix build error with Clang 6. - Pet portlint. Added: branches/2018Q4/japanese/jmode/files/patch-src_anthy.xpm - copied unchanged from r483145, head/japanese/jmode/files/patch-src_anthy.xpm branches/2018Q4/japanese/jmode/files/patch-src_anthyconv.cpp - copied unchanged from r483145, head/japanese/jmode/files/patch-src_anthyconv.cpp branches/2018Q4/japanese/jmode/files/patch-src_anthyconv.h - copied unchanged from r483145, head/japanese/jmode/files/patch-src_anthyconv.h branches/2018Q4/japanese/jmode/files/patch-src_code.xpm - copied unchanged from r483145, head/japanese/jmode/files/patch-src_code.xpm branches/2018Q4/japanese/jmode/files/patch-src_connection.cpp - copied unchanged from r483145, head/japanese/jmode/files/patch-src_connection.cpp branches/2018Q4/japanese/jmode/files/patch-src_convdisp.cpp - copied unchanged from r483145, head/japanese/jmode/files/patch-src_convdisp.cpp branches/2018Q4/japanese/jmode/files/patch-src_kkconv.h - copied unchanged from r483145, head/japanese/jmode/files/patch-src_kkconv.h branches/2018Q4/japanese/jmode/files/patch-src_off.xpm - copied unchanged from r483145, head/japanese/jmode/files/patch-src_off.xpm branches/2018Q4/japanese/jmode/files/patch-src_on.xpm - copied unchanged from r483145, head/japanese/jmode/files/patch-src_on.xpm branches/2018Q4/japanese/jmode/files/patch-src_skk.xpm - copied unchanged from r483145, head/japanese/jmode/files/patch-src_skk.xpm branches/2018Q4/japanese/jmode/files/patch-src_skkconv.cpp - copied unchanged from r483145, head/japanese/jmode/files/patch-src_skkconv.cpp branches/2018Q4/japanese/jmode/files/patch-src_skkconv.h - copied unchanged from r483145, head/japanese/jmode/files/patch-src_skkconv.h branches/2018Q4/japanese/jmode/files/patch-src_ui.cpp - copied unchanged from r483145, head/japanese/jmode/files/patch-src_ui.cpp branches/2018Q4/japanese/jmode/files/patch-src_ximic.cpp - copied unchanged from r483145, head/japanese/jmode/files/patch-src_ximic.cpp Modified: branches/2018Q4/japanese/jmode/Makefile branches/2018Q4/japanese/jmode/files/patch-Makefile.in branches/2018Q4/japanese/jmode/files/patch-src_dispatch.cpp branches/2018Q4/japanese/jmode/files/patch-src_keyatom.cpp branches/2018Q4/japanese/jmode/files/patch-src_kkconv.cpp branches/2018Q4/japanese/jmode/files/patch-src_main.cpp branches/2018Q4/japanese/jmode/files/patch-src_ximim.cpp branches/2018Q4/japanese/jmode/files/patch-src_ximpacket.cpp branches/2018Q4/japanese/jmode/files/patch-src_ximtrans.cpp Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/japanese/jmode/Makefile ============================================================================== --- branches/2018Q4/japanese/jmode/Makefile Thu Nov 1 17:58:46 2018 (r483692) +++ branches/2018Q4/japanese/jmode/Makefile Thu Nov 1 18:02:47 2018 (r483693) @@ -13,13 +13,16 @@ COMMENT?= XIM server for Anthy input method LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +NOT_FOR_ARCHS= aarch64 mips mips64 powerpc64 sparc64 + LIB_DEPENDS= libanthy.so:japanese/anthy +USES= gettext-runtime gnome USE_GNOME= gtk12 +USE_XORG= x11 xext xi + GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib - -NOT_FOR_ARCHS= aarch64 amd64 mips mips64 powerpc64 sparc64 .include Modified: branches/2018Q4/japanese/jmode/files/patch-Makefile.in ============================================================================== --- branches/2018Q4/japanese/jmode/files/patch-Makefile.in Thu Nov 1 17:58:46 2018 (r483692) +++ branches/2018Q4/japanese/jmode/files/patch-Makefile.in Thu Nov 1 18:02:47 2018 (r483693) @@ -1,6 +1,6 @@ ---- Makefile.in.orig Mon Apr 14 22:12:05 2003 -+++ Makefile.in Thu May 22 19:00:49 2003 -@@ -430,7 +430,7 @@ +--- Makefile.in.orig 2003-08-11 14:13:27 UTC ++++ Makefile.in +@@ -430,7 +430,7 @@ info: info-recursive info-am: Copied: branches/2018Q4/japanese/jmode/files/patch-src_anthy.xpm (from r483145, head/japanese/jmode/files/patch-src_anthy.xpm) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/japanese/jmode/files/patch-src_anthy.xpm Thu Nov 1 18:02:47 2018 (r483693, copy of r483145, head/japanese/jmode/files/patch-src_anthy.xpm) @@ -0,0 +1,9 @@ +--- src/anthy.xpm.orig 2018-02-10 09:55:51 UTC ++++ src/anthy.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * anthy_xpm[] = { ++static const char * anthy_xpm[] = { + "24 32 81 1", + " c None", + ". c #EAAFC3", Copied: branches/2018Q4/japanese/jmode/files/patch-src_anthyconv.cpp (from r483145, head/japanese/jmode/files/patch-src_anthyconv.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/japanese/jmode/files/patch-src_anthyconv.cpp Thu Nov 1 18:02:47 2018 (r483693, copy of r483145, head/japanese/jmode/files/patch-src_anthyconv.cpp) @@ -0,0 +1,19 @@ +--- src/anthyconv.cpp.orig 2003-06-02 14:50:36 UTC ++++ src/anthyconv.cpp +@@ -5,6 +5,7 @@ + #endif + + #include ++#include + #include "anthy.xpm" + #include "jmode.h" + #include "anthyconv.h" +@@ -147,7 +148,7 @@ KKContext *AnthyConv::createContext(XimI + return anthy; + } + +-char **AnthyConv::getIcon() ++const char **AnthyConv::getIcon() + { + // toolbar¤Ë½Ð¤Æ¤¯¤ë¥¢¥¤¥³¥ó¤òÊÖ¤¹¡£ + return anthy_xpm; Copied: branches/2018Q4/japanese/jmode/files/patch-src_anthyconv.h (from r483145, head/japanese/jmode/files/patch-src_anthyconv.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/japanese/jmode/files/patch-src_anthyconv.h Thu Nov 1 18:02:47 2018 (r483693, copy of r483145, head/japanese/jmode/files/patch-src_anthyconv.h) @@ -0,0 +1,11 @@ +--- src/anthyconv.h.orig 2003-01-27 13:20:32 UTC ++++ src/anthyconv.h +@@ -13,7 +13,7 @@ class AnthyConv : public KKConv{ + public: + virtual ~AnthyConv(); + KKContext *createContext(XimIC *); +- char **getIcon(); ++ const char **getIcon(); + void onPushIcon(); + virtual char *getModeName(int ); + private: Copied: branches/2018Q4/japanese/jmode/files/patch-src_code.xpm (from r483145, head/japanese/jmode/files/patch-src_code.xpm) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/japanese/jmode/files/patch-src_code.xpm Thu Nov 1 18:02:47 2018 (r483693, copy of r483145, head/japanese/jmode/files/patch-src_code.xpm) @@ -0,0 +1,9 @@ +--- src/code.xpm.orig 2018-02-10 09:59:43 UTC ++++ src/code.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * code_xpm[] = { ++static const char * code_xpm[] = { + "24 32 13 1", + " c None", + ". c #7FFF00", Copied: branches/2018Q4/japanese/jmode/files/patch-src_connection.cpp (from r483145, head/japanese/jmode/files/patch-src_connection.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/japanese/jmode/files/patch-src_connection.cpp Thu Nov 1 18:02:47 2018 (r483693, copy of r483145, head/japanese/jmode/files/patch-src_connection.cpp) @@ -0,0 +1,10 @@ +--- src/connection.cpp.orig 2003-05-03 13:13:15 UTC ++++ src/connection.cpp +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + #include "xim.h" + #include "xdispatch.h" + #include Copied: branches/2018Q4/japanese/jmode/files/patch-src_convdisp.cpp (from r483145, head/japanese/jmode/files/patch-src_convdisp.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/japanese/jmode/files/patch-src_convdisp.cpp Thu Nov 1 18:02:47 2018 (r483693, copy of r483145, head/japanese/jmode/files/patch-src_convdisp.cpp) @@ -0,0 +1,10 @@ +--- src/convdisp.cpp.orig 2003-06-02 15:02:23 UTC ++++ src/convdisp.cpp +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + #include "xim.h" + #include "kkconv.h" + #include "convdisp.h" Modified: branches/2018Q4/japanese/jmode/files/patch-src_dispatch.cpp ============================================================================== --- branches/2018Q4/japanese/jmode/files/patch-src_dispatch.cpp Thu Nov 1 17:58:46 2018 (r483692) +++ branches/2018Q4/japanese/jmode/files/patch-src_dispatch.cpp Thu Nov 1 18:02:47 2018 (r483693) @@ -1,5 +1,5 @@ ---- src/dispatch.cpp.orig 2014-06-28 22:10:26.000000000 +0900 -+++ src/dispatch.cpp 2014-06-28 22:10:45.000000000 +0900 +--- src/dispatch.cpp.orig 2003-08-11 14:38:20 UTC ++++ src/dispatch.cpp @@ -16,6 +16,7 @@ #include #include Modified: branches/2018Q4/japanese/jmode/files/patch-src_keyatom.cpp ============================================================================== --- branches/2018Q4/japanese/jmode/files/patch-src_keyatom.cpp Thu Nov 1 17:58:46 2018 (r483692) +++ branches/2018Q4/japanese/jmode/files/patch-src_keyatom.cpp Thu Nov 1 18:02:47 2018 (r483693) @@ -1,10 +1,20 @@ ---- src/keyatom.cpp.orig 2014-06-28 22:19:00.000000000 +0900 -+++ src/keyatom.cpp 2014-06-28 22:19:19.000000000 +0900 -@@ -9,6 +9,7 @@ +--- src/keyatom.cpp.orig 2003-01-21 14:26:14 UTC ++++ src/keyatom.cpp +@@ -9,6 +9,8 @@ # include # endif #endif +#include ++#include #include "jmode.h" +@@ -275,7 +277,7 @@ read_conf_file() + strlen(CONF_DIR)+20); + fn[0] = 0; + strcat(fn, homedir); +- strcat(fn, "/."PACKAGE); ++ strcat(fn, "/." PACKAGE); + if (read_a_conf_file(fn)) { + return ; + } Modified: branches/2018Q4/japanese/jmode/files/patch-src_kkconv.cpp ============================================================================== --- branches/2018Q4/japanese/jmode/files/patch-src_kkconv.cpp Thu Nov 1 17:58:46 2018 (r483692) +++ branches/2018Q4/japanese/jmode/files/patch-src_kkconv.cpp Thu Nov 1 18:02:47 2018 (r483693) @@ -1,10 +1,37 @@ ---- src/kkconv.cpp.orig 2014-06-28 22:15:17.000000000 +0900 -+++ src/kkconv.cpp 2014-06-28 22:15:38.000000000 +0900 -@@ -18,6 +18,7 @@ +--- src/kkconv.cpp.orig 2002-06-15 14:05:09 UTC ++++ src/kkconv.cpp +@@ -18,10 +18,12 @@ # include # endif #endif +#include ++#include // ¥­¥ã¥é¥¯¥¿¥³¡¼¥É32¤«¤é¡¢ //¤³¤Î¥½¡¼¥¹¤ÏEUC¤Ç½ñ¤«¤ì¤Æ¤¤¤ë¡£ +-static char *ascii_wide_tab[]={ ++static const char *ascii_wide_tab[]={ + 0,"¡ª","¡É","¡ô","¡ð","¡ó","¡õ","¡Ç", + "¡Ê","¡Ë","¡ö","¡Ü","¡¤","¡Ý","¡¥","¡¿", + "£°","£±","£²","£³","£´","£µ","£¶","£·", +@@ -325,9 +327,9 @@ KKContext *createKKContext(XimIC *ic) + return c; + } + +-char **getKKIcon() ++const char **getKKIcon() + { +- char **c; ++ const char **c; + c = NULL; + if (current_conv) { + c = current_conv->getIcon (); +@@ -338,7 +340,7 @@ char **getKKIcon() + // tool bar¤Î²¾Ì¾´Á»úÊÑ´¹¤Î¥Ü¥¿¥ó¤¬²¡¤µ¤ì¤¿¡£ + void onPushIcon() + { +- char **c=0; ++ const char **c=0; + if (current_conv) { + c = current_conv->getIcon (); + if (c) { Copied: branches/2018Q4/japanese/jmode/files/patch-src_kkconv.h (from r483145, head/japanese/jmode/files/patch-src_kkconv.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/japanese/jmode/files/patch-src_kkconv.h Thu Nov 1 18:02:47 2018 (r483693, copy of r483145, head/japanese/jmode/files/patch-src_kkconv.h) @@ -0,0 +1,20 @@ +--- src/kkconv.h.orig 2018-02-10 10:12:06 UTC ++++ src/kkconv.h +@@ -82,7 +82,7 @@ protected: + class XimIC; + class KKConv { + public: +- virtual char **getIcon()=0; ++ virtual const char **getIcon()=0; + virtual void onPushIcon()=0; + virtual KKContext *createContext(XimIC *)=0; + virtual char *getModeName(int )=0; +@@ -105,7 +105,7 @@ struct Candidates { + + bool init_conv(); + KKContext *createKKContext(XimIC *); +-char **getKKIcon(); ++const char **getKKIcon(); + void onPushIcon(); + + void register_kkconv(KKConv *); Modified: branches/2018Q4/japanese/jmode/files/patch-src_main.cpp ============================================================================== --- branches/2018Q4/japanese/jmode/files/patch-src_main.cpp Thu Nov 1 17:58:46 2018 (r483692) +++ branches/2018Q4/japanese/jmode/files/patch-src_main.cpp Thu Nov 1 18:02:47 2018 (r483693) @@ -1,6 +1,6 @@ ---- src/main.cpp.orig Sat May 3 18:46:15 2003 -+++ src/main.cpp Sat Jul 12 03:40:03 2003 -@@ -27,7 +27,7 @@ +--- src/main.cpp.orig 2003-05-03 09:46:15 UTC ++++ src/main.cpp +@@ -27,11 +27,11 @@ int host_byte_order; //ʸ»úÎó #ifdef __FreeBSD__ @@ -9,3 +9,8 @@ #else #define LANG "ja_JP" #endif +-#define VERSION_NAME "jmode out of the way! Version "VERSION"\n" ++#define VERSION_NAME "jmode out of the way! Version " VERSION "\n" + char *version_name=VERSION_NAME; + char *usage= + "--help , --version :Show usage or version\n" Copied: branches/2018Q4/japanese/jmode/files/patch-src_off.xpm (from r483145, head/japanese/jmode/files/patch-src_off.xpm) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/japanese/jmode/files/patch-src_off.xpm Thu Nov 1 18:02:47 2018 (r483693, copy of r483145, head/japanese/jmode/files/patch-src_off.xpm) @@ -0,0 +1,9 @@ +--- src/off.xpm.orig 2018-02-10 09:59:01 UTC ++++ src/off.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * off_xpm[] = { ++static const char * off_xpm[] = { + "12 32 2 1", + " c None", + ". c #FFFF00", Copied: branches/2018Q4/japanese/jmode/files/patch-src_on.xpm (from r483145, head/japanese/jmode/files/patch-src_on.xpm) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/japanese/jmode/files/patch-src_on.xpm Thu Nov 1 18:02:47 2018 (r483693, copy of r483145, head/japanese/jmode/files/patch-src_on.xpm) @@ -0,0 +1,9 @@ +--- src/on.xpm.orig 2018-02-10 09:57:51 UTC ++++ src/on.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * on_xpm[] = { ++static const char * on_xpm[] = { + "12 32 3 1", + " c None", + ". c #FFFF00", Copied: branches/2018Q4/japanese/jmode/files/patch-src_skk.xpm (from r483145, head/japanese/jmode/files/patch-src_skk.xpm) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/japanese/jmode/files/patch-src_skk.xpm Thu Nov 1 18:02:47 2018 (r483693, copy of r483145, head/japanese/jmode/files/patch-src_skk.xpm) @@ -0,0 +1,9 @@ +--- src/skk.xpm.orig 2001-01-29 07:48:17 UTC ++++ src/skk.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * skk_xpm[] = { ++static const char * skk_xpm[] = { + "24 32 13 1", + " c None", + ". c #FFFFFF", Copied: branches/2018Q4/japanese/jmode/files/patch-src_skkconv.cpp (from r483145, head/japanese/jmode/files/patch-src_skkconv.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/japanese/jmode/files/patch-src_skkconv.cpp Thu Nov 1 18:02:47 2018 (r483693, copy of r483145, head/japanese/jmode/files/patch-src_skkconv.cpp) @@ -0,0 +1,20 @@ +--- src/skkconv.cpp.orig 2002-06-15 14:35:40 UTC ++++ src/skkconv.cpp +@@ -101,7 +101,7 @@ void SKKConv::init() + bind_str_to_atom("slash", A_skk_begin_latin_conv); + } + +-char **SKKConv::getIcon() ++const char **SKKConv::getIcon() + { + return skk_xpm; + } +@@ -960,7 +960,7 @@ void SKKChildWindow::draw() + void SKKChildWindow::activate(GtkWidget *w, gpointer p) + { + SKKChildContext *c; +- int pos = (int)p; ++ int pos = (uint64_t)p; + c = get_current_context(); + if (c) { + c->stat.setMode(pos); Copied: branches/2018Q4/japanese/jmode/files/patch-src_skkconv.h (from r483145, head/japanese/jmode/files/patch-src_skkconv.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/japanese/jmode/files/patch-src_skkconv.h Thu Nov 1 18:02:47 2018 (r483693, copy of r483145, head/japanese/jmode/files/patch-src_skkconv.h) @@ -0,0 +1,11 @@ +--- src/skkconv.h.orig 2002-06-15 14:10:40 UTC ++++ src/skkconv.h +@@ -35,7 +35,7 @@ class SKKConv : public KKConv{ + public: + virtual ~SKKConv(); + // +- char **getIcon(); ++ const char **getIcon(); + void onPushIcon(); + virtual char *getModeName(int ); + // Copied: branches/2018Q4/japanese/jmode/files/patch-src_ui.cpp (from r483145, head/japanese/jmode/files/patch-src_ui.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/japanese/jmode/files/patch-src_ui.cpp Thu Nov 1 18:02:47 2018 (r483693, copy of r483145, head/japanese/jmode/files/patch-src_ui.cpp) @@ -0,0 +1,47 @@ +--- src/ui.cpp.orig 2018-02-10 10:03:56 UTC ++++ src/ui.cpp +@@ -100,7 +100,7 @@ public: + virtual void motion(GtkWidget *,int x,int y,int b); + private: + void create(); +- void add_icon_to_button(GtkWidget *,char **xpm); ++ void add_icon_to_button(GtkWidget *,const char **xpm); + void add_input_mode(GtkWidget *,char *,int mode); + void init_mode_menu(); + void init_buttons(); +@@ -286,7 +286,7 @@ void ToolBar::create() + gtk_widget_show(m_hbox); + gtk_widget_show(m_win); + //³¨¤òŽ¤ë¡¢ +- char **p; ++ const char **p; + p = getKKIcon(); + if (p) { + add_icon_to_button(kk_setting_button,p); +@@ -353,7 +353,7 @@ void ToolBar::set_mode(int s) + } + } + +-void ToolBar::add_icon_to_button(GtkWidget *button,char **xpm) ++void ToolBar::add_icon_to_button(GtkWidget *button,const char **xpm) + { + GtkStyle *style; + GdkBitmap *mask; +@@ -434,7 +434,7 @@ void ToolBar::destroy(GtkWidget *w) + + void ToolBar::activate(GtkWidget *w,gpointer p) + { +- int pos = (int)p; ++ int pos = (uint64_t)p; + gtk_widget_draw(w, NULL); + user_if->change_menu(pos); + } +@@ -581,7 +581,7 @@ GtkWidget *Indicator::get_win() + + void Indicator::draw_stat() + { +- char *m = "OFF"; ++ const char *m = "OFF"; + if (XimIC::isAnyActive()){ + m = "ON"; + } Copied: branches/2018Q4/japanese/jmode/files/patch-src_ximic.cpp (from r483145, head/japanese/jmode/files/patch-src_ximic.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/japanese/jmode/files/patch-src_ximic.cpp Thu Nov 1 18:02:47 2018 (r483693, copy of r483145, head/japanese/jmode/files/patch-src_ximic.cpp) @@ -0,0 +1,10 @@ +--- src/ximic.cpp.orig 2003-08-11 14:23:54 UTC ++++ src/ximic.cpp +@@ -7,6 +7,7 @@ + #endif + + #include ++#include + #include + #include "xim.h" + #include "convdisp.h" Modified: branches/2018Q4/japanese/jmode/files/patch-src_ximim.cpp ============================================================================== --- branches/2018Q4/japanese/jmode/files/patch-src_ximim.cpp Thu Nov 1 17:58:46 2018 (r483692) +++ branches/2018Q4/japanese/jmode/files/patch-src_ximim.cpp Thu Nov 1 18:02:47 2018 (r483693) @@ -1,5 +1,5 @@ ---- src/ximim.cpp.orig 2014-06-28 22:13:59.000000000 +0900 -+++ src/ximim.cpp 2014-06-28 22:14:31.000000000 +0900 +--- src/ximim.cpp.orig 2003-05-16 16:07:43 UTC ++++ src/ximim.cpp @@ -15,6 +15,7 @@ # include # endif Modified: branches/2018Q4/japanese/jmode/files/patch-src_ximpacket.cpp ============================================================================== --- branches/2018Q4/japanese/jmode/files/patch-src_ximpacket.cpp Thu Nov 1 17:58:46 2018 (r483692) +++ branches/2018Q4/japanese/jmode/files/patch-src_ximpacket.cpp Thu Nov 1 18:02:47 2018 (r483693) @@ -1,5 +1,5 @@ ---- src/ximpacket.cpp.orig 2014-06-28 22:17:36.000000000 +0900 -+++ src/ximpacket.cpp 2014-06-28 22:18:08.000000000 +0900 +--- src/ximpacket.cpp.orig 2003-02-10 15:01:26 UTC ++++ src/ximpacket.cpp @@ -3,6 +3,7 @@ #endif Modified: branches/2018Q4/japanese/jmode/files/patch-src_ximtrans.cpp ============================================================================== --- branches/2018Q4/japanese/jmode/files/patch-src_ximtrans.cpp Thu Nov 1 17:58:46 2018 (r483692) +++ branches/2018Q4/japanese/jmode/files/patch-src_ximtrans.cpp Thu Nov 1 18:02:47 2018 (r483693) @@ -1,10 +1,11 @@ ---- src/ximtrans.cpp.orig 2014-06-28 22:11:37.000000000 +0900 -+++ src/ximtrans.cpp 2014-06-28 22:11:54.000000000 +0900 -@@ -6,6 +6,7 @@ +--- src/ximtrans.cpp.orig 2003-05-27 10:54:52 UTC ++++ src/ximtrans.cpp +@@ -6,6 +6,8 @@ #endif #include +#include ++#include #include "xim.h" #ifndef __GNUC__ From owner-svn-ports-branches@freebsd.org Thu Nov 1 18:04:20 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D9FEB10FA469; Thu, 1 Nov 2018 18:04:20 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 879F1835D2; Thu, 1 Nov 2018 18:04:20 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6A1A11F3F4; Thu, 1 Nov 2018 18:04:20 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA1I4KX9098999; Thu, 1 Nov 2018 18:04:20 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA1I4K3a098998; Thu, 1 Nov 2018 18:04:20 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811011804.wA1I4K3a098998@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 1 Nov 2018 18:04:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483694 - branches/2018Q4/security/openca-tools-forked X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: branches/2018Q4/security/openca-tools-forked X-SVN-Commit-Revision: 483694 X-SVN-Commit-Repository: ports 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.29 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, 01 Nov 2018 18:04:21 -0000 Author: antoine Date: Thu Nov 1 18:04:20 2018 New Revision: 483694 URL: https://svnweb.freebsd.org/changeset/ports/483694 Log: MFH: r483101 security/openca-tools-forked: mark BROKEN on FreeBSD-12 PR: 232441 Submitted by: Sergei Vyshenski (maintainer) Modified: branches/2018Q4/security/openca-tools-forked/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/security/openca-tools-forked/Makefile ============================================================================== --- branches/2018Q4/security/openca-tools-forked/Makefile Thu Nov 1 18:02:47 2018 (r483693) +++ branches/2018Q4/security/openca-tools-forked/Makefile Thu Nov 1 18:04:20 2018 (r483694) @@ -4,7 +4,7 @@ PORTNAME= openca-tools-forked PORTVERSION= 1.4.0 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MAINTAINER= svysh.fbsd@gmail.com @@ -14,12 +14,13 @@ LICENSE= APACHE20 BROKEN_SSL= openssl-devel -USE_GITHUB= yes -GH_ACCOUNT= openxpki +USES= gmake perl5 ssl GNU_CONFIGURE= yes -USES= gmake perl5 ssl +USE_GITHUB= yes +GH_ACCOUNT= openxpki + CONFIGURE_ARGS+= --with-openssl-prefix=${OPENSSLBASE} # security/openssl already has a verify.1 manpage. @@ -28,4 +29,10 @@ post-install: @${MV} ${STAGEDIR}${PREFIX}/man/man1/${f} ${STAGEDIR}${PREFIX}/man/man1/openca-${f} .endfor -.include +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 && ${SSL_DEFAULT} == base +BROKEN= OpenSSL-1.1.1 not supported by the upstream +.endif + +.include From owner-svn-ports-branches@freebsd.org Thu Nov 1 18:06:52 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9347010FA55E; Thu, 1 Nov 2018 18:06:52 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 491D6837AC; Thu, 1 Nov 2018 18:06:52 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 261FC1F3F6; Thu, 1 Nov 2018 18:06:52 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA1I6qS9099309; Thu, 1 Nov 2018 18:06:52 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA1I6pX2099304; Thu, 1 Nov 2018 18:06:51 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811011806.wA1I6pX2099304@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 1 Nov 2018 18:06:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483695 - in branches/2018Q4/mail/panda-cclient: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q4/mail/panda-cclient: . files X-SVN-Commit-Revision: 483695 X-SVN-Commit-Repository: ports 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.29 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, 01 Nov 2018 18:06:53 -0000 Author: antoine Date: Thu Nov 1 18:06:50 2018 New Revision: 483695 URL: https://svnweb.freebsd.org/changeset/ports/483695 Log: MFH: r483321 r483371 Fix in head and with openssl-devel. Obtained from: openembedded/meta-openembedded Remove a duplicate patch. Reported by: fluffy Added: branches/2018Q4/mail/panda-cclient/files/patch-src_osdep_unix_os__bsi.h - copied unchanged from r483321, head/mail/panda-cclient/files/patch-src_osdep_unix_os__bsi.h branches/2018Q4/mail/panda-cclient/files/patch-src_osdep_unix_ssl__unix.c - copied unchanged from r483321, head/mail/panda-cclient/files/patch-src_osdep_unix_ssl__unix.c Deleted: branches/2018Q4/mail/panda-cclient/files/patch-src_osdep_unix_os_bsi.h Modified: branches/2018Q4/mail/panda-cclient/Makefile branches/2018Q4/mail/panda-cclient/files/patch-Makefile branches/2018Q4/mail/panda-cclient/files/patch-src_osdep_unix_Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/mail/panda-cclient/Makefile ============================================================================== --- branches/2018Q4/mail/panda-cclient/Makefile Thu Nov 1 18:04:20 2018 (r483694) +++ branches/2018Q4/mail/panda-cclient/Makefile Thu Nov 1 18:06:50 2018 (r483695) @@ -3,6 +3,7 @@ PORTNAME= cclient PORTVERSION= 20130621 +PORTREVISION= 1 CATEGORIES= mail devel ipv6 PKGNAMEPREFIX= panda- @@ -33,12 +34,6 @@ USES+= ssl PKGMESSAGE= pkg-message-ssl .endif -.include - -.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel} -BROKEN= Does not build with openssl-devel -.endif - USE_LDCONFIG= yes ALL_TARGET= bsf .if ! ${PORT_OPTIONS:MSSL} @@ -113,4 +108,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/c-client/OSCFLAGS ${STAGEDIR}${PREFIX}/include/c-client ${INSTALL_DATA} ${PORTREV_H} ${STAGEDIR}${PREFIX}/include/c-client -.include +.include Modified: branches/2018Q4/mail/panda-cclient/files/patch-Makefile ============================================================================== --- branches/2018Q4/mail/panda-cclient/files/patch-Makefile Thu Nov 1 18:04:20 2018 (r483694) +++ branches/2018Q4/mail/panda-cclient/files/patch-Makefile Thu Nov 1 18:06:50 2018 (r483695) @@ -1,78 +1,50 @@ -*** Makefile.orig Wed May 9 00:50:45 2007 ---- Makefile Mon Jul 23 16:02:26 2007 -*************** -*** 294,300 **** - - # Make the IMAP Toolkit - -! all: c-client SPECIALS rebuild bundled - - c-client: - @echo Not processed yet. In a first-time build, you must specify ---- 294,300 ---- - - # Make the IMAP Toolkit - -! all: c-client SPECIALS rebuild - - c-client: - @echo Not processed yet. In a first-time build, you must specify -*************** -*** 559,567 **** - @echo + In order to rectify this problem, you MUST build with: - @echo ++ SSLTYPE=$(SSLTYPE).nopwd - @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -- @echo -- @echo Do you want to continue this build anyway? Type y or n please: -- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nounenc;exit 1);; esac' - - nounenc: - @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ---- 559,564 ---- -*************** -*** 582,590 **** - @echo ++ SSLTYPE=nopwd - @echo + You must also have OpenSSL or equivalent installed. - @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -- @echo -- @echo Do you want to continue this build anyway? Type y or n please: -- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nonossl;exit 1);; esac' - - nonossl: - @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ---- 579,584 ---- -*************** -*** 659,665 **** - $(TOOLS)/$@ "$(LN)" src/tmail tmail - $(LN) $(TOOLS)/$@ . - -! build: OSTYPE rebuild rebuildclean bundled - - OSTYPE: - @$(MAKE) ip$(IP) ---- 653,659 ---- - $(TOOLS)/$@ "$(LN)" src/tmail tmail - $(LN) $(TOOLS)/$@ . - -! build: OSTYPE rebuild rebuildclean - - OSTYPE: - @$(MAKE) ip$(IP) -*************** -*** 679,686 **** - @$(SH) -c '(test $(BUILDTYPE) = rebuild -o $(BUILDTYPE) = `$(CAT) OSTYPE`) || (echo Already built for `$(CAT) OSTYPE` -- you must do \"make clean\" first && exit 1)' - @echo Rebuilding c-client for `$(CAT) OSTYPE`... - @$(TOUCH) SPECIALS -! $(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \ -! CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS` - - rebuildclean: - $(SH) -c '$(RM) rebuild || true' ---- 673,679 ---- - @$(SH) -c '(test $(BUILDTYPE) = rebuild -o $(BUILDTYPE) = `$(CAT) OSTYPE`) || (echo Already built for `$(CAT) OSTYPE` -- you must do \"make clean\" first && exit 1)' - @echo Rebuilding c-client for `$(CAT) OSTYPE`... - @$(TOUCH) SPECIALS -! $(CD) c-client;$(MAKE) all CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS` - - rebuildclean: - $(SH) -c '$(RM) rebuild || true' +--- Makefile.orig 2013-06-21 21:29:17 UTC ++++ Makefile +@@ -295,7 +295,7 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRA + + # Make the IMAP Toolkit + +-all: c-client SPECIALS rebuild bundled ++all: c-client SPECIALS rebuild + + c-client: + @echo Not processed yet. In a first-time build, you must specify +@@ -587,9 +587,6 @@ sslunix sslsco: + @echo + In order to rectify this problem, you MUST build with: + @echo ++ SSLTYPE=$(SSLTYPE).nopwd + @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +- @echo +- @echo Do you want to continue this build anyway? Type y or n please: +- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nounenc;exit 1);; esac' + + nounenc: + @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +@@ -610,9 +607,6 @@ sslnone: + @echo ++ SSLTYPE=nopwd + @echo + You must also have OpenSSL or equivalent installed. + @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +- @echo +- @echo Do you want to continue this build anyway? Type y or n please: +- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nonossl;exit 1);; esac' + + nonossl: + @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +@@ -687,7 +681,7 @@ an ua: + $(TOOLS)/$@ "$(LN)" src/tmail tmail + $(LN) $(TOOLS)/$@ . + +-build: OSTYPE rebuild rebuildclean bundled ++build: OSTYPE rebuild rebuildclean + + OSTYPE: + @$(MAKE) ip$(IP) +@@ -707,8 +701,7 @@ rebuild: + @$(SH) -c '(test $(BUILDTYPE) = rebuild -o $(BUILDTYPE) = `$(CAT) OSTYPE`) || (echo Already built for `$(CAT) OSTYPE` -- you must do \"make clean\" first && exit 1)' + @echo Rebuilding c-client for `$(CAT) OSTYPE`... + @$(TOUCH) SPECIALS +- $(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \ +- CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS` ++ $(CD) c-client;$(MAKE) all CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS` + + rebuildclean: + $(SH) -c '$(RM) rebuild || true' Modified: branches/2018Q4/mail/panda-cclient/files/patch-src_osdep_unix_Makefile ============================================================================== --- branches/2018Q4/mail/panda-cclient/files/patch-src_osdep_unix_Makefile Thu Nov 1 18:04:20 2018 (r483694) +++ branches/2018Q4/mail/panda-cclient/files/patch-src_osdep_unix_Makefile Thu Nov 1 18:06:50 2018 (r483695) @@ -1,5 +1,5 @@ ---- src/osdep/unix/Makefile.orig 2013-06-21 23:29:17.000000000 +0200 -+++ src/osdep/unix/Makefile 2014-12-01 22:35:23.000000000 +0100 +--- src/osdep/unix/Makefile.orig 2013-06-21 21:29:17 UTC ++++ src/osdep/unix/Makefile @@ -30,9 +30,9 @@ EXTRAAUTHENTICATORS= @@ -13,7 +13,7 @@ # The optimization level here for GCC ports is set here for a reason. It's -@@ -56,13 +56,13 @@ +@@ -56,13 +56,13 @@ GCC4CFLAGS= $(GCCCFLAGS) -Wno-pointer-si # Extended flags needed for SSL. You may need to modify. @@ -30,7 +30,7 @@ # Older versions of MIT Kerberos also have a libcrypto. If so, you may need # to use this instead -@@ -89,7 +89,7 @@ +@@ -89,7 +89,7 @@ AFSLDFLAGS=-L$(AFSLIB)/afs -L$(AFSLIB) - # AFSLDFLAGS may also need -L/usr/ucblib -lucb DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\" DCELDFLAGS= -ldce @@ -39,7 +39,7 @@ # Build parameters normally set by the individual port -@@ -132,7 +132,7 @@ +@@ -132,7 +132,7 @@ EMPTYPROTO=unixproto # Commands possibly overriden by the individual port ARRC=ar rc @@ -48,7 +48,7 @@ LN=ln -s RANLIB=ranlib -@@ -156,7 +156,7 @@ +@@ -156,7 +156,7 @@ BINARIES=osdep.o mail.o misc.o newsrc.o dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o @@ -57,7 +57,7 @@ CAT=cat MAKE=make -@@ -173,6 +173,10 @@ +@@ -173,6 +173,10 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRA PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP) @@ -68,7 +68,7 @@ # Here if no make argument established missing: osdep.h -@@ -261,13 +265,14 @@ +@@ -261,13 +265,14 @@ bsd: # BSD UNIX BASECFLAGS="-g -Dconst=" bsf: # FreeBSD @@ -85,7 +85,7 @@ bsi: # BSD/i386 $(BUILD) `$(CAT) SPECIALS` OS=$@ \ -@@ -863,23 +868,31 @@ +@@ -863,23 +868,31 @@ vu2: # VAX Ultrix 2.3, etc. # Build it! @@ -120,7 +120,7 @@ # Dependencies -@@ -914,7 +927,7 @@ +@@ -914,7 +927,7 @@ utf8aux.o: mail.h misc.h osdep.h utf8.h # OS-dependent @@ -129,7 +129,7 @@ osdep.h env_unix.h tcp_unix.h \ osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\ auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c fsync.c \ -@@ -928,12 +941,19 @@ +@@ -928,12 +941,19 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h n write.c sslstdio.c \ strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ OSCFLAGS Copied: branches/2018Q4/mail/panda-cclient/files/patch-src_osdep_unix_os__bsi.h (from r483321, head/mail/panda-cclient/files/patch-src_osdep_unix_os__bsi.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/mail/panda-cclient/files/patch-src_osdep_unix_os__bsi.h Thu Nov 1 18:06:50 2018 (r483695, copy of r483321, head/mail/panda-cclient/files/patch-src_osdep_unix_os__bsi.h) @@ -0,0 +1,21 @@ +--- src/osdep/unix/os_bsi.h.orig Wed Apr 11 10:53:03 2001 ++++ src/osdep/unix/os_bsi.h Wed Apr 11 10:55:32 2001 +@@ -22,7 +22,18 @@ + #include + #include + #include ++ ++/* ++ * FreeBSD v3.x and onward whines about being obsolete, so switch ++ * to POSIX semantics. ++ */ ++#if __FreeBSD__ >= 3 ++#include ++#define direct dirent ++#else + #include ++#endif ++ + #include + #include + #include Copied: branches/2018Q4/mail/panda-cclient/files/patch-src_osdep_unix_ssl__unix.c (from r483321, head/mail/panda-cclient/files/patch-src_osdep_unix_ssl__unix.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/mail/panda-cclient/files/patch-src_osdep_unix_ssl__unix.c Thu Nov 1 18:06:50 2018 (r483695, copy of r483321, head/mail/panda-cclient/files/patch-src_osdep_unix_ssl__unix.c) @@ -0,0 +1,63 @@ +--- src/osdep/unix/ssl_unix.c.orig 2013-06-21 21:29:17 UTC ++++ src/osdep/unix/ssl_unix.c +@@ -22,6 +22,10 @@ + * http://www.apache.org/licenses/LICENSE-2.0 + * + */ ++ ++/* Patch for OPENSSL_VERSION_NUMBER >= 0x10100000 obtained from ++ * openembedded/meta-openembedded (on GitHub) ++ */ + + #define crypt ssl_private_crypt + #define STRING OPENSSL_STRING +@@ -241,8 +245,16 @@ static char *ssl_start_work (SSLSTREAM * + /* disable certificate validation? */ + if (flags & NET_NOVALIDATECERT) + SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL); +- else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify); ++ else { ++#if OPENSSL_VERSION_NUMBER >= 0x10100000 ++ X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context); ++ X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS); ++ X509_VERIFY_PARAM_set1_host(param, host, 0); ++#endif ++ ++ SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify); + /* set default paths to CAs... */ ++ } + SSL_CTX_set_default_verify_paths (stream->context); + /* ...unless a non-standard path desired */ + if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL)) +@@ -280,6 +292,7 @@ static char *ssl_start_work (SSLSTREAM * + if (SSL_write (stream->con,"",0) < 0) + return ssl_last_error ? ssl_last_error : "SSL negotiation failed"; + /* need to validate host names? */ ++#if OPENSSL_VERSION_NUMBER < 0x10100000 + if (!(flags & NET_NOVALIDATECERT) && + (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con), + host))) { +@@ -289,6 +302,7 @@ static char *ssl_start_work (SSLSTREAM * + sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???"); + return ssl_last_error = cpystr (tmp); + } ++#endif + return NIL; + } + +@@ -327,6 +341,7 @@ static int ssl_open_verify (int ok,X509_ + * Returns: NIL if validated, else string of error message + */ + ++#if OPENSSL_VERSION_NUMBER < 0x10100000 + static char *ssl_validate_cert (X509 *cert,char *host) + { + int i,n; +@@ -356,6 +371,7 @@ static char *ssl_validate_cert (X509 *ce + else ret = "Unable to locate common name in certificate"; + return ret; + } ++#endif + + /* Case-independent wildcard pattern match + * Accepts: base string From owner-svn-ports-branches@freebsd.org Thu Nov 1 18:10:23 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 768E510FA681; Thu, 1 Nov 2018 18:10:23 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2C0A683975; Thu, 1 Nov 2018 18:10:23 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0CF211F3FC; Thu, 1 Nov 2018 18:10:23 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA1IAM9X099591; Thu, 1 Nov 2018 18:10:22 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA1IAMTj099590; Thu, 1 Nov 2018 18:10:22 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811011810.wA1IAMTj099590@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 1 Nov 2018 18:10:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483696 - branches/2018Q4/mail/spamilter X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: branches/2018Q4/mail/spamilter X-SVN-Commit-Revision: 483696 X-SVN-Commit-Repository: ports 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.29 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, 01 Nov 2018 18:10:23 -0000 Author: antoine Date: Thu Nov 1 18:10:22 2018 New Revision: 483696 URL: https://svnweb.freebsd.org/changeset/ports/483696 Log: MFH: r482452 - make ipfwmtad optional - fix build on FreeBSD-12 Modified: branches/2018Q4/mail/spamilter/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/mail/spamilter/Makefile ============================================================================== --- branches/2018Q4/mail/spamilter/Makefile Thu Nov 1 18:06:50 2018 (r483695) +++ branches/2018Q4/mail/spamilter/Makefile Thu Nov 1 18:10:22 2018 (r483696) @@ -26,15 +26,15 @@ DOCSFILES= Changelog INSTALL LICENSE docs/docs.html do conf/db.rcpt conf/db.rdnsbl conf/db.sndr \ conf/policy.html conf/spamilter.rc -PLIST_FILES+= bin/dnsblchk bin/dnsblupd bin/ipfwmtad bin/mxlookup \ - bin/spamilter \ +PLIST_FILES+= bin/dnsblchk bin/dnsblupd bin/mxlookup bin/spamilter \ bin/spamilter-system-report bin/spamilter-user-report PORTDOCS= Changelog INSTALL LICENSE docs.html docs.txt db.rcpt \ db.rdnsbl db.sndr policy.html spamilter.rc -OPTIONS_DEFINE= SMTP_AFTER_POP3 PAM LIBSPF DOCS +OPTIONS_DEFINE= SMTP_AFTER_POP3 PAM LIBSPF IPFWMTAD DOCS SMTP_AFTER_POP3_DESC= SMTP after POP3 LIBSPF_DESC= build with libspf +IPFWMTAD_DESC= build ipfwmtad (requires openssl) SMTP_AFTER_POP3_CONFIGURE_ON= --with-popauth PAM_CONFIGURE_ON= --with-pam @@ -42,9 +42,15 @@ LIBSPF_BUILD_DEPENDS= ${LOCALBASE}/lib/libspf.a:mail/l LIBSPF_CONFIGURE_ON= --with-libspf ${LOCALBASE} LIBSPF_CFLAGS= -I${LOCALBASE}/include LIBSPF_LDFLAGS= -L${LOCALBASE}/lib +IPFWMTAD_PLIST_FILES= bin/ipfwmtad +IPFWMTAD_USES= ssl .include +.if ${PORT_OPTIONS:MIPFWMTAD} +BROKEN_FreeBSD_12= option IPFWMTAD needs old openssl +.endif + .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" CONFIGURE_ARGS+= --sendmail-dir "${MILTERBASE}" @@ -60,6 +66,14 @@ pre-configure: ${REINPLACE_CMD} \ -e "s=/usr/local/=${PREFIX}/=" \ ${WRKSRC}/Makefile.tmpl + +.if ! ${PORT_OPTIONS:MIPFWMTAD} +post-configure: + ${REINPLACE_CMD} \ + -e 's| install-ipfwmtad $$| |' \ + -e 's| ipfwmtad $$| |' \ + ${WRKSRC}/Makefile +.endif post-install: .for i in ${BINFILES} From owner-svn-ports-branches@freebsd.org Thu Nov 1 18:13:05 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 97D4C10FABAB; Thu, 1 Nov 2018 18:13:05 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4422A83E85; Thu, 1 Nov 2018 18:13:05 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 237801F58A; Thu, 1 Nov 2018 18:13:05 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA1ID5Fu004483; Thu, 1 Nov 2018 18:13:05 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA1ID4QK004481; Thu, 1 Nov 2018 18:13:04 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811011813.wA1ID4QK004481@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 1 Nov 2018 18:13:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483697 - in branches/2018Q4/multimedia/librtmp: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q4/multimedia/librtmp: . files X-SVN-Commit-Revision: 483697 X-SVN-Commit-Repository: ports 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.29 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, 01 Nov 2018 18:13:05 -0000 Author: antoine Date: Thu Nov 1 18:13:04 2018 New Revision: 483697 URL: https://svnweb.freebsd.org/changeset/ports/483697 Log: MFH: r482967 multimedia/librtmp: Fix build with OpenSSL 1.1.x - Update LICENSE and add LICENSE_FILE PR: 231940 Reported by: antoine Approved by: hrs (maintainer timeout) Obtained from: https://github.com/xbmc/inputstream.rtmp/blob/master/depends/common/librtmp/0003-openssl-1.1.patch Added: branches/2018Q4/multimedia/librtmp/files/patch-openssl-1.1 - copied unchanged from r482967, head/multimedia/librtmp/files/patch-openssl-1.1 Modified: branches/2018Q4/multimedia/librtmp/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/multimedia/librtmp/Makefile ============================================================================== --- branches/2018Q4/multimedia/librtmp/Makefile Thu Nov 1 18:10:22 2018 (r483696) +++ branches/2018Q4/multimedia/librtmp/Makefile Thu Nov 1 18:13:04 2018 (r483697) @@ -2,6 +2,7 @@ PORTNAME= librtmp PORTVERSION= 2.4.20151223 +PORTREVISION= 3 CATEGORIES= multimedia net MASTER_SITES= LOCAL/hrs DISTNAME= rtmpdump-2.4.fa8646da @@ -9,13 +10,12 @@ DISTNAME= rtmpdump-2.4.fa8646da MAINTAINER= hrs@FreeBSD.org COMMENT= RTMP stream library -LICENSE= GPLv2 +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_SSL= openssl-devel -BROKEN_SSL_REASON_openssl-devel= error: incomplete definition of type 'struct dh_st' - USES= pkgconfig tar:bz2 ssl USE_LDCONFIG= yes + CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} WRKSRC= ${WRKDIR}/${DISTNAME}/librtmp Copied: branches/2018Q4/multimedia/librtmp/files/patch-openssl-1.1 (from r482967, head/multimedia/librtmp/files/patch-openssl-1.1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/multimedia/librtmp/files/patch-openssl-1.1 Thu Nov 1 18:13:04 2018 (r483697, copy of r482967, head/multimedia/librtmp/files/patch-openssl-1.1) @@ -0,0 +1,249 @@ +--- dh.h.orig 2016-02-29 01:15:13 UTC ++++ dh.h +@@ -253,20 +253,44 @@ DHInit(int nKeyBits) + if (!dh) + goto failed; + ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + MP_new(dh->g); + + if (!dh->g) + goto failed; ++#else ++ BIGNUM *g = NULL; ++ MP_new(g); ++ if (!g) ++ goto failed; + ++ DH_set0_pqg(dh, NULL, g, NULL); ++#endif ++ ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + MP_gethex(dh->p, P1024, res); /* prime P1024, see dhgroups.h */ ++#else ++ BIGNUM* p = NULL; ++ DH_get0_pqg(dh, (BIGNUM const**)&p, NULL, NULL); ++ MP_gethex(p, P1024, res); /* prime P1024, see dhgroups.h */ ++#endif + if (!res) + { + goto failed; + } + ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + MP_set_w(dh->g, 2); /* base 2 */ ++#else ++ MP_set_w(g, 2); /* base 2 */ ++ DH_set0_pqg(dh, NULL, g, NULL); ++#endif + ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + dh->length = nKeyBits; ++#else ++ DH_set_length(dh, nKeyBits); ++#endif + return dh; + + failed: +@@ -293,12 +317,24 @@ DHGenerateKey(MDH *dh) + MP_gethex(q1, Q1024, res); + assert(res); + ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + res = isValidPublicKey(dh->pub_key, dh->p, q1); ++#else ++ BIGNUM const* pub_key = NULL; ++ BIGNUM const* p = NULL; ++ DH_get0_key(dh, &pub_key, NULL); ++ DH_get0_pqg(dh, &p, NULL, NULL); ++ res = isValidPublicKey((BIGNUM*)pub_key, (BIGNUM*)p, q1); ++#endif + if (!res) + { ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + MP_free(dh->pub_key); + MP_free(dh->priv_key); + dh->pub_key = dh->priv_key = 0; ++#else ++ DH_free(dh); ++#endif + } + + MP_free(q1); +@@ -314,15 +350,29 @@ static int + DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen) + { + int len; ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + if (!dh || !dh->pub_key) ++#else ++ BIGNUM const* pub_key = NULL; ++ DH_get0_key(dh, &pub_key, NULL); ++ if (!dh || !pub_key) ++#endif + return 0; + ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + len = MP_bytes(dh->pub_key); ++#else ++ len = MP_bytes(pub_key); ++#endif + if (len <= 0 || len > (int) nPubkeyLen) + return 0; + + memset(pubkey, 0, nPubkeyLen); ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + MP_setbin(dh->pub_key, pubkey + (nPubkeyLen - len), len); ++#else ++ MP_setbin(pub_key, pubkey + (nPubkeyLen - len), len); ++#endif + return 1; + } + +@@ -364,7 +414,13 @@ DHComputeSharedSecretKey(MDH *dh, uint8_t *pubkey, siz + MP_gethex(q1, Q1024, len); + assert(len); + ++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + if (isValidPublicKey(pubkeyBn, dh->p, q1)) ++#else ++ BIGNUM const* p = NULL; ++ DH_get0_pqg(dh, &p, NULL, NULL); ++ if (isValidPublicKey(pubkeyBn, (BIGNUM*)p, q1)) ++#endif + res = MDH_compute_key(secret, nPubkeyLen, pubkeyBn, dh); + else + res = -1; +--- handshake.h.orig 2016-02-29 01:15:13 UTC ++++ handshake.h +@@ -31,9 +31,9 @@ + #define SHA256_DIGEST_LENGTH 32 + #endif + #define HMAC_CTX sha2_context +-#define HMAC_setup(ctx, key, len) sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0) +-#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(&ctx, buf, len) +-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig) ++#define HMAC_setup(ctx, key, len) sha2_hmac_starts(ctx, (unsigned char *)key, len, 0) ++#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(ctx, buf, len) ++#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(ctx, dig) + + typedef arc4_context * RC4_handle; + #define RC4_alloc(h) *h = malloc(sizeof(arc4_context)) +@@ -50,9 +50,9 @@ typedef arc4_context * RC4_handle; + #endif + #undef HMAC_CTX + #define HMAC_CTX struct hmac_sha256_ctx +-#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(&ctx, len, key) +-#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(&ctx, len, buf) +-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig) ++#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(ctx, len, key) ++#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(ctx, len, buf) ++#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(ctx, SHA256_DIGEST_LENGTH, dig) + #define HMAC_close(ctx) + + typedef struct arcfour_ctx* RC4_handle; +@@ -64,14 +64,23 @@ typedef struct arcfour_ctx* RC4_handle; + + #else /* USE_OPENSSL */ + #include ++#include + #include + #include + #if OPENSSL_VERSION_NUMBER < 0x0090800 || !defined(SHA256_DIGEST_LENGTH) + #error Your OpenSSL is too old, need 0.9.8 or newer with SHA256 + #endif +-#define HMAC_setup(ctx, key, len) HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, key, len, EVP_sha256(), 0) +-#define HMAC_crunch(ctx, buf, len) HMAC_Update(&ctx, buf, len) +-#define HMAC_finish(ctx, dig, dlen) HMAC_Final(&ctx, dig, &dlen); HMAC_CTX_cleanup(&ctx) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#define HMAC_setup(ctx, key, len) HMAC_CTX_init(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0) ++#else ++#define HMAC_setup(ctx, key, len) HMAC_CTX_reset(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0) ++#endif ++#define HMAC_crunch(ctx, buf, len) HMAC_Update(ctx, buf, len) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#define HMAC_finish(ctx, dig, dlen) HMAC_Final(ctx, dig, &dlen); HMAC_CTX_cleanup(ctx) ++#else ++#define HMAC_finish(ctx, dig, dlen) HMAC_Final(ctx, dig, &dlen); HMAC_CTX_free(ctx) ++#endif + + typedef RC4_KEY * RC4_handle; + #define RC4_alloc(h) *h = malloc(sizeof(RC4_KEY)) +@@ -117,7 +126,7 @@ static void InitRC4Encryption + { + uint8_t digest[SHA256_DIGEST_LENGTH]; + unsigned int digestLen = 0; +- HMAC_CTX ctx; ++ HMAC_CTX* ctx = NULL; + + RC4_alloc(rc4keyIn); + RC4_alloc(rc4keyOut); +@@ -266,7 +275,7 @@ HMACsha256(const uint8_t *message, size_t messageLen, + size_t keylen, uint8_t *digest) + { + unsigned int digestLen; +- HMAC_CTX ctx; ++ HMAC_CTX* ctx = NULL; + + HMAC_setup(ctx, key, keylen); + HMAC_crunch(ctx, message, messageLen); +--- hashswf.c.orig 2016-02-29 01:15:13 UTC ++++ hashswf.c +@@ -37,9 +37,9 @@ + #define SHA256_DIGEST_LENGTH 32 + #endif + #define HMAC_CTX sha2_context +-#define HMAC_setup(ctx, key, len) sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0) +-#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(&ctx, buf, len) +-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig) ++#define HMAC_setup(ctx, key, len) sha2_hmac_starts(ctx, (unsigned char *)key, len, 0) ++#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(ctx, buf, len) ++#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(ctx, dig) + #define HMAC_close(ctx) + #elif defined(USE_GNUTLS) + #include +@@ -48,20 +48,28 @@ + #endif + #undef HMAC_CTX + #define HMAC_CTX struct hmac_sha256_ctx +-#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(&ctx, len, key) +-#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(&ctx, len, buf) +-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig) ++#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(ctx, len, key) ++#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(ctx, len, buf) ++#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(ctx, SHA256_DIGEST_LENGTH, dig) + #define HMAC_close(ctx) + #else /* USE_OPENSSL */ + #include + #include + #include + #include +-#define HMAC_setup(ctx, key, len) HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, (unsigned char *)key, len, EVP_sha256(), 0) +-#define HMAC_crunch(ctx, buf, len) HMAC_Update(&ctx, (unsigned char *)buf, len) +-#define HMAC_finish(ctx, dig, dlen) HMAC_Final(&ctx, (unsigned char *)dig, &dlen); +-#define HMAC_close(ctx) HMAC_CTX_cleanup(&ctx) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#define HMAC_setup(ctx, key, len) HMAC_CTX_init(ctx); HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0) ++#else ++#define HMAC_setup(ctx, key, len) HMAC_CTX_reset(ctx); HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0) + #endif ++#define HMAC_crunch(ctx, buf, len) HMAC_Update(ctx, (unsigned char *)buf, len) ++#define HMAC_finish(ctx, dig, dlen) HMAC_Final(ctx, (unsigned char *)dig, &dlen); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#define HMAC_close(ctx) HMAC_CTX_cleanup(ctx) ++#else ++#define HMAC_close(ctx) HMAC_CTX_reset(ctx); HMAC_CTX_free(ctx) ++#endif ++#endif + + extern void RTMP_TLS_Init(); + extern TLS_CTX RTMP_TLS_ctx; +@@ -289,7 +297,7 @@ leave: + struct info + { + z_stream *zs; +- HMAC_CTX ctx; ++ HMAC_CTX *ctx; + int first; + int zlib; + int size; From owner-svn-ports-branches@freebsd.org Thu Nov 1 18:16:36 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F72110FAC94; Thu, 1 Nov 2018 18:16:36 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D287883FEB; Thu, 1 Nov 2018 18:16:35 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B3A8B1F58F; Thu, 1 Nov 2018 18:16:35 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA1IGZP6004929; Thu, 1 Nov 2018 18:16:35 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA1IGXhX004917; Thu, 1 Nov 2018 18:16:33 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811011816.wA1IGXhX004917@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 1 Nov 2018 18:16:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483698 - in branches/2018Q4/net-im/jabberd: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q4/net-im/jabberd: . files X-SVN-Commit-Revision: 483698 X-SVN-Commit-Repository: ports 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.29 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, 01 Nov 2018 18:16:36 -0000 Author: antoine Date: Thu Nov 1 18:16:33 2018 New Revision: 483698 URL: https://svnweb.freebsd.org/changeset/ports/483698 Log: MFH: r482797 r482800 r482837 r482994 net-im/jabberd: - add OpenSSL 1.1 patches from upstream - use autoreconf - make portlint happier net-im/jabberd: fix build errors with MariaDB 10.2 PR: 228382 Submitted by: Fabian Wenk net-im/jabberd: remove dependency on autoconf-archive net-im/jabberd: add missing build dependency on pkgconfig Added: branches/2018Q4/net-im/jabberd/files/patch-configure.ac - copied, changed from r482797, head/net-im/jabberd/files/patch-configure.ac branches/2018Q4/net-im/jabberd/files/patch-etc__Makefile.am - copied unchanged from r482797, head/net-im/jabberd/files/patch-etc__Makefile.am branches/2018Q4/net-im/jabberd/files/patch-etc__templates__Makefile.am - copied unchanged from r482797, head/net-im/jabberd/files/patch-etc__templates__Makefile.am branches/2018Q4/net-im/jabberd/files/patch-sx__ssl.c - copied unchanged from r482797, head/net-im/jabberd/files/patch-sx__ssl.c Deleted: branches/2018Q4/net-im/jabberd/files/patch-etc__Makefile.in branches/2018Q4/net-im/jabberd/files/patch-etc__templates__Makefile.in Modified: branches/2018Q4/net-im/jabberd/Makefile branches/2018Q4/net-im/jabberd/files/patch-sm__mod_iq_time.c branches/2018Q4/net-im/jabberd/files/patch-storage__authreg_ldapfull.c branches/2018Q4/net-im/jabberd/files/patch-storage__authreg_mysql.c branches/2018Q4/net-im/jabberd/files/patch-tools__jabberd.in branches/2018Q4/net-im/jabberd/files/patch-util_crypt__blowfish.c Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/net-im/jabberd/Makefile ============================================================================== --- branches/2018Q4/net-im/jabberd/Makefile Thu Nov 1 18:13:04 2018 (r483697) +++ branches/2018Q4/net-im/jabberd/Makefile Thu Nov 1 18:16:33 2018 (r483698) @@ -3,7 +3,7 @@ PORTNAME= jabberd PORTVERSION= 2.6.1 -PORTREVISION= 3 +PORTREVISION= 7 CATEGORIES= net-im MASTER_SITES= https://github.com/jabberd2/jabberd2/releases/download/${PORTNAME}-${DISTVERSION}/ \ LOCAL/matthew/${PORTNAME} @@ -17,6 +17,8 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \ libgsasl.so:security/gsasl \ libidn.so:dns/libidn \ libudns.so:dns/udns +USES= autoreconf compiler:c11 iconv libtool perl5 pkgconfig \ + ssl tar:xz OPTIONS_DEFINE= MYSQL PGSQL LDAP BDB SQLITE PAM PIPE ANON FS DEBUG REQUIRES \ DOCS SUPERSEDED EXPERIMENTAL @@ -25,7 +27,6 @@ OPTIONS_SUB= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= compiler:c11 iconv libtool perl5 ssl tar:xz USE_PERL5= run USE_RC_SUBR= jabberd USE_LDCONFIG= ${PREFIX}/lib/jabberd @@ -133,10 +134,6 @@ post-patch: router.xml s2s.xml sm.xml templates/roster.xml @${MV} ${WRKSRC}/etc/${FILE}.dist.in ${WRKSRC}/etc/${FILE}.sample.in .endfor -#.if ${PORT_OPTIONS:MCYRUS} -# @${REINPLACE_CMD} -e '/^#error /d' \ -# ${WRKSRC}/sx/sasl_cyrus.c -#.endif post-install: .for DIR in db logs pid Copied and modified: branches/2018Q4/net-im/jabberd/files/patch-configure.ac (from r482797, head/net-im/jabberd/files/patch-configure.ac) ============================================================================== --- head/net-im/jabberd/files/patch-configure.ac Mon Oct 22 23:47:21 2018 (r482797, copy source) +++ branches/2018Q4/net-im/jabberd/files/patch-configure.ac Thu Nov 1 18:16:33 2018 (r483698) @@ -1,6 +1,17 @@ --- configure.ac.orig 2017-07-01 15:27:52 UTC +++ configure.ac -@@ -406,9 +406,9 @@ if test "x-$want_ssl" != "x-no" ; then +@@ -74,10 +74,6 @@ if test "x-$want_mio_debug" = "x-yes" ; then + AC_DEFINE(MIO_DEBUG,1,[Define to 1 if you want to enable managed IO debug output.]) + fi + +-# Colorized build output +-AX_CHECK_COMPILE_FLAG([-fdiagnostics-color], [CFLAGS="${CFLAGS} -fdiagnostics-color"], +- [AX_CHECK_COMPILE_FLAG([-fcolor-diagnostics], [CFLAGS="${CFLAGS} -fcolor-diagnostics"])]) +- + # Two-step header checking. First check for headers which don't + # require any other headers. + AC_HEADER_DIRENT +@@ -406,9 +402,9 @@ if test "x-$want_ssl" != "x-no" ; then fi AC_CHECK_HEADERS(openssl/crypto.h) if test "x-$ac_cv_header_openssl_crypto_h" = "x-yes" ; then Copied: branches/2018Q4/net-im/jabberd/files/patch-etc__Makefile.am (from r482797, head/net-im/jabberd/files/patch-etc__Makefile.am) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/net-im/jabberd/files/patch-etc__Makefile.am Thu Nov 1 18:16:33 2018 (r483698, copy of r482797, head/net-im/jabberd/files/patch-etc__Makefile.am) @@ -0,0 +1,36 @@ +--- etc/Makefile.am.orig 2016-05-03 22:25:09 UTC ++++ etc/Makefile.am +@@ -1,12 +1,8 @@ + LIBTOOL += --quiet + +-sysconf_DATA = c2s.xml.dist router.xml.dist s2s.xml.dist sm.xml.dist jabberd.cfg.dist router-users.xml.dist router-filter.xml.dist +-initdir = $(prefix)/etc/init +-init_DATA = jabberd-c2s.conf jabberd-router.conf jabberd-s2s.conf jabberd-sm.conf +-systemddir = $(prefix)/lib/systemd/system +-systemd_DATA = jabberd-sm.service jabberd.service jabberd-s2s.service jabberd-router.service jabberd-c2s.service +-configs = $(sysconf_DATA) $(init_DATA) $(systemd_DATA) +-EXTRA_DIST = $(sysconf_DATA:%.dist=%.dist.in) $(init_DATA:%.conf=%.conf.in) $(systemd_DATA:%.service=%.service.in) ++sysconf_DATA = c2s.xml.sample router.xml.sample s2s.xml.sample sm.xml.sample jabberd.cfg.sample router-users.xml.sample router-filter.xml.sample ++configs = $(sysconf_DATA) ++EXTRA_DIST = $(sysconf_DATA:%.sample=%.sample.in) + + SUBDIRS = templates + +@@ -20,7 +16,7 @@ edit = sed \ + -e 's,@libdir\@,$(libdir),g' \ + -e 's,@pkglibdir\@,$(pkglibdir),g' + +-$(configs): $(sysconf_DATA:%.dist=@srcdir@/%.dist.in) $(init_DATA:%.conf=@srcdir@/%.conf.in) $(systemd_DATA:%.service=%.service.in) ++$(configs): $(sysconf_DATA:%.sample=@srcdir@/%.sample.in) + @echo "generating $@ from $@.in"; \ + edit='$(edit)'; \ + list='$(jabberd_bin)'; for p in $$list; do \ +@@ -33,7 +29,7 @@ $(configs): $(sysconf_DATA:%.dist=@srcdir@/%.dist.in) + + install-data-hook: + @list='$(sysconf_DATA)'; for p in $$list; do \ +- dest=`echo $$p | sed -e s/.dist//`; \ ++ dest=`echo $$p | sed -e s/.sample//`; \ + if test -f $(DESTDIR)$(sysconfdir)/$$dest; then \ + echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/$$dest"; \ + else \ Copied: branches/2018Q4/net-im/jabberd/files/patch-etc__templates__Makefile.am (from r482797, head/net-im/jabberd/files/patch-etc__templates__Makefile.am) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/net-im/jabberd/files/patch-etc__templates__Makefile.am Thu Nov 1 18:16:33 2018 (r483698, copy of r482797, head/net-im/jabberd/files/patch-etc__templates__Makefile.am) @@ -0,0 +1,22 @@ +--- etc/templates/Makefile.am.orig 2016-05-03 22:25:09 UTC ++++ etc/templates/Makefile.am +@@ -2,8 +2,8 @@ templatesdir = $(sysconfdir)/templates + + LIBTOOL += --quiet + +-templates_DATA = roster.xml.dist +-EXTRA_DIST = roster.xml.dist.in ++templates_DATA = roster.xml.sample ++EXTRA_DIST = roster.xml.sample.in + + edit = sed \ + -e 's,@sysconfdir\@,$(sysconfdir),g' \ +@@ -18,7 +18,7 @@ $(templates_DATA): + + install-data-hook: + @list='$(templates_DATA)'; for p in $$list; do \ +- dest=`echo $$p | sed -e s/.dist//`; \ ++ dest=`echo $$p | sed -e s/.sample//`; \ + if test -f $(DESTDIR)$(templatesdir)/$$dest; then \ + echo "$@ will not overwrite existing $(DESTDIR)$(templatesdir)/$$dest"; \ + else \ Modified: branches/2018Q4/net-im/jabberd/files/patch-sm__mod_iq_time.c ============================================================================== --- branches/2018Q4/net-im/jabberd/files/patch-sm__mod_iq_time.c Thu Nov 1 18:13:04 2018 (r483697) +++ branches/2018Q4/net-im/jabberd/files/patch-sm__mod_iq_time.c Thu Nov 1 18:16:33 2018 (r483698) @@ -1,6 +1,6 @@ --- sm/mod_iq_time.c.orig 2016-02-09 09:47:02 UTC +++ sm/mod_iq_time.c -@@ -77,7 +77,7 @@ static mod_ret_t _iq_time_pkt_sm(mod_ins +@@ -77,7 +77,7 @@ static mod_ret_t _iq_time_pkt_sm(mod_instance_t mi, pk datetime_out(t, dt_DATETIME, buf, 64); nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "utc", buf); Modified: branches/2018Q4/net-im/jabberd/files/patch-storage__authreg_ldapfull.c ============================================================================== --- branches/2018Q4/net-im/jabberd/files/patch-storage__authreg_ldapfull.c Thu Nov 1 18:13:04 2018 (r483697) +++ branches/2018Q4/net-im/jabberd/files/patch-storage__authreg_ldapfull.c Thu Nov 1 18:16:33 2018 (r483698) @@ -9,3 +9,230 @@ #define _XOPEN_SOURCE 500 // need this to get crypt() #include "c2s.h" +@@ -39,6 +41,7 @@ + + #ifdef HAVE_SSL + #include ++#include + #endif + + #include +@@ -228,13 +231,18 @@ int _ldapfull_base64_decode( const char *src, const un + int rc, tlen = 0; + int i; + unsigned char *text; ++#if OPENSSL_VERSION_NUMBER < 0x10100005L + EVP_ENCODE_CTX EVP_ctx; ++#else ++ EVP_ENCODE_CTX *EVP_ctx; ++#endif + + text = (unsigned char *)malloc(((strlen(src)+3)/4 * 3) + 1); + if (text == NULL) { + return 0; + } + ++#if OPENSSL_VERSION_NUMBER < 0x10100005L + EVP_DecodeInit(&EVP_ctx); + rc = EVP_DecodeUpdate(&EVP_ctx, text, &i, (const unsigned char *)src, strlen(src)); + if (rc < 0) { +@@ -243,40 +251,69 @@ int _ldapfull_base64_decode( const char *src, const un + } + tlen+=i; + EVP_DecodeFinal(&EVP_ctx, (unsigned char*)text, &i); ++#else ++ EVP_ctx = EVP_ENCODE_CTX_new(); ++ EVP_DecodeInit(EVP_ctx); ++ rc = EVP_DecodeUpdate(EVP_ctx, text, &i, (const unsigned char *)src, strlen(src)); ++ if (rc < 0) { ++ free(text); ++ EVP_ENCODE_CTX_free(EVP_ctx); ++ return 0; ++ } ++ tlen+=i; ++ EVP_DecodeFinal(EVP_ctx, (unsigned char*)text, &i); ++#endif + + *ret = text; + if (rlen != NULL) { + *rlen = tlen; + } + ++#if !(OPENSSL_VERSION_NUMBER < 0x10100005L) ++ EVP_ENCODE_CTX_free(EVP_ctx); ++#endif + return 1; + } + + static int _ldapfull_base64_encode( const unsigned char *src, int srclen, char **ret, int *rlen ) { + int tlen = 0; + unsigned char *text; ++#if OPENSSL_VERSION_NUMBER < 0x10100005L + EVP_ENCODE_CTX EVP_ctx; ++#else ++ EVP_ENCODE_CTX *EVP_ctx; ++#endif + + text = (unsigned char *)malloc((srclen*4/3) + 1 ); + if (text == NULL) { + return 0; + } + ++#if OPENSSL_VERSION_NUMBER < 0x10100005L + EVP_EncodeInit(&EVP_ctx); + EVP_EncodeUpdate(&EVP_ctx, text, &tlen, src, srclen); + EVP_EncodeFinal(&EVP_ctx, text, &tlen); ++#else ++ EVP_ctx = EVP_ENCODE_CTX_new(); ++ EVP_EncodeInit(EVP_ctx); ++ EVP_EncodeUpdate(EVP_ctx, text, &tlen, src, srclen); ++ EVP_EncodeFinal(EVP_ctx, text, &tlen); ++#endif + + *ret = (char*)text; + if (rlen != NULL) { + *rlen = tlen; + } + ++#if !(OPENSSL_VERSION_NUMBER < 0x10100005L) ++ EVP_ENCODE_CTX_free(EVP_ctx); ++#endif + return 1; + } + + int _ldapfull_chk_hashed(moddata_t data, const char *scheme, int salted, const char *hash, const char *passwd) { + const unsigned char *bhash; // binary hash, will get it from base64 +- EVP_MD_CTX mdctx; ++ EVP_MD_CTX *mdctx; + const EVP_MD *md; + unsigned char digest[EVP_MAX_MD_SIZE]; + int bhlen, rc; +@@ -289,22 +326,32 @@ int _ldapfull_chk_hashed(moddata_t data, const char *s + return 0; + } + +- EVP_DigestInit(&mdctx, md); +- EVP_DigestUpdate(&mdctx, passwd, strlen(passwd)); ++#if OPENSSL_VERSION_NUMBER < 0x10100005L ++ mdctx = EVP_MD_CTX_create(); ++#else ++ mdctx = EVP_MD_CTX_new(); ++#endif ++ EVP_DigestInit(mdctx, md); ++ EVP_DigestUpdate(mdctx, passwd, strlen(passwd)); + if (salted) { +- EVP_DigestUpdate(&mdctx, &bhash[EVP_MD_size(md)], ++ EVP_DigestUpdate(mdctx, &bhash[EVP_MD_size(md)], + bhlen - EVP_MD_size(md)); + } +- EVP_DigestFinal(&mdctx, digest, NULL); ++ EVP_DigestFinal(mdctx, digest, NULL); + + rc = memcmp((char *)bhash, (char *)digest, EVP_MD_size(md)); + free((void*)bhash); ++#if OPENSSL_VERSION_NUMBER < 0x10100005L ++ EVP_MD_CTX_destroy(mdctx); ++#else ++ EVP_MD_CTX_free(mdctx); ++#endif + return !rc; + } + + int _ldapfull_set_hashed(moddata_t data, const char *scheme, const char *prefix, int saltlen, const char *passwd, char *buf, int buflen) { + char *hash = 0; // base64 hash +- EVP_MD_CTX mdctx; ++ EVP_MD_CTX *mdctx; + const EVP_MD *md; + unsigned char *digest; + unsigned char *salt; +@@ -316,30 +363,48 @@ int _ldapfull_set_hashed(moddata_t data, const char *s + if (!md) { + return 0; + } +- EVP_DigestInit(&mdctx, md); +- EVP_DigestUpdate(&mdctx, passwd, strlen(passwd)); ++ ++#if OPENSSL_VERSION_NUMBER < 0x10100005L ++ mdctx = EVP_MD_CTX_create(); ++#else ++ mdctx = EVP_MD_CTX_new(); ++#endif ++ EVP_DigestInit(mdctx, md); ++ EVP_DigestUpdate(mdctx, passwd, strlen(passwd)); + if (saltlen) { + salt = (unsigned char *)malloc(saltlen); + if( !salt ) { +- EVP_MD_CTX_cleanup(&mdctx); ++#if OPENSSL_VERSION_NUMBER < 0x10100005L ++ EVP_MD_CTX_destroy(mdctx); ++#else ++ EVP_MD_CTX_free(mdctx); ++#endif + return 0; + } + if( !RAND_bytes(salt,saltlen) ) { +- EVP_MD_CTX_cleanup(&mdctx); ++#if OPENSSL_VERSION_NUMBER < 0x10100005L ++ EVP_MD_CTX_destroy(mdctx); ++#else ++ EVP_MD_CTX_free(mdctx); ++#endif + free(salt); + return 0; + } +- EVP_DigestUpdate(&mdctx, salt, saltlen); ++ EVP_DigestUpdate(mdctx, salt, saltlen); + } + digest = (unsigned char *)malloc(EVP_MD_size(md) + saltlen); + if( !digest ) { + if (saltlen) { + free(salt); + } +- EVP_MD_CTX_cleanup(&mdctx); ++#if OPENSSL_VERSION_NUMBER < 0x10100005L ++ EVP_MD_CTX_destroy(mdctx); ++#else ++ EVP_MD_CTX_free(mdctx); ++#endif + return 0; + } +- EVP_DigestFinal(&mdctx, digest, &dlen); ++ EVP_DigestFinal(mdctx, digest, &dlen); + + memcpy(digest+dlen,salt,saltlen); + if (saltlen) { +@@ -352,6 +417,11 @@ int _ldapfull_set_hashed(moddata_t data, const char *s + free(digest); + if( !rc ) { + free(hash); ++#if OPENSSL_VERSION_NUMBER < 0x10100005L ++ EVP_MD_CTX_destroy(mdctx); ++#else ++ EVP_MD_CTX_free(mdctx); ++#endif + return 0; + } + +@@ -359,12 +429,22 @@ int _ldapfull_set_hashed(moddata_t data, const char *s + if( hlen + plen >= buflen ) { + log_write(data->ar->c2s->log,LOG_ERR,"_ldapfull_set_hashed: buffer is too short (%i bytes)",buflen); + free(hash); ++#if OPENSSL_VERSION_NUMBER < 0x10100005L ++ EVP_MD_CTX_destroy(mdctx); ++#else ++ EVP_MD_CTX_free(mdctx); ++#endif + return 0; + } + memcpy(buf,prefix,plen); + memcpy(buf+plen,hash,hlen); + buf[hlen+plen]='\0'; + free(hash); ++#if OPENSSL_VERSION_NUMBER < 0x10100005L ++ EVP_MD_CTX_destroy(mdctx); ++#else ++ EVP_MD_CTX_free(mdctx); ++#endif + + return 1; + } Modified: branches/2018Q4/net-im/jabberd/files/patch-storage__authreg_mysql.c ============================================================================== --- branches/2018Q4/net-im/jabberd/files/patch-storage__authreg_mysql.c Thu Nov 1 18:13:04 2018 (r483697) +++ branches/2018Q4/net-im/jabberd/files/patch-storage__authreg_mysql.c Thu Nov 1 18:16:33 2018 (r483698) @@ -1,11 +1,29 @@ --- storage/authreg_mysql.c.orig 2016-05-22 15:52:07 UTC +++ storage/authreg_mysql.c -@@ -20,6 +20,8 @@ +@@ -487,6 +487,8 @@ DLLEXPORT int ar_init(authreg_t ar) { + MYSQL *conn; + mysqlcontext_t mysqlcontext; + int fail = 0; ++ /* enable reconnect */ ++ my_bool reconnect= 1; - /* this module talks to a MySQL server via libmysqlclient */ + /* configure the database context with field names and SQL statements */ + mysqlcontext = (mysqlcontext_t) malloc( sizeof( struct mysqlcontext_st ) ); +@@ -618,6 +620,7 @@ DLLEXPORT int ar_init(authreg_t ar) { -+#include -+ - #define _XOPEN_SOURCE 500 - #include "c2s.h" - #include + mysql_options(conn, MYSQL_READ_DEFAULT_GROUP, "jabberd"); + mysql_options(conn, MYSQL_SET_CHARSET_NAME, "utf8"); ++ mysql_options(conn, MYSQL_OPT_RECONNECT, (void *)&reconnect); + + /* connect with CLIENT_INTERACTIVE to get a (possibly) higher timeout value than default */ + if(mysql_real_connect(conn, host, user, pass, dbname, atoi(port), NULL, CLIENT_INTERACTIVE) == NULL) { +@@ -626,9 +629,6 @@ DLLEXPORT int ar_init(authreg_t ar) { + } + + mysql_query(conn, "SET NAMES 'utf8'"); +- +- /* Set reconnect flag to 1 (set to 0 by default from mysql 5 on) */ +- conn->reconnect = 1; + + ar->user_exists = _ar_mysql_user_exists; + if (MPC_PLAIN == mysqlcontext->password_type) { Copied: branches/2018Q4/net-im/jabberd/files/patch-sx__ssl.c (from r482797, head/net-im/jabberd/files/patch-sx__ssl.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/net-im/jabberd/files/patch-sx__ssl.c Thu Nov 1 18:16:33 2018 (r483698, copy of r482797, head/net-im/jabberd/files/patch-sx__ssl.c) @@ -0,0 +1,115 @@ +--- sx/ssl.c.orig 2016-05-22 16:19:36 UTC ++++ sx/ssl.c +@@ -70,7 +70,7 @@ static int _sx_ssl_verify_callback(int preverify_ok, X + */ + if (!preverify_ok && (err == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT)) + { +- X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, 256); ++ X509_NAME_oneline(X509_get_issuer_name(err_cert), buf, 256); + _sx_debug(ZONE, "issuer= %s\n", buf); + } + +@@ -115,12 +115,27 @@ static DH *sx_ssl_make_dh_params(BIGNUM *(*const get_p + if (!dh) + return NULL; + ++#if OPENSSL_VERSION_NUMBER < 0x10100005L + dh->p = get_prime(NULL); + BN_dec2bn(&dh->g, gen); + if (!dh->p || !dh->g) { + DH_free(dh); + return NULL; + } ++#else ++ { ++ BIGNUM *p, *g = NULL; ++ p = get_prime(NULL); ++ BN_dec2bn(&g, gen); ++ ++ if (p == NULL || g == NULL || !DH_set0_pqg(dh, p, NULL, g)) { ++ DH_free(dh); ++ BN_free(p); ++ BN_free(g); ++ return NULL; ++ } ++ } ++#endif + return dh; + } + +@@ -134,7 +149,7 @@ static void sx_ssl_free_dh_params(void) { + + static DH *_sx_ssl_tmp_dh_callback(SSL *ssl, int export, int keylen) { + EVP_PKEY *pkey = SSL_get_privatekey(ssl); +- int type = pkey ? EVP_PKEY_type(pkey->type) : EVP_PKEY_NONE; ++ int type = pkey ? EVP_PKEY_base_id(pkey) : EVP_PKEY_NONE; + unsigned i; + + if (type == EVP_PKEY_RSA || type == EVP_PKEY_DSA) +@@ -351,7 +366,11 @@ static void _sx_ssl_get_external_id(sx_t s, _sx_ssl_co + } else if (altname->type == GEN_DNS) { + len = ASN1_STRING_length(altname->d.dNSName); + sc->external_id[id] = (char *) malloc(sizeof(char) * (len + 1)); ++#if OPENSSL_VERSION_NUMBER < 0x10100005L + memcpy(sc->external_id[id], ASN1_STRING_data(altname->d.dNSName), len); ++#else ++ memcpy(sc->external_id[id], ASN1_STRING_get0_data(altname->d.dNSName), len); ++#endif + sc->external_id[id][len] = '\0'; // just to make sure + _sx_debug(ZONE, "external_id: Found(%d) subjectAltName/dNSName: '%s'", id, sc->external_id[id]); + id++; +@@ -728,11 +747,15 @@ static void _sx_ssl_client(sx_t s, sx_plugin_t p) { + SSL_set_bio(sc->ssl, sc->rbio, sc->wbio); + SSL_set_connect_state(sc->ssl); + SSL_set_options(sc->ssl, SSL_OP_NO_TICKET); ++#if OPENSSL_VERSION_NUMBER < 0x10100005L + #ifdef ENABLE_EXPERIMENTAL + SSL_set_ssl_method(sc->ssl, TLSv1_2_client_method()); + #else + SSL_set_ssl_method(sc->ssl, TLSv1_client_method()); + #endif ++#else ++ SSL_set_ssl_method(sc->ssl, TLS_client_method()); ++#endif + + /* empty external_id */ + for (i = 0; i < SX_CONN_EXTERNAL_ID_MAX_COUNT; i++) +@@ -761,8 +784,8 @@ static void _sx_ssl_client(sx_t s, sx_plugin_t p) { + } + + /* set callback giving a password for pemfile */ +- SSL_CTX_set_default_passwd_cb_userdata(sc->ssl->ctx, (void *)pemfile_password); +- SSL_CTX_set_default_passwd_cb(sc->ssl->ctx, &_sx_pem_passwd_callback); ++ SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *)pemfile_password); ++ SSL_CTX_set_default_passwd_cb(ctx, &_sx_pem_passwd_callback); + + /* load the private key */ + ret = SSL_use_PrivateKey_file(sc->ssl, pemfile, SSL_FILETYPE_PEM); +@@ -977,11 +1000,15 @@ int sx_ssl_server_addcert(sx_plugin_t p, const char *n + ERR_clear_error(); + + /* create the context */ ++#if OPENSSL_VERSION_NUMBER < 0x10100005L + #ifdef ENABLE_EXPERIMENTAL + ctx = SSL_CTX_new(TLSv1_2_method()); + #else + ctx = SSL_CTX_new(SSLv23_method()); + #endif ++#else ++ ctx = SSL_CTX_new(TLS_method()); ++#endif + if(ctx == NULL) { + _sx_debug(ZONE, "ssl context creation failed; %s", ERR_error_string(ERR_get_error(), NULL)); + return 1; +@@ -1063,7 +1090,11 @@ int sx_ssl_server_addcert(sx_plugin_t p, const char *n + /* try to read DH params from pem file */ + if((dhparams = sx_ssl_get_DHparams(pemfile))) { + SSL_CTX_set_tmp_dh(ctx, dhparams); ++#if OPENSSL_VERSION_NUMBER < 0x10100005L + _sx_debug(ZONE, "custom DH parameters loaded from certificate", BN_num_bits(dhparams->p)); ++#else ++ _sx_debug(ZONE, "custom DH parameters loaded from certificate", DH_bits(dhparams)); ++#endif + } + + /* try to read ECDH params from pem file */ Modified: branches/2018Q4/net-im/jabberd/files/patch-tools__jabberd.in ============================================================================== --- branches/2018Q4/net-im/jabberd/files/patch-tools__jabberd.in Thu Nov 1 18:13:04 2018 (r483697) +++ branches/2018Q4/net-im/jabberd/files/patch-tools__jabberd.in Thu Nov 1 18:16:33 2018 (r483698) @@ -1,16 +1,17 @@ --- tools/jabberd.in.orig 2016-02-09 09:45:54 UTC +++ tools/jabberd.in -@@ -1,9 +1,4 @@ +@@ -1,10 +1,5 @@ -#!/bin/sh -#-*-Perl-*- -- ++#!/usr/local/bin/perl + -exec perl -w -x $0 "$@" - -#!perl -+#!/usr/local/bin/perl - +- ############################################################################## # + # jabberd - perl wrapper script to manage launching and controlling the various @@ -28,8 +23,7 @@ my $Bin = "@bindir@"; my $LibExec = "@libexecdir@"; my $VERSION = "@VERSION@"; Modified: branches/2018Q4/net-im/jabberd/files/patch-util_crypt__blowfish.c ============================================================================== --- branches/2018Q4/net-im/jabberd/files/patch-util_crypt__blowfish.c Thu Nov 1 18:13:04 2018 (r483697) +++ branches/2018Q4/net-im/jabberd/files/patch-util_crypt__blowfish.c Thu Nov 1 18:16:33 2018 (r483698) @@ -1,6 +1,6 @@ --- util/crypt_blowfish.c.orig 2016-05-08 14:30:08 UTC +++ util/crypt_blowfish.c -@@ -1106,7 +1106,7 @@ char *crypt_ra(const char *key, const ch +@@ -1106,7 +1106,7 @@ char *crypt_ra(const char *key, const char *setting, return _crypt_blowfish_rn(key, setting, (char *)*data, *size); } From owner-svn-ports-branches@freebsd.org Thu Nov 1 18:19:12 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D1FAC10FAD13; Thu, 1 Nov 2018 18:19:11 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8576584124; Thu, 1 Nov 2018 18:19:11 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 673951F59E; Thu, 1 Nov 2018 18:19:11 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA1IJBxP005313; Thu, 1 Nov 2018 18:19:11 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA1IJ93Z005262; Thu, 1 Nov 2018 18:19:09 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811011819.wA1IJ93Z005262@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 1 Nov 2018 18:19:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483699 - in branches/2018Q4/devel/tcl-trf: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q4/devel/tcl-trf: . files X-SVN-Commit-Revision: 483699 X-SVN-Commit-Repository: ports 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.29 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, 01 Nov 2018 18:19:12 -0000 Author: antoine Date: Thu Nov 1 18:19:09 2018 New Revision: 483699 URL: https://svnweb.freebsd.org/changeset/ports/483699 Log: MFH: r482639 Stop chasing the whims of OpenSSL and use our own -lmd as the source of various digest-algorithms. Years ago, when I was undertaking the replacement of the bundled implementations with those found in the base system, it seemed like OpenSSL will be more stable... Ha-ha. Fix the WWW, while I'm here. PR: 229026 Submitted by: brnrd Reported by: Package Fallout Modified: branches/2018Q4/devel/tcl-trf/Makefile branches/2018Q4/devel/tcl-trf/files/patch-Makefile branches/2018Q4/devel/tcl-trf/files/patch-md5dig branches/2018Q4/devel/tcl-trf/files/patch-rmd160 branches/2018Q4/devel/tcl-trf/files/patch-sha branches/2018Q4/devel/tcl-trf/files/patch-sha1 branches/2018Q4/devel/tcl-trf/files/patch-zlib branches/2018Q4/devel/tcl-trf/pkg-descr Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/devel/tcl-trf/Makefile ============================================================================== --- branches/2018Q4/devel/tcl-trf/Makefile Thu Nov 1 18:16:33 2018 (r483698) +++ branches/2018Q4/devel/tcl-trf/Makefile Thu Nov 1 18:19:09 2018 (r483699) @@ -3,7 +3,7 @@ PORTNAME= Trf PORTVERSION= 2.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel tcl MASTER_SITES= SF/tcltrf/tcltrf/${PORTVERSION} PKGNAMEPREFIX= tcl- @@ -17,9 +17,7 @@ LICENSE_NAME= Tcl Trf License LICENSE_FILE= ${WRKSRC}/doc/license.terms LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BROKEN_SSL= openssl-devel -BROKEN_SSL_REASON_openssl-devel= use of undeclared identifier 'SHA_Init' - +TEST_DEPENDS= ${LOCALBASE}/lib/Memchan2.3/libMemchan.so.1:devel/tcl-memchan ALL_TARGET= all USES+= tcl:tea tar:bzip2 @@ -29,34 +27,10 @@ CFLAGS+= -Wall -Werror MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}" -TEST_TARGET= do-test - REINPLACE_ARGS= -i "" CONFIGURE_ARGS+=--enable-static-zlib --enable-static-bzlib \ --enable-static-md5 -.include -post-patch: -.if defined(TRF_USE_MD) - # - # Using FreeBSD's own -lmd instead of OpenSSL's -lcrypto - # - ${REINPLACE_CMD} -E -e 's,openssl/,,' \ - -e 's,(MD[5])_([A-Z][a-z]),\1\2,g' \ - ${WRKSRC}/generic/*.[ch] - ${REINPLACE_CMD} 's,-lcrypto,-lmd,' ${WRKSRC}/Makefile.in -.else - # - # Using OpenSSL's implementations of message digests (-lcrypto) - # To use FreeBSD's own -lmd, stop now and restart make with: - # - # -DTRF_USE_MD - # -USES+= ssl -CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} -CFLAGS+= -I${OPENSSLINC} -.endif - do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/Trf ${INSTALL_DATA} ${WRKSRC}/libTrf${PORTVERSION}.so \ @@ -68,19 +42,9 @@ do-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/Trf/libTrf${PORTVERSION}.so do-test: - @if ! ${PKG_BIN} info --quiet tcl-memchan; then \ - ${PRINTF} "*****************\n%s\n*****************\n" \ - "devel/tcl-memchan must be installed for the tests to work"; \ - exit 1; \ - fi cd ${WRKSRC}/tests && ${SETENV} TCLLIBPATH="${WRKSRC}" ${TCLSH} all -.include PLIST_SUB+= TCL_DVER=${TCL_VER:C/\.//} VER=${PORTVERSION} -.if defined(OPENSSLBASE) && ${OPENSSLBASE} != "/usr" -MAKE_ENV+= SSLINC=-I${OPENSSLINC} SSLLIB=-L${OPENSSLLIB} -.endif - -.include +.include Modified: branches/2018Q4/devel/tcl-trf/files/patch-Makefile ============================================================================== --- branches/2018Q4/devel/tcl-trf/files/patch-Makefile Thu Nov 1 18:16:33 2018 (r483698) +++ branches/2018Q4/devel/tcl-trf/files/patch-Makefile Thu Nov 1 18:19:09 2018 (r483699) @@ -11,6 +11,6 @@ CPPFLAGS = @CPPFLAGS@ -LIBS = @PKG_LIBS@ @LIBS@ -+LIBS = @PKG_LIBS@ @LIBS@ -lz -lbz2 -lcrypt ${SSLLIB} -lcrypto ++LIBS = @PKG_LIBS@ @LIBS@ -lz -lbz2 -lcrypt -lmd AR = @AR@ CFLAGS = @CFLAGS@ Modified: branches/2018Q4/devel/tcl-trf/files/patch-md5dig ============================================================================== --- branches/2018Q4/devel/tcl-trf/files/patch-md5dig Thu Nov 1 18:16:33 2018 (r483698) +++ branches/2018Q4/devel/tcl-trf/files/patch-md5dig Thu Nov 1 18:19:09 2018 (r483699) @@ -7,7 +7,7 @@ +#include "transformInt.h" +#include -+#include ++#include /* * Generator description @@ -38,6 +40,4 @@ @@ -27,7 +27,7 @@ -static void MDmd5_Final _ANSI_ARGS_ ((VOID* context, VOID* digest)); -static int MDmd5_Check _ANSI_ARGS_ ((Tcl_Interp* interp)); +#ifdef OTP -+static void MDmd5_OTP_Final _ANSI_ARGS_ ((VOID* context, VOID* digest)); ++static void MDmd5_OTP_Final _ANSI_ARGS_ ((VOID* digest, VOID* context)); +#endif /* @@ -39,13 +39,13 @@ - MDmd5_UpdateBuf, - MDmd5_Final, - MDmd5_Check -+ (Trf_MDStart *)MD5_Init, ++ (Trf_MDStart *)MD5Init, + NULL, -+ (Trf_MDUpdateBuf *)MD5_Update, ++ (Trf_MDUpdateBuf *)MD5Update, +#ifdef OTP + MDmd5_OTP_Final, +#else -+ (Trf_MDFinal *)MD5_Final, ++ (Trf_MDFinal *)MD5Final, +#endif + NULL, }; @@ -189,7 +189,7 @@ - /* MD5Final ((unsigned char*) result, (MD5_CTX*) context);*/ - md5f.final ((unsigned char*) result, MD5_CTXP context); -+ MD5_Final (result, (MD5_CTX*) context); ++ MD5Final (result, (MD5_CTX*) context); for (i = 0; i < 8; i++) @@ -255,5 +142,4 @@ Modified: branches/2018Q4/devel/tcl-trf/files/patch-rmd160 ============================================================================== --- branches/2018Q4/devel/tcl-trf/files/patch-rmd160 Thu Nov 1 18:16:33 2018 (r483698) +++ branches/2018Q4/devel/tcl-trf/files/patch-rmd160 Thu Nov 1 18:19:09 2018 (r483699) @@ -4,7 +4,7 @@ #include "transformInt.h" -#include "ripemd/rmd160.h" -+#include ++#include /* @@ -40,27 +40,4 @@ Modified: branches/2018Q4/devel/tcl-trf/files/patch-sha ============================================================================== --- branches/2018Q4/devel/tcl-trf/files/patch-sha Thu Nov 1 18:16:33 2018 (r483698) +++ branches/2018Q4/devel/tcl-trf/files/patch-sha Thu Nov 1 18:19:09 2018 (r483699) @@ -1,13 +1,11 @@ ---- generic/sha.c.orig 2009-06-18 04:54:44 UTC +--- generic/sha.c 2009-06-18 04:54:44 UTC +++ generic/sha.c -@@ -27,15 +27,11 @@ +@@ -27,15 +27,9 @@ * CVS: $Id: sha.c,v 1.4 2007/10/05 23:12:21 andreas_kupries Exp $ */ -#include "transformInt.h" -#include "sha/sha.h" -+#include -+#ifndef OPENSSL_NO_SHA0 -#ifdef WORDS_BIGENDIAN -#undef LITTLE_ENDIAN @@ -16,7 +14,7 @@ -#define LITTLE_ENDIAN -#endif +#include "transformInt.h" -+#include ++#include /* * Generator description @@ -70,7 +68,7 @@ NULL }; -@@ -110,182 +84,5 @@ Tcl_Interp* interp; +@@ -110,182 +84,4 @@ Tcl_Interp* interp; { return Trf_RegisterMessageDigest (interp, &mdDescription); } @@ -239,7 +237,7 @@ - -#ifndef WORDS_BIGENDIAN - Trf_FlipRegisterLong (s->s.digest, SHA_DIGESTSIZE); - #endif +-#endif - - memcpy (digest, s->s.digest, SHA_DIGESTSIZE); -} Modified: branches/2018Q4/devel/tcl-trf/files/patch-sha1 ============================================================================== --- branches/2018Q4/devel/tcl-trf/files/patch-sha1 Thu Nov 1 18:16:33 2018 (r483698) +++ branches/2018Q4/devel/tcl-trf/files/patch-sha1 Thu Nov 1 18:19:09 2018 (r483699) @@ -5,7 +5,7 @@ -#include "loadman.h" +#include "transformInt.h" -+#include ++#include /* @@ -39,5 +40,5 @@ @@ -24,7 +24,7 @@ -static void MDsha1_Final _ANSI_ARGS_ ((VOID* context, VOID* digest)); -static int MDsha1_Check _ANSI_ARGS_ ((Tcl_Interp* interp)); +#ifdef OTP -+static void MDsha1_OTP_Final _ANSI_ARGS_ ((VOID* context, VOID* digest)); ++static void MDsha1_OTP_Final _ANSI_ARGS_ ((VOID* digest, VOID *context)); +#endif /* Modified: branches/2018Q4/devel/tcl-trf/files/patch-zlib ============================================================================== --- branches/2018Q4/devel/tcl-trf/files/patch-zlib Thu Nov 1 18:16:33 2018 (r483698) +++ branches/2018Q4/devel/tcl-trf/files/patch-zlib Thu Nov 1 18:19:09 2018 (r483699) @@ -94,64 +94,111 @@ -} - --- generic/crc_zlib.c 2009-06-18 00:54:43.000000000 -0400 -+++ generic/crc_zlib.c 2009-07-12 23:51:04.000000000 -0400 ++++ generic/crc_zlib.c 2018-10-21 00:42:01.795595000 -0400 @@ -29,4 +29,5 @@ #include "transformInt.h" +#include /* -@@ -47,7 +48,6 @@ +@@ -46,8 +47,5 @@ + static void MDcrcz_Start _ANSI_ARGS_ ((VOID* context)); - static void MDcrcz_Update _ANSI_ARGS_ ((VOID* context, unsigned int character)); +-static void MDcrcz_Update _ANSI_ARGS_ ((VOID* context, unsigned int character)); -static void MDcrcz_UpdateBuf _ANSI_ARGS_ ((VOID* context, unsigned char* buffer, int bufLen)); -static void MDcrcz_Final _ANSI_ARGS_ ((VOID* context, VOID* digest)); -static int MDcrcz_Check _ANSI_ARGS_ ((Tcl_Interp* interp)); -+static void MDcrcz_UpdateBuf _ANSI_ARGS_ ((VOID* context, unsigned char* buffer, size_t bufLen)); -+static void MDcrcz_Final _ANSI_ARGS_ ((VOID* digest, VOID* context)); ++static void MDcrcz_Final _ANSI_ARGS_ ((VOID* digest, VOID *context)); /* -@@ -63,5 +63,5 @@ - MDcrcz_UpdateBuf, +@@ -60,8 +58,8 @@ + DIGEST_SIZE, + MDcrcz_Start, +- MDcrcz_Update, +- MDcrcz_UpdateBuf, ++ NULL, ++ (Trf_MDUpdateBuf *)crc32, MDcrcz_Final, - MDcrcz_Check + NULL }; -@@ -118,5 +118,5 @@ +@@ -118,66 +116,5 @@ /* call md specific initialization here */ - CRC = zf.zcrc32 (0L, Z_NULL, 0); -+ CRC = crc32(0L, Z_NULL, 0); - } - -@@ -149,5 +149,5 @@ - unsigned char buf = character; - +-} +- +-/* +- *------------------------------------------------------* +- * +- * MDcrcz_Update -- +- * +- * ------------------------------------------------* +- * Update the internal state of the message digest +- * generator for a single character. +- * ------------------------------------------------* +- * +- * Sideeffects: +- * As of the called procedure. +- * +- * Result: +- * None. +- * +- *------------------------------------------------------* +- */ +- +-static void +-MDcrcz_Update (context, character) +-VOID* context; +-unsigned int character; +-{ +- /* call md specific update here */ +- +- unsigned char buf = character; +- - CRC = zf.zcrc32 (CRC, &buf, 1); -+ CRC = crc32(CRC, &buf, 1); - } - -@@ -175,9 +175,9 @@ - VOID* context; - unsigned char* buffer; +-} +- +-/* +- *------------------------------------------------------* +- * +- * MDcrcz_UpdateBuf -- +- * +- * ------------------------------------------------* +- * Update the internal state of the message digest +- * generator for a character buffer. +- * ------------------------------------------------* +- * +- * Sideeffects: +- * As of the called procedure. +- * +- * Result: +- * None. +- * +- *------------------------------------------------------* +- */ +- +-static void +-MDcrcz_UpdateBuf (context, buffer, bufLen) +-VOID* context; +-unsigned char* buffer; -int bufLen; -+size_t bufLen; - { - /* call md specific update here */ - +-{ +- /* call md specific update here */ +- - CRC = zf.zcrc32 (CRC, buffer, bufLen); -+ CRC = crc32(CRC, buffer, bufLen); ++ CRC = crc32(0L, Z_NULL, 0); } -@@ -202,5 +202,5 @@ +@@ -202,5 +139,5 @@ static void -MDcrcz_Final (context, digest) +MDcrcz_Final (digest, context) VOID* context; VOID* digest; -@@ -217,28 +217,2 @@ +@@ -217,28 +154,2 @@ out [0] = (char) ((crc >> 0) & 0xff); } - Modified: branches/2018Q4/devel/tcl-trf/pkg-descr ============================================================================== --- branches/2018Q4/devel/tcl-trf/pkg-descr Thu Nov 1 18:16:33 2018 (r483698) +++ branches/2018Q4/devel/tcl-trf/pkg-descr Thu Nov 1 18:19:09 2018 (r483699) @@ -9,4 +9,4 @@ transparent encryption, compression, charset recoding this framework (and as proof of concept) a collection of tcl-level commands was implemented. -WWW: http://www.oche.de/~akupries/soft/trf/ +WWW: https://wiki.tcl-lang.org/479 From owner-svn-ports-branches@freebsd.org Thu Nov 1 18:22:27 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E034F10FAFBC; Thu, 1 Nov 2018 18:22:26 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 95CF484697; Thu, 1 Nov 2018 18:22:26 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 77F0A1F739; Thu, 1 Nov 2018 18:22:26 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA1IMQGR010258; Thu, 1 Nov 2018 18:22:26 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA1IMQGc010256; Thu, 1 Nov 2018 18:22:26 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811011822.wA1IMQGc010256@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 1 Nov 2018 18:22:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483700 - in branches/2018Q4/devel/gnome-vfs: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q4/devel/gnome-vfs: . files X-SVN-Commit-Revision: 483700 X-SVN-Commit-Repository: ports 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.29 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, 01 Nov 2018 18:22:27 -0000 Author: antoine Date: Thu Nov 1 18:22:25 2018 New Revision: 483700 URL: https://svnweb.freebsd.org/changeset/ports/483700 Log: MFH: r483115 devel/gnome-vfs: Fix OpenSSL 1.1.X build - Patch taken from NetBSD [1] - Add gnome to USES [1] http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/sysutils/gnome-vfs/patches/patch-libgnomevfs_gnome-vfs-ssl.c?rev=1.1&content-type=text/x-cvsweb-markup PR: 228896 Submitted by: Nathan Reported by: brnrd Approved by: gnome (maintainer timeout) Obtained from: NetBSD Added: branches/2018Q4/devel/gnome-vfs/files/patch-openssl-1.1 - copied unchanged from r483115, head/devel/gnome-vfs/files/patch-openssl-1.1 Modified: branches/2018Q4/devel/gnome-vfs/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/devel/gnome-vfs/Makefile ============================================================================== --- branches/2018Q4/devel/gnome-vfs/Makefile Thu Nov 1 18:19:09 2018 (r483699) +++ branches/2018Q4/devel/gnome-vfs/Makefile Thu Nov 1 18:22:25 2018 (r483700) @@ -3,7 +3,7 @@ PORTNAME= gnome-vfs PORTVERSION= 2.24.4 -PORTREVISION?= 9 +PORTREVISION?= 10 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,9 +16,6 @@ LICENSE_COMB= multi LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LIB LICENSE_FILE_LGPL20+ = ${WRKSRC}/COPYING.LIB -BROKEN_SSL= openssl-devel -BROKEN_SSL_REASON_openssl-devel= incomplete definition of type 'struct ssl_st' - USES= tar:bzip2 .if !defined(REFERENCE_PORT) @@ -27,7 +24,7 @@ RUN_DEPENDS= update-mime-database:misc/shared-mime-inf LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libdbus-1.so:devel/dbus -USES+= gettext gmake libtool:keepla pathfix pkgconfig ssl +USES+= gettext gmake gnome libtool:keepla pathfix pkgconfig ssl USE_GNOME= gconf2 gnomemimedata intlhack referencehack INSTALL_TARGET= install-strip USE_LDCONFIG= yes Copied: branches/2018Q4/devel/gnome-vfs/files/patch-openssl-1.1 (from r483115, head/devel/gnome-vfs/files/patch-openssl-1.1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/devel/gnome-vfs/files/patch-openssl-1.1 Thu Nov 1 18:22:25 2018 (r483700, copy of r483115, head/devel/gnome-vfs/files/patch-openssl-1.1) @@ -0,0 +1,26 @@ +$NetBSD: patch-libgnomevfs_gnome-vfs-ssl.c,v 1.1 2018/02/16 13:18:26 wiz Exp $ + +struct SSL is opaque in openssl-1.1; and the SSL_free() man page +says that one should not free members of it manually (in both +the openssl-1.0 and openssl-1.1 man pages). + +--- libgnomevfs/gnome-vfs-ssl.c.orig 2010-02-09 12:16:14.000000000 +0000 ++++ libgnomevfs/gnome-vfs-ssl.c +@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS + } + } + +- if (ssl->private->ssl->ctx) +- SSL_CTX_free (ssl->private->ssl->ctx); +- + SSL_free (ssl->private->ssl); + g_free (ssl->private); + g_free (ssl); +@@ -705,7 +702,6 @@ gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl, + } + } + +- SSL_CTX_free (ssl->private->ssl->ctx); + SSL_free (ssl->private->ssl); + close (ssl->private->sockfd); + if (ssl->private->timeout) From owner-svn-ports-branches@freebsd.org Fri Nov 2 05:07:19 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 904A410E892F; Fri, 2 Nov 2018 05:07:19 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 45CA0760FD; Fri, 2 Nov 2018 05:07:19 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 26E16260A9; Fri, 2 Nov 2018 05:07:19 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA257JGw046201; Fri, 2 Nov 2018 05:07:19 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA257Id0046197; Fri, 2 Nov 2018 05:07:18 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201811020507.wA257Id0046197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 2 Nov 2018 05:07:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483769 - in branches/2018Q4/emulators: ppsspp ppsspp-qt5 ppsspp/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q4/emulators: ppsspp ppsspp-qt5 ppsspp/files X-SVN-Commit-Revision: 483769 X-SVN-Commit-Repository: ports 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.29 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, 02 Nov 2018 05:07:19 -0000 Author: jbeich Date: Fri Nov 2 05:07:18 2018 New Revision: 483769 URL: https://svnweb.freebsd.org/changeset/ports/483769 Log: MFH: r483177 r483768 emulators/ppsspp: update to 1.7.1 Changes: http://ppsspp.org/#news Changes: https://github.com/hrydgard/ppsspp/compare/v1.6.3...v1.7.1 Approved by: ports-secteam (miwi) Deleted: branches/2018Q4/emulators/ppsspp/files/patch-CMakeLists.txt Modified: branches/2018Q4/emulators/ppsspp-qt5/Makefile branches/2018Q4/emulators/ppsspp/Makefile branches/2018Q4/emulators/ppsspp/distinfo branches/2018Q4/emulators/ppsspp/files/patch-system-libpng16 Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/emulators/ppsspp-qt5/Makefile ============================================================================== --- branches/2018Q4/emulators/ppsspp-qt5/Makefile Fri Nov 2 03:06:30 2018 (r483768) +++ branches/2018Q4/emulators/ppsspp-qt5/Makefile Fri Nov 2 05:07:18 2018 (r483769) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../ppsspp Modified: branches/2018Q4/emulators/ppsspp/Makefile ============================================================================== --- branches/2018Q4/emulators/ppsspp/Makefile Fri Nov 2 03:06:30 2018 (r483768) +++ branches/2018Q4/emulators/ppsspp/Makefile Fri Nov 2 05:07:18 2018 (r483769) @@ -2,20 +2,14 @@ PORTNAME= ppsspp DISTVERSIONPREFIX= v -DISTVERSION?= 1.6.3 -PORTREVISION?= 3 +DISTVERSION?= 1.7.1 +PORTREVISION?= 0 CATEGORIES= emulators # XXX Get from Debian once #697821 lands MASTER_SITES= https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage DISTFILES= ${PORTNAME}.1:manpage EXTRACT_ONLY= ${DISTFILES:N*\:manpage:C/:.*//} -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= c783e7761c2a.patch:-p1 -PATCHFILES+= f2a75719d843.patch:-p1 -PATCHFILES+= 78a41980dfd7.patch:-p1 -PATCHFILES+= 7a7c655615a4.patch:-p1 - MAINTAINER= jbeich@FreeBSD.org COMMENT= PSP emulator in C++ with dynarec JIT for x86, ARM, MIPS @@ -28,11 +22,13 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils USE_GITHUB= yes GH_ACCOUNT= hrydgard -GH_TUPLE?= hrydgard:glslang:2edde666:glslang/ext/glslang \ - hrydgard:${PORTNAME}-lang:1153a42:lang/assets/lang \ - KhronosGroup:SPIRV-Cross:90966d5:SPIRV/ext/SPIRV-Cross \ - Kingcom:armips:v0.9-89-g8b4cada:armips/ext/armips \ - Kingcom:tinyformat:Release-2.0.1-7-gb7f5a22:tinyformat/ext/armips/ext/tinyformat +GH_TUPLE?= hrydgard:glslang:29619b23:glslang/ext/glslang \ + hrydgard:${PORTNAME}-lang:f60be49:lang/assets/lang \ + KhronosGroup:SPIRV-Cross:be7425e:SPIRV/ext/SPIRV-Cross \ + Kingcom:armips:v0.10.0-22-g9efe336:armips/ext/armips \ + Kingcom:tinyformat:Release-2.0.1-7-gb7f5a22:tinyformat/ext/armips/ext/tinyformat \ + Tencent:rapidjson:v1.1.0-415-g73063f50:rapidjson/ext/rapidjson \ + discordapp:discord-rpc:v3.3.0-15-g3d3ae71:discord_rpc/ext/discord-rpc CONFLICTS_INSTALL= ${PORTNAME}-* Modified: branches/2018Q4/emulators/ppsspp/distinfo ============================================================================== --- branches/2018Q4/emulators/ppsspp/distinfo Fri Nov 2 03:06:30 2018 (r483768) +++ branches/2018Q4/emulators/ppsspp/distinfo Fri Nov 2 05:07:18 2018 (r483769) @@ -1,23 +1,19 @@ -TIMESTAMP = 1528221521 +TIMESTAMP = 1541080274 SHA256 (ppsspp.1) = 64a7cca4c3a5fc6ad5b63399edef9056b0c85ea68fed00fb7e97f4b2724e503b SIZE (ppsspp.1) = 1598 -SHA256 (hrydgard-ppsspp-v1.6.3_GH0.tar.gz) = 366f8b3c545071d919e1f51a5c4e0da48ba55cf1c15ff8d78a90985b3d5e8eb3 -SIZE (hrydgard-ppsspp-v1.6.3_GH0.tar.gz) = 19477643 -SHA256 (hrydgard-glslang-2edde666_GH0.tar.gz) = 9ab09c2aa5a89b2c32297358d25850bec56667aa28fdfe6986fbedd1ced28e78 -SIZE (hrydgard-glslang-2edde666_GH0.tar.gz) = 1941913 -SHA256 (hrydgard-ppsspp-lang-1153a42_GH0.tar.gz) = a4a5a674fbfab8f19f0b420f9abbb2584dc45932deeb066ed4bdbdb8677787b2 -SIZE (hrydgard-ppsspp-lang-1153a42_GH0.tar.gz) = 477413 -SHA256 (KhronosGroup-SPIRV-Cross-90966d5_GH0.tar.gz) = de8bcf01e0a0c4107871fdc8b764771487052fedbe2990a369e7908d4a95c000 -SIZE (KhronosGroup-SPIRV-Cross-90966d5_GH0.tar.gz) = 228783 -SHA256 (Kingcom-armips-v0.9-89-g8b4cada_GH0.tar.gz) = c41aa68bd6798356af568509de4f298485f752f620caae35ff84d17ff798b227 -SIZE (Kingcom-armips-v0.9-89-g8b4cada_GH0.tar.gz) = 191171 +SHA256 (hrydgard-ppsspp-v1.7.1_GH0.tar.gz) = 4c325d585407f65b7b4012c407e3e2f246e57e821f780c3af12aa2874356f2bd +SIZE (hrydgard-ppsspp-v1.7.1_GH0.tar.gz) = 19484840 +SHA256 (hrydgard-glslang-29619b23_GH0.tar.gz) = d1779812444d1514701ae41e9f07ecf368a29a8ce43452ef17601494cd27e672 +SIZE (hrydgard-glslang-29619b23_GH0.tar.gz) = 2351816 +SHA256 (hrydgard-ppsspp-lang-f60be49_GH0.tar.gz) = 5dffccd8f5dcabcc37a8f7d3a634226f3591b79d8b483c6820720371e828dbbe +SIZE (hrydgard-ppsspp-lang-f60be49_GH0.tar.gz) = 534035 +SHA256 (KhronosGroup-SPIRV-Cross-be7425e_GH0.tar.gz) = a5a06eee313583289f697689a3b79579b6f3dc40c766520e905047dfa94aade1 +SIZE (KhronosGroup-SPIRV-Cross-be7425e_GH0.tar.gz) = 537750 +SHA256 (Kingcom-armips-v0.10.0-22-g9efe336_GH0.tar.gz) = 5cd6210447b4a03f22901304f8a19b77526908671bb6522621154267948ad865 +SIZE (Kingcom-armips-v0.10.0-22-g9efe336_GH0.tar.gz) = 197073 SHA256 (Kingcom-tinyformat-Release-2.0.1-7-gb7f5a22_GH0.tar.gz) = d86b5b4592047254c5118d0639e51d00869b3adc2f2c5419fdf29381ca42011e SIZE (Kingcom-tinyformat-Release-2.0.1-7-gb7f5a22_GH0.tar.gz) = 22286 -SHA256 (c783e7761c2a.patch) = 588701f2e5ef299dad9ec820716791bfa2261f17516bae1d884138d58b64c872 -SIZE (c783e7761c2a.patch) = 1272 -SHA256 (f2a75719d843.patch) = 4a299603dd6c3f5143a7b2c455c948c7aa54af4ac60fcfd19b843fe7cf37db11 -SIZE (f2a75719d843.patch) = 1043 -SHA256 (78a41980dfd7.patch) = 9cfbc62c7e4f5a47ea88b854a83d3bd407a14f96c2b60bc3d190bdbc9266824b -SIZE (78a41980dfd7.patch) = 1577 -SHA256 (7a7c655615a4.patch) = 48d1ab7f59a2f2fdf7b53b55844d146639f8e638b9a92e92e6d75df56ffea66f -SIZE (7a7c655615a4.patch) = 1035 +SHA256 (Tencent-rapidjson-v1.1.0-415-g73063f50_GH0.tar.gz) = 45e801225dd7a8d09bde7e5a2dc52c18d630f07bbbec7587017ca19bac9446fe +SIZE (Tencent-rapidjson-v1.1.0-415-g73063f50_GH0.tar.gz) = 1054127 +SHA256 (discordapp-discord-rpc-v3.3.0-15-g3d3ae71_GH0.tar.gz) = fc329cac4553f0ff87ad488e9f8a318c73127a8b413e6de4fde9b562a88d8c5d +SIZE (discordapp-discord-rpc-v3.3.0-15-g3d3ae71_GH0.tar.gz) = 2107411 Modified: branches/2018Q4/emulators/ppsspp/files/patch-system-libpng16 ============================================================================== --- branches/2018Q4/emulators/ppsspp/files/patch-system-libpng16 Fri Nov 2 03:06:30 2018 (r483768) +++ branches/2018Q4/emulators/ppsspp/files/patch-system-libpng16 Fri Nov 2 05:07:18 2018 (r483769) @@ -1,8 +1,8 @@ Make build glue accept libpng 1.6.x and don't hardcode suffix ---- CMakeLists.txt.orig 2017-05-27 09:58:05 UTC +--- CMakeLists.txt.orig 2018-10-27 18:56:20 UTC +++ CMakeLists.txt -@@ -582,9 +582,10 @@ else() +@@ -663,9 +663,10 @@ else() set(LIBZIP_LIBRARY libzip) endif() @@ -16,7 +16,18 @@ Make build glue accept libpng 1.6.x and don't hardcode find_package(PackageHandleStandardArgs) find_package_handle_standard_args(PNG REQUIRED_VARS PNG_LIBRARY PNG_PNG_INCLUDE_DIR) if (PNG_FOUND) ---- Core/Screenshot.cpp.orig 2017-05-27 09:58:05 UTC +--- Core/Debugger/WebSocket/GPUBufferSubscriber.cpp.orig 2018-10-27 09:29:42 UTC ++++ Core/Debugger/WebSocket/GPUBufferSubscriber.cpp +@@ -17,7 +17,7 @@ + + #include + #ifndef USING_QT_UI +-#include ++#include "png.h" + #include + #endif + #include "data/base64.h" +--- Core/Screenshot.cpp.orig 2018-10-27 09:29:42 UTC +++ Core/Screenshot.cpp @@ -21,7 +21,7 @@ #ifdef USING_QT_UI @@ -27,7 +38,18 @@ Make build glue accept libpng 1.6.x and don't hardcode #include "ext/jpge/jpge.h" #endif ---- ext/native/image/png_load.cpp.orig 2017-05-27 09:58:05 UTC +--- Core/TextureReplacer.cpp.orig 2018-10-27 09:29:42 UTC ++++ Core/TextureReplacer.cpp +@@ -18,7 +18,7 @@ + #ifdef USING_QT_UI + #include + #else +-#include ++#include "png.h" + #endif + + #include +--- ext/native/image/png_load.cpp.orig 2018-10-27 09:29:42 UTC +++ ext/native/image/png_load.cpp @@ -5,7 +5,7 @@ #ifdef USING_QT_UI @@ -38,14 +60,3 @@ Make build glue accept libpng 1.6.x and don't hardcode #endif #include "png_load.h" ---- Core/TextureReplacer.cpp.orig 2017-05-27 09:58:05 UTC -+++ Core/TextureReplacer.cpp -@@ -16,7 +16,7 @@ - // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. - - #ifndef USING_QT_UI --#include -+#include "png.h" - #endif - - #include From owner-svn-ports-branches@freebsd.org Fri Nov 2 07:17:07 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1779210EB6E2; Fri, 2 Nov 2018 07:17:07 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B81A779AEA; Fri, 2 Nov 2018 07:17:06 +0000 (UTC) (envelope-from flo@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 93AF1275B3; Fri, 2 Nov 2018 07:17:06 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA27H6Ro013326; Fri, 2 Nov 2018 07:17:06 GMT (envelope-from flo@FreeBSD.org) Received: (from flo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA27H65B013325; Fri, 2 Nov 2018 07:17:06 GMT (envelope-from flo@FreeBSD.org) Message-Id: <201811020717.wA27H65B013325@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: flo set sender to flo@FreeBSD.org using -f From: Florian Smeets Date: Fri, 2 Nov 2018 07:17:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483776 - branches/2018Q4/www/gitea X-SVN-Group: ports-branches X-SVN-Commit-Author: flo X-SVN-Commit-Paths: branches/2018Q4/www/gitea X-SVN-Commit-Revision: 483776 X-SVN-Commit-Repository: ports 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.29 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, 02 Nov 2018 07:17:07 -0000 Author: flo Date: Fri Nov 2 07:17:05 2018 New Revision: 483776 URL: https://svnweb.freebsd.org/changeset/ports/483776 Log: MFH: r483745 Update to 1.5.3 PR: 232897 Submitted by: stb@lassitu.de (maintainer) Security: deb4f633-de1d-11e8-a9fb-080027f43a02 Approved by: ports-secteam (miwi) Modified: branches/2018Q4/www/gitea/Makefile branches/2018Q4/www/gitea/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/www/gitea/Makefile ============================================================================== --- branches/2018Q4/www/gitea/Makefile Fri Nov 2 06:50:10 2018 (r483775) +++ branches/2018Q4/www/gitea/Makefile Fri Nov 2 07:17:05 2018 (r483776) @@ -3,7 +3,7 @@ PORTNAME= gitea DISTVERSIONPREFIX= v -DISTVERSION= 1.5.2 +DISTVERSION= 1.5.3 CATEGORIES= www MAINTAINER= stb@lassitu.de Modified: branches/2018Q4/www/gitea/distinfo ============================================================================== --- branches/2018Q4/www/gitea/distinfo Fri Nov 2 06:50:10 2018 (r483775) +++ branches/2018Q4/www/gitea/distinfo Fri Nov 2 07:17:05 2018 (r483776) @@ -1,3 +1,3 @@ -TIMESTAMP = 1539271750 -SHA256 (go-gitea-gitea-v1.5.2_GH0.tar.gz) = 297652c49c412fa509f04dba58aefe91aa75285911260037ba25fd7136f4a016 -SIZE (go-gitea-gitea-v1.5.2_GH0.tar.gz) = 18866286 +TIMESTAMP = 1541109080 +SHA256 (go-gitea-gitea-v1.5.3_GH0.tar.gz) = 3a94982d1fa0549e26e2c86f859bc09dda480a98a6b07ce5682257f3ce7de188 +SIZE (go-gitea-gitea-v1.5.3_GH0.tar.gz) = 18866434 From owner-svn-ports-branches@freebsd.org Fri Nov 2 08:12:22 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EE24B10ECDB2; Fri, 2 Nov 2018 08:12:21 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A27BC7BEEA; Fri, 2 Nov 2018 08:12:21 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 81C8F27F5A; Fri, 2 Nov 2018 08:12:21 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA28CLTH043602; Fri, 2 Nov 2018 08:12:21 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA28CLfo043600; Fri, 2 Nov 2018 08:12:21 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811020812.wA28CLfo043600@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Fri, 2 Nov 2018 08:12:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483778 - in branches/2018Q4/deskutils/pinot: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q4/deskutils/pinot: . files X-SVN-Commit-Revision: 483778 X-SVN-Commit-Repository: ports 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.29 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, 02 Nov 2018 08:12:22 -0000 Author: antoine Date: Fri Nov 2 08:12:20 2018 New Revision: 483778 URL: https://svnweb.freebsd.org/changeset/ports/483778 Log: MFH: r482166 - Fix OpenSSL build (1) - Enable libnotify PR: 232234 Submitted by: Nathan (1) Added: branches/2018Q4/deskutils/pinot/files/patch-openssl - copied unchanged from r482166, head/deskutils/pinot/files/patch-openssl Modified: branches/2018Q4/deskutils/pinot/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/deskutils/pinot/Makefile ============================================================================== --- branches/2018Q4/deskutils/pinot/Makefile Fri Nov 2 07:49:09 2018 (r483777) +++ branches/2018Q4/deskutils/pinot/Makefile Fri Nov 2 08:12:20 2018 (r483778) @@ -3,7 +3,7 @@ PORTNAME= pinot PORTVERSION= 1.09 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= deskutils MAINTAINER= thierry@FreeBSD.org @@ -21,6 +21,7 @@ LIB_DEPENDS= libxapian.so:databases/xapian-core \ libdbus-1.so:devel/dbus \ libxml++-2.6.so:textproc/libxml++26 \ libboost_thread.so:devel/boost-libs \ + libnotify.so:devel/libnotify \ libexif.so:graphics/libexif \ libexiv2.so:graphics/exiv2 \ libgmime-2.4.so:mail/gmime24 \ @@ -39,20 +40,20 @@ USE_GITHUB= yes GH_ACCOUNT= FabriceColin GH_TAGNAME= c14d6d5 -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-http=curl --with-ssl=${OPENSSLBASE} --enable-libarchive \ - --enable-mempool=no -CONFIGURE_ENV= MKDIR_P="${MKDIR}" TEXTCAT_LIBS="-lexttextcat-2.0" -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib -lboost_system - -USES= compiler:c++11-lang autoreconf gettext libarchive \ +USES= compiler:c++11-lang autoreconf gettext gnome libarchive \ libtool pkgconfig python shebangfix sqlite:3 ssl USE_CXXSTD= c++11 USE_XORG= pixman USE_GNOME= atkmm cairo cairomm glibmm gtk20 gtkmm24 libsigc++20 libxml2 pangomm USE_LDCONFIG= ${PREFIX}/lib/pinot/backends ${PREFIX}/lib/pinot/filters SHEBANG_FILES= scripts/bash/*.sh + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-http=curl --with-ssl=${OPENSSLBASE} --enable-libarchive \ + --enable-mempool=no --enable-libnotify +CONFIGURE_ENV= MKDIR_P="${MKDIR}" TEXTCAT_LIBS="-lexttextcat-2.0" +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lboost_system OPTIONS_DEFINE= DEBUG CHMLIB DOCS OPTIONS_SUB= yes Copied: branches/2018Q4/deskutils/pinot/files/patch-openssl (from r482166, head/deskutils/pinot/files/patch-openssl) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/deskutils/pinot/files/patch-openssl Fri Nov 2 08:12:20 2018 (r483778, copy of r482166, head/deskutils/pinot/files/patch-openssl) @@ -0,0 +1,102 @@ +Description: Catch up with current glib and OpenSSL +Author: FabriceColin +Bug-Debian: https://bugs.debian.org/828503 +Forwarded: yes +Last-Update: 2018-06-14 + +diff --git Collect/DownloaderInterface.cpp Collect/DownloaderInterface.cpp +index 10f4f66..f084f50 100644 +--- Collect/DownloaderInterface.cpp ++++ Collect/DownloaderInterface.cpp +@@ -1,5 +1,5 @@ + /* +- * Copyright 2005-2008 Fabrice Colin ++ * Copyright 2005-2017 Fabrice Colin + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -33,7 +33,8 @@ using namespace std; + + #ifdef USE_SSL + // OpenSSL multi-thread support, required by Curl +-static pthread_mutex_t locksTable[CRYPTO_NUM_LOCKS]; ++static unsigned int g_lockArrayCount = 0; ++static pthread_mutex_t *g_pLockArray = NULL; + + // OpenSSL locking functiom + static void lockingCallback(int mode, int n, const char *file, int line) +@@ -42,7 +43,7 @@ static void lockingCallback(int mode, int n, const char *file, int line) + + if (mode & CRYPTO_LOCK) + { +- status = pthread_mutex_lock(&(locksTable[n])); ++ status = pthread_mutex_lock(&(g_pLockArray[n])); + #ifdef DEBUG + if (status != 0) + { +@@ -52,7 +53,7 @@ static void lockingCallback(int mode, int n, const char *file, int line) + } + else + { +- status = pthread_mutex_unlock(&(locksTable[n])); ++ status = pthread_mutex_unlock(&(g_pLockArray[n])); + #ifdef DEBUG + if (status != 0) + { +@@ -82,9 +83,15 @@ void DownloaderInterface::initialize(void) + pthread_mutexattr_settype(&mutexAttr, PTHREAD_MUTEX_ERRORCHECK); + + // Initialize the OpenSSL mutexes +- for (unsigned int lockNum = 0; lockNum < CRYPTO_NUM_LOCKS; ++lockNum) ++#ifdef CRYPTO_num_locks ++ g_lockArrayCount = CRYPTO_num_locks(); ++#else ++ g_lockArrayCount = CRYPTO_NUM_LOCKS; ++#endif ++ g_pLockArray = (pthread_mutex_t *)OPENSSL_malloc(g_lockArrayCount * sizeof(pthread_mutex_t)); ++ for (unsigned int lockNum = 0; lockNum < g_lockArrayCount; ++lockNum) + { +- pthread_mutex_init(&(locksTable[lockNum]), &mutexAttr); ++ pthread_mutex_init(&(g_pLockArray[lockNum]), &mutexAttr); + } + // Set the callbacks + CRYPTO_set_locking_callback(lockingCallback); +@@ -103,10 +110,13 @@ void DownloaderInterface::shutdown(void) + CRYPTO_set_locking_callback(NULL); + + // Free the mutexes +- for (unsigned int lockNum = 0; lockNum < CRYPTO_NUM_LOCKS; ++lockNum) ++ for (unsigned int lockNum = 0; lockNum < g_lockArrayCount; ++lockNum) + { +- pthread_mutex_destroy(&(locksTable[lockNum])); ++ pthread_mutex_destroy(&(g_pLockArray[lockNum])); + } ++ OPENSSL_free(g_pLockArray); ++ g_pLockArray = NULL; ++ g_lockArrayCount = 0; + #endif + } + +diff --git Utils/MIMEScanner.cpp Utils/MIMEScanner.cpp +index e02215c..50ceb3d 100644 +--- Utils/MIMEScanner.cpp ++++ Utils/MIMEScanner.cpp +@@ -1,5 +1,5 @@ + /* +- * Copyright 2005-2012 Fabrice Colin ++ * Copyright 2005-2017 Fabrice Colin + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -456,9 +456,10 @@ MIMEScanner::~MIMEScanner() + bool MIMEScanner::initialize(const string &userPrefix, const string &systemPrefix) + { + #ifdef USE_GIO ++#if !GLIB_CHECK_VERSION(2,35,0) + // Initialize the GType system + g_type_init(); +- ++#endif + return true; + #else + list desktopFilesPaths; From owner-svn-ports-branches@freebsd.org Fri Nov 2 08:15:07 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D610D10ECE63; Fri, 2 Nov 2018 08:15:06 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 858317C040; Fri, 2 Nov 2018 08:15:06 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 64E9C27F7E; Fri, 2 Nov 2018 08:15:06 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA28F6PD043878; Fri, 2 Nov 2018 08:15:06 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA28F6OK043876; Fri, 2 Nov 2018 08:15:06 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811020815.wA28F6OK043876@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Fri, 2 Nov 2018 08:15:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483779 - in branches/2018Q4/net-im/telegram: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q4/net-im/telegram: . files X-SVN-Commit-Revision: 483779 X-SVN-Commit-Repository: ports 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.29 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, 02 Nov 2018 08:15:07 -0000 Author: antoine Date: Fri Nov 2 08:15:05 2018 New Revision: 483779 URL: https://svnweb.freebsd.org/changeset/ports/483779 Log: MFH: r482679 net-im/telegram: Unbreak build on 12.0-CURRENT Add extra-patch to fix build on 12.0-CURRENT after updating OpenSSL to version 1.1.1 See https://github.com/vysheng/tgl/issues/129 Added: branches/2018Q4/net-im/telegram/files/extra-patch-openssl-1.1.0 - copied unchanged from r482679, head/net-im/telegram/files/extra-patch-openssl-1.1.0 Modified: branches/2018Q4/net-im/telegram/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/net-im/telegram/Makefile ============================================================================== --- branches/2018Q4/net-im/telegram/Makefile Fri Nov 2 08:12:20 2018 (r483778) +++ branches/2018Q4/net-im/telegram/Makefile Fri Nov 2 08:15:05 2018 (r483779) @@ -35,6 +35,12 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-openssl-1.1.0 +.endif + do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/telegram-cli ${INSTALL_PROGRAM} ${WRKSRC}/bin/telegram-cli ${STAGEDIR}${PREFIX}/bin Copied: branches/2018Q4/net-im/telegram/files/extra-patch-openssl-1.1.0 (from r482679, head/net-im/telegram/files/extra-patch-openssl-1.1.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/net-im/telegram/files/extra-patch-openssl-1.1.0 Fri Nov 2 08:15:05 2018 (r483779, copy of r482679, head/net-im/telegram/files/extra-patch-openssl-1.1.0) @@ -0,0 +1,38 @@ +--- tgl/crypto/rsa_pem_openssl.c.orig 2018-10-21 14:25:36 UTC ++++ tgl/crypto/rsa_pem_openssl.c +@@ -36,18 +36,28 @@ TGLC_WRAPPER_ASSOC(rsa,RSA) + // TODO: Refactor crucial struct-identity into its own header. + TGLC_WRAPPER_ASSOC(bn,BIGNUM) + ++/* ++ * Note: Since OpenSSL version 1.1.0-pre5 the RSA struct (rsa_st) is opaque, ++ * see https://wiki.openssl.org/index.php/OpenSSL_1.1.0_Changes ++ */ + TGLC_rsa *TGLC_rsa_new (unsigned long e, int n_bytes, const unsigned char *n) { + RSA *ret = RSA_new (); +- ret->e = unwrap_bn (TGLC_bn_new ()); +- TGLC_bn_set_word (wrap_bn (ret->e), e); +- ret->n = unwrap_bn (TGLC_bn_bin2bn (n, n_bytes, NULL)); ++ BIGNUM *ret_e = unwrap_bn (TGLC_bn_new ()); ++ BIGNUM *ret_n = unwrap_bn (TGLC_bn_bin2bn (n, n_bytes, NULL)); ++ RSA_set0_key (ret, ret_n, ret_e, NULL); ++ TGLC_bn_set_word (wrap_bn (ret_e), e); + return wrap_rsa (ret); + } + +-#define RSA_GETTER(M) \ +- TGLC_bn *TGLC_rsa_ ## M (TGLC_rsa *key) { \ +- return wrap_bn (unwrap_rsa (key)->M); \ +- } \ ++#define RSA_GETTER(M) \ ++TGLC_bn *TGLC_rsa_ ## M (TGLC_rsa *key) { \ ++ BIGNUM *rsa_n, *rsa_e, *rsa_d; \ ++ RSA_get0_key(unwrap_rsa (key), \ ++ (const BIGNUM **) &rsa_n, \ ++ (const BIGNUM **) &rsa_e, \ ++ (const BIGNUM **) &rsa_d); \ ++ return wrap_bn (rsa_ ## M); \ ++} + + RSA_GETTER(n); + RSA_GETTER(e); From owner-svn-ports-branches@freebsd.org Fri Nov 2 08:18:03 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ACEA510ECF27; Fri, 2 Nov 2018 08:18:03 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 517167C179; Fri, 2 Nov 2018 08:18:03 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2D02A27F83; Fri, 2 Nov 2018 08:18:03 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA28I37N044142; Fri, 2 Nov 2018 08:18:03 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA28I2sC044139; Fri, 2 Nov 2018 08:18:02 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811020818.wA28I2sC044139@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Fri, 2 Nov 2018 08:18:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483780 - in branches/2018Q4/security/pev: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q4/security/pev: . files X-SVN-Commit-Revision: 483780 X-SVN-Commit-Repository: ports 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.29 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, 02 Nov 2018 08:18:03 -0000 Author: antoine Date: Fri Nov 2 08:18:02 2018 New Revision: 483780 URL: https://svnweb.freebsd.org/changeset/ports/483780 Log: MFH: r482494 - Fix build after OpenSSL update on FreeBSD 12 PR: 232211 Submitted by: Nathan Added: branches/2018Q4/security/pev/files/patch-src_pehash.c - copied unchanged from r482494, head/security/pev/files/patch-src_pehash.c branches/2018Q4/security/pev/files/patch-src_pesec.c - copied unchanged from r482494, head/security/pev/files/patch-src_pesec.c Modified: branches/2018Q4/security/pev/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/security/pev/Makefile ============================================================================== --- branches/2018Q4/security/pev/Makefile Fri Nov 2 08:15:05 2018 (r483779) +++ branches/2018Q4/security/pev/Makefile Fri Nov 2 08:18:02 2018 (r483780) @@ -3,6 +3,7 @@ PORTNAME= pev PORTVERSION= 0.80 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ Copied: branches/2018Q4/security/pev/files/patch-src_pehash.c (from r482494, head/security/pev/files/patch-src_pehash.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/security/pev/files/patch-src_pehash.c Fri Nov 2 08:18:02 2018 (r483780, copy of r482494, head/security/pev/files/patch-src_pehash.c) @@ -0,0 +1,34 @@ +--- src/pehash.c.orig 2018-10-20 11:44:18 UTC ++++ src/pehash.c +@@ -215,13 +215,25 @@ static void calc_hash(const char *alg_name, const unsi + unsigned char md_value[EVP_MAX_MD_SIZE]; + unsigned int md_len; + +- EVP_MD_CTX md_ctx; ++ // See https://wiki.openssl.org/index.php/1.1_API_Changes ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ EVP_MD_CTX md_ctx_auto; ++ EVP_MD_CTX *md_ctx = &md_ctx_auto; ++#else ++ EVP_MD_CTX *md_ctx = EVP_MD_CTX_new(); ++#endif ++ + // FIXME: Handle errors - Check return values. +- EVP_MD_CTX_init(&md_ctx); +- EVP_DigestInit_ex(&md_ctx, md, NULL); +- EVP_DigestUpdate(&md_ctx, data, size); +- EVP_DigestFinal_ex(&md_ctx, md_value, &md_len); +- EVP_MD_CTX_cleanup(&md_ctx); ++ EVP_MD_CTX_init(md_ctx); ++ EVP_DigestInit_ex(md_ctx, md, NULL); ++ EVP_DigestUpdate(md_ctx, data, size); ++ EVP_DigestFinal_ex(md_ctx, md_value, &md_len); ++ ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ EVP_MD_CTX_cleanup(md_ctx); ++#else ++ EVP_MD_CTX_free(md_ctx); ++#endif + + for (unsigned int i=0; i < md_len; i++) + sprintf(&output[i * 2], "%02x", md_value[i]); Copied: branches/2018Q4/security/pev/files/patch-src_pesec.c (from r482494, head/security/pev/files/patch-src_pesec.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/security/pev/files/patch-src_pesec.c Fri Nov 2 08:18:02 2018 (r483780, copy of r482494, head/security/pev/files/patch-src_pesec.c) @@ -0,0 +1,12 @@ +--- src/pesec.c.orig 2018-10-20 11:48:33 UTC ++++ src/pesec.c +@@ -225,7 +225,9 @@ static int parse_pkcs7_data(const options_t *options, + PKCS7 *p7 = NULL; + BIO *in = NULL; + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + CRYPTO_malloc_init(); ++#endif + ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); + From owner-svn-ports-branches@freebsd.org Fri Nov 2 08:19:52 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 33CBC10ECFDF; Fri, 2 Nov 2018 08:19:52 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D1DAE7C28E; Fri, 2 Nov 2018 08:19:51 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B379127F88; Fri, 2 Nov 2018 08:19:51 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA28Jpwu044370; Fri, 2 Nov 2018 08:19:51 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA28JpaZ044367; Fri, 2 Nov 2018 08:19:51 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811020819.wA28JpaZ044367@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Fri, 2 Nov 2018 08:19:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483781 - in branches/2018Q4/sysutils/mcelog: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q4/sysutils/mcelog: . files X-SVN-Commit-Revision: 483781 X-SVN-Commit-Repository: ports 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.29 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, 02 Nov 2018 08:19:52 -0000 Author: antoine Date: Fri Nov 2 08:19:50 2018 New Revision: 483781 URL: https://svnweb.freebsd.org/changeset/ports/483781 Log: MFH: r483144 * Updated to 161 The added header should fix build on head. Submitted by: eric@van^ Differential Revision: https://reviews.freebsd.org/D17696 Modified: branches/2018Q4/sysutils/mcelog/Makefile branches/2018Q4/sysutils/mcelog/distinfo branches/2018Q4/sysutils/mcelog/files/patch-mcelog.c Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/sysutils/mcelog/Makefile ============================================================================== --- branches/2018Q4/sysutils/mcelog/Makefile Fri Nov 2 08:18:02 2018 (r483780) +++ branches/2018Q4/sysutils/mcelog/Makefile Fri Nov 2 08:19:50 2018 (r483781) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mcelog -PORTVERSION= 160 +PORTVERSION= 161 DISTVERSIONPREFIX= v CATEGORIES= sysutils Modified: branches/2018Q4/sysutils/mcelog/distinfo ============================================================================== --- branches/2018Q4/sysutils/mcelog/distinfo Fri Nov 2 08:18:02 2018 (r483780) +++ branches/2018Q4/sysutils/mcelog/distinfo Fri Nov 2 08:19:50 2018 (r483781) @@ -1,3 +1,3 @@ -TIMESTAMP = 1534799764 -SHA256 (andikleen-mcelog-v160_GH0.tar.gz) = 1fd241cc0ec78924382329b130e56ab983fc12dc71413a3c8543e926de091951 -SIZE (andikleen-mcelog-v160_GH0.tar.gz) = 307762 +TIMESTAMP = 1540433813 +SHA256 (andikleen-mcelog-v161_GH0.tar.gz) = 485f5be8f2d5ff8ec1382b54033f75f88b2960ef18f1d87bcf865bb1c094dbd5 +SIZE (andikleen-mcelog-v161_GH0.tar.gz) = 308227 Modified: branches/2018Q4/sysutils/mcelog/files/patch-mcelog.c ============================================================================== --- branches/2018Q4/sysutils/mcelog/files/patch-mcelog.c Fri Nov 2 08:18:02 2018 (r483780) +++ branches/2018Q4/sysutils/mcelog/files/patch-mcelog.c Fri Nov 2 08:19:50 2018 (r483781) @@ -1,6 +1,6 @@ ---- mcelog.c.orig 2017-10-12 20:42:20 UTC +--- mcelog.c.orig 2018-08-09 21:49:49 UTC +++ mcelog.c -@@ -20,9 +20,22 @@ +@@ -20,9 +20,23 @@ #define _GNU_SOURCE 1 #include #include @@ -11,6 +11,7 @@ +#endif +#ifdef __FreeBSD__ +#include ++#include +#include +#include +#include @@ -23,7 +24,7 @@ #include #include #include -@@ -60,9 +73,25 @@ +@@ -60,9 +74,25 @@ #include "bus.h" #include "unknown.h" @@ -49,7 +50,7 @@ int ignore_nodev; int filter_bogus = 1; -@@ -73,7 +102,9 @@ int ascii_mode; +@@ -73,7 +103,9 @@ int ascii_mode; int dump_raw_ascii; int daemon_mode; static char *inputfile; @@ -59,7 +60,7 @@ static int foreground; int filter_memory_errors; static struct config_cred runcred = { .uid = -1U, .gid = -1U }; -@@ -82,6 +113,10 @@ static char pidfile_default[] = PID_FILE; +@@ -82,6 +114,10 @@ static char pidfile_default[] = PID_FILE static char logfile_default[] = LOG_FILE; static char *pidfile = pidfile_default; static char *logfile; @@ -70,7 +71,7 @@ static int debug_numerrors; int imc_log = -1; static int check_only = 0; -@@ -196,6 +231,7 @@ static void parse_cpuid(u32 cpuid, u32 *family, u32 *m +@@ -199,6 +235,7 @@ static void parse_cpuid(u32 cpuid, u32 * *model += c.c.ext_model << 4; } @@ -78,7 +79,7 @@ static u32 unparse_cpuid(unsigned family, unsigned model) { union { -@@ -213,6 +249,7 @@ static u32 unparse_cpuid(unsigned family, unsigned mod +@@ -216,6 +253,7 @@ static u32 unparse_cpuid(unsigned family c.c.ext_model = model >> 4; return c.v; } @@ -86,7 +87,7 @@ static char *cputype_name[] = { [CPU_GENERIC] = "generic CPU", -@@ -329,6 +366,7 @@ static char *vendor[] = { +@@ -332,6 +370,7 @@ static char *vendor[] = { [8] = "NSC" }; @@ -94,7 +95,7 @@ static unsigned cpuvendor_to_num(char *name) { unsigned i; -@@ -343,6 +381,7 @@ static unsigned cpuvendor_to_num(char *name) +@@ -346,6 +385,7 @@ static unsigned cpuvendor_to_num(char *n return i; return 0; } @@ -102,7 +103,7 @@ static char *cpuvendor_name(u32 cpuvendor) { -@@ -491,6 +530,7 @@ static void dump_mce_raw_ascii(struct mce *m, unsigned +@@ -497,6 +537,7 @@ static void dump_mce_raw_ascii(struct mc Wprintf("\n"); } @@ -110,12 +111,12 @@ int is_cpu_supported(void) { enum { -@@ -561,14 +601,61 @@ int is_cpu_supported(void) +@@ -567,14 +608,61 @@ int is_cpu_supported(void) return 1; } +#endif - ++ +#ifdef __FreeBSD__ +int is_cpu_supported(void) +{ @@ -158,7 +159,7 @@ + return 0; +} +#endif -+ + +#ifdef __Linux__ static char *skipspace(char *s) { @@ -172,7 +173,7 @@ static char *skip_syslog(char *s) { char *p; -@@ -579,7 +666,9 @@ static char *skip_syslog(char *s) +@@ -585,7 +673,9 @@ static char *skip_syslog(char *s) return p + sizeof("mcelog: ") - 1; return s; } @@ -182,7 +183,7 @@ static char *skipgunk(char *s) { s = skip_syslog(s); -@@ -604,12 +693,16 @@ static char *skipgunk(char *s) +@@ -610,12 +700,16 @@ static char *skipgunk(char *s) return skipspace(s); } @@ -199,7 +200,7 @@ static int is_short(char *name) { return strlen(name) == 3 && -@@ -617,7 +710,9 @@ static int is_short(char *name) +@@ -623,7 +717,9 @@ static int is_short(char *name) islower(name[1]) && islower(name[2]); } @@ -209,7 +210,7 @@ static unsigned skip_date(char *s) { unsigned day, hour, min, year, sec; -@@ -634,6 +729,7 @@ static unsigned skip_date(char *s) +@@ -640,6 +736,7 @@ static unsigned skip_date(char *s) return 0; return next; } @@ -217,7 +218,7 @@ static void dump_mce_final(struct mce *m, char *symbol, int missing, int recordlen, int dseen) -@@ -654,6 +750,7 @@ static void dump_mce_final(struct mce *m, char *symbol +@@ -660,6 +757,7 @@ static void dump_mce_final(struct mce *m flushlog(); } @@ -225,7 +226,7 @@ static char *skip_patterns[] = { "MCA:*", "MCi_MISC register valid*", -@@ -662,7 +759,9 @@ static char *skip_patterns[] = { +@@ -668,7 +766,9 @@ static char *skip_patterns[] = { "Kernel does not support page offline interface", NULL }; @@ -235,7 +236,7 @@ static int match_patterns(char *s, char **pat) { for (; *pat; pat++) -@@ -670,12 +769,14 @@ static int match_patterns(char *s, char **pat) +@@ -676,12 +776,14 @@ static int match_patterns(char *s, char return 0; return 1; } @@ -250,12 +251,12 @@ static void decodefatal(FILE *inf) { struct mce m; -@@ -886,7 +987,228 @@ restart: +@@ -892,6 +994,227 @@ restart: if (data) dump_mce_final(&m, symbol, missing, recordlen, disclaimer_seen); } +#endif - ++ +#ifdef __FreeBSD__ +/* + * Table used to map cpuid vendor strings and FreeBSD CPU vendor IDs @@ -475,11 +476,10 @@ + } +} +#endif -+ + static void remove_pidfile(void) { - unlink(pidfile); -@@ -951,6 +1273,10 @@ void usage(void) +@@ -957,6 +1280,10 @@ void usage(void) " mcelog [options] --ascii < log\n" " mcelog [options] --ascii --file log\n" "Decode machine check ASCII output from kernel logs\n" @@ -490,7 +490,7 @@ "\n" "Options:\n" "--version Show the version of mcelog and exit\n" -@@ -1168,6 +1494,14 @@ static int modifier(int opt) +@@ -1174,6 +1501,14 @@ static int modifier(int opt) usage(); exit(0); break; @@ -505,7 +505,7 @@ case 0: break; default: -@@ -1218,10 +1552,12 @@ static int combined_modifier(int opt) +@@ -1224,10 +1559,12 @@ static int combined_modifier(int opt) static void general_setup(void) { @@ -518,7 +518,7 @@ config_cred("global", "run-credentials", &runcred); if (config_bool("global", "filter-memory-errors") == 1) filter_memory_errors = 1; -@@ -1244,6 +1580,7 @@ static void drop_cred(void) +@@ -1250,6 +1587,7 @@ static void drop_cred(void) } } @@ -526,12 +526,12 @@ static void process(int fd, unsigned recordlen, unsigned loglen, char *buf) { int i; -@@ -1296,7 +1633,174 @@ static void process(int fd, unsigned recordlen, unsign +@@ -1302,6 +1640,173 @@ static void process(int fd, unsigned rec if (finish) exit(0); } +#endif - ++ +#ifdef __FreeBSD__ +#ifdef LOCAL_HACK +struct mca_record_old { @@ -697,11 +697,10 @@ + exit(0); +} +#endif -+ + static void noargs(int ac, char **av) { - if (getopt_long(ac, av, "", options, NULL) != -1) { -@@ -1358,12 +1862,14 @@ struct mcefd_data { +@@ -1364,12 +1869,14 @@ struct mcefd_data { char *buf; }; @@ -716,7 +715,7 @@ static void handle_sigusr1(int sig) { -@@ -1372,13 +1878,18 @@ static void handle_sigusr1(int sig) +@@ -1378,13 +1885,18 @@ static void handle_sigusr1(int sig) int main(int ac, char **av) { @@ -737,7 +736,7 @@ if (opt == '?') { usage(); exit(1); -@@ -1399,11 +1910,13 @@ int main(int ac, char **av) +@@ -1405,11 +1917,13 @@ int main(int ac, char **av) } /* before doing anything else let's see if the CPUs are supported */ @@ -751,7 +750,7 @@ if (check_only) exit(0); -@@ -1422,15 +1935,23 @@ int main(int ac, char **av) +@@ -1428,15 +1942,23 @@ int main(int ac, char **av) } modifier_finish(); @@ -775,7 +774,7 @@ fd = open(logfn, O_RDONLY); if (fd < 0) { if (ignore_nodev) -@@ -1445,27 +1966,44 @@ int main(int ac, char **av) +@@ -1451,27 +1973,44 @@ int main(int ac, char **av) err("MCE_GET_LOG_LEN"); d.buf = xalloc(d.recordlen * d.loglen); From owner-svn-ports-branches@freebsd.org Fri Nov 2 08:23:19 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7134B10ED202; Fri, 2 Nov 2018 08:23:19 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 23D1A7C61C; Fri, 2 Nov 2018 08:23:19 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 05095160; Fri, 2 Nov 2018 08:23:19 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA28NIZ4049882; Fri, 2 Nov 2018 08:23:18 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA28NIWr049880; Fri, 2 Nov 2018 08:23:18 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811020823.wA28NIWr049880@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Fri, 2 Nov 2018 08:23:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483782 - in branches/2018Q4/mail/avenger: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q4/mail/avenger: . files X-SVN-Commit-Revision: 483782 X-SVN-Commit-Repository: ports 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.29 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, 02 Nov 2018 08:23:19 -0000 Author: antoine Date: Fri Nov 2 08:23:18 2018 New Revision: 483782 URL: https://svnweb.freebsd.org/changeset/ports/483782 Log: MFH: r483216 - Update to 0.8.5 - Correct LICENSE info and add LICENSE_FILE, per handbook - Correct DOC switch PR: 232337 Submitted by: ndowens@yahoo.com Modified: branches/2018Q4/mail/avenger/Makefile branches/2018Q4/mail/avenger/distinfo branches/2018Q4/mail/avenger/files/patch-Makefile.in Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/mail/avenger/Makefile ============================================================================== --- branches/2018Q4/mail/avenger/Makefile Fri Nov 2 08:19:50 2018 (r483781) +++ branches/2018Q4/mail/avenger/Makefile Fri Nov 2 08:23:18 2018 (r483782) @@ -2,17 +2,18 @@ # $FreeBSD$ PORTNAME= avenger -PORTVERSION= 0.8.4 -PORTREVISION= 1 +PORTVERSION= 0.8.5 CATEGORIES= mail MASTER_SITES= http://www.mailavenger.org/dist/ MAINTAINER= ports@FreeBSD.org COMMENT= Anti-spam SMTP server -LICENSE= GPLv2+ # though COPYING is GPLv3 +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING USES= bdb ssl + GNU_CONFIGURE= yes USERS= ${PORTNAME} @@ -26,9 +27,9 @@ CONFIGURE_ARGS= --enable-ssl=${OPENSSLBASE} \ --with-db=${LOCALBASE} \ --with-etcdir=${ETCDIR} -OPTIONS_DEFINE= SASL DOCS +OPTIONS_DEFINE= DOCS SASL -SASL_CONFIGURE_ON= --enable-sasl +SASL_CONFIGURE_ENABLE= sasl SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 post-patch: @@ -45,9 +46,10 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/etc/pf.os ${STAGEDIR}${PREFIX}/share @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/etc/smtp-filter.pf ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/etc/avsendmail.m4 ${STAGEDIR}${DATADIR} + (cd ${WRKSRC}/etc ; ${INSTALL_DATA} smtp-filter.pf avsendmail.m4 \ + ${STAGEDIR}${DATADIR}) +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} Modified: branches/2018Q4/mail/avenger/distinfo ============================================================================== --- branches/2018Q4/mail/avenger/distinfo Fri Nov 2 08:19:50 2018 (r483781) +++ branches/2018Q4/mail/avenger/distinfo Fri Nov 2 08:23:18 2018 (r483782) @@ -1,2 +1,3 @@ -SHA256 (avenger-0.8.4.tar.gz) = cd6be345687fa0e6be056a575865b937f8ebcb486cb4f8da2d74bf4c4bdd64ce -SIZE (avenger-0.8.4.tar.gz) = 890192 +TIMESTAMP = 1540694687 +SHA256 (avenger-0.8.5.tar.gz) = b0fc3e2e03ed010e95e561367fce7b087968df7ea6056251eba95cad14d26d37 +SIZE (avenger-0.8.5.tar.gz) = 910358 Modified: branches/2018Q4/mail/avenger/files/patch-Makefile.in ============================================================================== --- branches/2018Q4/mail/avenger/files/patch-Makefile.in Fri Nov 2 08:19:50 2018 (r483781) +++ branches/2018Q4/mail/avenger/files/patch-Makefile.in Fri Nov 2 08:23:18 2018 (r483782) @@ -1,6 +1,6 @@ ---- ./Makefile.in.orig 2013-03-08 21:13:45.000000000 +0100 -+++ ./Makefile.in 2013-03-08 21:16:55.000000000 +0100 -@@ -287,9 +287,9 @@ +--- Makefile.in.orig 2018-10-09 06:38:27 UTC ++++ Makefile.in +@@ -386,9 +386,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ LYNX = lynx From owner-svn-ports-branches@freebsd.org Fri Nov 2 08:26:41 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B8E610ED2F2; Fri, 2 Nov 2018 08:26:41 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BECC37C791; Fri, 2 Nov 2018 08:26:40 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 94B9D164; Fri, 2 Nov 2018 08:26:40 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA28Qe9T050164; Fri, 2 Nov 2018 08:26:40 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA28QeVi050162; Fri, 2 Nov 2018 08:26:40 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811020826.wA28QeVi050162@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Fri, 2 Nov 2018 08:26:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483783 - in branches/2018Q4/www/mod_webauth: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q4/www/mod_webauth: . files X-SVN-Commit-Revision: 483783 X-SVN-Commit-Repository: ports 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.29 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, 02 Nov 2018 08:26:41 -0000 Author: antoine Date: Fri Nov 2 08:26:39 2018 New Revision: 483783 URL: https://svnweb.freebsd.org/changeset/ports/483783 Log: MFH: r482160 Fix build with OpenSSL 1.1.x PR: 232220 Submitted by: Nathan Sponsored by: Netzkommune GmbH Added: branches/2018Q4/www/mod_webauth/files/patch-configure - copied unchanged from r482160, head/www/mod_webauth/files/patch-configure Modified: branches/2018Q4/www/mod_webauth/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/www/mod_webauth/Makefile ============================================================================== --- branches/2018Q4/www/mod_webauth/Makefile Fri Nov 2 08:23:18 2018 (r483782) +++ branches/2018Q4/www/mod_webauth/Makefile Fri Nov 2 08:26:39 2018 (r483783) @@ -3,6 +3,7 @@ PORTNAME= mod_webauth PORTVERSION= 4.7.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://webauth.stanford.edu/dist/ DISTNAME= webauth-${PORTVERSION} @@ -13,7 +14,7 @@ COMMENT= Apache module for authenticating users with K LIB_DEPENDS= libcurl.so:ftp/curl \ libsasl2.so:security/cyrus-sasl2 -USES= apache:2.2+ libtool pathfix pkgconfig ssl +USES= apache:2.4 libtool pathfix pkgconfig ssl USE_OPENLDAP= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes Copied: branches/2018Q4/www/mod_webauth/files/patch-configure (from r482160, head/www/mod_webauth/files/patch-configure) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/www/mod_webauth/files/patch-configure Fri Nov 2 08:26:39 2018 (r483783, copy of r482160, head/www/mod_webauth/files/patch-configure) @@ -0,0 +1,98 @@ +--- configure.orig 2018-10-13 05:39:44 UTC ++++ configure +@@ -23425,9 +23425,9 @@ fi + fi + + if test x"$rra_reduced_depends" = xtrue; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5 +-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; } +-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5 ++$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; } ++if ${ac_cv_lib_ssl_SSL_CTX_new+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -23441,27 +23441,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #ifdef __cplusplus + extern "C" + #endif +-char SSL_library_init (); ++char SSL_CTX_new (); + int + main () + { +-return SSL_library_init (); ++return SSL_CTX_new (); + ; + return 0; + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_ssl_SSL_library_init=yes ++ ac_cv_lib_ssl_SSL_CTX_new=yes + else +- ac_cv_lib_ssl_SSL_library_init=no ++ ac_cv_lib_ssl_SSL_CTX_new=no + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5 +-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; } +-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5 ++$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; } ++if test "x$ac_cv_lib_ssl_SSL_CTX_new" = xyes; then : + OPENSSL_LIBS=-lssl + else + if test x"true" = xtrue; then : +@@ -23470,9 +23470,9 @@ fi + fi + + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5 +-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; } +-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5 ++$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; } ++if ${ac_cv_lib_ssl_SSL_CTX_new+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -23486,27 +23486,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #ifdef __cplusplus + extern "C" + #endif +-char SSL_library_init (); ++char SSL_CTX_new (); + int + main () + { +-return SSL_library_init (); ++return SSL_CTX_new (); + ; + return 0; + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_ssl_SSL_library_init=yes ++ ac_cv_lib_ssl_SSL_CTX_new=yes + else +- ac_cv_lib_ssl_SSL_library_init=no ++ ac_cv_lib_ssl_SSL_CTX_new=no + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5 +-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; } +-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5 ++$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; } ++if test "x$ac_cv_lib_ssl_SSL_CTX_new" = xyes; then : + OPENSSL_LIBS="-lssl $CRYPTO_LIBS" + else + if test x"true" = xtrue; then : From owner-svn-ports-branches@freebsd.org Fri Nov 2 08:28:41 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7827910ED3C1; Fri, 2 Nov 2018 08:28:41 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2C52B7C9FD; Fri, 2 Nov 2018 08:28:41 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0EC7F169; Fri, 2 Nov 2018 08:28:41 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA28SeIk050470; Fri, 2 Nov 2018 08:28:40 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA28SeHO050468; Fri, 2 Nov 2018 08:28:40 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811020828.wA28SeHO050468@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Fri, 2 Nov 2018 08:28:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483784 - in branches/2018Q4/mail/heirloom-mailx: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q4/mail/heirloom-mailx: . files X-SVN-Commit-Revision: 483784 X-SVN-Commit-Repository: ports 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.29 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, 02 Nov 2018 08:28:41 -0000 Author: antoine Date: Fri Nov 2 08:28:40 2018 New Revision: 483784 URL: https://svnweb.freebsd.org/changeset/ports/483784 Log: MFH: r482131 Jettison SSLv2 support. Not only does this allow mail/mailx to build using openssl111 in base but SSLv2 is insecure. Added: branches/2018Q4/mail/heirloom-mailx/files/patch-mailx.1 - copied unchanged from r482131, head/mail/heirloom-mailx/files/patch-mailx.1 branches/2018Q4/mail/heirloom-mailx/files/patch-mailx.1.html - copied unchanged from r482131, head/mail/heirloom-mailx/files/patch-mailx.1.html Modified: branches/2018Q4/mail/heirloom-mailx/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/mail/heirloom-mailx/Makefile ============================================================================== --- branches/2018Q4/mail/heirloom-mailx/Makefile Fri Nov 2 08:26:39 2018 (r483783) +++ branches/2018Q4/mail/heirloom-mailx/Makefile Fri Nov 2 08:28:40 2018 (r483784) @@ -2,7 +2,7 @@ PORTNAME= mailx PORTVERSION= 12.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= mail ipv6 MASTER_SITES= SF/heirloom/heirloom-${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= heirloom- @@ -18,6 +18,7 @@ CONFLICTS= mailx-[0-9]* MAKE_JOBS_UNSAFE= yes USES= iconv localbase ssl tar:bzip2 +CPPFLAGS+= -DOPENSSL_NO_SSL2 MAKE_ARGS= PREFIX="${PREFIX}" \ SYSCONFDIR="${PREFIX}/etc" \ SENDMAIL="/usr/sbin/sendmail" \ Copied: branches/2018Q4/mail/heirloom-mailx/files/patch-mailx.1 (from r482131, head/mail/heirloom-mailx/files/patch-mailx.1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/mail/heirloom-mailx/files/patch-mailx.1 Fri Nov 2 08:28:40 2018 (r483784, copy of r482131, head/mail/heirloom-mailx/files/patch-mailx.1) @@ -0,0 +1,14 @@ +--- mailx.1.orig 2007-10-01 06:00:39.000000000 -0700 ++++ mailx.1 2018-10-14 19:36:55.360353000 -0700 +@@ -2683,11 +2683,6 @@ + to verify SSL/TLS server certificates. + Only applicable if SSL/TLS support is built using OpenSSL. + .TP +-.B ssl-v2-allow +-Accept SSLv2 connections. +-These are normally not allowed +-because this protocol version is insecure. +-.TP + .B stealthmua + Inhibits the generation of + the \fI`Message-Id:'\fR and \fI`User-Agent:'\fR Copied: branches/2018Q4/mail/heirloom-mailx/files/patch-mailx.1.html (from r482131, head/mail/heirloom-mailx/files/patch-mailx.1.html) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/mail/heirloom-mailx/files/patch-mailx.1.html Fri Nov 2 08:28:40 2018 (r483784, copy of r482131, head/mail/heirloom-mailx/files/patch-mailx.1.html) @@ -0,0 +1,15 @@ +--- mailx.1.html.orig 2008-07-28 15:33:37.000000000 -0700 ++++ mailx.1.html 2018-10-14 19:38:44.077272000 -0700 +@@ -2953,12 +2953,6 @@ + Only applicable if SSL/TLS support is built using OpenSSL. + + +-ssl-v2-allow   +-Accept SSLv2 connections. +-These are normally not allowed +-because this protocol version is insecure. +- +- + stealthmua   + Inhibits the generation of + the 'Message-Id:' and 'User-Agent:' From owner-svn-ports-branches@freebsd.org Fri Nov 2 08:30:04 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 168B710ED497; Fri, 2 Nov 2018 08:30:04 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BEBBE7CB78; Fri, 2 Nov 2018 08:30:03 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9FE8718D; Fri, 2 Nov 2018 08:30:03 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA28U3jO050689; Fri, 2 Nov 2018 08:30:03 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA28U3HA050687; Fri, 2 Nov 2018 08:30:03 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811020830.wA28U3HA050687@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Fri, 2 Nov 2018 08:30:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483785 - in branches/2018Q4/www/mod_auth_cas: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q4/www/mod_auth_cas: . files X-SVN-Commit-Revision: 483785 X-SVN-Commit-Repository: ports 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.29 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, 02 Nov 2018 08:30:04 -0000 Author: antoine Date: Fri Nov 2 08:30:02 2018 New Revision: 483785 URL: https://svnweb.freebsd.org/changeset/ports/483785 Log: MFH: r482047 Fix build with OpenSSL 1.1.x While here: - Pet Portlint PR: 232221 Submitted by: Nathan Sponsored by: Netzkommune GmbH Added: branches/2018Q4/www/mod_auth_cas/files/patch-configure - copied unchanged from r482047, head/www/mod_auth_cas/files/patch-configure Modified: branches/2018Q4/www/mod_auth_cas/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/www/mod_auth_cas/Makefile ============================================================================== --- branches/2018Q4/www/mod_auth_cas/Makefile Fri Nov 2 08:28:40 2018 (r483784) +++ branches/2018Q4/www/mod_auth_cas/Makefile Fri Nov 2 08:30:02 2018 (r483785) @@ -4,6 +4,7 @@ PORTNAME= mod_auth_cas PORTVERSION= 1.1 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} @@ -15,9 +16,10 @@ LICENSE= APACHE20 LIB_DEPENDS= libcurl.so:ftp/curl \ libpcre.so:devel/pcre +USES= apache:2.4 ssl + USE_GITHUB= yes GH_ACCOUNT= Jasig -USES= apache:2.2+ ssl HAS_CONFIGURE= yes # configure requires LDFLAGS to find libpcre Copied: branches/2018Q4/www/mod_auth_cas/files/patch-configure (from r482047, head/www/mod_auth_cas/files/patch-configure) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/www/mod_auth_cas/files/patch-configure Fri Nov 2 08:30:02 2018 (r483785, copy of r482047, head/www/mod_auth_cas/files/patch-configure) @@ -0,0 +1,50 @@ +--- configure.orig 2018-10-13 05:53:29 UTC ++++ configure +@@ -13727,9 +13727,9 @@ else + as_fn_error $? "OpenSSL libraries required" "$LINENO" 5 + fi + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5 +-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; } +-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5 ++$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; } ++if ${ac_cv_lib_ssl_SSL_CTX_new+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -13743,27 +13743,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #ifdef __cplusplus + extern "C" + #endif +-char SSL_library_init (); ++char SSL_CTX_new (); + int + main () + { +-return SSL_library_init (); ++return SSL_CTX_new (); + ; + return 0; + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_ssl_SSL_library_init=yes ++ ac_cv_lib_ssl_SSL_CTX_new=yes + else +- ac_cv_lib_ssl_SSL_library_init=no ++ ac_cv_lib_ssl_SSL_CTX_new=no + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5 +-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; } +-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5 ++$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; } ++if test "x$ac_cv_lib_ssl_SSL_CTX_new" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBSSL 1 + _ACEOF From owner-svn-ports-branches@freebsd.org Fri Nov 2 09:00:07 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2053510EE493; Fri, 2 Nov 2018 09:00:07 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C92DE7DAE1; Fri, 2 Nov 2018 09:00:06 +0000 (UTC) (envelope-from mfechner@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A7BDF69D; Fri, 2 Nov 2018 09:00:06 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA2906VU065722; Fri, 2 Nov 2018 09:00:06 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA2906xF065720; Fri, 2 Nov 2018 09:00:06 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201811020900.wA2906xF065720@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Fri, 2 Nov 2018 09:00:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483786 - in branches/2018Q4: devel devel/rubygem-gitlab-sidekiq-fetcher textproc textproc/rubygem-github-markup17 X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in branches/2018Q4: devel devel/rubygem-gitlab-sidekiq-fetcher textproc textproc/rubygem-github-markup17 X-SVN-Commit-Revision: 483786 X-SVN-Commit-Repository: ports 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.29 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, 02 Nov 2018 09:00:07 -0000 Author: mfechner Date: Fri Nov 2 09:00:05 2018 New Revision: 483786 URL: https://svnweb.freebsd.org/changeset/ports/483786 Log: MFH: r483495 Added new ports required for www/gitlab-ce 11.4.x. Approved by: mentors (implicit) Approved by: ports-secteam (miwi) Added: branches/2018Q4/devel/rubygem-gitlab-sidekiq-fetcher/ - copied from r483495, head/devel/rubygem-gitlab-sidekiq-fetcher/ branches/2018Q4/textproc/rubygem-github-markup17/ - copied from r483495, head/textproc/rubygem-github-markup17/ Modified: branches/2018Q4/devel/Makefile branches/2018Q4/textproc/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/devel/Makefile ============================================================================== --- branches/2018Q4/devel/Makefile Fri Nov 2 08:30:02 2018 (r483785) +++ branches/2018Q4/devel/Makefile Fri Nov 2 09:00:05 2018 (r483786) @@ -5668,6 +5668,7 @@ SUBDIR += rubygem-git SUBDIR += rubygem-git-version-bump SUBDIR += rubygem-github_api + SUBDIR += rubygem-gitlab-sidekiq-fetcher SUBDIR += rubygem-gitlab-pygments.rb SUBDIR += rubygem-gitlab_git SUBDIR += rubygem-gitlab_meta Modified: branches/2018Q4/textproc/Makefile ============================================================================== --- branches/2018Q4/textproc/Makefile Fri Nov 2 08:30:02 2018 (r483785) +++ branches/2018Q4/textproc/Makefile Fri Nov 2 09:00:05 2018 (r483786) @@ -1553,6 +1553,7 @@ SUBDIR += rubygem-github-linguist53 SUBDIR += rubygem-github-markup SUBDIR += rubygem-github-markup16 + SUBDIR += rubygem-github-markup17 SUBDIR += rubygem-gitlab-grit SUBDIR += rubygem-gitlab-linguist SUBDIR += rubygem-gitlab-markup From owner-svn-ports-branches@freebsd.org Fri Nov 2 09:01:14 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 387F810EE642; Fri, 2 Nov 2018 09:01:14 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E2B717DD16; Fri, 2 Nov 2018 09:01:13 +0000 (UTC) (envelope-from mfechner@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C3F5B6CD; Fri, 2 Nov 2018 09:01:13 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA291Dsw068458; Fri, 2 Nov 2018 09:01:13 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA291Dj4068068; Fri, 2 Nov 2018 09:01:13 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201811020901.wA291Dj4068068@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Fri, 2 Nov 2018 09:01:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483788 - branches/2018Q4/devel/libgit2 X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: branches/2018Q4/devel/libgit2 X-SVN-Commit-Revision: 483788 X-SVN-Commit-Repository: ports 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.29 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, 02 Nov 2018 09:01:14 -0000 Author: mfechner Date: Fri Nov 2 09:01:13 2018 New Revision: 483788 URL: https://svnweb.freebsd.org/changeset/ports/483788 Log: MFH: r483496 Upgrade to 0.27.7. Approved by: mentors (implicit) Approved by: ports-secteam (miwi) Modified: branches/2018Q4/devel/libgit2/Makefile branches/2018Q4/devel/libgit2/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/devel/libgit2/Makefile ============================================================================== --- branches/2018Q4/devel/libgit2/Makefile Fri Nov 2 09:00:17 2018 (r483787) +++ branches/2018Q4/devel/libgit2/Makefile Fri Nov 2 09:01:13 2018 (r483788) @@ -3,7 +3,7 @@ # Also update devel/libgit2-glib, devel/rubygem-rugged, devel/py-pygit2 PORTNAME= libgit2 -PORTVERSION= 0.27.5 +PORTVERSION= 0.27.7 DISTVERSIONPREFIX= v CATEGORIES= devel Modified: branches/2018Q4/devel/libgit2/distinfo ============================================================================== --- branches/2018Q4/devel/libgit2/distinfo Fri Nov 2 09:00:17 2018 (r483787) +++ branches/2018Q4/devel/libgit2/distinfo Fri Nov 2 09:01:13 2018 (r483788) @@ -1,3 +1,3 @@ -TIMESTAMP = 1539602141 -SHA256 (libgit2-libgit2-v0.27.5_GH0.tar.gz) = 15f2775f4f325951d9139ed906502b6c71fee6787cada9b045f5994072ccbd33 -SIZE (libgit2-libgit2-v0.27.5_GH0.tar.gz) = 4775158 +TIMESTAMP = 1540899281 +SHA256 (libgit2-libgit2-v0.27.7_GH0.tar.gz) = 1a5435a483759b1cd96feb12b11abb5231b0688016db506ce5947178f6ba2531 +SIZE (libgit2-libgit2-v0.27.7_GH0.tar.gz) = 4782856 From owner-svn-ports-branches@freebsd.org Fri Nov 2 09:02:55 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE92F10EE6CE; Fri, 2 Nov 2018 09:02:55 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 949DB7DFF6; Fri, 2 Nov 2018 09:02:55 +0000 (UTC) (envelope-from mfechner@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 75AC7830; Fri, 2 Nov 2018 09:02:55 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA292t4D071201; Fri, 2 Nov 2018 09:02:55 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA292tbu071199; Fri, 2 Nov 2018 09:02:55 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201811020902.wA292tbu071199@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Fri, 2 Nov 2018 09:02:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483789 - branches/2018Q4/net/rubygem-gitaly-proto X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: branches/2018Q4/net/rubygem-gitaly-proto X-SVN-Commit-Revision: 483789 X-SVN-Commit-Repository: ports 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.29 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, 02 Nov 2018 09:02:56 -0000 Author: mfechner Date: Fri Nov 2 09:02:54 2018 New Revision: 483789 URL: https://svnweb.freebsd.org/changeset/ports/483789 Log: MFH: r483498 Upgrade to version 0.118.1 which is required for www/gitlab-ce 11.4.x. Approved by: mentors (implicit) Approved by: ports-secteam (miwi) Modified: branches/2018Q4/net/rubygem-gitaly-proto/Makefile branches/2018Q4/net/rubygem-gitaly-proto/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/net/rubygem-gitaly-proto/Makefile ============================================================================== --- branches/2018Q4/net/rubygem-gitaly-proto/Makefile Fri Nov 2 09:01:13 2018 (r483788) +++ branches/2018Q4/net/rubygem-gitaly-proto/Makefile Fri Nov 2 09:02:54 2018 (r483789) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitaly-proto -PORTVERSION= 0.117.0 +PORTVERSION= 0.118.1 CATEGORIES= net rubygems MASTER_SITES= RG Modified: branches/2018Q4/net/rubygem-gitaly-proto/distinfo ============================================================================== --- branches/2018Q4/net/rubygem-gitaly-proto/distinfo Fri Nov 2 09:01:13 2018 (r483788) +++ branches/2018Q4/net/rubygem-gitaly-proto/distinfo Fri Nov 2 09:02:54 2018 (r483789) @@ -1,3 +1,3 @@ -TIMESTAMP = 1537565844 -SHA256 (rubygem/gitaly-proto-0.117.0.gem) = 11906acfa59d1c537e4a6c491f93f5619ad0098e36793776851256ca08ffaf47 -SIZE (rubygem/gitaly-proto-0.117.0.gem) = 17408 +TIMESTAMP = 1540327600 +SHA256 (rubygem/gitaly-proto-0.118.1.gem) = 713a618e4e0a950663adef8d866a662d708db70a77e46caed2742cdbcbe9dea6 +SIZE (rubygem/gitaly-proto-0.118.1.gem) = 17920 From owner-svn-ports-branches@freebsd.org Fri Nov 2 09:07:28 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7210510EE7D5; Fri, 2 Nov 2018 09:07:28 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 270C07E2F0; Fri, 2 Nov 2018 09:07:28 +0000 (UTC) (envelope-from mfechner@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 07B68836; Fri, 2 Nov 2018 09:07:28 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA297RFw071887; Fri, 2 Nov 2018 09:07:27 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA297RUs071883; Fri, 2 Nov 2018 09:07:27 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201811020907.wA297RUs071883@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Fri, 2 Nov 2018 09:07:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483792 - in branches/2018Q4/devel/gitaly: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in branches/2018Q4/devel/gitaly: . files X-SVN-Commit-Revision: 483792 X-SVN-Commit-Repository: ports 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.29 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, 02 Nov 2018 09:07:28 -0000 Author: mfechner Date: Fri Nov 2 09:07:26 2018 New Revision: 483792 URL: https://svnweb.freebsd.org/changeset/ports/483792 Log: MFH: r482097 r483497 Bump PORTREVISION for package change caused by rubygem-bundler 1.16.6 update Upgrade to version 0.125.1 which is required for www/gitlab-ce 11.4.x. Approved by: mentors (implicit) Approved by: ports-secteam (miwi) Modified: branches/2018Q4/devel/gitaly/Makefile branches/2018Q4/devel/gitaly/distinfo branches/2018Q4/devel/gitaly/files/patch-ruby_Gemfile branches/2018Q4/devel/gitaly/pkg-plist Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/devel/gitaly/Makefile ============================================================================== --- branches/2018Q4/devel/gitaly/Makefile Fri Nov 2 09:06:24 2018 (r483791) +++ branches/2018Q4/devel/gitaly/Makefile Fri Nov 2 09:07:26 2018 (r483792) @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 0.120.1 +DISTVERSION= 0.125.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -41,7 +42,7 @@ USE_RUBY= yes USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/tags -GL_COMMIT= 5a739d657452de73137c2a0cb7d171c40fa3557a +GL_COMMIT= 076f3b0710ac07af5530ff20618e3fc27a5aead7 post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example Modified: branches/2018Q4/devel/gitaly/distinfo ============================================================================== --- branches/2018Q4/devel/gitaly/distinfo Fri Nov 2 09:06:24 2018 (r483791) +++ branches/2018Q4/devel/gitaly/distinfo Fri Nov 2 09:07:26 2018 (r483792) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538419557 -SHA256 (gitlab-org-gitaly-5a739d657452de73137c2a0cb7d171c40fa3557a_GL0.tar.gz) = 1bc5e27bef1ae2ff6c69f8a04afbd8db954562d3888398226e281a4004ea5ea0 -SIZE (gitlab-org-gitaly-5a739d657452de73137c2a0cb7d171c40fa3557a_GL0.tar.gz) = 3608844 +TIMESTAMP = 1540328037 +SHA256 (gitlab-org-gitaly-076f3b0710ac07af5530ff20618e3fc27a5aead7_GL0.tar.gz) = 7d4f62b68b5e8b587024a3db5833285068bb25d77b3f40c440bbeb3a9d9418f0 +SIZE (gitlab-org-gitaly-076f3b0710ac07af5530ff20618e3fc27a5aead7_GL0.tar.gz) = 3603356 Modified: branches/2018Q4/devel/gitaly/files/patch-ruby_Gemfile ============================================================================== --- branches/2018Q4/devel/gitaly/files/patch-ruby_Gemfile Fri Nov 2 09:06:24 2018 (r483791) +++ branches/2018Q4/devel/gitaly/files/patch-ruby_Gemfile Fri Nov 2 09:07:26 2018 (r483792) @@ -8,7 +8,7 @@ +gem 'github-linguist', '~> 5.3', require: 'linguist' gem 'gitlab-markup', '~> 1.6.4' -gem 'gitaly-proto', '~> 0.116.0', require: 'gitaly' -+gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly' ++gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly' gem 'activesupport', '~> 5.0.2' -gem 'rdoc', '~> 4.2' +gem 'rdoc', '~> 6.0' Modified: branches/2018Q4/devel/gitaly/pkg-plist ============================================================================== --- branches/2018Q4/devel/gitaly/pkg-plist Fri Nov 2 09:06:24 2018 (r483791) +++ branches/2018Q4/devel/gitaly/pkg-plist Fri Nov 2 09:07:26 2018 (r483792) @@ -19,33 +19,44 @@ %%DATADIR%%/ruby/lib/gitaly_server/utils.rb %%DATADIR%%/ruby/lib/gitaly_server/wiki_service.rb %%DATADIR%%/ruby/lib/gitlab/config.rb +%%DATADIR%%/ruby/lib/gitlab/encoding_helper.rb %%DATADIR%%/ruby/lib/gitlab/git.rb %%DATADIR%%/ruby/lib/gitlab/git/blob.rb %%DATADIR%%/ruby/lib/gitlab/git/branch.rb %%DATADIR%%/ruby/lib/gitlab/git/commit.rb %%DATADIR%%/ruby/lib/gitlab/git/commit_stats.rb +%%DATADIR%%/ruby/lib/gitlab/git/committer_with_hooks.rb +%%DATADIR%%/ruby/lib/gitlab/git/conflict/file.rb +%%DATADIR%%/ruby/lib/gitlab/git/conflict/parser.rb +%%DATADIR%%/ruby/lib/gitlab/git/conflict/resolution.rb %%DATADIR%%/ruby/lib/gitlab/git/conflict/resolver.rb %%DATADIR%%/ruby/lib/gitlab/git/diff.rb %%DATADIR%%/ruby/lib/gitlab/git/gitaly_remote_repository.rb %%DATADIR%%/ruby/lib/gitlab/git/gitlab_projects.rb +%%DATADIR%%/ruby/lib/gitlab/git/hook.rb +%%DATADIR%%/ruby/lib/gitlab/git/hooks_service.rb %%DATADIR%%/ruby/lib/gitlab/git/index.rb %%DATADIR%%/ruby/lib/gitlab/git/lfs_changes.rb -%%DATADIR%%/ruby/lib/gitlab/git/pre_receive_error.rb +%%DATADIR%%/ruby/lib/gitlab/git/operation_service.rb +%%DATADIR%%/ruby/lib/gitlab/git/path_helper.rb +%%DATADIR%%/ruby/lib/gitlab/git/popen.rb %%DATADIR%%/ruby/lib/gitlab/git/raw_diff_change.rb %%DATADIR%%/ruby/lib/gitlab/git/ref.rb %%DATADIR%%/ruby/lib/gitlab/git/remote_mirror.rb +%%DATADIR%%/ruby/lib/gitlab/git/remote_repository.rb %%DATADIR%%/ruby/lib/gitlab/git/repository.rb %%DATADIR%%/ruby/lib/gitlab/git/repository_mirroring.rb %%DATADIR%%/ruby/lib/gitlab/git/rev_list.rb %%DATADIR%%/ruby/lib/gitlab/git/tag.rb +%%DATADIR%%/ruby/lib/gitlab/git/user.rb %%DATADIR%%/ruby/lib/gitlab/git/wiki.rb %%DATADIR%%/ruby/lib/gitlab/git/wiki_file.rb %%DATADIR%%/ruby/lib/gitlab/git/wiki_page.rb %%DATADIR%%/ruby/lib/gitlab/git/wiki_page_version.rb %%DATADIR%%/ruby/lib/gitlab/git_logger.rb -%%DATADIR%%/ruby/lib/gitlab/gitaly_client.rb %%DATADIR%%/ruby/lib/gitlab/gollum.rb %%DATADIR%%/ruby/lib/gitlab/rails_logger.rb +%%DATADIR%%/ruby/lib/gitlab/utils/strong_memoize.rb %%DATADIR%%/ruby/lib/gitlab/version_info.rb %%DATADIR%%/ruby/spec/gitaly/ref_service_spec.rb %%DATADIR%%/ruby/spec/gitaly/repository_service_spec.rb @@ -56,6 +67,7 @@ %%DATADIR%%/ruby/spec/lib/gitaly_server/sentry_interceptor_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/config_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/diff_spec.rb +%%DATADIR%%/ruby/spec/lib/gitlab/git/gitlab_projects_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/index_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/repository_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/rev_list_spec.rb @@ -64,28 +76,6 @@ %%DATADIR%%/ruby/spec/spec_helper.rb %%DATADIR%%/ruby/spec/support/sentry.rb %%DATADIR%%/ruby/spec/test_repo_helper.rb -%%DATADIR%%/ruby/vendor/gitlab_git/ORIGIN -%%DATADIR%%/ruby/vendor/gitlab_git/REVISION -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/encoding_helper.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/committer_with_hooks.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/conflict/file.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/conflict/parser.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/conflict/resolution.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/gitlab_projects.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/hook.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/hooks_service.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/operation_service.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/path_helper.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/popen.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/pre_receive_error.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/remote_mirror.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/remote_repository.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/repository.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/repository_mirroring.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/user.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/util.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/utils/strong_memoize.rb @(,,555) %%DATADIR%%/bin/gitaly @(,,555) %%DATADIR%%/bin/gitaly-ssh @sample %%DATADIR%%/config.toml.sample From owner-svn-ports-branches@freebsd.org Fri Nov 2 09:08:49 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BC27110EE89F; Fri, 2 Nov 2018 09:08:49 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6D3177E4ED; Fri, 2 Nov 2018 09:08:49 +0000 (UTC) (envelope-from mfechner@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4C1B4839; Fri, 2 Nov 2018 09:08:49 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA298ntR072128; Fri, 2 Nov 2018 09:08:49 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA298m00072126; Fri, 2 Nov 2018 09:08:48 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201811020908.wA298m00072126@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Fri, 2 Nov 2018 09:08:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483793 - branches/2018Q4/textproc/rubygem-gitlab-markup X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: branches/2018Q4/textproc/rubygem-gitlab-markup X-SVN-Commit-Revision: 483793 X-SVN-Commit-Repository: ports 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.29 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, 02 Nov 2018 09:08:49 -0000 Author: mfechner Date: Fri Nov 2 09:08:48 2018 New Revision: 483793 URL: https://svnweb.freebsd.org/changeset/ports/483793 Log: MFH: r483499 r483733 Renamed the binary installed from github-markup to gitlab-markup to fix a file collision caused by package rubygem-github-markup. Approved by: mentors (implicit) Upgrade to 1.6.5 which includes upstream now the binary rename, so patch removed for it. Approved by: mentors (implicit) Approved by: ports-secteam (miwi) Modified: branches/2018Q4/textproc/rubygem-gitlab-markup/Makefile branches/2018Q4/textproc/rubygem-gitlab-markup/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/textproc/rubygem-gitlab-markup/Makefile ============================================================================== --- branches/2018Q4/textproc/rubygem-gitlab-markup/Makefile Fri Nov 2 09:07:26 2018 (r483792) +++ branches/2018Q4/textproc/rubygem-gitlab-markup/Makefile Fri Nov 2 09:08:48 2018 (r483793) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitlab-markup -PORTVERSION= 1.6.4 +PORTVERSION= 1.6.5 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -16,7 +16,7 @@ USE_RUBY= yes NO_ARCH= yes -PLIST_FILES= bin/github-markup +PLIST_FILES= bin/gitlab-markup SHEBANG_FILES= lib/github/commands/rest2html \ script/bootstrap \ Modified: branches/2018Q4/textproc/rubygem-gitlab-markup/distinfo ============================================================================== --- branches/2018Q4/textproc/rubygem-gitlab-markup/distinfo Fri Nov 2 09:07:26 2018 (r483792) +++ branches/2018Q4/textproc/rubygem-gitlab-markup/distinfo Fri Nov 2 09:08:48 2018 (r483793) @@ -1,3 +1,3 @@ -TIMESTAMP = 1532162886 -SHA256 (rubygem/gitlab-markup-1.6.4.gem) = 66c930854b295210e5f25fdf8fa9ab7107f3f07df091052fb478d6aacf1fdcec -SIZE (rubygem/gitlab-markup-1.6.4.gem) = 28160 +TIMESTAMP = 1541099508 +SHA256 (rubygem/gitlab-markup-1.6.5.gem) = de11fde43a459603bfce0a00f10e87225269871d26b533ef1095b45817fc9f8a +SIZE (rubygem/gitlab-markup-1.6.5.gem) = 28160 From owner-svn-ports-branches@freebsd.org Fri Nov 2 09:09:41 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C1DEA10EE94B; Fri, 2 Nov 2018 09:09:41 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 73ED77E5D8; Fri, 2 Nov 2018 09:09:41 +0000 (UTC) (envelope-from mfechner@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 544D883A; Fri, 2 Nov 2018 09:09:41 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA299fkd072327; Fri, 2 Nov 2018 09:09:41 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA299f2D072325; Fri, 2 Nov 2018 09:09:41 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201811020909.wA299f2D072325@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Fri, 2 Nov 2018 09:09:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483794 - branches/2018Q4/www/gitlab-workhorse X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: branches/2018Q4/www/gitlab-workhorse X-SVN-Commit-Revision: 483794 X-SVN-Commit-Repository: ports 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.29 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, 02 Nov 2018 09:09:41 -0000 Author: mfechner Date: Fri Nov 2 09:09:40 2018 New Revision: 483794 URL: https://svnweb.freebsd.org/changeset/ports/483794 Log: MFH: r483500 Upgrade to version 7.0.0 which is required for www/gitlab-ce 11.4.x. Approved by: mentors (implicit) Approved by: ports-secteam (miwi) Modified: branches/2018Q4/www/gitlab-workhorse/Makefile branches/2018Q4/www/gitlab-workhorse/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/www/gitlab-workhorse/Makefile ============================================================================== --- branches/2018Q4/www/gitlab-workhorse/Makefile Fri Nov 2 09:08:48 2018 (r483793) +++ branches/2018Q4/www/gitlab-workhorse/Makefile Fri Nov 2 09:09:40 2018 (r483794) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-workhorse -PORTVERSION= 6.1.0 +PORTVERSION= 7.0.0 CATEGORIES= www MAINTAINER= mfechner@FreeBSD.org @@ -19,7 +19,7 @@ USES= gmake USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-workhorse/tags -GL_COMMIT= 70ca94d07aecf2151d6b749cb049bedecc8a6a3d +GL_COMMIT= 279962ec11bd26d0a1855537efb38f569ce85e72 PLIST_FILES= bin/gitlab-workhorse \ bin/gitlab-zip-cat \ Modified: branches/2018Q4/www/gitlab-workhorse/distinfo ============================================================================== --- branches/2018Q4/www/gitlab-workhorse/distinfo Fri Nov 2 09:08:48 2018 (r483793) +++ branches/2018Q4/www/gitlab-workhorse/distinfo Fri Nov 2 09:09:40 2018 (r483794) @@ -1,3 +1,3 @@ -TIMESTAMP = 1537567672 -SHA256 (gitlab-org-gitlab-workhorse-70ca94d07aecf2151d6b749cb049bedecc8a6a3d_GL0.tar.gz) = 3b6007300f7c6ebf276cfc3e62a362e4339f070a572b193c8c4ab1eb501de03c -SIZE (gitlab-org-gitlab-workhorse-70ca94d07aecf2151d6b749cb049bedecc8a6a3d_GL0.tar.gz) = 1846823 +TIMESTAMP = 1540327734 +SHA256 (gitlab-org-gitlab-workhorse-279962ec11bd26d0a1855537efb38f569ce85e72_GL0.tar.gz) = a833c9bb6f89df606d3b633b2c1d892ca9dbac75671fea9e57b509b764afa9d4 +SIZE (gitlab-org-gitlab-workhorse-279962ec11bd26d0a1855537efb38f569ce85e72_GL0.tar.gz) = 1870561 From owner-svn-ports-branches@freebsd.org Fri Nov 2 09:11:17 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1DFB510EE9AC; Fri, 2 Nov 2018 09:11:17 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C676B7E73C; Fri, 2 Nov 2018 09:11:16 +0000 (UTC) (envelope-from mfechner@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A67F1876; Fri, 2 Nov 2018 09:11:16 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA29BGja075577; Fri, 2 Nov 2018 09:11:16 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA29BF9P075573; Fri, 2 Nov 2018 09:11:15 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201811020911.wA29BF9P075573@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Fri, 2 Nov 2018 09:11:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483795 - branches/2018Q4/www/gitlab-ce X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: branches/2018Q4/www/gitlab-ce X-SVN-Commit-Revision: 483795 X-SVN-Commit-Repository: ports 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.29 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, 02 Nov 2018 09:11:17 -0000 Author: mfechner Date: Fri Nov 2 09:11:15 2018 New Revision: 483795 URL: https://svnweb.freebsd.org/changeset/ports/483795 Log: MFH: r483501 r483734 Upgrade to 11.4.3. For detailed changelog please see here: https://about.gitlab.com/2018/10/22/gitlab-11-4-released/ https://about.gitlab.com/2018/10/29/security-release-gitlab-11-dot-4-dot-3-released/ Approved by: mentors (implicit) Security update to 11.4.4, for more details see here: https://about.gitlab.com/2018/11/01/critical-security-release-gitlab-11-dot-4-dot-4-released/ Approved by: mentors (implicit) Security: b51d9e83-de08-11e8-9416-001b217b3468 Approved by: ports-secteam (miwi) Modified: branches/2018Q4/www/gitlab-ce/Makefile branches/2018Q4/www/gitlab-ce/distinfo branches/2018Q4/www/gitlab-ce/pkg-message branches/2018Q4/www/gitlab-ce/pkg-plist Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/www/gitlab-ce/Makefile ============================================================================== --- branches/2018Q4/www/gitlab-ce/Makefile Fri Nov 2 09:09:40 2018 (r483794) +++ branches/2018Q4/www/gitlab-ce/Makefile Fri Nov 2 09:11:15 2018 (r483795) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-ce -PORTVERSION= 11.3.8 +PORTVERSION= 11.4.4 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -17,8 +17,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # for the options MY_DEPENDS= git>=2.16.2:devel/git \ gitlab-shell>=8.3.3:devel/gitlab-shell \ - gitlab-workhorse>=6.1.0:www/gitlab-workhorse \ - gitaly>=0.120.1:devel/gitaly \ + gitlab-workhorse>=7.0.0:www/gitlab-workhorse \ + gitaly>=0.125.1:devel/gitaly \ gitlab-pages>=1.1.0:www/gitlab-pages \ redis>=3.2.12:databases/redis \ npm>=4.3.0:www/npm \ @@ -63,9 +63,8 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-gitlab_omniauth-ldap20>=2.0.4:net/rubygem-gitlab_omniauth-ldap20 \ rubygem-net-ldap>=0.16.0:net/rubygem-net-ldap \ rubygem-gitlab-gollum-lib>=4.2.0:www/rubygem-gitlab-gollum-lib \ - rubygem-gitlab-gollum-rugged_adapter>=0.4.4:www/rubygem-gitlab-gollum-rugged_adapter \ rubygem-github-linguist53>=5.3.3:textproc/rubygem-github-linguist53 \ - rubygem-grape>=1.0:devel/rubygem-grape \ + rubygem-grape>=1.1:devel/rubygem-grape \ rubygem-grape-entity>=0.7.1:devel/rubygem-grape-entity \ rubygem-rack-cors>=1.0.0:www/rubygem-rack-cors \ rubygem-graphql>=1.8.0:devel/rubygem-graphql \ @@ -75,7 +74,6 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-hamlit>=2.8.8:www/rubygem-hamlit \ rubygem-carrierwave>=1.2.3:www/rubygem-carrierwave \ rubygem-mini_magick>=0:graphics/rubygem-mini_magick \ - rubygem-dropzonejs-rails07>=0.7.1:www/rubygem-dropzonejs-rails07 \ rubygem-fog-aws2>=2.0.1:net/rubygem-fog-aws2 \ rubygem-fog-core1>=1.44:devel/rubygem-fog-core1 \ rubygem-fog-google>=1.7.1:net/rubygem-fog-google \ @@ -88,7 +86,8 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-seed-fu>=2.3.7:databases/rubygem-seed-fu \ rubygem-html-pipeline>=2.8:textproc/rubygem-html-pipeline \ rubygem-deckar01-task_list>=2.0.0:www/rubygem-deckar01-task_list \ - rubygem-gitlab-markup>=1.6.4:textproc/rubygem-gitlab-markup \ + rubygem-gitlab-markup>=1.6.5:textproc/rubygem-gitlab-markup \ + rubygem-github-markup17>=1.7.0:textproc/rubygem-github-markup17 \ rubygem-redcarpet>=3.4:textproc/rubygem-redcarpet \ rubygem-commonmarker>=0.17:textproc/rubygem-commonmarker \ rubygem-redcloth>=4.3.2:www/rubygem-redcloth \ @@ -108,10 +107,9 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-unicorn-worker-killer044>=0.4.4:www/rubygem-unicorn-worker-killer044 \ rubygem-state_machines-activerecord>=0.5.1:databases/rubygem-state_machines-activerecord \ rubygem-acts-as-taggable-on>=5.0:www/rubygem-acts-as-taggable-on \ - rubygem-sidekiq>=5.1.0:devel/rubygem-sidekiq \ + rubygem-sidekiq>=5.2.1:devel/rubygem-sidekiq \ rubygem-sidekiq-cron0>=0.6.0:devel/rubygem-sidekiq-cron0 \ rubygem-redis-namespace>=1.6.0:databases/rubygem-redis-namespace \ - rubygem-sidekiq-limit_fetch>=3.4:devel/rubygem-sidekiq-limit_fetch \ rubygem-rufus-scheduler342>=3.4.0:devel/rubygem-rufus-scheduler342 \ rubygem-httparty>=0.13.3:www/rubygem-httparty \ rubygem-rainbow>=3.0:devel/rubygem-rainbow \ @@ -168,7 +166,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-peek-gc>=0.0.2:devel/rubygem-peek-gc \ rubygem-peek-rblineprof>=0.2.0:devel/rubygem-peek-rblineprof \ rubygem-peek-redis>=1.2.0:devel/rubygem-peek-redis \ - rubygem-peek-sidekiq>=1.0.3:devel/rubygem-peek-sidekiq \ + rubygem-gitlab-sidekiq-fetcher>0:devel/rubygem-gitlab-sidekiq-fetcher \ rubygem-prometheus-client-mmap>=0.9.4:devel/rubygem-prometheus-client-mmap \ rubygem-octokit>=4.9:net/rubygem-octokit \ rubygem-mail_room>=0.9.1:mail/rubygem-mail_room \ @@ -184,7 +182,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-sshkey>=1.9.0:security/rubygem-sshkey \ rubygem-ed25519>=1.2:security/rubygem-ed25519 \ rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \ - rubygem-gitaly-proto>=0.117.0:net/rubygem-gitaly-proto \ + rubygem-gitaly-proto>=0.118.1:net/rubygem-gitaly-proto \ rubygem-grpc>=1.11.0:net/rubygem-grpc \ rubygem-gitaly>=0.8.0:net/rubygem-gitaly \ rubygem-google-protobuf351>=3.5.1:devel/rubygem-google-protobuf351 \ @@ -218,7 +216,7 @@ USE_RC_SUBR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags -GL_COMMIT= 0a6f6119fa3e6f708e745bba369ecba18c3d07cc +GL_COMMIT= 2e8fd64ba68c310e9aa387531d1dc65184a80135 USERS= git GROUPS= git Modified: branches/2018Q4/www/gitlab-ce/distinfo ============================================================================== --- branches/2018Q4/www/gitlab-ce/distinfo Fri Nov 2 09:09:40 2018 (r483794) +++ branches/2018Q4/www/gitlab-ce/distinfo Fri Nov 2 09:11:15 2018 (r483795) @@ -1,3 +1,3 @@ -TIMESTAMP = 1540838450 -SHA256 (gitlab-org-gitlab-ce-0a6f6119fa3e6f708e745bba369ecba18c3d07cc_GL0.tar.gz) = 679e5338e3d40f6db60472477c33fc0b974e2ed97218eb3b08fc6509d1a79472 -SIZE (gitlab-org-gitlab-ce-0a6f6119fa3e6f708e745bba369ecba18c3d07cc_GL0.tar.gz) = 42479125 +TIMESTAMP = 1541100338 +SHA256 (gitlab-org-gitlab-ce-2e8fd64ba68c310e9aa387531d1dc65184a80135_GL0.tar.gz) = baffd279827d39d48be76386352ee6500877e41e2072f6ea4a5b473950c35b5c +SIZE (gitlab-org-gitlab-ce-2e8fd64ba68c310e9aa387531d1dc65184a80135_GL0.tar.gz) = 43341488 Modified: branches/2018Q4/www/gitlab-ce/pkg-message ============================================================================== --- branches/2018Q4/www/gitlab-ce/pkg-message Fri Nov 2 09:09:40 2018 (r483794) +++ branches/2018Q4/www/gitlab-ce/pkg-message Fri Nov 2 09:11:15 2018 (r483795) @@ -4,12 +4,12 @@ Gitlab was installed successfully. You now need to set up the various components of Gitlab, so please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/11.3-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/11.4-freebsd.md If you just installed an major upgrade of GitLab, for example you switched from 11.2.x to 11.3.x, please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/11.2-11.3-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/11.3-11.4-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at: Modified: branches/2018Q4/www/gitlab-ce/pkg-plist ============================================================================== --- branches/2018Q4/www/gitlab-ce/pkg-plist Fri Nov 2 09:09:40 2018 (r483794) +++ branches/2018Q4/www/gitlab-ce/pkg-plist Fri Nov 2 09:11:15 2018 (r483795) @@ -1,4 +1,4 @@ -%%WWWDIR%%/.babelrc +%%WWWDIR%%/.babelrc.js %%WWWDIR%%/.codeclimate.yml %%WWWDIR%%/.csscomb.json %%WWWDIR%%/.eslintignore @@ -67,6 +67,7 @@ %%WWWDIR%%/app/assets/images/ci_favicons/canary/favicon_status_not_found.ico %%WWWDIR%%/app/assets/images/ci_favicons/canary/favicon_status_pending.ico %%WWWDIR%%/app/assets/images/ci_favicons/canary/favicon_status_running.ico +%%WWWDIR%%/app/assets/images/ci_favicons/canary/favicon_status_scheduled.ico %%WWWDIR%%/app/assets/images/ci_favicons/canary/favicon_status_skipped.ico %%WWWDIR%%/app/assets/images/ci_favicons/canary/favicon_status_success.ico %%WWWDIR%%/app/assets/images/ci_favicons/canary/favicon_status_warning.ico @@ -77,9 +78,18 @@ %%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_not_found.png %%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_pending.png %%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_running.png +%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_scheduled.png %%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_skipped.png %%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_success.png %%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_warning.png +%%WWWDIR%%/app/assets/images/cluster_app_logos/elasticsearch.png +%%WWWDIR%%/app/assets/images/cluster_app_logos/gitlab.png +%%WWWDIR%%/app/assets/images/cluster_app_logos/helm.png +%%WWWDIR%%/app/assets/images/cluster_app_logos/jeager.png +%%WWWDIR%%/app/assets/images/cluster_app_logos/jupyterhub.png +%%WWWDIR%%/app/assets/images/cluster_app_logos/kubernetes.png +%%WWWDIR%%/app/assets/images/cluster_app_logos/meltano.png +%%WWWDIR%%/app/assets/images/cluster_app_logos/prometheus.png %%WWWDIR%%/app/assets/images/dark-scheme-preview.png %%WWWDIR%%/app/assets/images/emoji.png %%WWWDIR%%/app/assets/images/emoji/100.png @@ -1944,12 +1954,23 @@ %%WWWDIR%%/app/assets/javascripts/behaviors/gl_emoji.js %%WWWDIR%%/app/assets/javascripts/behaviors/index.js %%WWWDIR%%/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js +%%WWWDIR%%/app/assets/javascripts/behaviors/markdown/gfm_auto_complete.js +%%WWWDIR%%/app/assets/javascripts/behaviors/markdown/highlight_current_user.js %%WWWDIR%%/app/assets/javascripts/behaviors/markdown/render_gfm.js %%WWWDIR%%/app/assets/javascripts/behaviors/markdown/render_math.js %%WWWDIR%%/app/assets/javascripts/behaviors/markdown/render_mermaid.js +%%WWWDIR%%/app/assets/javascripts/behaviors/preview_markdown.js %%WWWDIR%%/app/assets/javascripts/behaviors/quick_submit.js %%WWWDIR%%/app/assets/javascripts/behaviors/requires_input.js %%WWWDIR%%/app/assets/javascripts/behaviors/secret_values.js +%%WWWDIR%%/app/assets/javascripts/behaviors/shortcuts.js +%%WWWDIR%%/app/assets/javascripts/behaviors/shortcuts/shortcuts.js +%%WWWDIR%%/app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js +%%WWWDIR%%/app/assets/javascripts/behaviors/shortcuts/shortcuts_find_file.js +%%WWWDIR%%/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js +%%WWWDIR%%/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js +%%WWWDIR%%/app/assets/javascripts/behaviors/shortcuts/shortcuts_network.js +%%WWWDIR%%/app/assets/javascripts/behaviors/shortcuts/shortcuts_wiki.js %%WWWDIR%%/app/assets/javascripts/behaviors/toggler_behavior.js %%WWWDIR%%/app/assets/javascripts/blob/3d_viewer/index.js %%WWWDIR%%/app/assets/javascripts/blob/3d_viewer/mesh_object.js @@ -2012,7 +2033,6 @@ %%WWWDIR%%/app/assets/javascripts/breadcrumb.js %%WWWDIR%%/app/assets/javascripts/breakpoints.js %%WWWDIR%%/app/assets/javascripts/build_artifacts.js -%%WWWDIR%%/app/assets/javascripts/build_variables.js %%WWWDIR%%/app/assets/javascripts/ci_variable_list/ajax_variable_list.js %%WWWDIR%%/app/assets/javascripts/ci_variable_list/ci_variable_list.js %%WWWDIR%%/app/assets/javascripts/ci_variable_list/native_form_variable_list.js @@ -2041,6 +2061,7 @@ %%WWWDIR%%/app/assets/javascripts/commons/polyfills/event.js %%WWWDIR%%/app/assets/javascripts/commons/polyfills/nodelist.js %%WWWDIR%%/app/assets/javascripts/commons/polyfills/request_idle_callback.js +%%WWWDIR%%/app/assets/javascripts/commons/polyfills/svg.js %%WWWDIR%%/app/assets/javascripts/commons/vue.js %%WWWDIR%%/app/assets/javascripts/compare_autocomplete.js %%WWWDIR%%/app/assets/javascripts/confirm_danger_modal.js @@ -2088,8 +2109,8 @@ %%WWWDIR%%/app/assets/javascripts/diff_notes/services/resolve.js %%WWWDIR%%/app/assets/javascripts/diff_notes/stores/comments.js %%WWWDIR%%/app/assets/javascripts/diffs/components/app.vue -%%WWWDIR%%/app/assets/javascripts/diffs/components/changed_files.vue -%%WWWDIR%%/app/assets/javascripts/diffs/components/changed_files_dropdown.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/commit_item.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/commit_widget.vue %%WWWDIR%%/app/assets/javascripts/diffs/components/compare_versions.vue %%WWWDIR%%/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue %%WWWDIR%%/app/assets/javascripts/diffs/components/diff_content.vue @@ -2101,6 +2122,7 @@ %%WWWDIR%%/app/assets/javascripts/diffs/components/diff_line_note_form.vue %%WWWDIR%%/app/assets/javascripts/diffs/components/diff_table_cell.vue %%WWWDIR%%/app/assets/javascripts/diffs/components/edit_button.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/file_row_stats.vue %%WWWDIR%%/app/assets/javascripts/diffs/components/hidden_files_warning.vue %%WWWDIR%%/app/assets/javascripts/diffs/components/inline_diff_comment_row.vue %%WWWDIR%%/app/assets/javascripts/diffs/components/inline_diff_table_row.vue @@ -2109,9 +2131,9 @@ %%WWWDIR%%/app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue %%WWWDIR%%/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue %%WWWDIR%%/app/assets/javascripts/diffs/components/parallel_diff_view.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/tree_list.vue %%WWWDIR%%/app/assets/javascripts/diffs/constants.js %%WWWDIR%%/app/assets/javascripts/diffs/index.js -%%WWWDIR%%/app/assets/javascripts/diffs/mixins/changed_files.js %%WWWDIR%%/app/assets/javascripts/diffs/store/actions.js %%WWWDIR%%/app/assets/javascripts/diffs/store/getters.js %%WWWDIR%%/app/assets/javascripts/diffs/store/modules/diff_state.js @@ -2119,8 +2141,6 @@ %%WWWDIR%%/app/assets/javascripts/diffs/store/mutation_types.js %%WWWDIR%%/app/assets/javascripts/diffs/store/mutations.js %%WWWDIR%%/app/assets/javascripts/diffs/store/utils.js -%%WWWDIR%%/app/assets/javascripts/dismissable_callout.js -%%WWWDIR%%/app/assets/javascripts/dispatcher.js %%WWWDIR%%/app/assets/javascripts/docs/docs_bundle.js %%WWWDIR%%/app/assets/javascripts/droplab/constants.js %%WWWDIR%%/app/assets/javascripts/droplab/drop_down.js @@ -2165,6 +2185,7 @@ %%WWWDIR%%/app/assets/javascripts/feature_highlight/feature_highlight_options.js %%WWWDIR%%/app/assets/javascripts/files_comment_button.js %%WWWDIR%%/app/assets/javascripts/filterable_list.js +%%WWWDIR%%/app/assets/javascripts/filtered_search/admin_runners_filtered_search_token_keys.js %%WWWDIR%%/app/assets/javascripts/filtered_search/components/recent_searches_dropdown_content.vue %%WWWDIR%%/app/assets/javascripts/filtered_search/container.js %%WWWDIR%%/app/assets/javascripts/filtered_search/dropdown_emoji.js @@ -2179,6 +2200,8 @@ %%WWWDIR%%/app/assets/javascripts/filtered_search/filtered_search_token_keys.js %%WWWDIR%%/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js %%WWWDIR%%/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js +%%WWWDIR%%/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js +%%WWWDIR%%/app/assets/javascripts/filtered_search/null_dropdown.js %%WWWDIR%%/app/assets/javascripts/filtered_search/recent_searches_root.js %%WWWDIR%%/app/assets/javascripts/filtered_search/services/recent_searches_service.js %%WWWDIR%%/app/assets/javascripts/filtered_search/services/recent_searches_service_error.js @@ -2236,7 +2259,6 @@ %%WWWDIR%%/app/assets/javascripts/ide/components/activity_bar.vue %%WWWDIR%%/app/assets/javascripts/ide/components/branches/item.vue %%WWWDIR%%/app/assets/javascripts/ide/components/branches/search_list.vue -%%WWWDIR%%/app/assets/javascripts/ide/components/changed_file_icon.vue %%WWWDIR%%/app/assets/javascripts/ide/components/commit_sidebar/actions.vue %%WWWDIR%%/app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue %%WWWDIR%%/app/assets/javascripts/ide/components/commit_sidebar/empty_state.vue @@ -2254,6 +2276,7 @@ %%WWWDIR%%/app/assets/javascripts/ide/components/external_link.vue %%WWWDIR%%/app/assets/javascripts/ide/components/file_finder/index.vue %%WWWDIR%%/app/assets/javascripts/ide/components/file_finder/item.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/file_row_extra.vue %%WWWDIR%%/app/assets/javascripts/ide/components/file_templates/bar.vue %%WWWDIR%%/app/assets/javascripts/ide/components/file_templates/dropdown.vue %%WWWDIR%%/app/assets/javascripts/ide/components/ide.vue @@ -2286,9 +2309,7 @@ %%WWWDIR%%/app/assets/javascripts/ide/components/preview/navigator.vue %%WWWDIR%%/app/assets/javascripts/ide/components/repo_commit_section.vue %%WWWDIR%%/app/assets/javascripts/ide/components/repo_editor.vue -%%WWWDIR%%/app/assets/javascripts/ide/components/repo_file.vue %%WWWDIR%%/app/assets/javascripts/ide/components/repo_file_status_icon.vue -%%WWWDIR%%/app/assets/javascripts/ide/components/repo_loading_file.vue %%WWWDIR%%/app/assets/javascripts/ide/components/repo_tab.vue %%WWWDIR%%/app/assets/javascripts/ide/components/repo_tabs.vue %%WWWDIR%%/app/assets/javascripts/ide/components/resizable_panel.vue @@ -2340,6 +2361,12 @@ %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/merge_requests/mutation_types.js %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/merge_requests/mutations.js %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/merge_requests/state.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/pane/actions.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/pane/getters.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/pane/index.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/pane/mutation_types.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/pane/mutations.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/pane/state.js %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/pipelines/actions.js %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/pipelines/constants.js %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/pipelines/getters.js @@ -2406,24 +2433,22 @@ %%WWWDIR%%/app/assets/javascripts/jobs/components/empty_state.vue %%WWWDIR%%/app/assets/javascripts/jobs/components/environments_block.vue %%WWWDIR%%/app/assets/javascripts/jobs/components/erased_block.vue -%%WWWDIR%%/app/assets/javascripts/jobs/components/header.vue +%%WWWDIR%%/app/assets/javascripts/jobs/components/job_app.vue %%WWWDIR%%/app/assets/javascripts/jobs/components/job_log.vue %%WWWDIR%%/app/assets/javascripts/jobs/components/job_log_controllers.vue %%WWWDIR%%/app/assets/javascripts/jobs/components/jobs_container.vue +%%WWWDIR%%/app/assets/javascripts/jobs/components/sidebar.vue %%WWWDIR%%/app/assets/javascripts/jobs/components/sidebar_detail_row.vue -%%WWWDIR%%/app/assets/javascripts/jobs/components/sidebar_details_block.vue %%WWWDIR%%/app/assets/javascripts/jobs/components/stages_dropdown.vue %%WWWDIR%%/app/assets/javascripts/jobs/components/stuck_block.vue %%WWWDIR%%/app/assets/javascripts/jobs/components/trigger_block.vue %%WWWDIR%%/app/assets/javascripts/jobs/job_details_bundle.js -%%WWWDIR%%/app/assets/javascripts/jobs/job_details_mediator.js -%%WWWDIR%%/app/assets/javascripts/jobs/services/job_service.js %%WWWDIR%%/app/assets/javascripts/jobs/store/actions.js +%%WWWDIR%%/app/assets/javascripts/jobs/store/getters.js %%WWWDIR%%/app/assets/javascripts/jobs/store/index.js %%WWWDIR%%/app/assets/javascripts/jobs/store/mutation_types.js %%WWWDIR%%/app/assets/javascripts/jobs/store/mutations.js %%WWWDIR%%/app/assets/javascripts/jobs/store/state.js -%%WWWDIR%%/app/assets/javascripts/jobs/stores/job_store.js %%WWWDIR%%/app/assets/javascripts/label_manager.js %%WWWDIR%%/app/assets/javascripts/labels.js %%WWWDIR%%/app/assets/javascripts/labels_select.js @@ -2447,6 +2472,7 @@ %%WWWDIR%%/app/assets/javascripts/lib/utils/image_utility.js %%WWWDIR%%/app/assets/javascripts/lib/utils/keycodes.js %%WWWDIR%%/app/assets/javascripts/lib/utils/logoutput_behaviours.js +%%WWWDIR%%/app/assets/javascripts/lib/utils/navigation_utility.js %%WWWDIR%%/app/assets/javascripts/lib/utils/notify.js %%WWWDIR%%/app/assets/javascripts/lib/utils/number_utils.js %%WWWDIR%%/app/assets/javascripts/lib/utils/poll.js @@ -2525,7 +2551,6 @@ %%WWWDIR%%/app/assets/javascripts/notebook/lib/highlight.js %%WWWDIR%%/app/assets/javascripts/notes.js %%WWWDIR%%/app/assets/javascripts/notes/components/comment_form.vue -%%WWWDIR%%/app/assets/javascripts/notes/components/diff_file_header.vue %%WWWDIR%%/app/assets/javascripts/notes/components/diff_with_note.vue %%WWWDIR%%/app/assets/javascripts/notes/components/discussion_counter.vue %%WWWDIR%%/app/assets/javascripts/notes/components/discussion_locked_widget.vue @@ -2565,6 +2590,7 @@ %%WWWDIR%%/app/assets/javascripts/pages/admin/admin.js %%WWWDIR%%/app/assets/javascripts/pages/admin/application_settings/account_and_limits.js %%WWWDIR%%/app/assets/javascripts/pages/admin/application_settings/index.js +%%WWWDIR%%/app/assets/javascripts/pages/admin/application_settings/metrics_and_profiling/index.js %%WWWDIR%%/app/assets/javascripts/pages/admin/application_settings/usage_ping_payload.js %%WWWDIR%%/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js %%WWWDIR%%/app/assets/javascripts/pages/admin/broadcast_messages/index.js @@ -2580,6 +2606,7 @@ %%WWWDIR%%/app/assets/javascripts/pages/admin/projects/index.js %%WWWDIR%%/app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue %%WWWDIR%%/app/assets/javascripts/pages/admin/projects/index/index.js +%%WWWDIR%%/app/assets/javascripts/pages/admin/runners/index.js %%WWWDIR%%/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue %%WWWDIR%%/app/assets/javascripts/pages/admin/users/index.js %%WWWDIR%%/app/assets/javascripts/pages/admin/users/new/index.js @@ -2753,6 +2780,7 @@ %%WWWDIR%%/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue %%WWWDIR%%/app/assets/javascripts/pages/projects/wikis/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/wikis/wikis.js +%%WWWDIR%%/app/assets/javascripts/pages/root/index.js %%WWWDIR%%/app/assets/javascripts/pages/search/init_filtered_search.js %%WWWDIR%%/app/assets/javascripts/pages/search/show/index.js %%WWWDIR%%/app/assets/javascripts/pages/search/show/search.js @@ -2768,6 +2796,7 @@ %%WWWDIR%%/app/assets/javascripts/pages/snippets/show/index.js %%WWWDIR%%/app/assets/javascripts/pages/users/activity_calendar.js %%WWWDIR%%/app/assets/javascripts/pages/users/index.js +%%WWWDIR%%/app/assets/javascripts/pages/users/user_overview_block.js %%WWWDIR%%/app/assets/javascripts/pages/users/user_tabs.js %%WWWDIR%%/app/assets/javascripts/pdf/assets/img/bg.gif %%WWWDIR%%/app/assets/javascripts/pdf/index.vue @@ -2779,6 +2808,7 @@ %%WWWDIR%%/app/assets/javascripts/performance_bar/index.js %%WWWDIR%%/app/assets/javascripts/performance_bar/services/performance_bar_service.js %%WWWDIR%%/app/assets/javascripts/performance_bar/stores/performance_bar_store.js +%%WWWDIR%%/app/assets/javascripts/persistent_user_callout.js %%WWWDIR%%/app/assets/javascripts/pipelines.js %%WWWDIR%%/app/assets/javascripts/pipelines/components/blank_state.vue %%WWWDIR%%/app/assets/javascripts/pipelines/components/empty_state.vue @@ -2807,7 +2837,6 @@ %%WWWDIR%%/app/assets/javascripts/pipelines/services/pipelines_service.js %%WWWDIR%%/app/assets/javascripts/pipelines/stores/pipeline_store.js %%WWWDIR%%/app/assets/javascripts/pipelines/stores/pipelines_store.js -%%WWWDIR%%/app/assets/javascripts/preview_markdown.js %%WWWDIR%%/app/assets/javascripts/profile/account/components/delete_account_modal.vue %%WWWDIR%%/app/assets/javascripts/profile/account/components/update_username.vue %%WWWDIR%%/app/assets/javascripts/profile/account/index.js @@ -2884,18 +2913,14 @@ %%WWWDIR%%/app/assets/javascripts/reports/store/utils.js %%WWWDIR%%/app/assets/javascripts/right_sidebar.js %%WWWDIR%%/app/assets/javascripts/search_autocomplete.js +%%WWWDIR%%/app/assets/javascripts/set_status_modal/emoji_menu_in_modal.js +%%WWWDIR%%/app/assets/javascripts/set_status_modal/event_hub.js +%%WWWDIR%%/app/assets/javascripts/set_status_modal/set_status_modal_trigger.vue +%%WWWDIR%%/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue %%WWWDIR%%/app/assets/javascripts/settings_panels.js %%WWWDIR%%/app/assets/javascripts/shared/milestones/form.js %%WWWDIR%%/app/assets/javascripts/shared/popover.js %%WWWDIR%%/app/assets/javascripts/shared/sessions/u2f.js -%%WWWDIR%%/app/assets/javascripts/shortcuts.js -%%WWWDIR%%/app/assets/javascripts/shortcuts_blob.js -%%WWWDIR%%/app/assets/javascripts/shortcuts_dashboard_navigation.js -%%WWWDIR%%/app/assets/javascripts/shortcuts_find_file.js -%%WWWDIR%%/app/assets/javascripts/shortcuts_issuable.js -%%WWWDIR%%/app/assets/javascripts/shortcuts_navigation.js -%%WWWDIR%%/app/assets/javascripts/shortcuts_network.js -%%WWWDIR%%/app/assets/javascripts/shortcuts_wiki.js %%WWWDIR%%/app/assets/javascripts/sidebar/components/assignees/assignee_title.vue %%WWWDIR%%/app/assets/javascripts/sidebar/components/assignees/assignees.vue %%WWWDIR%%/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue @@ -2976,12 +3001,11 @@ %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_not_allowed.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue -%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js -%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/sha_mismatch.vue +%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/dependencies.js @@ -2995,6 +3019,7 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/bar_chart.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/bar_chart_constants.js %%WWWDIR%%/app/assets/javascripts/vue_shared/components/callout.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/changed_file_icon.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/ci_badge_link.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/ci_icon.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/clipboard_button.vue @@ -3019,6 +3044,7 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/expand_button.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/file_icon.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/file_icon/file_icon_map.js +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/file_row.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/gl_modal.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/header_ci_component.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/help_popover.vue @@ -3027,7 +3053,6 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/issue/issue_warning.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/lib/utils/dom_utils.js %%WWWDIR%%/app/assets/javascripts/vue_shared/components/loading_button.vue -%%WWWDIR%%/app/assets/javascripts/vue_shared/components/loading_icon.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/field.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/header.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue @@ -3038,6 +3063,7 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/notes/placeholder_system_note.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/notes/skeleton_note.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/notes/system_note.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/pagination_links.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/panel_resizer.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/pikaday.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/project_avatar/default.vue @@ -3056,7 +3082,6 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue -%%WWWDIR%%/app/assets/javascripts/vue_shared/components/skeleton_loading_container.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/svg_gradient.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/table_pagination.vue @@ -3116,7 +3141,6 @@ %%WWWDIR%%/app/assets/stylesheets/framework/icons.scss %%WWWDIR%%/app/assets/stylesheets/framework/images.scss %%WWWDIR%%/app/assets/stylesheets/framework/issue_box.scss -%%WWWDIR%%/app/assets/stylesheets/framework/jquery.scss %%WWWDIR%%/app/assets/stylesheets/framework/layout.scss %%WWWDIR%%/app/assets/stylesheets/framework/lists.scss %%WWWDIR%%/app/assets/stylesheets/framework/logo.scss @@ -3160,6 +3184,7 @@ %%WWWDIR%%/app/assets/stylesheets/mailers/highlighted_diff_email.scss %%WWWDIR%%/app/assets/stylesheets/notify.scss %%WWWDIR%%/app/assets/stylesheets/page_bundles/ide.scss +%%WWWDIR%%/app/assets/stylesheets/page_bundles/xterm.scss %%WWWDIR%%/app/assets/stylesheets/pages/admin.scss %%WWWDIR%%/app/assets/stylesheets/pages/boards.scss %%WWWDIR%%/app/assets/stylesheets/pages/branches.scss @@ -3210,7 +3235,6 @@ %%WWWDIR%%/app/assets/stylesheets/pages/tree.scss %%WWWDIR%%/app/assets/stylesheets/pages/ui_dev_kit.scss %%WWWDIR%%/app/assets/stylesheets/pages/wiki.scss -%%WWWDIR%%/app/assets/stylesheets/pages/xterm.scss %%WWWDIR%%/app/assets/stylesheets/performance_bar.scss %%WWWDIR%%/app/assets/stylesheets/print.scss %%WWWDIR%%/app/assets/stylesheets/snippets.scss @@ -3264,10 +3288,12 @@ %%WWWDIR%%/app/controllers/concerns/group_tree.rb %%WWWDIR%%/app/controllers/concerns/hooks_execution.rb %%WWWDIR%%/app/controllers/concerns/internal_redirect.rb +%%WWWDIR%%/app/controllers/concerns/invalid_utf8_error_handler.rb %%WWWDIR%%/app/controllers/concerns/issuable_actions.rb %%WWWDIR%%/app/controllers/concerns/issuable_collections.rb %%WWWDIR%%/app/controllers/concerns/issues_action.rb %%WWWDIR%%/app/controllers/concerns/issues_calendar.rb +%%WWWDIR%%/app/controllers/concerns/labels_as_hash.rb %%WWWDIR%%/app/controllers/concerns/lfs_request.rb %%WWWDIR%%/app/controllers/concerns/members_presentation.rb %%WWWDIR%%/app/controllers/concerns/membership_actions.rb @@ -3466,6 +3492,7 @@ %%WWWDIR%%/app/finders/README.md %%WWWDIR%%/app/finders/access_requests_finder.rb %%WWWDIR%%/app/finders/admin/projects_finder.rb +%%WWWDIR%%/app/finders/admin/runners_finder.rb %%WWWDIR%%/app/finders/autocomplete/group_finder.rb %%WWWDIR%%/app/finders/autocomplete/move_to_project_finder.rb %%WWWDIR%%/app/finders/autocomplete/project_finder.rb @@ -3483,6 +3510,7 @@ %%WWWDIR%%/app/finders/fork_projects_finder.rb %%WWWDIR%%/app/finders/group_descendants_finder.rb %%WWWDIR%%/app/finders/group_finder.rb +%%WWWDIR%%/app/finders/group_labels_finder.rb %%WWWDIR%%/app/finders/group_members_finder.rb %%WWWDIR%%/app/finders/group_projects_finder.rb %%WWWDIR%%/app/finders/groups_finder.rb @@ -3776,6 +3804,7 @@ %%WWWDIR%%/app/models/concerns/created_at_filterable.rb %%WWWDIR%%/app/models/concerns/deployment_platform.rb %%WWWDIR%%/app/models/concerns/diff_file.rb +%%WWWDIR%%/app/models/concerns/diff_positionable_note.rb %%WWWDIR%%/app/models/concerns/discussion_on_diff.rb %%WWWDIR%%/app/models/concerns/each_batch.rb %%WWWDIR%%/app/models/concerns/editable.rb @@ -3784,6 +3813,7 @@ %%WWWDIR%%/app/models/concerns/fast_destroy_all.rb %%WWWDIR%%/app/models/concerns/faster_cache_keys.rb %%WWWDIR%%/app/models/concerns/feature_gate.rb +%%WWWDIR%%/app/models/concerns/from_union.rb %%WWWDIR%%/app/models/concerns/ghost_user.rb %%WWWDIR%%/app/models/concerns/group_descendant.rb %%WWWDIR%%/app/models/concerns/has_status.rb @@ -4143,10 +4173,12 @@ %%WWWDIR%%/app/serializers/deploy_keys_project_entity.rb %%WWWDIR%%/app/serializers/deployment_entity.rb %%WWWDIR%%/app/serializers/deployment_serializer.rb +%%WWWDIR%%/app/serializers/detailed_status_entity.rb %%WWWDIR%%/app/serializers/diff_file_entity.rb %%WWWDIR%%/app/serializers/diff_line_entity.rb %%WWWDIR%%/app/serializers/diff_line_parallel_entity.rb %%WWWDIR%%/app/serializers/diff_line_serializer.rb +%%WWWDIR%%/app/serializers/diff_viewer_entity.rb %%WWWDIR%%/app/serializers/diffs_entity.rb %%WWWDIR%%/app/serializers/diffs_serializer.rb %%WWWDIR%%/app/serializers/discussion_entity.rb @@ -4199,7 +4231,6 @@ %%WWWDIR%%/app/serializers/runner_entity.rb %%WWWDIR%%/app/serializers/stage_entity.rb %%WWWDIR%%/app/serializers/stage_serializer.rb -%%WWWDIR%%/app/serializers/status_entity.rb %%WWWDIR%%/app/serializers/submodule_entity.rb %%WWWDIR%%/app/serializers/test_case_entity.rb %%WWWDIR%%/app/serializers/test_reports_comparer_entity.rb @@ -4209,6 +4240,7 @@ %%WWWDIR%%/app/serializers/tree_entity.rb %%WWWDIR%%/app/serializers/tree_root_entity.rb %%WWWDIR%%/app/serializers/tree_serializer.rb +%%WWWDIR%%/app/serializers/trigger_variable_entity.rb %%WWWDIR%%/app/serializers/user_entity.rb %%WWWDIR%%/app/serializers/user_serializer.rb %%WWWDIR%%/app/serializers/variable_entity.rb @@ -4244,16 +4276,16 @@ %%WWWDIR%%/app/services/ci/compare_test_reports_service.rb %%WWWDIR%%/app/services/ci/create_pipeline_schedule_service.rb %%WWWDIR%%/app/services/ci/create_pipeline_service.rb -%%WWWDIR%%/app/services/ci/enqueue_build_service.rb %%WWWDIR%%/app/services/ci/ensure_stage_service.rb %%WWWDIR%%/app/services/ci/extract_sections_from_build_trace_service.rb -%%WWWDIR%%/app/services/ci/fetch_kubernetes_token_service.rb %%WWWDIR%%/app/services/ci/pipeline_trigger_service.rb %%WWWDIR%%/app/services/ci/play_build_service.rb +%%WWWDIR%%/app/services/ci/process_build_service.rb %%WWWDIR%%/app/services/ci/process_pipeline_service.rb %%WWWDIR%%/app/services/ci/register_job_service.rb %%WWWDIR%%/app/services/ci/retry_build_service.rb %%WWWDIR%%/app/services/ci/retry_pipeline_service.rb +%%WWWDIR%%/app/services/ci/run_scheduled_build_service.rb %%WWWDIR%%/app/services/ci/stop_environments_service.rb %%WWWDIR%%/app/services/ci/update_build_queue_service.rb %%WWWDIR%%/app/services/ci/update_runner_service.rb @@ -4265,6 +4297,9 @@ %%WWWDIR%%/app/services/clusters/create_service.rb %%WWWDIR%%/app/services/clusters/gcp/fetch_operation_service.rb %%WWWDIR%%/app/services/clusters/gcp/finalize_creation_service.rb +%%WWWDIR%%/app/services/clusters/gcp/kubernetes.rb +%%WWWDIR%%/app/services/clusters/gcp/kubernetes/create_service_account_service.rb +%%WWWDIR%%/app/services/clusters/gcp/kubernetes/fetch_kubernetes_token_service.rb %%WWWDIR%%/app/services/clusters/gcp/provision_service.rb %%WWWDIR%%/app/services/clusters/gcp/verify_provision_status_service.rb %%WWWDIR%%/app/services/clusters/update_service.rb @@ -4326,6 +4361,7 @@ %%WWWDIR%%/app/services/issues/duplicate_service.rb %%WWWDIR%%/app/services/issues/move_service.rb %%WWWDIR%%/app/services/issues/referenced_merge_requests_service.rb +%%WWWDIR%%/app/services/issues/related_branches_service.rb %%WWWDIR%%/app/services/issues/reopen_service.rb %%WWWDIR%%/app/services/issues/update_service.rb %%WWWDIR%%/app/services/keys/base_service.rb @@ -4557,8 +4593,8 @@ %%WWWDIR%%/app/views/admin/appearances/show.html.haml %%WWWDIR%%/app/views/admin/application_settings/_abuse.html.haml %%WWWDIR%%/app/views/admin/application_settings/_account_and_limit.html.haml -%%WWWDIR%%/app/views/admin/application_settings/_background_jobs.html.haml %%WWWDIR%%/app/views/admin/application_settings/_ci_cd.html.haml +%%WWWDIR%%/app/views/admin/application_settings/_diff_limits.html.haml %%WWWDIR%%/app/views/admin/application_settings/_email.html.haml %%WWWDIR%%/app/views/admin/application_settings/_gitaly.html.haml %%WWWDIR%%/app/views/admin/application_settings/_help_page.html.haml @@ -4585,6 +4621,13 @@ %%WWWDIR%%/app/views/admin/application_settings/_third_party_offers.html.haml %%WWWDIR%%/app/views/admin/application_settings/_usage.html.haml %%WWWDIR%%/app/views/admin/application_settings/_visibility_and_access.html.haml +%%WWWDIR%%/app/views/admin/application_settings/ci_cd.html.haml +%%WWWDIR%%/app/views/admin/application_settings/integrations.html.haml +%%WWWDIR%%/app/views/admin/application_settings/metrics_and_profiling.html.haml +%%WWWDIR%%/app/views/admin/application_settings/network.html.haml +%%WWWDIR%%/app/views/admin/application_settings/preferences.html.haml +%%WWWDIR%%/app/views/admin/application_settings/reporting.html.haml +%%WWWDIR%%/app/views/admin/application_settings/repository.html.haml %%WWWDIR%%/app/views/admin/application_settings/show.html.haml %%WWWDIR%%/app/views/admin/applications/_delete_form.html.haml %%WWWDIR%%/app/views/admin/applications/_form.html.haml @@ -4634,6 +4677,7 @@ %%WWWDIR%%/app/views/admin/projects/show.html.haml %%WWWDIR%%/app/views/admin/requests_profiles/index.html.haml %%WWWDIR%%/app/views/admin/runners/_runner.html.haml +%%WWWDIR%%/app/views/admin/runners/_sort_dropdown.html.haml %%WWWDIR%%/app/views/admin/runners/index.html.haml %%WWWDIR%%/app/views/admin/runners/show.html.haml %%WWWDIR%%/app/views/admin/runners/update.js.haml @@ -4658,8 +4702,6 @@ %%WWWDIR%%/app/views/award_emoji/_awards_block.html.haml %%WWWDIR%%/app/views/ci/lints/show.html.haml %%WWWDIR%%/app/views/ci/runner/_how_to_setup_runner.html.haml -%%WWWDIR%%/app/views/ci/runner/_how_to_setup_shared_runner.html.haml -%%WWWDIR%%/app/views/ci/runner/_how_to_setup_specific_runner.html.haml %%WWWDIR%%/app/views/ci/status/_badge.html.haml %%WWWDIR%%/app/views/ci/status/_dropdown_graph_badge.html.haml %%WWWDIR%%/app/views/ci/variables/_content.html.haml @@ -4753,6 +4795,7 @@ %%WWWDIR%%/app/views/errors/git_not_found.html.haml %%WWWDIR%%/app/views/errors/not_found.html.haml %%WWWDIR%%/app/views/errors/omniauth_error.html.haml +%%WWWDIR%%/app/views/errors/precondition_failed.html.haml %%WWWDIR%%/app/views/events/_commit.html.haml %%WWWDIR%%/app/views/events/_event.atom.builder %%WWWDIR%%/app/views/events/_event.html.haml @@ -5281,10 +5324,7 @@ %%WWWDIR%%/app/views/projects/issues/new.html.haml %%WWWDIR%%/app/views/projects/issues/show.html.haml %%WWWDIR%%/app/views/projects/issues/verify.html.haml -%%WWWDIR%%/app/views/projects/jobs/_empty_state.html.haml -%%WWWDIR%%/app/views/projects/jobs/_empty_states.html.haml %%WWWDIR%%/app/views/projects/jobs/_header.html.haml -%%WWWDIR%%/app/views/projects/jobs/_sidebar.html.haml %%WWWDIR%%/app/views/projects/jobs/_table.html.haml %%WWWDIR%%/app/views/projects/jobs/_user.html.haml %%WWWDIR%%/app/views/projects/jobs/index.html.haml @@ -5684,6 +5724,8 @@ %%WWWDIR%%/app/views/shared/icons/_icon_status_pending_borderless.svg %%WWWDIR%%/app/views/shared/icons/_icon_status_running.svg %%WWWDIR%%/app/views/shared/icons/_icon_status_running_borderless.svg +%%WWWDIR%%/app/views/shared/icons/_icon_status_scheduled.svg +%%WWWDIR%%/app/views/shared/icons/_icon_status_scheduled_borderless.svg %%WWWDIR%%/app/views/shared/icons/_icon_status_skipped.svg %%WWWDIR%%/app/views/shared/icons/_icon_status_skipped_borderless.svg %%WWWDIR%%/app/views/shared/icons/_icon_status_success.svg @@ -5759,6 +5801,8 @@ %%WWWDIR%%/app/views/shared/issuable/form/_title.html.haml %%WWWDIR%%/app/views/shared/issuable/nav_links/_all.html.haml %%WWWDIR%%/app/views/shared/labels/_form.html.haml +%%WWWDIR%%/app/views/shared/labels/_nav.html.haml +%%WWWDIR%%/app/views/shared/labels/_sort_dropdown.html.haml %%WWWDIR%%/app/views/shared/members/_access_request_buttons.html.haml %%WWWDIR%%/app/views/shared/members/_filter_2fa_dropdown.html.haml %%WWWDIR%%/app/views/shared/members/_group.html.haml @@ -5832,6 +5876,7 @@ %%WWWDIR%%/app/views/u2f/_register.html.haml %%WWWDIR%%/app/views/users/_deletion_guidance.html.haml %%WWWDIR%%/app/views/users/_groups.html.haml +%%WWWDIR%%/app/views/users/_overview.html.haml %%WWWDIR%%/app/views/users/calendar_activities.html.haml %%WWWDIR%%/app/views/users/show.atom.builder %%WWWDIR%%/app/views/users/show.html.haml @@ -5849,6 +5894,7 @@ %%WWWDIR%%/app/workers/build_success_worker.rb %%WWWDIR%%/app/workers/build_trace_sections_worker.rb %%WWWDIR%%/app/workers/ci/archive_traces_cron_worker.rb +%%WWWDIR%%/app/workers/ci/build_schedule_worker.rb %%WWWDIR%%/app/workers/ci/build_trace_chunk_flush_worker.rb %%WWWDIR%%/app/workers/cluster_install_app_worker.rb %%WWWDIR%%/app/workers/cluster_provision_worker.rb @@ -6067,7 +6113,6 @@ %%WWWDIR%%/config/initializers/gitlab_shell_secret_token.rb %%WWWDIR%%/config/initializers/gitlab_workhorse_secret.rb %%WWWDIR%%/config/initializers/go_get.rb -%%WWWDIR%%/config/initializers/gollum.rb %%WWWDIR%%/config/initializers/grpc.rb %%WWWDIR%%/config/initializers/hamlit.rb %%WWWDIR%%/config/initializers/health_check.rb @@ -6157,11 +6202,14 @@ %%WWWDIR%%/config/webpack.config.js %%WWWDIR%%/danger/changelog/Dangerfile %%WWWDIR%%/danger/changes_size/Dangerfile +%%WWWDIR%%/danger/commit_messages/Dangerfile %%WWWDIR%%/danger/database/Dangerfile %%WWWDIR%%/danger/documentation/Dangerfile +%%WWWDIR%%/danger/eslint/Dangerfile %%WWWDIR%%/danger/frozen_string/Dangerfile %%WWWDIR%%/danger/gemfile/Dangerfile %%WWWDIR%%/danger/metadata/Dangerfile +%%WWWDIR%%/danger/prettier/Dangerfile %%WWWDIR%%/danger/specs/Dangerfile %%WWWDIR%%/db/fixtures/development/01_admin.rb %%WWWDIR%%/db/fixtures/development/04_project.rb @@ -6965,6 +7013,7 @@ %%WWWDIR%%/db/migrate/20180418053107_add_index_to_ci_job_artifacts_file_store.rb %%WWWDIR%%/db/migrate/20180420010016_add_pipeline_build_foreign_key.rb %%WWWDIR%%/db/migrate/20180420010616_cleanup_build_stage_migration.rb +%%WWWDIR%%/db/migrate/20180423204600_add_pages_access_level_to_project_feature.rb %%WWWDIR%%/db/migrate/20180424090541_add_enforce_terms_to_application_settings.rb %%WWWDIR%%/db/migrate/20180424134533_create_application_setting_terms.rb %%WWWDIR%%/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb @@ -7027,6 +7076,7 @@ %%WWWDIR%%/db/migrate/20180808162000_add_user_show_add_ssh_key_message_to_application_settings.rb %%WWWDIR%%/db/migrate/20180813101999_change_default_of_auto_devops_instance_wide.rb %%WWWDIR%%/db/migrate/20180813102000_enable_auto_devops_instance_wide_for_everyone.rb +%%WWWDIR%%/db/migrate/20180814153625_add_commit_email_to_users.rb %%WWWDIR%%/db/migrate/20180815040323_add_authorization_type_to_cluster_platforms_kubernetes.rb %%WWWDIR%%/db/migrate/20180815160409_add_file_location_to_ci_job_artifacts.rb %%WWWDIR%%/db/migrate/20180815170510_add_partial_index_to_ci_builds_artifacts_file.rb @@ -7040,8 +7090,15 @@ %%WWWDIR%%/db/migrate/20180901171833_add_project_config_source_status_index_to_pipeline.rb %%WWWDIR%%/db/migrate/20180901200537_add_resource_label_event_reference_fields.rb %%WWWDIR%%/db/migrate/20180906101639_add_user_ping_consent_to_application_settings.rb +%%WWWDIR%%/db/migrate/20180907015926_add_legacy_abac_to_cluster_providers_gcp.rb +%%WWWDIR%%/db/migrate/20180910115836_add_attr_encrypted_columns_to_web_hook.rb %%WWWDIR%%/db/migrate/20180910153412_add_token_digest_to_personal_access_tokens.rb %%WWWDIR%%/db/migrate/20180910153413_add_index_to_token_digest_on_personal_access_tokens.rb +%%WWWDIR%%/db/migrate/20180916011959_add_index_pipelines_project_id_source.rb +%%WWWDIR%%/db/migrate/20180924141949_add_diff_max_patch_bytes_to_application_settings.rb +%%WWWDIR%%/db/migrate/20180924190739_add_scheduled_at_to_ci_builds.rb +%%WWWDIR%%/db/migrate/20180924201039_add_partial_index_to_scheduled_at.rb +%%WWWDIR%%/db/migrate/20181002172433_remove_restricted_todos_with_cte.rb %%WWWDIR%%/db/migrate/gpg_keys_limits_to_mysql.rb %%WWWDIR%%/db/migrate/limits_ci_build_trace_chunks_raw_data_for_mysql.rb %%WWWDIR%%/db/migrate/limits_to_mysql.rb @@ -7205,7 +7262,12 @@ %%WWWDIR%%/db/post_migrate/20180816193530_rename_login_root_namespaces.rb %%WWWDIR%%/db/post_migrate/20180826111825_recalculate_site_statistics.rb %%WWWDIR%%/db/post_migrate/20180906051323_remove_orphaned_label_links.rb +%%WWWDIR%%/db/post_migrate/20180913051323_consume_remaining_diff_files_deletion_jobs.rb %%WWWDIR%%/db/post_migrate/20180913142237_schedule_digest_personal_access_tokens.rb +%%WWWDIR%%/db/post_migrate/20180914162043_encrypt_web_hooks_columns.rb +%%WWWDIR%%/db/post_migrate/20180914201132_remove_sidekiq_throttling_from_application_settings.rb +%%WWWDIR%%/db/post_migrate/20180916014356_populate_external_pipeline_source.rb +%%WWWDIR%%/db/post_migrate/20180917172041_remove_wikis_count_from_site_statistics.rb %%WWWDIR%%/db/post_migrate/20181014121030_enqueue_redact_links.rb @(git,,) %%WWWDIR%%/db/schema.rb %%WWWDIR%%/db/seeds.rb @@ -7230,6 +7292,7 @@ %%WWWDIR%%/doc/administration/custom_hooks.md %%WWWDIR%%/doc/administration/environment_variables.md %%WWWDIR%%/doc/administration/external_database.md +%%WWWDIR%%/doc/administration/git_protocol.md %%WWWDIR%%/doc/administration/gitaly/index.md %%WWWDIR%%/doc/administration/high_availability/README.md %%WWWDIR%%/doc/administration/high_availability/database.md @@ -7290,11 +7353,9 @@ %%WWWDIR%%/doc/administration/operations.md %%WWWDIR%%/doc/administration/operations/cleaning_up_redis_sessions.md %%WWWDIR%%/doc/administration/operations/fast_ssh_key_lookup.md -%%WWWDIR%%/doc/administration/operations/img/sidekiq_job_throttling.png %%WWWDIR%%/doc/administration/operations/img/write_to_authorized_keys_setting.png %%WWWDIR%%/doc/administration/operations/index.md %%WWWDIR%%/doc/administration/operations/moving_repositories.md -%%WWWDIR%%/doc/administration/operations/sidekiq_job_throttling.md %%WWWDIR%%/doc/administration/operations/sidekiq_memory_killer.md %%WWWDIR%%/doc/administration/operations/speed_up_ssh.md %%WWWDIR%%/doc/administration/operations/ssh_certificates.md @@ -7367,6 +7428,7 @@ %%WWWDIR%%/doc/api/project_import_export.md %%WWWDIR%%/doc/api/project_level_variables.md %%WWWDIR%%/doc/api/project_snippets.md +%%WWWDIR%%/doc/api/project_templates.md %%WWWDIR%%/doc/api/projects.md %%WWWDIR%%/doc/api/protected_branches.md %%WWWDIR%%/doc/api/protected_tags.md @@ -7382,6 +7444,7 @@ %%WWWDIR%%/doc/api/snippets.md %%WWWDIR%%/doc/api/system_hooks.md %%WWWDIR%%/doc/api/tags.md +%%WWWDIR%%/doc/api/templates/dockerfiles.md %%WWWDIR%%/doc/api/templates/gitignores.md %%WWWDIR%%/doc/api/templates/gitlab_ci_ymls.md %%WWWDIR%%/doc/api/templates/licenses.md @@ -7480,6 +7543,7 @@ %%WWWDIR%%/doc/ci/img/environments_terminal_page.png %%WWWDIR%%/doc/ci/img/job_failure_reason.png %%WWWDIR%%/doc/ci/img/junit_test_report.png +%%WWWDIR%%/doc/ci/img/pipeline_incremental_rollout.png %%WWWDIR%%/doc/ci/img/pipelines-goal.svg %%WWWDIR%%/doc/ci/img/pipelines.png %%WWWDIR%%/doc/ci/img/pipelines_grouped.png @@ -7504,6 +7568,7 @@ %%WWWDIR%%/doc/ci/quick_start/img/pipelines_status.png %%WWWDIR%%/doc/ci/quick_start/img/runners_activated.png %%WWWDIR%%/doc/ci/quick_start/img/single_commit_status_pending.png +%%WWWDIR%%/doc/ci/review_apps/img/continuous-delivery-review-apps.svg %%WWWDIR%%/doc/ci/review_apps/img/review_apps_preview_in_mr.png %%WWWDIR%%/doc/ci/review_apps/index.md %%WWWDIR%%/doc/ci/runners/README.md @@ -7557,11 +7622,13 @@ %%WWWDIR%%/doc/development/build_test_package.md %%WWWDIR%%/doc/development/changelog.md %%WWWDIR%%/doc/development/code_review.md +%%WWWDIR%%/doc/development/contributing/community_roles.md %%WWWDIR%%/doc/development/contributing/design.md %%WWWDIR%%/doc/development/contributing/index.md %%WWWDIR%%/doc/development/contributing/issue_workflow.md %%WWWDIR%%/doc/development/contributing/merge_request_workflow.md %%WWWDIR%%/doc/development/database_debugging.md +%%WWWDIR%%/doc/development/database_helpers.md %%WWWDIR%%/doc/development/database_merge_request_checklist.md %%WWWDIR%%/doc/development/db_dump.md %%WWWDIR%%/doc/development/diffs.md @@ -7610,6 +7677,7 @@ %%WWWDIR%%/doc/development/i18n/externalization.md %%WWWDIR%%/doc/development/i18n/img/crowdin-editor.png %%WWWDIR%%/doc/development/i18n/index.md +%%WWWDIR%%/doc/development/i18n/merging_translations.md %%WWWDIR%%/doc/development/i18n/proofreader.md %%WWWDIR%%/doc/development/i18n/translation.md %%WWWDIR%%/doc/development/i18n_guide.md @@ -7646,6 +7714,7 @@ %%WWWDIR%%/doc/development/omnibus.md %%WWWDIR%%/doc/development/ordering_table_columns.md %%WWWDIR%%/doc/development/performance.md +%%WWWDIR%%/doc/development/permissions.md %%WWWDIR%%/doc/development/policies.md %%WWWDIR%%/doc/development/polling.md %%WWWDIR%%/doc/development/polymorphic_associations.md @@ -7656,6 +7725,8 @@ %%WWWDIR%%/doc/development/query_count_limits.md %%WWWDIR%%/doc/development/query_recorder.md %%WWWDIR%%/doc/development/rake_tasks.md +%%WWWDIR%%/doc/development/reusing_abstractions.md +%%WWWDIR%%/doc/development/rolling_out_changes_using_feature_flags.md %%WWWDIR%%/doc/development/serializing_data.md %%WWWDIR%%/doc/development/sha1_as_binary.md %%WWWDIR%%/doc/development/shared_files.md @@ -7673,6 +7744,7 @@ %%WWWDIR%%/doc/development/testing_guide/frontend_testing.md %%WWWDIR%%/doc/development/testing_guide/img/testing_triangle.png %%WWWDIR%%/doc/development/testing_guide/index.md +%%WWWDIR%%/doc/development/testing_guide/review_apps.md %%WWWDIR%%/doc/development/testing_guide/smoke.md %%WWWDIR%%/doc/development/testing_guide/testing_levels.md %%WWWDIR%%/doc/development/testing_guide/testing_rake_tasks.md @@ -8142,7 +8214,8 @@ %%WWWDIR%%/doc/update/10.8-to-11.0.md %%WWWDIR%%/doc/update/11.0-to-11.1.md %%WWWDIR%%/doc/update/11.1-to-11.2.md -%%WWWDIR%%/doc/update/11.2-to-11-3.md +%%WWWDIR%%/doc/update/11.2-to-11.3.md +%%WWWDIR%%/doc/update/11.3-to-11.4.md %%WWWDIR%%/doc/update/2.6-to-3.0.md %%WWWDIR%%/doc/update/2.9-to-3.0.md %%WWWDIR%%/doc/update/3.0-to-3.1.md @@ -8215,6 +8288,8 @@ %%WWWDIR%%/doc/update/upgrading_postgresql_using_slony.md %%WWWDIR%%/doc/user/account/security.md %%WWWDIR%%/doc/user/account/two_factor_authentication.md +%%WWWDIR%%/doc/user/admin_area/diff_limits.md +%%WWWDIR%%/doc/user/admin_area/img/admin_area_settings_button.png %%WWWDIR%%/doc/user/admin_area/img/admin_labels.png %%WWWDIR%%/doc/user/admin_area/labels.md %%WWWDIR%%/doc/user/admin_area/monitoring/convdev.md @@ -8225,13 +8300,13 @@ %%WWWDIR%%/doc/user/admin_area/settings/img/access_restrictions.png %%WWWDIR%%/doc/user/admin_area/settings/img/admin_area_default_artifacts_expiration.png %%WWWDIR%%/doc/user/admin_area/settings/img/admin_area_maximum_artifacts_size.png -%%WWWDIR%%/doc/user/admin_area/settings/img/admin_area_settings_button.png %%WWWDIR%%/doc/user/admin_area/settings/img/domain_blacklist.png %%WWWDIR%%/doc/user/admin_area/settings/img/enforce_terms.png %%WWWDIR%%/doc/user/admin_area/settings/img/respond_to_terms.png %%WWWDIR%%/doc/user/admin_area/settings/img/restricted_url.png %%WWWDIR%%/doc/user/admin_area/settings/img/sign_up_terms.png %%WWWDIR%%/doc/user/admin_area/settings/img/update-available.png +%%WWWDIR%%/doc/user/admin_area/settings/index.md %%WWWDIR%%/doc/user/admin_area/settings/sign_up_restrictions.md %%WWWDIR%%/doc/user/admin_area/settings/terms.md %%WWWDIR%%/doc/user/admin_area/settings/third_party_offers.md @@ -8354,12 +8429,16 @@ %%WWWDIR%%/doc/user/project/img/issue_board_creation.png %%WWWDIR%%/doc/user/project/img/issue_board_edit_button.png %%WWWDIR%%/doc/user/project/img/issue_board_focus_mode.gif +%%WWWDIR%%/doc/user/project/img/issue_board_milestone_lists.png %%WWWDIR%%/doc/user/project/img/issue_board_move_issue_card_list.png +%%WWWDIR%%/doc/user/project/img/issue_board_summed_weights.png %%WWWDIR%%/doc/user/project/img/issue_board_system_notes.png %%WWWDIR%%/doc/user/project/img/issue_board_view_scope.png %%WWWDIR%%/doc/user/project/img/issue_board_welcome_message.png %%WWWDIR%%/doc/user/project/img/issue_boards_add_issues_modal.png +%%WWWDIR%%/doc/user/project/img/issue_boards_core.png %%WWWDIR%%/doc/user/project/img/issue_boards_multiple.png +%%WWWDIR%%/doc/user/project/img/issue_boards_premium.png %%WWWDIR%%/doc/user/project/img/issue_boards_remove_issue.png %%WWWDIR%%/doc/user/project/img/koding_build-in-progress.png %%WWWDIR%%/doc/user/project/img/koding_build-logs.png @@ -8584,6 +8663,7 @@ %%WWWDIR%%/doc/user/project/merge_requests/img/create_from_email.png %%WWWDIR%%/doc/user/project/merge_requests/img/ff_merge_rebase.png %%WWWDIR%%/doc/user/project/merge_requests/img/ff_merge_rebase_locally.png +%%WWWDIR%%/doc/user/project/merge_requests/img/filter_wip_merge_requests.png %%WWWDIR%%/doc/user/project/merge_requests/img/group_merge_requests_list_view.png %%WWWDIR%%/doc/user/project/merge_requests/img/merge_conflict_editor.png %%WWWDIR%%/doc/user/project/merge_requests/img/merge_request.png @@ -8633,6 +8713,13 @@ %%WWWDIR%%/doc/user/project/pages/img/choose_ci_template.png %%WWWDIR%%/doc/user/project/pages/img/dns_add_new_a_record_example_updated_2018.png %%WWWDIR%%/doc/user/project/pages/img/dns_cname_record_example.png +%%WWWDIR%%/doc/user/project/pages/img/icons/click.png +%%WWWDIR%%/doc/user/project/pages/img/icons/cogs.png +%%WWWDIR%%/doc/user/project/pages/img/icons/fork.png +%%WWWDIR%%/doc/user/project/pages/img/icons/free.png +%%WWWDIR%%/doc/user/project/pages/img/icons/lock.png +%%WWWDIR%%/doc/user/project/pages/img/icons/monitor.png +%%WWWDIR%%/doc/user/project/pages/img/icons/terminal.png %%WWWDIR%%/doc/user/project/pages/img/pages_create_project.png %%WWWDIR%%/doc/user/project/pages/img/pages_create_user_page.png %%WWWDIR%%/doc/user/project/pages/img/pages_dns_details.png @@ -8642,6 +8729,7 @@ %%WWWDIR%%/doc/user/project/pages/img/pages_upload_cert.png %%WWWDIR%%/doc/user/project/pages/img/remove_fork_relationship.png %%WWWDIR%%/doc/user/project/pages/img/setup_ci.png +%%WWWDIR%%/doc/user/project/pages/img/ssgs_pages.png %%WWWDIR%%/doc/user/project/pages/img/verify_your_domain.png %%WWWDIR%%/doc/user/project/pages/index.md %%WWWDIR%%/doc/user/project/pages/introduction.md @@ -8907,6 +8995,7 @@ %%WWWDIR%%/lib/api/project_milestones.rb %%WWWDIR%%/lib/api/project_snapshots.rb %%WWWDIR%%/lib/api/project_snippets.rb +%%WWWDIR%%/lib/api/project_templates.rb %%WWWDIR%%/lib/api/projects.rb %%WWWDIR%%/lib/api/projects_relation_builder.rb %%WWWDIR%%/lib/api/protected_branches.rb @@ -9148,6 +9237,7 @@ %%WWWDIR%%/lib/gitlab/background_migration/delete_diff_files.rb %%WWWDIR%%/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits.rb %%WWWDIR%%/lib/gitlab/background_migration/digest_column.rb +%%WWWDIR%%/lib/gitlab/background_migration/encrypt_columns.rb %%WWWDIR%%/lib/gitlab/background_migration/fill_file_store_job_artifact.rb %%WWWDIR%%/lib/gitlab/background_migration/fill_file_store_lfs_object.rb %%WWWDIR%%/lib/gitlab/background_migration/fill_store_upload.rb @@ -9159,8 +9249,10 @@ %%WWWDIR%%/lib/gitlab/background_migration/migrate_stage_index.rb %%WWWDIR%%/lib/gitlab/background_migration/migrate_stage_status.rb %%WWWDIR%%/lib/gitlab/background_migration/migrate_system_uploads_to_new_folder.rb +%%WWWDIR%%/lib/gitlab/background_migration/models/encrypt_columns/web_hook.rb %%WWWDIR%%/lib/gitlab/background_migration/move_personal_snippet_files.rb %%WWWDIR%%/lib/gitlab/background_migration/normalize_ldap_extern_uids_range.rb +%%WWWDIR%%/lib/gitlab/background_migration/populate_external_pipeline_source.rb %%WWWDIR%%/lib/gitlab/background_migration/populate_fork_networks_range.rb %%WWWDIR%%/lib/gitlab/background_migration/populate_import_state.rb %%WWWDIR%%/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data.rb @@ -9214,6 +9306,7 @@ %%WWWDIR%%/lib/gitlab/ci/build/credentials/registry.rb %%WWWDIR%%/lib/gitlab/ci/build/image.rb %%WWWDIR%%/lib/gitlab/ci/build/policy.rb +%%WWWDIR%%/lib/gitlab/ci/build/policy/changes.rb %%WWWDIR%%/lib/gitlab/ci/build/policy/kubernetes.rb %%WWWDIR%%/lib/gitlab/ci/build/policy/refs.rb %%WWWDIR%%/lib/gitlab/ci/build/policy/specification.rb @@ -9257,10 +9350,15 @@ %%WWWDIR%%/lib/gitlab/ci/config/extendable/entry.rb %%WWWDIR%%/lib/gitlab/ci/config/loader.rb %%WWWDIR%%/lib/gitlab/ci/cron_parser.rb +%%WWWDIR%%/lib/gitlab/ci/external/file/base.rb +%%WWWDIR%%/lib/gitlab/ci/external/file/local.rb +%%WWWDIR%%/lib/gitlab/ci/external/file/remote.rb +%%WWWDIR%%/lib/gitlab/ci/external/mapper.rb +%%WWWDIR%%/lib/gitlab/ci/external/processor.rb %%WWWDIR%%/lib/gitlab/ci/mask_secret.rb %%WWWDIR%%/lib/gitlab/ci/model.rb -%%WWWDIR%%/lib/gitlab/ci/parsers.rb -%%WWWDIR%%/lib/gitlab/ci/parsers/junit.rb +%%WWWDIR%%/lib/gitlab/ci/parsers/test.rb +%%WWWDIR%%/lib/gitlab/ci/parsers/test/junit.rb %%WWWDIR%%/lib/gitlab/ci/pipeline/chain/base.rb %%WWWDIR%%/lib/gitlab/ci/pipeline/chain/build.rb %%WWWDIR%%/lib/gitlab/ci/pipeline/chain/command.rb @@ -9310,8 +9408,10 @@ %%WWWDIR%%/lib/gitlab/ci/status/build/play.rb %%WWWDIR%%/lib/gitlab/ci/status/build/retried.rb %%WWWDIR%%/lib/gitlab/ci/status/build/retryable.rb +%%WWWDIR%%/lib/gitlab/ci/status/build/scheduled.rb %%WWWDIR%%/lib/gitlab/ci/status/build/skipped.rb %%WWWDIR%%/lib/gitlab/ci/status/build/stop.rb +%%WWWDIR%%/lib/gitlab/ci/status/build/unschedule.rb %%WWWDIR%%/lib/gitlab/ci/status/canceled.rb %%WWWDIR%%/lib/gitlab/ci/status/core.rb %%WWWDIR%%/lib/gitlab/ci/status/created.rb @@ -9327,12 +9427,60 @@ %%WWWDIR%%/lib/gitlab/ci/status/pipeline/blocked.rb %%WWWDIR%%/lib/gitlab/ci/status/pipeline/common.rb %%WWWDIR%%/lib/gitlab/ci/status/pipeline/factory.rb *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Sat Nov 3 00:09:22 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 65BEB10DFC9B; Sat, 3 Nov 2018 00:09:22 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1A55385A0A; Sat, 3 Nov 2018 00:09:22 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EF43111FE3; Sat, 3 Nov 2018 00:09:21 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA309LWf055398; Sat, 3 Nov 2018 00:09:21 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA309L53055396; Sat, 3 Nov 2018 00:09:21 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201811030009.wA309L53055396@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 3 Nov 2018 00:09:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483867 - branches/2018Q4/emulators/citra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q4/emulators/citra X-SVN-Commit-Revision: 483867 X-SVN-Commit-Repository: ports 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.29 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, 03 Nov 2018 00:09:22 -0000 Author: jbeich Date: Sat Nov 3 00:09:21 2018 New Revision: 483867 URL: https://svnweb.freebsd.org/changeset/ports/483867 Log: MFH: r483865 emulators/citra: update to s20181101 Changes: https://github.com/citra-emu/citra/compare/a753b9c6c...7c3d325af Approved by: ports-secteam (swills, implicit for snapshots) Modified: branches/2018Q4/emulators/citra/Makefile branches/2018Q4/emulators/citra/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/emulators/citra/Makefile ============================================================================== --- branches/2018Q4/emulators/citra/Makefile Sat Nov 3 00:08:22 2018 (r483866) +++ branches/2018Q4/emulators/citra/Makefile Sat Nov 3 00:09:21 2018 (r483867) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20181030 +PORTVERSION= s20181101 PORTREVISION?= 0 CATEGORIES= emulators @@ -23,7 +23,7 @@ BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= a753b9c6c +GH_TAGNAME= 7c3d325af GH_TUPLE= citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ MerryMage:dynarmic:r1-992-g4e6848d1:dynarmic/externals/dynarmic \ Modified: branches/2018Q4/emulators/citra/distinfo ============================================================================== --- branches/2018Q4/emulators/citra/distinfo Sat Nov 3 00:08:22 2018 (r483866) +++ branches/2018Q4/emulators/citra/distinfo Sat Nov 3 00:09:21 2018 (r483867) @@ -1,6 +1,6 @@ TIMESTAMP = 1540941491 -SHA256 (citra-emu-citra-s20181030-a753b9c6c_GH0.tar.gz) = f065e3d3f58565498634b3a23e25f6d8b2b06cf155016a0dcdc32b57f0448235 -SIZE (citra-emu-citra-s20181030-a753b9c6c_GH0.tar.gz) = 4501844 +SHA256 (citra-emu-citra-s20181101-7c3d325af_GH0.tar.gz) = 73825df18efa3df814c3c6d81b75f5a32ba08c3ced829d9559f291cd0d97ae91 +SIZE (citra-emu-citra-s20181101-7c3d325af_GH0.tar.gz) = 4502037 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3 SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c From owner-svn-ports-branches@freebsd.org Sat Nov 3 00:11:16 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A647C10DFE98; Sat, 3 Nov 2018 00:11:16 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5C92A85CB0; Sat, 3 Nov 2018 00:11:16 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 226861210C; Sat, 3 Nov 2018 00:11:16 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA30BFLd057238; Sat, 3 Nov 2018 00:11:16 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA30BFhe057237; Sat, 3 Nov 2018 00:11:15 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201811030011.wA30BFhe057237@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 3 Nov 2018 00:11:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483868 - branches/2018Q4/emulators/rpcs3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q4/emulators/rpcs3 X-SVN-Commit-Revision: 483868 X-SVN-Commit-Repository: ports 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.29 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, 03 Nov 2018 00:11:16 -0000 Author: jbeich Date: Sat Nov 3 00:11:15 2018 New Revision: 483868 URL: https://svnweb.freebsd.org/changeset/ports/483868 Log: MFH: r483864 emulators/rpcs3: update to 0.0.5.1010 Changes: https://github.com/RPCS3/rpcs3/compare/7056b5fc7...43b75ccf0 Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q4/emulators/rpcs3/Makefile branches/2018Q4/emulators/rpcs3/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q4/emulators/rpcs3/Makefile Sat Nov 3 00:09:21 2018 (r483867) +++ branches/2018Q4/emulators/rpcs3/Makefile Sat Nov 3 00:11:15 2018 (r483868) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.5-1006 -DISTVERSIONSUFFIX= -g7056b5fc7 +DISTVERSION= 0.0.5-1010 +DISTVERSIONSUFFIX= -g43b75ccf0 CATEGORIES= emulators PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ Modified: branches/2018Q4/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q4/emulators/rpcs3/distinfo Sat Nov 3 00:09:21 2018 (r483867) +++ branches/2018Q4/emulators/rpcs3/distinfo Sat Nov 3 00:11:15 2018 (r483868) @@ -1,6 +1,6 @@ -TIMESTAMP = 1540928039 -SHA256 (RPCS3-rpcs3-v0.0.5-1006-g7056b5fc7_GH0.tar.gz) = 9d0ca2e75fc84dbaee0784e6edc90241c5866abc2f4cf413b20c771e38d9b9d0 -SIZE (RPCS3-rpcs3-v0.0.5-1006-g7056b5fc7_GH0.tar.gz) = 5013733 +TIMESTAMP = 1541177257 +SHA256 (RPCS3-rpcs3-v0.0.5-1010-g43b75ccf0_GH0.tar.gz) = a6a8e10a1e638dc74fe8687807f113a33504a25b9a0f8c7e95806db80942d970 +SIZE (RPCS3-rpcs3-v0.0.5-1010-g43b75ccf0_GH0.tar.gz) = 5013756 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-26-g4c27501_GH0.tar.gz) = 4f58ba2a51136cc6af0f1d833688b55f78468c4f5429a4bf9b38bb51c9d212b1 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-26-g4c27501_GH0.tar.gz) = 105372 SHA256 (RPCS3-llvm-5c906fd1694e_GH0.tar.gz) = 8bbe95fbbea545ebb03e73d526add64e2853f86176ad42690f8ce5846bd419ce