From owner-svn-ports-branches@freebsd.org Sun May 3 00:59:21 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 195502CABF8; Sun, 3 May 2020 00:59: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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49F7146th2z3wdv; Sun, 3 May 2020 00:59:20 +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 E78E4286C; Sun, 3 May 2020 00:59:20 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0430xK8B022918; Sun, 3 May 2020 00:59:20 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0430xKVX022916; Sun, 3 May 2020 00:59:20 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005030059.0430xKVX022916@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 3 May 2020 00:59:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r533719 - branches/2020Q2/emulators/citra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/emulators/citra X-SVN-Commit-Revision: 533719 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, 03 May 2020 00:59:21 -0000 Author: jbeich Date: Sun May 3 00:59:20 2020 New Revision: 533719 URL: https://svnweb.freebsd.org/changeset/ports/533719 Log: MFH: r533718 emulators/citra: update to s20200502 Changes: https://github.com/citra-emu/citra/compare/4d7487bd3...41bff0e3b Approved by: ports-secteam (swills, implicit for snapshots) Modified: branches/2020Q2/emulators/citra/Makefile branches/2020Q2/emulators/citra/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/emulators/citra/Makefile ============================================================================== --- branches/2020Q2/emulators/citra/Makefile Sun May 3 00:58:51 2020 (r533718) +++ branches/2020Q2/emulators/citra/Makefile Sun May 3 00:59:20 2020 (r533719) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20200501 +PORTVERSION= s20200502 PORTREVISION?= 0 CATEGORIES= emulators @@ -21,7 +21,7 @@ LICENSE_FILE_OpenSSL= ${WRKSRC}/externals/libressl/COP USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 4d7487bd3 +GH_TAGNAME= 41bff0e3b GH_TUPLE= citra-emu:ext-boost:36603a1:boost/externals/boost \ citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ Modified: branches/2020Q2/emulators/citra/distinfo ============================================================================== --- branches/2020Q2/emulators/citra/distinfo Sun May 3 00:58:51 2020 (r533718) +++ branches/2020Q2/emulators/citra/distinfo Sun May 3 00:59:20 2020 (r533719) @@ -1,6 +1,6 @@ -TIMESTAMP = 1588347276 -SHA256 (citra-emu-citra-s20200501-4d7487bd3_GH0.tar.gz) = 30e27805feb1cd8c65a756746b5c5c818c402190f6c9a95d50f8185949991c79 -SIZE (citra-emu-citra-s20200501-4d7487bd3_GH0.tar.gz) = 5254664 +TIMESTAMP = 1588405351 +SHA256 (citra-emu-citra-s20200502-41bff0e3b_GH0.tar.gz) = f305dc09aa75a13fecaa64b1ddbd6850e2c2807e36d6f4679ad2903bc24443de +SIZE (citra-emu-citra-s20200502-41bff0e3b_GH0.tar.gz) = 5254814 SHA256 (citra-emu-ext-boost-36603a1_GH0.tar.gz) = a1885cf0f7b1c790f8a83e963fec591bad1232e6b824e64d8db136920ec1b67d SIZE (citra-emu-ext-boost-36603a1_GH0.tar.gz) = 2351603 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3 From owner-svn-ports-branches@freebsd.org Sun May 3 01:20:20 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8474E2CBD10; Sun, 3 May 2020 01:20:20 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49F7TJ32GKz3yL7; Sun, 3 May 2020 01:20:20 +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 633F82C88; Sun, 3 May 2020 01:20:20 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0431KKlG036015; Sun, 3 May 2020 01:20:20 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0431KKYq036012; Sun, 3 May 2020 01:20:20 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005030120.0431KKYq036012@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 3 May 2020 01:20:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r533726 - in branches/2020Q2/emulators/rpcs3: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2020Q2/emulators/rpcs3: . files X-SVN-Commit-Revision: 533726 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, 03 May 2020 01:20:20 -0000 Author: jbeich Date: Sun May 3 01:20:19 2020 New Revision: 533726 URL: https://svnweb.freebsd.org/changeset/ports/533726 Log: MFH: r533725 emulators/rpcs3: disable LLVM for SPU on FreeBSD 11 by default Many games crash which gives bad first impression. PR: 240495 Approved by: ports-secteam blanket Added: branches/2020Q2/emulators/rpcs3/files/patch-rpcs3_Emu_system__config.h - copied unchanged from r533725, head/emulators/rpcs3/files/patch-rpcs3_Emu_system__config.h Modified: branches/2020Q2/emulators/rpcs3/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/emulators/rpcs3/Makefile ============================================================================== --- branches/2020Q2/emulators/rpcs3/Makefile Sun May 3 01:19:53 2020 (r533725) +++ branches/2020Q2/emulators/rpcs3/Makefile Sun May 3 01:20:19 2020 (r533726) @@ -5,6 +5,7 @@ DISTVERSIONPREFIX= v DISTVERSION= 0.0.9-10084 # git rev-list --count HEAD DISTVERSIONSUFFIX= -g85c4321c2 PORTREVISION= 1 +PORTREVISION= 1 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Copied: branches/2020Q2/emulators/rpcs3/files/patch-rpcs3_Emu_system__config.h (from r533725, head/emulators/rpcs3/files/patch-rpcs3_Emu_system__config.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/emulators/rpcs3/files/patch-rpcs3_Emu_system__config.h Sun May 3 01:20:19 2020 (r533726, copy of r533725, head/emulators/rpcs3/files/patch-rpcs3_Emu_system__config.h) @@ -0,0 +1,16 @@ +https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=240495 + +--- rpcs3/Emu/system_config.h.orig 2020-05-02 11:57:38 UTC ++++ rpcs3/Emu/system_config.h +@@ -28,7 +28,11 @@ struct cfg_root : cfg::node + cfg::_int<0, INT32_MAX> llvm_threads{ this, "Max LLVM Compile Threads", 0 }; + cfg::_bool thread_scheduler_enabled{ this, "Enable thread scheduler", thread_scheduler_enabled_def }; + cfg::_bool set_daz_and_ftz{ this, "Set DAZ and FTZ", false }; ++#if defined(__FreeBSD__) && __FreeBSD__ < 12 ++ cfg::_enum spu_decoder{ this, "SPU Decoder", spu_decoder_type::asmjit }; ++#else + cfg::_enum spu_decoder{ this, "SPU Decoder", spu_decoder_type::llvm }; ++#endif + cfg::_bool lower_spu_priority{ this, "Lower SPU thread priority" }; + cfg::_bool spu_debug{ this, "SPU Debug" }; + cfg::_int<0, 6> preferred_spu_threads{ this, "Preferred SPU Threads", 0, true }; // Number of hardware threads dedicated to heavy simultaneous spu tasks From owner-svn-ports-branches@freebsd.org Sun May 3 01:22:23 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 84A502CC092; Sun, 3 May 2020 01:22:23 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49F7Wg2zrxz3yr0; Sun, 3 May 2020 01:22:23 +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 619642E51; Sun, 3 May 2020 01:22:23 +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 0431MNC4041832; Sun, 3 May 2020 01:22:23 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0431MN7W041831; Sun, 3 May 2020 01:22:23 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005030122.0431MN7W041831@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 3 May 2020 01:22:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r533727 - branches/2020Q2/emulators/rpcs3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/emulators/rpcs3 X-SVN-Commit-Revision: 533727 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, 03 May 2020 01:22:23 -0000 Author: jbeich Date: Sun May 3 01:22:22 2020 New Revision: 533727 URL: https://svnweb.freebsd.org/changeset/ports/533727 Log: emulators/rpcs3: fix PORTREVISION after r533726 Approved by: ports-secteam blanket Modified: branches/2020Q2/emulators/rpcs3/Makefile Modified: branches/2020Q2/emulators/rpcs3/Makefile ============================================================================== --- branches/2020Q2/emulators/rpcs3/Makefile Sun May 3 01:20:19 2020 (r533726) +++ branches/2020Q2/emulators/rpcs3/Makefile Sun May 3 01:22:22 2020 (r533727) @@ -4,8 +4,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v DISTVERSION= 0.0.9-10084 # git rev-list --count HEAD DISTVERSIONSUFFIX= -g85c4321c2 -PORTREVISION= 1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org From owner-svn-ports-branches@freebsd.org Sun May 3 06:20:13 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7AAD12D5423; Sun, 3 May 2020 06:20:13 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49FG7K2kHKz4J8N; Sun, 3 May 2020 06:20:13 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 58CB5698B; Sun, 3 May 2020 06:20:13 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0436KDJS023466; Sun, 3 May 2020 06:20:13 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0436KDWv023464; Sun, 3 May 2020 06:20:13 GMT (envelope-from pi@FreeBSD.org) Message-Id: <202005030620.0436KDWv023464@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 3 May 2020 06:20:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r533746 - branches/2020Q2/sysutils/py-salt X-SVN-Group: ports-branches X-SVN-Commit-Author: pi X-SVN-Commit-Paths: branches/2020Q2/sysutils/py-salt X-SVN-Commit-Revision: 533746 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, 03 May 2020 06:20:13 -0000 Author: pi Date: Sun May 3 06:20:12 2020 New Revision: 533746 URL: https://svnweb.freebsd.org/changeset/ports/533746 Log: MFH: r533533 sysutils/py-salt: update 2019.2.3 -> 2019.2.4 - fix two CVE found in the Salt Master PR: 246061 Submitted by: Christer Edwards (maintainer) Relnotes: https://docs.saltstack.com/en/latest/topics/releases/2019.2.4.html Approved by: portmgr (security blanket) Modified: branches/2020Q2/sysutils/py-salt/Makefile branches/2020Q2/sysutils/py-salt/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/sysutils/py-salt/Makefile ============================================================================== --- branches/2020Q2/sysutils/py-salt/Makefile Sun May 3 05:55:24 2020 (r533745) +++ branches/2020Q2/sysutils/py-salt/Makefile Sun May 3 06:20:12 2020 (r533746) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= salt -PORTVERSION= 2019.2.3 +PORTVERSION= 2019.2.4 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -85,9 +85,7 @@ post-patch: .for file in conf/minion conf/master doc/man/salt-key.1 \ doc/man/salt-cp.1 doc/man/salt-minion.1 doc/man/salt-syndic.1 \ doc/man/salt-master.1 doc/man/salt-run.1 doc/man/salt.7 doc/man/salt.1 \ - doc/man/salt-call.1 \ - salt/modules/mysql.py salt/utils/parsers.py salt/modules/tls.py \ - salt/modules/postgres.py salt/utils/migrations.py + doc/man/salt-call.1 salt/modules/mysql.py salt/modules/tls.py salt/modules/postgres.py @${REINPLACE_CMD} -e 's|/etc/salt|${ETCDIR}|' \ -e 's|/srv/salt|${ETCDIR}/states|' \ -e 's|/srv/pillar|${ETCDIR}/pillar|' ${WRKSRC}/${file} Modified: branches/2020Q2/sysutils/py-salt/distinfo ============================================================================== --- branches/2020Q2/sysutils/py-salt/distinfo Sun May 3 05:55:24 2020 (r533745) +++ branches/2020Q2/sysutils/py-salt/distinfo Sun May 3 06:20:12 2020 (r533746) @@ -1,3 +1,3 @@ -TIMESTAMP = 1583539877 -SHA256 (salt-2019.2.3.tar.gz) = 7497e7dbfd4dc3799bbbc8da63da98b8301bbb644150f3905fe5775a7d81271a -SIZE (salt-2019.2.3.tar.gz) = 14572686 +TIMESTAMP = 1588189291 +SHA256 (salt-2019.2.4.tar.gz) = afeb1c95db61c9008f95259c0b27e525c8a9957cbc6f51c40e824a92637d2847 +SIZE (salt-2019.2.4.tar.gz) = 14572556 From owner-svn-ports-branches@freebsd.org Sun May 3 07:49:57 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9F6262D7088; Sun, 3 May 2020 07:49:57 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49FJ6s47h1z4NXP; Sun, 3 May 2020 07:49:57 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8481E7A66; Sun, 3 May 2020 07:49:57 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0437nvab079703; Sun, 3 May 2020 07:49:57 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0437nuNN079700; Sun, 3 May 2020 07:49:56 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202005030749.0437nuNN079700@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sun, 3 May 2020 07:49:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r533757 - in branches/2020Q2/audio/taglib: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in branches/2020Q2/audio/taglib: . files X-SVN-Commit-Revision: 533757 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, 03 May 2020 07:49:57 -0000 Author: tcberner Date: Sun May 3 07:49:56 2020 New Revision: 533757 URL: https://svnweb.freebsd.org/changeset/ports/533757 Log: MFH: r533680 audio/taglib: update to 1.12-beta1 PR: 246025 Exp-run by: antoine Submitted by: Daniel Engberg Approved by: jhale (timeout) Security: CVE-2018-11439 Differential Revision: https://reviews.freebsd.org/D23260 Approved by: ports-secteam (joneum) Modified: branches/2020Q2/audio/taglib/Makefile branches/2020Q2/audio/taglib/distinfo branches/2020Q2/audio/taglib/files/extrapatch-rcc branches/2020Q2/audio/taglib/pkg-plist Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/audio/taglib/Makefile ============================================================================== --- branches/2020Q2/audio/taglib/Makefile Sun May 3 07:46:28 2020 (r533756) +++ branches/2020Q2/audio/taglib/Makefile Sun May 3 07:49:56 2020 (r533757) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= taglib -PORTVERSION= 1.11.1 -PORTREVISION= 3 +DISTVERSIONPREFIX= v +DISTVERSION= 1.12-beta-1 CATEGORIES= audio -MASTER_SITES= http://taglib.github.io/releases/ MAINTAINER= jhale@FreeBSD.org COMMENT= Library for manipulating ID3 tags and Ogg comments @@ -15,29 +14,31 @@ LICENSE_COMB= dual LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPL LICENSE_FILE_MPL11= ${WRKSRC}/COPYING.MPL +TEST_DEPENDS= cppunit-config:devel/cppunit + USES= cmake compiler:c++11-lang cpe pathfix USE_LDCONFIG= yes +USE_GITHUB= yes + CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Boost \ WITH_ASF \ - WITH_MP4 \ - BUILD_SHARED_LIBS + WITH_MP4 -CPE_VENDOR= scott_wheeler - -OPTIONS_DEFINE= RCC +OPTIONS_DEFINE= RCC TEST OPTIONS_SUB= yes # The official patches for this can be obtained from: # http://darksoft.org/files/rusxmms/patches/ -# however, they do not seem to yet have any for taglib-1.11.1. -# So instead, use: -# https://sourceforge.net/p/qmmp-dev/code/HEAD/tree/trunk/extras/package/win32/contrib/taglib-rusxmms/ # RCC_DESC= Build with RusXMMS librcc patches (experimental) RCC_LIB_DEPENDS= librcc.so:devel/librcc RCC_USES= localbase:ldflags RCC_EXTRA_PATCHES= ${FILESDIR}/extrapatch-rcc + +TEST_CMAKE_BOOL= BUILD_TESTS +TEST_CMAKE_BOOL_OFF= BUILD_SHARED_LIBS +TEST_TARGET= check post-patch-RCC-on: @${REINPLACE_CMD} -e 's|-ltag|-ltag -lrcc|g' \ Modified: branches/2020Q2/audio/taglib/distinfo ============================================================================== --- branches/2020Q2/audio/taglib/distinfo Sun May 3 07:46:28 2020 (r533756) +++ branches/2020Q2/audio/taglib/distinfo Sun May 3 07:49:56 2020 (r533757) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501054372 -SHA256 (taglib-1.11.1.tar.gz) = b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b -SIZE (taglib-1.11.1.tar.gz) = 1261620 +TIMESTAMP = 1588158265 +SHA256 (taglib-taglib-v1.12-beta-1_GH0.tar.gz) = d2a44be7ca8b7682b218affc9910dcfb027481f402f7c30bd2996392b2429ae4 +SIZE (taglib-taglib-v1.12-beta-1_GH0.tar.gz) = 1289326 Modified: branches/2020Q2/audio/taglib/files/extrapatch-rcc ============================================================================== --- branches/2020Q2/audio/taglib/files/extrapatch-rcc Sun May 3 07:46:28 2020 (r533756) +++ branches/2020Q2/audio/taglib/files/extrapatch-rcc Sun May 3 07:49:56 2020 (r533757) @@ -1,24 +1,19 @@ -Obtained from: - https://sourceforge.net/p/qmmp-dev/code/HEAD/tree/trunk/extras/package/win32/contrib/taglib-rusxmms/taglib-1.11.1-ds-rusxmms.patch?format=raw - -diff --git CMakeLists.txt CMakeLists.txt -index a59efc9..eda2f53 100644 ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -120,6 +120,8 @@ if(NOT HAVE_ZLIB AND ZLIB_SOURCE) - set(HAVE_ZLIB_SOURCE 1) +diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake +index 5e5fca2..69a5e39 100644 +--- ConfigureChecks.cmake ++++ ConfigureChecks.cmake +@@ -213,3 +213,5 @@ endif() + if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(PLATFORM WINRT 1) endif() - -+SET(HAVE_LIBRCC 1) + - include_directories(${CMAKE_CURRENT_BINARY_DIR}) - configure_file(config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/config.h") - -diff --git config.h.cmake config.h.cmake -index 7eb5993..8d4a541 100644 ++SET(HAVE_LIBRCC 1) +\ No newline at end of file +diff --git a/config.h.cmake b/config.h.cmake +index c1a3109..5eb5b84 100644 --- config.h.cmake +++ config.h.cmake -@@ -30,4 +30,7 @@ +@@ -30,6 +30,9 @@ /* Indicates whether debug messages are shown even in release mode */ #cmakedefine TRACE_IN_RELEASE 1 @@ -26,7 +21,9 @@ index 7eb5993..8d4a541 100644 +#cmakedefine HAVE_LIBRCC 1 + #cmakedefine TESTS_DIR "@TESTS_DIR@" -diff --git examples/tagreader_c.c examples/tagreader_c.c + + #endif +diff --git a/examples/tagreader_c.c b/examples/tagreader_c.c index 0436992..e0f17d8 100644 --- examples/tagreader_c.c +++ examples/tagreader_c.c @@ -39,7 +36,7 @@ index 0436992..e0f17d8 100644 for(i = 1; i < argc; i++) { printf("******************** \"%s\" ********************\n", argv[i]); -diff --git examples/tagwriter.cpp examples/tagwriter.cpp +diff --git a/examples/tagwriter.cpp b/examples/tagwriter.cpp index ed8b0d7..6a7a263 100644 --- examples/tagwriter.cpp +++ examples/tagwriter.cpp @@ -52,11 +49,11 @@ index ed8b0d7..6a7a263 100644 TagLib::List::ConstIterator it; for(it = fileList.begin(); it != fileList.end(); ++it) { -diff --git taglib/CMakeLists.txt taglib/CMakeLists.txt -index 000f793..e30471e 100644 +diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt +index fcff0b3..2741ef4 100644 --- taglib/CMakeLists.txt +++ taglib/CMakeLists.txt -@@ -42,6 +42,7 @@ set(tag_HDRS +@@ -41,6 +41,7 @@ set(tag_HDRS audioproperties.h taglib_export.h ${CMAKE_CURRENT_BINARY_DIR}/../taglib_config.h @@ -72,20 +69,22 @@ index 000f793..e30471e 100644 toolkit/tstring.cpp toolkit/tstringlist.cpp toolkit/tbytevector.cpp -@@ -345,7 +347,7 @@ set(tag_LIB_SRCS +@@ -339,7 +341,9 @@ set(tag_LIB_SRCS add_library(tag ${tag_LIB_SRCS} ${tag_HDRS}) - if(ZLIB_FOUND) + if(HAVE_ZLIB AND NOT HAVE_ZLIB_SOURCE) - target_link_libraries(tag ${ZLIB_LIBRARIES}) + target_link_libraries(tag rcc ${ZLIB_LIBRARIES}) ++else () ++ target_link_libraries(tag rcc) endif() - if(HAVE_BOOST_ATOMIC) -diff --git taglib/mpeg/id3v1/id3v1tag.cpp taglib/mpeg/id3v1/id3v1tag.cpp -index ca93041..dca5f7a 100644 + set_target_properties(tag PROPERTIES +diff --git a/taglib/mpeg/id3v1/id3v1tag.cpp b/taglib/mpeg/id3v1/id3v1tag.cpp +index ca93041..872ba6a 100644 --- taglib/mpeg/id3v1/id3v1tag.cpp +++ taglib/mpeg/id3v1/id3v1tag.cpp -@@ -69,15 +69,15 @@ StringHandler::StringHandler() +@@ -69,15 +69,18 @@ StringHandler::StringHandler() String ID3v1::StringHandler::parse(const ByteVector &data) const { @@ -98,14 +97,17 @@ index ca93041..dca5f7a 100644 - if(s.isLatin1()) - return s.data(String::Latin1); - else -+ if(!s.isLatin1() && String::ID3WType(String::Latin1) == String::Latin1) ++ if(!s.isLatin1()) ++ { ++ if (String::ID3WType(String::Latin1) == String::Latin1) return ByteVector(); -+ ++ } ++ + return s.data(String::Latin1ID3); } //////////////////////////////////////////////////////////////////////////////// -@@ -262,7 +262,7 @@ void ID3v1::Tag::parse(const ByteVector &data) +@@ -262,7 +265,7 @@ void ID3v1::Tag::parse(const ByteVector &data) d->track = static_cast(data[offset + 29]); } else @@ -114,11 +116,11 @@ index ca93041..dca5f7a 100644 offset += 30; -diff --git taglib/mpeg/id3v2/frames/commentsframe.cpp taglib/mpeg/id3v2/frames/commentsframe.cpp -index b561832..9cfaba2 100644 +diff --git a/taglib/mpeg/id3v2/frames/commentsframe.cpp b/taglib/mpeg/id3v2/frames/commentsframe.cpp +index 815e5e1..cf25328 100644 --- taglib/mpeg/id3v2/frames/commentsframe.cpp +++ taglib/mpeg/id3v2/frames/commentsframe.cpp -@@ -148,10 +148,10 @@ void CommentsFrame::parseFields(const ByteVector &data) +@@ -150,10 +150,10 @@ void CommentsFrame::parseFields(const ByteVector &data) return; } @@ -131,13 +133,12 @@ index b561832..9cfaba2 100644 ByteVectorList l = ByteVectorList::split(data.mid(4), textDelimiter(d->textEncoding), byteAlign, 2); -@@ -171,11 +171,13 @@ ByteVector CommentsFrame::renderFields() const - ByteVector v; +@@ -174,10 +174,12 @@ ByteVector CommentsFrame::renderFields() const String::Type encoding = d->textEncoding; -+ -+ encoding = String::ID3WType(encoding); ++ encoding = String::ID3WType(encoding); ++ encoding = checkTextEncoding(d->description, encoding); encoding = checkTextEncoding(d->text, encoding); @@ -146,8 +147,8 @@ index b561832..9cfaba2 100644 v.append(d->language.size() == 3 ? d->language : "XXX"); v.append(d->description.data(encoding)); v.append(textDelimiter(encoding)); -diff --git taglib/mpeg/id3v2/frames/textidentificationframe.cpp taglib/mpeg/id3v2/frames/textidentificationframe.cpp -index d9d3b29..74f69da 100644 +diff --git a/taglib/mpeg/id3v2/frames/textidentificationframe.cpp b/taglib/mpeg/id3v2/frames/textidentificationframe.cpp +index 9b1eacd..464d951 100644 --- taglib/mpeg/id3v2/frames/textidentificationframe.cpp +++ taglib/mpeg/id3v2/frames/textidentificationframe.cpp @@ -191,12 +191,12 @@ void TextIdentificationFrame::parseFields(const ByteVector &data) @@ -171,7 +172,7 @@ index d9d3b29..74f69da 100644 { - String::Type encoding = checkTextEncoding(d->fieldList, d->textEncoding); + String::Type encoding = d->textEncoding; -+ ++ + encoding = String::ID3WType(encoding); + encoding = checkTextEncoding(d->fieldList, encoding); @@ -182,8 +183,8 @@ index d9d3b29..74f69da 100644 for(StringList::ConstIterator it = d->fieldList.begin(); it != d->fieldList.end(); it++) { -diff --git taglib/mpeg/id3v2/id3v2frame.cpp taglib/mpeg/id3v2/id3v2frame.cpp -index 1f896fa..ef9d91d 100644 +diff --git a/taglib/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp +index af4136a..e792d63 100644 --- taglib/mpeg/id3v2/id3v2frame.cpp +++ taglib/mpeg/id3v2/id3v2frame.cpp @@ -297,7 +297,7 @@ String::Type Frame::checkEncoding(const StringList &fields, String::Type encodin @@ -195,12 +196,12 @@ index 1f896fa..ef9d91d 100644 return encoding; for(StringList::ConstIterator it = fields.begin(); it != fields.end(); ++it) { -diff --git taglib/toolkit/rccpatch.cpp taglib/toolkit/rccpatch.cpp +diff --git a/taglib/toolkit/rccpatch.cpp b/taglib/toolkit/rccpatch.cpp new file mode 100644 -index 0000000..af99323 +index 0000000..2e40e01 --- /dev/null +++ taglib/toolkit/rccpatch.cpp -@@ -0,0 +1,237 @@ +@@ -0,0 +1,235 @@ +#include + +#include @@ -275,7 +276,7 @@ index 0000000..af99323 +#ifdef HAVE_LIBRCC + if (!rcc_initialized) { + rccTaglibPatchInit(); -+ if (rcc_initialized) atexit(rccTaglibPatchFree); ++ if (rcc_initialized) atexit(rccTaglibPatchFree); + } +#endif /* HAVE_LIBRCC */ +} @@ -306,7 +307,7 @@ index 0000000..af99323 + return v; +#else + v.setData("", 0); -+ ++ + return v; +#endif /* HAVE_LIBRCC */ +} @@ -336,7 +337,7 @@ index 0000000..af99323 + return v; +#else + v.setData("", 0); -+ ++ + return v; +#endif /* HAVE_LIBRCC */ +} @@ -363,7 +364,7 @@ index 0000000..af99323 + else +#endif /* HAVE_LIBRCC */ + v.setData("", 0); -+ ++ + return v; +} + @@ -401,7 +402,6 @@ index 0000000..af99323 + if (!rccLocaleGetCharset(charset, NULL, 31)) { + if (!strncmp(charset, "UTF", 3)) { + len = strlen(charset); -+ + if (charset[len-1]=='8') return TagLib::String::UTF8; + if (!strcmp(charset+(len-2),"16")) return TagLib::String::UTF16; + if (!strcmp(charset+(len-4),"16LE")) return TagLib::String::UTF16LE; @@ -419,12 +419,11 @@ index 0000000..af99323 + const char *charset; + + rccTaglibPatchTryInit(); -+ ++ + charset = rccGetCurrentCharsetName(ctx, ID3V2_CLASS); + if (charset) { + if (!strncmp(charset, "UTF", 3)) { + len = strlen(charset); -+ + if (charset[len-1]=='8') return TagLib::String::UTF8; + if (!strcmp(charset+(len-2),"16")) return TagLib::String::UTF16; + if (!strcmp(charset+(len-4),"16LE")) return TagLib::String::UTF16LE; @@ -438,7 +437,7 @@ index 0000000..af99323 +#endif /* HAVE_LIBRCC */ + return TagLib::String::Latin1; +} -diff --git taglib/toolkit/rccpatch.h taglib/toolkit/rccpatch.h +diff --git a/taglib/toolkit/rccpatch.h b/taglib/toolkit/rccpatch.h new file mode 100644 index 0000000..31f4410 --- /dev/null @@ -464,11 +463,11 @@ index 0000000..31f4410 +TagLib::String::Type rccTaglibPatchGetID3Type(); + +#endif /* _RCC_PATCH_H */ -diff --git taglib/toolkit/tstring.cpp taglib/toolkit/tstring.cpp -index 8328790..278256f 100644 +diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp +index c60a3e2..7249c83 100644 --- taglib/toolkit/tstring.cpp +++ taglib/toolkit/tstring.cpp -@@ -42,6 +42,7 @@ +@@ -33,6 +33,7 @@ #include #include @@ -476,60 +475,74 @@ index 8328790..278256f 100644 #include "tstring.h" namespace -@@ -120,15 +121,37 @@ namespace - else +@@ -48,16 +49,6 @@ namespace return String::UTF16BE; } -+ -+ void copyFromUTF8(std::wstring &data, const char *s, size_t length); - // Converts a Latin-1 string into UTF-16(without BOM/CPU byte order) - // and copies it to the internal buffer. +- // Converts a Latin-1 string into UTF-16(without BOM/CPU byte order) +- // and copies it to the internal buffer. - void copyFromLatin1(std::wstring &data, const char *s, size_t length) -+ void copyFromLatin1(std::wstring &data, const char *s, size_t length, bool prepare = false, String::Type t = String::Latin1) - { - data.resize(length); - - for(size_t i = 0; i < length; ++i) - data[i] = static_cast(s[i]); -+ -+ -+ // librcc conversation +- { +- data.resize(length); +- +- for(size_t i = 0; i < length; ++i) +- data[i] = static_cast(s[i]); +- } +- + // Converts a UTF-8 string into UTF-16(without BOM/CPU byte order) + // and copies it to the internal buffer. + void copyFromUTF8(std::wstring &data, const char *s, size_t length) +@@ -73,6 +64,36 @@ namespace + debug("String::copyFromUTF8() - UTF8-CPP error: " + message); + data.clear(); + } ++ ++ } ++ ++ // Converts a Latin-1 string into UTF-16(without BOM/CPU byte order) ++ // and copies it to the internal buffer. ++ void copyFromLatin1(std::wstring &data, const char *s, size_t length, bool prepare, String::Type t) ++ { ++ // librcc conversation + if (prepare) { -+ -+ ByteVector v; -+ std::string str = std::string(s, length); -+ -+ if (t == String::Latin1ID3) v = rccTaglibPatchRecodeInputID3(str, false); -+ else if (t == String::Latin1ID3V2) v = rccTaglibPatchRecodeInputID3(str, true); -+ else /* Latin1 converted from Locale */ v = rccTaglibPatchRecodeInput(str); ++ ByteVector v; ++ std::string std_s(s); + -+ if (v.size()) { -+ copyFromUTF8(data, v.data(), v.size()); -+ } else { -+ // We don't know if we got UTF-8 encoded string or either rcc is disable or something is failed, -+ // since standard applications are really expecting here Latin1, it is safe to just check if we have violations of UTF8 -+ //if (Unicode::isLegalUTF8(s)) t = UTF8; -+ } -+ } ++ if (t == String::Latin1ID3) v = rccTaglibPatchRecodeInputID3(std_s, false); ++ else if (t == String::Latin1ID3V2) v = rccTaglibPatchRecodeInputID3(std_s, true); ++ else /* Latin1 converted from Locale */ v = rccTaglibPatchRecodeInput(std_s); ++ ++ if (v.size()) { ++ copyFromUTF8(data, v.data(), v.size()); ++ return; ++ } else { ++ // We don't know if we got UTF-8 encoded string or either rcc is disable or something is failed, ++ // since standard applications are really expecting here Latin1, it is safe to just check if we have violations of UTF8 ++ //if (Unicode::isLegalUTF8(s)) t = UTF8; ++ } ++ } ++ ++ data.resize(length); ++ ++ for(size_t i = 0; i < length; ++i) ++ data[i] = static_cast(s[i]); } - // Converts a UTF-8 string into UTF-16(without BOM/CPU byte order) -@@ -264,8 +287,11 @@ String::String(const String &s) : + // Helper functions to read a UTF-16 character from an array. +@@ -175,8 +196,11 @@ String::String(const String &s) : String::String(const std::string &s, Type t) : d(new StringPrivate()) { -- if(t == Latin1) -- copyFromLatin1(d->data, s.c_str(), s.length()); + if(t == Locale) -+ t = rccTaglibPatchGetLocaleType(); ++ t = rccTaglibPatchGetLocaleType(); + -+ if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2) + if(t == Latin1) +- copyFromLatin1(d->data, s.c_str(), s.length()); + copyFromLatin1(d->data, s.c_str(), s.length(), true, t); else if(t == String::UTF8) copyFromUTF8(d->data, s.c_str(), s.length()); else { -@@ -312,8 +338,11 @@ String::String(const wchar_t *s, Type t) : +@@ -223,8 +247,11 @@ String::String(const wchar_t *s, Type t) : String::String(const char *s, Type t) : d(new StringPrivate()) { @@ -543,29 +556,41 @@ index 8328790..278256f 100644 else if(t == String::UTF8) copyFromUTF8(d->data, s, ::strlen(s)); else { -@@ -344,9 +373,13 @@ String::String(const ByteVector &v, Type t) : +@@ -245,8 +272,11 @@ String::String(wchar_t c, Type t) : + String::String(char c, Type t) : + d(new StringPrivate()) { - if(v.isEmpty()) - return; -+ +- if(t == Latin1) +- copyFromLatin1(d->data, &c, 1); + if(t == Locale) -+ t = rccTaglibPatchGetLocaleType(); ++ t = rccTaglibPatchGetLocaleType(); + -+ if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2) -+ copyFromLatin1(d->data, v.data(), v.size(), true, t); ++ if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2) ++ copyFromLatin1(d->data, &c, 1, true, t); + else if(t == String::UTF8) + copyFromUTF8(d->data, &c, 1); + else { +@@ -260,8 +290,11 @@ String::String(const ByteVector &v, Type t) : + if(v.isEmpty()) + return; - if(t == Latin1) - copyFromLatin1(d->data, v.data(), v.size()); ++ if(t == Locale) ++ t = rccTaglibPatchGetLocaleType(); ++ ++ if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2) ++ copyFromLatin1(d->data, v.data(), v.size(), true, t); else if(t == UTF8) copyFromUTF8(d->data, v.data(), v.size()); else -@@ -499,8 +532,38 @@ bool String::isNull() const +@@ -416,8 +449,38 @@ bool String::isNull() const ByteVector String::data(Type t) const { - switch(t) - { -+ ByteVector v; ++ ByteVector v; + + if (t == Locale) { + // The source is either Unicode or real Latin1 (if rcc is bypassed) @@ -585,9 +610,9 @@ index 8328790..278256f 100644 + std::string s = to8Bit(true); + if (t == Latin1ID3) v = rccTaglibPatchRecodeOutputID3(s, false); + else if (t == Latin1ID3V2) v = rccTaglibPatchRecodeOutputID3(s, true); -+ if (v.size()) ++ if (v.size()) + return v; -+ ++ + // we don't know if we got NULL because rcc is disabled (error) or UTF8 output is required + if ((t == Latin1ID3V2)&&(rccTaglibPatchGetID3Type() == UTF8)) { + v.setData(s.c_str(), s.length()); @@ -600,7 +625,7 @@ index 8328790..278256f 100644 case Latin1: { ByteVector v(size(), 0); -@@ -822,7 +885,35 @@ const TagLib::String operator+(const TagLib::String &s1, const char *s2) +@@ -741,7 +804,33 @@ const TagLib::String operator+(const TagLib::String &s1, const char *s2) std::ostream &operator<<(std::ostream &s, const TagLib::String &str) { @@ -635,39 +660,37 @@ index 8328790..278256f 100644 + return Latin1; + return type; +} -+ -+ -diff --git taglib/toolkit/tstring.h taglib/toolkit/tstring.h -index b1be04b..b21f297 100644 +diff --git a/taglib/toolkit/tstring.h b/taglib/toolkit/tstring.h +index 7028aab..715d04d 100644 --- taglib/toolkit/tstring.h +++ taglib/toolkit/tstring.h -@@ -96,6 +96,18 @@ namespace TagLib { +@@ -95,6 +95,18 @@ namespace TagLib { + * ID3v1 is assumed to be Latin1 and Ogg Vorbis comments use UTF8. */ enum Type { - /*! -+ * Determine using current locale settings -+ */ ++ /*! ++ * Determine using current locale settings ++ */ + Locale = -1, -+ /*! -+ * Latin1 for ID3 tags. -+ */ ++ /*! ++ * Latin1 for ID3 tags. ++ */ + Latin1ID3 = 65, -+ /*! -+ * Latin1 for ID3v2 tags. -+ */ -+ Latin1ID3V2 = 66, + /*! ++ * Latin1 for ID3v2 tags. ++ */ ++ Latin1ID3V2 = 66, + /*! * IS08859-1, or Latin1 encoding. 8 bit characters. */ - Latin1 = 0, -@@ -117,6 +129,10 @@ namespace TagLib { - */ +@@ -118,6 +130,10 @@ namespace TagLib { UTF16LE = 4 }; -+ + + static Type ID3Type(int i); + static Type ID3WType(Type type); + static Type ID3RealType(Type type); - ++ /*! * Constructs an empty String. + */ Modified: branches/2020Q2/audio/taglib/pkg-plist ============================================================================== --- branches/2020Q2/audio/taglib/pkg-plist Sun May 3 07:46:28 2020 (r533756) +++ branches/2020Q2/audio/taglib/pkg-plist Sun May 3 07:49:56 2020 (r533757) @@ -30,6 +30,7 @@ include/taglib/id3v2frame.h include/taglib/id3v2framefactory.h include/taglib/id3v2header.h include/taglib/id3v2synchdata.h +include/taglib/id3v2.h include/taglib/id3v2tag.h include/taglib/infotag.h include/taglib/itfile.h From owner-svn-ports-branches@freebsd.org Sun May 3 13:00:48 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 27FAA2DD0E3; Sun, 3 May 2020 13:00:48 +0000 (UTC) (envelope-from loader@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49FR1X0K7xz4f2c; Sun, 3 May 2020 13:00:48 +0000 (UTC) (envelope-from loader@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 0657DB4F5; Sun, 3 May 2020 13:00:48 +0000 (UTC) (envelope-from loader@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 043D0lZd072744; Sun, 3 May 2020 13:00:47 GMT (envelope-from loader@FreeBSD.org) Received: (from loader@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 043D0ln6072161; Sun, 3 May 2020 13:00:47 GMT (envelope-from loader@FreeBSD.org) Message-Id: <202005031300.043D0ln6072161@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: loader set sender to loader@FreeBSD.org using -f From: Fukang Chen Date: Sun, 3 May 2020 13:00:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r533774 - in branches/2020Q2/www: node node/files node12 node12/files X-SVN-Group: ports-branches X-SVN-Commit-Author: loader X-SVN-Commit-Paths: in branches/2020Q2/www: node node/files node12 node12/files X-SVN-Commit-Revision: 533774 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, 03 May 2020 13:00:48 -0000 Author: loader Date: Sun May 3 13:00:46 2020 New Revision: 533774 URL: https://svnweb.freebsd.org/changeset/ports/533774 Log: MFH: r533741 www/node, www/node12: Fix build on armv6 and armv7 Reviewed by: koobs, bhughes Approved by: koobs (ports, mentor), bhughes (maintainer) Differential Revision: https://reviews.freebsd.org/D24612 Approved by: ports-secteam (joneum) Added: branches/2020Q2/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp - copied unchanged from r533741, head/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp branches/2020Q2/www/node12/files/extra-patch-tools_v8__gypfiles_v8.gyp - copied unchanged from r533741, head/www/node12/files/extra-patch-tools_v8__gypfiles_v8.gyp Modified: branches/2020Q2/www/node/Makefile branches/2020Q2/www/node12/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/www/node/Makefile ============================================================================== --- branches/2020Q2/www/node/Makefile Sun May 3 12:50:42 2020 (r533773) +++ branches/2020Q2/www/node/Makefile Sun May 3 13:00:46 2020 (r533774) @@ -79,6 +79,10 @@ LIB_DEPENDS+= libcares.so:dns/c-ares\ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-common.gypi .endif +.if ${ARCH} == armv6 || ${ARCH} == armv7 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tools_v8__gypfiles_v8.gyp +.endif + .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 BROKEN_SSL+= base .endif Copied: branches/2020Q2/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp (from r533741, head/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp Sun May 3 13:00:46 2020 (r533774, copy of r533741, head/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp) @@ -0,0 +1,11 @@ +--- tools/v8_gypfiles/v8.gyp.orig 2020-04-25 08:50:20 UTC ++++ tools/v8_gypfiles/v8.gyp +@@ -805,7 +805,7 @@ + }], + # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library + # to implement atomic memory access +- ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "arm"]', { ++ ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc"]', { + 'link_settings': { + 'libraries': ['-latomic', ], + }, Modified: branches/2020Q2/www/node12/Makefile ============================================================================== --- branches/2020Q2/www/node12/Makefile Sun May 3 12:50:42 2020 (r533773) +++ branches/2020Q2/www/node12/Makefile Sun May 3 13:00:46 2020 (r533774) @@ -80,6 +80,10 @@ LIB_DEPENDS+= libcares.so:dns/c-ares\ BROKEN_SSL+= base .endif +.if ${ARCH} == armv6 || ${ARCH} == armv7 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tools_v8__gypfiles_v8.gyp +.endif + .if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 CONFIGURE_ARGS+=--openssl-no-asm .endif Copied: branches/2020Q2/www/node12/files/extra-patch-tools_v8__gypfiles_v8.gyp (from r533741, head/www/node12/files/extra-patch-tools_v8__gypfiles_v8.gyp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/www/node12/files/extra-patch-tools_v8__gypfiles_v8.gyp Sun May 3 13:00:46 2020 (r533774, copy of r533741, head/www/node12/files/extra-patch-tools_v8__gypfiles_v8.gyp) @@ -0,0 +1,11 @@ +--- tools/v8_gypfiles/v8.gyp.orig 2020-04-25 08:58:14 UTC ++++ tools/v8_gypfiles/v8.gyp +@@ -809,7 +809,7 @@ + }], + # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library + # to implement atomic memory access +- ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "arm"]', { ++ ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc"]', { + 'link_settings': { + 'libraries': ['-latomic', ], + }, From owner-svn-ports-branches@freebsd.org Sun May 3 13:57:30 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D16912DE3DB; Sun, 3 May 2020 13:57:30 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49FSGy450bz3Dv2; Sun, 3 May 2020 13:57:30 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7F2F4C1C5; Sun, 3 May 2020 13:57:30 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 043DvU2f009134; Sun, 3 May 2020 13:57:30 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 043DvTFK009130; Sun, 3 May 2020 13:57:29 GMT (envelope-from cy@FreeBSD.org) Message-Id: <202005031357.043DvTFK009130@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sun, 3 May 2020 13:57:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r533784 - in branches/2020Q2/sysutils/zetaback: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in branches/2020Q2/sysutils/zetaback: . files X-SVN-Commit-Revision: 533784 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, 03 May 2020 13:57:30 -0000 Author: cy Date: Sun May 3 13:57:29 2020 New Revision: 533784 URL: https://svnweb.freebsd.org/changeset/ports/533784 Log: MFH: r533732 r533736 r533780 Unbreak, make fetchable again. PR: 246132 Mostly by: Armin Gruner Add compression program and output to localhost options PR 246132 Mostly by: Armin Gruner Fix typos. PR: 246132 Submitted by: Armin Gruner Approved by: portmgr (joneum) Added: branches/2020Q2/sysutils/zetaback/files/ - copied from r533736, head/sysutils/zetaback/files/ Modified: branches/2020Q2/sysutils/zetaback/Makefile branches/2020Q2/sysutils/zetaback/distinfo branches/2020Q2/sysutils/zetaback/files/opt-compression.in Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/sysutils/zetaback/Makefile ============================================================================== --- branches/2020Q2/sysutils/zetaback/Makefile Sun May 3 13:39:36 2020 (r533783) +++ branches/2020Q2/sysutils/zetaback/Makefile Sun May 3 13:57:29 2020 (r533784) @@ -2,17 +2,24 @@ # $FreeBSD$ PORTNAME= zetaback -PORTVERSION= 1.0.7 +DISTVERSION= 1.0.7 CATEGORIES= sysutils -MASTER_SITES= http://mirrors.omniti.com/zetaback/ MAINTAINER= cy@FreeBSD.org COMMENT= Zetaback ZFS backup and recovery management system -BROKEN= unfetchable +USE_GITHUB= yes +GH_ACCOUNT= omniti-labs LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE + +OPTIONS_DEFINE= LOCAL BETTER_COMPRESSION +LOCAL_DESC= Avoid ssh for localhost backup +BETTER_COMPRESSION_DESC= Allow different compressions for snapshots + +LOCAL_EXTRA_PATCHES= ${PATCHDIR}/opt-localhost.in +BETTER_COMPRESSION_EXTRA_PATCHES= ${PATCHDIR}/opt-compression.in USES= autoreconf perl5 USE_PERL5= run Modified: branches/2020Q2/sysutils/zetaback/distinfo ============================================================================== --- branches/2020Q2/sysutils/zetaback/distinfo Sun May 3 13:39:36 2020 (r533783) +++ branches/2020Q2/sysutils/zetaback/distinfo Sun May 3 13:57:29 2020 (r533784) @@ -1,2 +1,3 @@ -SHA256 (zetaback-1.0.7.tar.gz) = e4bad4bb4a0149d44e5ae6022519b2927e4c0b5a0da465d47b4e66d707270270 -SIZE (zetaback-1.0.7.tar.gz) = 49934 +TIMESTAMP = 1588467175 +SHA256 (omniti-labs-zetaback-1.0.7_GH0.tar.gz) = b10c6df2b27d823f5fc18e4c7c8460e8231a86d32d89f9c73a916a7b15f98888 +SIZE (omniti-labs-zetaback-1.0.7_GH0.tar.gz) = 25592 Modified: branches/2020Q2/sysutils/zetaback/files/opt-compression.in ============================================================================== --- head/sysutils/zetaback/files/opt-compression.in Sun May 3 02:46:02 2020 (r533736) +++ branches/2020Q2/sysutils/zetaback/files/opt-compression.in Sun May 3 13:57:29 2020 (r533784) @@ -26,7 +26,7 @@ + my $cp = config_get($host, 'compressionprogram'); + if ($cp ne "xz" && $cp ne "bzip2" && $cp ne "gzip" && $cp ne "") { + die "zfs_full_backup: unsupported compression program specified\n"; -+ } else ($cp eq "") { ++ } elsif ($cp eq "") { + $cp = "gzip"; + my $cl = 1; + } else { From owner-svn-ports-branches@freebsd.org Mon May 4 09:45:42 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BC2252CAA45; Mon, 4 May 2020 09:45:42 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49Fydy4bxlz3xnc; Mon, 4 May 2020 09:45:42 +0000 (UTC) (envelope-from joneum@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 98A4F222EF; Mon, 4 May 2020 09:45:42 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0449jgo7052943; Mon, 4 May 2020 09:45:42 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0449jeHJ052935; Mon, 4 May 2020 09:45:40 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <202005040945.0449jeHJ052935@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Mon, 4 May 2020 09:45:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r533910 - in branches/2020Q2/databases: mysql57-client/files mysql57-server mysql57-server/files X-SVN-Group: ports-branches X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in branches/2020Q2/databases: mysql57-client/files mysql57-server mysql57-server/files X-SVN-Commit-Revision: 533910 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: Mon, 04 May 2020 09:45:42 -0000 Author: joneum Date: Mon May 4 09:45:40 2020 New Revision: 533910 URL: https://svnweb.freebsd.org/changeset/ports/533910 Log: MFH: r533909 In file included from /usr/obj/usr/ports/databases/mysql57-client/work/mysql-5.7.30/vio/viosslfactories.c:29: /usr/obj/usr/ports/databases/mysql57-client/work/mysql-5.7.30/include/my_openssl.h:55:30: error: use of undeclared identifier 'OPENSSL_INIT_NO_ATEXIT' return OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL); This fix a problem with libressl PR: 246070 Sponsored by: Netzkommune GmbH Approved by: ports-secteam (joneum) Added: branches/2020Q2/databases/mysql57-client/files/patch-include_my_openssl.h - copied unchanged from r533909, head/databases/mysql57-client/files/patch-include_my_openssl.h branches/2020Q2/databases/mysql57-client/files/patch-sql_auth_sha2_password_common.cc - copied unchanged from r533909, head/databases/mysql57-client/files/patch-sql_auth_sha2_password_common.cc branches/2020Q2/databases/mysql57-client/files/patch-vio_viosslfactories.c - copied unchanged from r533909, head/databases/mysql57-client/files/patch-vio_viosslfactories.c branches/2020Q2/databases/mysql57-server/files/patch-include_my_openssl.h - copied unchanged from r533909, head/databases/mysql57-server/files/patch-include_my_openssl.h branches/2020Q2/databases/mysql57-server/files/patch-rapid_plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_xcom_ssl_transport.c - copied unchanged from r533909, head/databases/mysql57-server/files/patch-rapid_plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_xcom_ssl_transport.c branches/2020Q2/databases/mysql57-server/files/patch-sql_auth_sha2_password_common.cc - copied unchanged from r533909, head/databases/mysql57-server/files/patch-sql_auth_sha2_password_common.cc branches/2020Q2/databases/mysql57-server/files/patch-vio_viosslfactories.c - copied unchanged from r533909, head/databases/mysql57-server/files/patch-vio_viosslfactories.c Modified: branches/2020Q2/databases/mysql57-server/Makefile Directory Properties: branches/2020Q2/ (props changed) Copied: branches/2020Q2/databases/mysql57-client/files/patch-include_my_openssl.h (from r533909, head/databases/mysql57-client/files/patch-include_my_openssl.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/databases/mysql57-client/files/patch-include_my_openssl.h Mon May 4 09:45:40 2020 (r533910, copy of r533909, head/databases/mysql57-client/files/patch-include_my_openssl.h) @@ -0,0 +1,11 @@ +--- include/my_openssl.h.orig 2020-03-23 17:35:17 UTC ++++ include/my_openssl.h +@@ -51,7 +51,7 @@ extern "C" { + */ + static inline int mysql_OPENSSL_init() + { +-#if defined(HAVE_STATIC_OPENSSL) ++#if defined(HAVE_STATIC_OPENSSL) && !defined(LIBRESSL_VERSION_NUMBER) + return OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL); + #else + return SSL_library_init(); Copied: branches/2020Q2/databases/mysql57-client/files/patch-sql_auth_sha2_password_common.cc (from r533909, head/databases/mysql57-client/files/patch-sql_auth_sha2_password_common.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/databases/mysql57-client/files/patch-sql_auth_sha2_password_common.cc Mon May 4 09:45:40 2020 (r533910, copy of r533909, head/databases/mysql57-client/files/patch-sql_auth_sha2_password_common.cc) @@ -0,0 +1,12 @@ +--- sql/auth/sha2_password_common.cc ++++ sql/auth/sha2_password_common.cc +@@ -116,7 +116,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *digest, + DBUG_RETURN(true); + } + m_ok= EVP_DigestFinal_ex(md_context, m_digest, NULL); +-#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL) + EVP_MD_CTX_cleanup(md_context); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + EVP_MD_CTX_reset(md_context); Copied: branches/2020Q2/databases/mysql57-client/files/patch-vio_viosslfactories.c (from r533909, head/databases/mysql57-client/files/patch-vio_viosslfactories.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/databases/mysql57-client/files/patch-vio_viosslfactories.c Mon May 4 09:45:40 2020 (r533910, copy of r533909, head/databases/mysql57-client/files/patch-vio_viosslfactories.c) @@ -0,0 +1,35 @@ +--- vio/viosslfactories.c ++++ vio/viosslfactories.c +@@ -123,21 +123,19 @@ static DH *get_dh2048(void) + DH *dh; + if ((dh=DH_new())) + { +- BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL); +- BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL); +- if (!p || !g +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L +- || !DH_set0_pqg(dh, p, NULL, g) +-#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ +- ) { +- /* DH_free() will free 'p' and 'g' at once. */ ++ BIGNUM *p = BN_bin2bn(dh2048_p,sizeof(dh2048_p), NULL); ++ BIGNUM *g = BN_bin2bn(dh2048_g,sizeof(dh2048_g), NULL); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++ dh->p=p; ++ dh->g=g; ++ if (! dh->p || ! dh->g) ++#else ++ if (!DH_set0_pqg(dh, p, NULL, g)) ++#endif ++ { + DH_free(dh); +- return NULL; ++ dh = NULL; + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000L +- dh->p= p; +- dh->g= g; +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + } + return(dh); + } Modified: branches/2020Q2/databases/mysql57-server/Makefile ============================================================================== --- branches/2020Q2/databases/mysql57-server/Makefile Mon May 4 09:44:07 2020 (r533909) +++ branches/2020Q2/databases/mysql57-server/Makefile Mon May 4 09:45:40 2020 (r533910) @@ -3,7 +3,7 @@ PORTNAME?= mysql PORTVERSION= 5.7.30 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-5.7 PKGNAMESUFFIX?= 57-server Copied: branches/2020Q2/databases/mysql57-server/files/patch-include_my_openssl.h (from r533909, head/databases/mysql57-server/files/patch-include_my_openssl.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/databases/mysql57-server/files/patch-include_my_openssl.h Mon May 4 09:45:40 2020 (r533910, copy of r533909, head/databases/mysql57-server/files/patch-include_my_openssl.h) @@ -0,0 +1,11 @@ +--- include/my_openssl.h.orig 2020-03-23 17:35:17 UTC ++++ include/my_openssl.h +@@ -51,7 +51,7 @@ extern "C" { + */ + static inline int mysql_OPENSSL_init() + { +-#if defined(HAVE_STATIC_OPENSSL) ++#if defined(HAVE_STATIC_OPENSSL) && !defined(LIBRESSL_VERSION_NUMBER) + return OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL); + #else + return SSL_library_init(); Copied: branches/2020Q2/databases/mysql57-server/files/patch-rapid_plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_xcom_ssl_transport.c (from r533909, head/databases/mysql57-server/files/patch-rapid_plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_xcom_ssl_transport.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/databases/mysql57-server/files/patch-rapid_plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_xcom_ssl_transport.c Mon May 4 09:45:40 2020 (r533910, copy of r533909, head/databases/mysql57-server/files/patch-rapid_plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_xcom_ssl_transport.c) @@ -0,0 +1,11 @@ +--- rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c.orig 2020-03-23 17:35:17 UTC ++++ rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c +@@ -529,7 +529,7 @@ int xcom_init_ssl(const char *server_key_file, const c + break e.g. ODBC clients (if the client also uses SSL). + */ + +-#if defined(HAVE_STATIC_OPENSSL) ++#if defined(HAVE_STATIC_OPENSSL) && !defined(LIBRESSL_VERSION_NUMBER) + OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL); + #else + SSL_library_init(); Copied: branches/2020Q2/databases/mysql57-server/files/patch-sql_auth_sha2_password_common.cc (from r533909, head/databases/mysql57-server/files/patch-sql_auth_sha2_password_common.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/databases/mysql57-server/files/patch-sql_auth_sha2_password_common.cc Mon May 4 09:45:40 2020 (r533910, copy of r533909, head/databases/mysql57-server/files/patch-sql_auth_sha2_password_common.cc) @@ -0,0 +1,12 @@ +--- sql/auth/sha2_password_common.cc ++++ sql/auth/sha2_password_common.cc +@@ -116,7 +116,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *digest, + DBUG_RETURN(true); + } + m_ok= EVP_DigestFinal_ex(md_context, m_digest, NULL); +-#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL) + EVP_MD_CTX_cleanup(md_context); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + EVP_MD_CTX_reset(md_context); Copied: branches/2020Q2/databases/mysql57-server/files/patch-vio_viosslfactories.c (from r533909, head/databases/mysql57-server/files/patch-vio_viosslfactories.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/databases/mysql57-server/files/patch-vio_viosslfactories.c Mon May 4 09:45:40 2020 (r533910, copy of r533909, head/databases/mysql57-server/files/patch-vio_viosslfactories.c) @@ -0,0 +1,35 @@ +--- vio/viosslfactories.c ++++ vio/viosslfactories.c +@@ -123,21 +123,19 @@ static DH *get_dh2048(void) + DH *dh; + if ((dh=DH_new())) + { +- BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL); +- BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL); +- if (!p || !g +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L +- || !DH_set0_pqg(dh, p, NULL, g) +-#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ +- ) { +- /* DH_free() will free 'p' and 'g' at once. */ ++ BIGNUM *p = BN_bin2bn(dh2048_p,sizeof(dh2048_p), NULL); ++ BIGNUM *g = BN_bin2bn(dh2048_g,sizeof(dh2048_g), NULL); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++ dh->p=p; ++ dh->g=g; ++ if (! dh->p || ! dh->g) ++#else ++ if (!DH_set0_pqg(dh, p, NULL, g)) ++#endif ++ { + DH_free(dh); +- return NULL; ++ dh = NULL; + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000L +- dh->p= p; +- dh->g= g; +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + } + return(dh); + } From owner-svn-ports-branches@freebsd.org Mon May 4 16:08:17 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9259D2D3D81; Mon, 4 May 2020 16:08:17 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49G77P3Msjz4Nn8; Mon, 4 May 2020 16:08:17 +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 6F05326C4A; Mon, 4 May 2020 16:08:17 +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 044G8HnN087183; Mon, 4 May 2020 16:08:17 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 044G8HKP087181; Mon, 4 May 2020 16:08:17 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <202005041608.044G8HKP087181@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Mon, 4 May 2020 16:08:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r533929 - branches/2020Q2/x11-servers/xorg-server X-SVN-Group: ports-branches X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: branches/2020Q2/x11-servers/xorg-server X-SVN-Commit-Revision: 533929 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: Mon, 04 May 2020 16:08:17 -0000 Author: zeising Date: Mon May 4 16:08:16 2020 New Revision: 533929 URL: https://svnweb.freebsd.org/changeset/ports/533929 Log: MFH: r533807 xorg-server: Do not send spurious focus events Apply an upstream patch to avoid sending focus evens when grab actually does not change. This fixes certain full screen applications. [1] Ensure that we actually don't try to find and link against HAL even if it's around on the system we're compiling on [2] Add CPE information [3] PR: 245854 [1] (with changes), 245604 [2], 197712 [3] Submitted by: naddy@ [1], mi@ [2], arrowd [3] Reported by: shun [3] Approved by: ports-secteam (joenum) Modified: branches/2020Q2/x11-servers/xorg-server/Makefile branches/2020Q2/x11-servers/xorg-server/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/x11-servers/xorg-server/Makefile ============================================================================== --- branches/2020Q2/x11-servers/xorg-server/Makefile Mon May 4 15:03:58 2020 (r533928) +++ branches/2020Q2/x11-servers/xorg-server/Makefile Mon May 4 16:08:16 2020 (r533929) @@ -3,6 +3,7 @@ PORTNAME?= xorg-server PORTVERSION?= 1.20.8 +PORTREVISION?= 1 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver @@ -11,6 +12,9 @@ DISTNAME= xorg-server-${PORTVERSION} MAINTAINER= x11@FreeBSD.org COMMENT?= X.Org X server and related programs +PATCH_SITES= https://gitlab.freedesktop.org/xorg/xserver/commit/ +PATCHFILES= 271934db9f3b1297754b29855646e0a4ee01db59.diff:-p1 + LICENSE= MIT RUN_DEPENDS+= xkeyboard-config>=2.5:x11/xkeyboard-config \ @@ -55,15 +59,16 @@ DEFAULT_FONTPATH_LIST= \ DEFAULT_FONTPATH_CMD=${ECHO_CMD} ${DEFAULT_FONTPATH_LIST} | ${TR} ' ' , PLIST_SUB+= FONTPATHD="${FONTPATHD:S,^${PREFIX}/,,}" -USES= compiler:c11 gl gmake perl5 ssl xorg xorg-cat:xserver +USES= compiler:c11 cpe gl gmake perl5 ssl xorg xorg-cat:xserver USE_PERL5= build USE_GL+= gl USE_XORG+= pixman xau xdmcp xfont2 xkbfile xorgproto xshmfence xtrans CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \ --with-default-font-path="$$(${DEFAULT_FONTPATH_CMD})" \ - --without-dtrace --with-shared-memory-dir=/tmp \ + --without-dtrace --disable-config-hal \ --disable-install-setuid --disable-unit-tests INSTALL_TARGET= install-strip +CPE_VENDOR= x.org .if ${SLAVE_PORT} == "no" || ${PORTNAME} == "xephyr" || ${PORTNAME} == "xwayland" LIB_DEPENDS+= libdrm.so:graphics/libdrm \ Modified: branches/2020Q2/x11-servers/xorg-server/distinfo ============================================================================== --- branches/2020Q2/x11-servers/xorg-server/distinfo Mon May 4 15:03:58 2020 (r533928) +++ branches/2020Q2/x11-servers/xorg-server/distinfo Mon May 4 16:08:16 2020 (r533929) @@ -1,3 +1,5 @@ -TIMESTAMP = 1585642684 +TIMESTAMP = 1588512348 SHA256 (xorg/xserver/xorg-server-1.20.8.tar.bz2) = d17b646bee4ba0fb7850c1cc55b18e3e8513ed5c02bdf38da7e107f84e2d0146 SIZE (xorg/xserver/xorg-server-1.20.8.tar.bz2) = 6309640 +SHA256 (xorg/xserver/271934db9f3b1297754b29855646e0a4ee01db59.diff) = b29a3af8f6d93a5b6e1d4652fca0a76e438884dee8caf03f89148fbc47c98f71 +SIZE (xorg/xserver/271934db9f3b1297754b29855646e0a4ee01db59.diff) = 1262 From owner-svn-ports-branches@freebsd.org Mon May 4 16:56:45 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0EBDA2D4B09; Mon, 4 May 2020 16:56: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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49G8CJ6c9Pz4RPk; Mon, 4 May 2020 16:56: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 DE02A2763D; Mon, 4 May 2020 16:56: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 044Guiru018091; Mon, 4 May 2020 16:56:44 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 044GuiCZ018089; Mon, 4 May 2020 16:56:44 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005041656.044GuiCZ018089@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 4 May 2020 16:56:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r533931 - branches/2020Q2/www/firefox-esr X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/www/firefox-esr X-SVN-Commit-Revision: 533931 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: Mon, 04 May 2020 16:56:45 -0000 Author: jbeich Date: Mon May 4 16:56:44 2020 New Revision: 533931 URL: https://svnweb.freebsd.org/changeset/ports/533931 Log: MFH: r533409 www/firefox-esr: update to 68.8.0 Changes: https://www.mozilla.org/firefox/68.8.0/releasenotes/ Security: aec18162-eaf3-4e73-a38e-3fd98bc47869 Approved by: ports-secteam blanket Modified: branches/2020Q2/www/firefox-esr/Makefile branches/2020Q2/www/firefox-esr/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/www/firefox-esr/Makefile ============================================================================== --- branches/2020Q2/www/firefox-esr/Makefile Mon May 4 16:54:42 2020 (r533930) +++ branches/2020Q2/www/firefox-esr/Makefile Mon May 4 16:56:44 2020 (r533931) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 68.7.0 -PORTREVISION= 1 +DISTVERSION= 68.8.0 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build3/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source PKGNAMESUFFIX= -esr DISTFILES= ${DISTNAME}esr.source${EXTRACT_SUFX} Modified: branches/2020Q2/www/firefox-esr/distinfo ============================================================================== --- branches/2020Q2/www/firefox-esr/distinfo Mon May 4 16:54:42 2020 (r533930) +++ branches/2020Q2/www/firefox-esr/distinfo Mon May 4 16:56:44 2020 (r533931) @@ -1,3 +1,3 @@ -TIMESTAMP = 1585942230 -SHA256 (firefox-68.7.0esr.source.tar.xz) = ad3ea069c3d23aab360ad04ff4d0f5e556d3538f7dd4eae0690c4e9241537570 -SIZE (firefox-68.7.0esr.source.tar.xz) = 312235932 +TIMESTAMP = 1588197054 +SHA256 (firefox-68.8.0esr.source.tar.xz) = fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842 +SIZE (firefox-68.8.0esr.source.tar.xz) = 312602308 From owner-svn-ports-branches@freebsd.org Mon May 4 16:59:35 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 055832D4B5B; Mon, 4 May 2020 16:59:35 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49G8GZ6MHZz4RWF; Mon, 4 May 2020 16:59:34 +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 D140C27640; Mon, 4 May 2020 16:59:34 +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 044GxYSc018473; Mon, 4 May 2020 16:59:34 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 044GxXhe018468; Mon, 4 May 2020 16:59:33 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005041659.044GxXhe018468@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 4 May 2020 16:59:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r533932 - in branches/2020Q2/www/firefox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2020Q2/www/firefox: . files X-SVN-Commit-Revision: 533932 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: Mon, 04 May 2020 16:59:35 -0000 Author: jbeich Date: Mon May 4 16:59:33 2020 New Revision: 533932 URL: https://svnweb.freebsd.org/changeset/ports/533932 Log: MFH: r533209 r533408 www/firefox: update to 76.0 - Add a workaround for Clang [1] Changes: https://www.mozilla.org/firefox/76.0/releasenotes/ PR: 245422 Submitted by: tobik [1] Security: aec18162-eaf3-4e73-a38e-3fd98bc47869 Approved by: ports-secteam blanket Differential Revision: https://reviews.freebsd.org/D24326 Added: branches/2020Q2/www/firefox/files/patch-bug1628567 - copied unchanged from r533209, head/www/firefox/files/patch-bug1628567 Deleted: branches/2020Q2/www/firefox/files/patch-bug1612377 branches/2020Q2/www/firefox/files/patch-bug1619258 branches/2020Q2/www/firefox/files/patch-bug1622551 Modified: branches/2020Q2/www/firefox/Makefile branches/2020Q2/www/firefox/distinfo branches/2020Q2/www/firefox/files/patch-bug1288587 branches/2020Q2/www/firefox/files/patch-bug1550891 branches/2020Q2/www/firefox/files/patch-bug847568 Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/www/firefox/Makefile ============================================================================== --- branches/2020Q2/www/firefox/Makefile Mon May 4 16:56:44 2020 (r533931) +++ branches/2020Q2/www/firefox/Makefile Mon May 4 16:59:33 2020 (r533932) @@ -2,23 +2,23 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 75.0 -PORTREVISION= 2 +DISTVERSION= 76.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.25:devel/nspr \ - nss>=3.51:security/nss \ + nss>=3.51.1:security/nss \ icu>=64.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=2.6.4:print/harfbuzz \ - graphite2>=1.3.13:graphics/graphite2 \ + graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.35:graphics/png \ libvpx>=1.8.2:multimedia/libvpx \ py${PYTHON3_DEFAULT:S/.//}-sqlite3>0:databases/py-sqlite3@py${PYTHON3_DEFAULT:S/.//} \ Modified: branches/2020Q2/www/firefox/distinfo ============================================================================== --- branches/2020Q2/www/firefox/distinfo Mon May 4 16:56:44 2020 (r533931) +++ branches/2020Q2/www/firefox/distinfo Mon May 4 16:59:33 2020 (r533932) @@ -1,3 +1,3 @@ -TIMESTAMP = 1585942574 -SHA256 (firefox-75.0.source.tar.xz) = bbb1054d8f2717c634480556d3753a8483986af7360e023bb6232df80b746b0f -SIZE (firefox-75.0.source.tar.xz) = 324614064 +TIMESTAMP = 1588197340 +SHA256 (firefox-76.0.source.tar.xz) = 3b7b97b0b0625fc6ec23ee28d425988c679d3a56f362d62fd3b225a5d50afdc8 +SIZE (firefox-76.0.source.tar.xz) = 323886744 Modified: branches/2020Q2/www/firefox/files/patch-bug1288587 ============================================================================== --- branches/2020Q2/www/firefox/files/patch-bug1288587 Mon May 4 16:56:44 2020 (r533931) +++ branches/2020Q2/www/firefox/files/patch-bug1288587 Mon May 4 16:59:33 2020 (r533932) @@ -23,7 +23,7 @@ index 855214a..1e91d51 100644 log.debug("python2: executable from configuration: %r" % python) -@@ -358,7 +365,10 @@ def virtualenv_python2(env_python, build_env, mozillab +@@ -365,7 +372,10 @@ def virtualenv_python2(env_python, build_env, mozillab sys.executable, manager.python_path)) log.info('Reexecuting in the virtualenv') if env_python: @@ -35,7 +35,7 @@ index 855214a..1e91d51 100644 # One would prefer to use os.execl, but that's completely borked on # Windows. sys.exit(subprocess.call([python] + sys.argv)) -@@ -460,6 +470,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre +@@ -468,6 +478,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre @imports(_from='mozbuild.pythonutil', _import='find_python3_executable') @imports(_from='mozbuild.pythonutil', _import='python_executable_version') @imports(_from='six', _import='ensure_text') @@ -43,7 +43,7 @@ index 855214a..1e91d51 100644 def virtualenv_python3(env_python, build_env, mozillabuild, mozconfig, help): if help: return -@@ -495,6 +506,12 @@ def virtualenv_python3(env_python, build_env, mozillab +@@ -503,6 +514,12 @@ def virtualenv_python3(env_python, build_env, mozillab python = mozconfig['vars']['added']['PYTHON3'] elif 'PYTHON3' in mozconfig['vars']['modified']: python = mozconfig['vars']['modified']['PYTHON3'][1] @@ -56,7 +56,7 @@ index 855214a..1e91d51 100644 log.debug("python3: executable from configuration: %r" % python) -@@ -575,7 +592,10 @@ def virtualenv_python3(env_python, build_env, mozillab +@@ -583,7 +600,10 @@ def virtualenv_python3(env_python, build_env, mozillab sys.executable, manager.python_path)) log.info('Re-executing in the virtualenv') if env_python: @@ -65,6 +65,6 @@ index 855214a..1e91d51 100644 + del os.environ['PYTHON3'] + except KeyError: + pass - # One would prefer to use os.execl, but that's completely borked on - # Windows. - sys.exit(subprocess.call([python] + sys.argv)) + # Homebrew on macOS will change Python's sys.executable to a custom + # value which messes with mach's virtualenv handling code. Override + # Homebrew's changes with the correct sys.executable value. Modified: branches/2020Q2/www/firefox/files/patch-bug1550891 ============================================================================== --- branches/2020Q2/www/firefox/files/patch-bug1550891 Mon May 4 16:56:44 2020 (r533931) +++ branches/2020Q2/www/firefox/files/patch-bug1550891 Mon May 4 16:59:33 2020 (r533932) @@ -72,10 +72,10 @@ index 0be9cce0b4bed..89e67483e4c16 100644 #else // Generic Unix: shm_open + shm_unlink do { -@@ -275,6 +282,13 @@ bool SharedMemory::Freeze() { - CHROMIUM_LOG(WARNING) << "failed to freeze shm: " << strerror(errno); +@@ -277,6 +284,14 @@ bool SharedMemory::ReadOnlyCopy(SharedMemory* ro_out) { return false; } + ro_file = mapped_file_; +#elif defined(__FreeBSD__) + cap_rights_t rights; + cap_rights_init(&rights, CAP_MMAP_R); @@ -83,6 +83,7 @@ index 0be9cce0b4bed..89e67483e4c16 100644 + CHROMIUM_LOG(WARNING) << "failed to freeze shm: " << strerror(errno); + return false; + } ++ ro_file = mapped_file_; #else DCHECK(frozen_file_ >= 0); DCHECK(mapped_file_ >= 0); Copied: branches/2020Q2/www/firefox/files/patch-bug1628567 (from r533209, head/www/firefox/files/patch-bug1628567) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/www/firefox/files/patch-bug1628567 Mon May 4 16:59:33 2020 (r533932, copy of r533209, head/www/firefox/files/patch-bug1628567) @@ -0,0 +1,34 @@ +Don't pass --target when CC/CXX contains clang + +--- third_party/rust/cc/src/lib.rs.orig 2020-04-10 00:57:23 UTC ++++ third_party/rust/cc/src/lib.rs +@@ -2344,28 +2344,7 @@ impl Tool { + } + + fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self { +- // Try to detect family of the tool from its name, falling back to Gnu. +- let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) { +- if fname.contains("clang-cl") { +- ToolFamily::Msvc { clang_cl: true } +- } else if fname.contains("cl") +- && !fname.contains("cloudabi") +- && !fname.contains("uclibc") +- && !fname.contains("clang") +- { +- ToolFamily::Msvc { clang_cl: false } +- } else if fname.contains("clang") { +- match clang_driver { +- Some("cl") => ToolFamily::Msvc { clang_cl: true }, +- _ => ToolFamily::Clang, +- } +- } else { +- ToolFamily::Gnu +- } +- } else { +- ToolFamily::Gnu +- }; +- ++ let family = ToolFamily::Gnu; + Tool { + path: path, + cc_wrapper_path: None, Modified: branches/2020Q2/www/firefox/files/patch-bug847568 ============================================================================== --- branches/2020Q2/www/firefox/files/patch-bug847568 Mon May 4 16:56:44 2020 (r533931) +++ branches/2020Q2/www/firefox/files/patch-bug847568 Mon May 4 16:59:33 2020 (r533932) @@ -227,7 +227,7 @@ index 95a58b634593..b614eef85c89 100644 + * 100 + GR2_VERSION_BUGFIX >= \ + (major) * 10000 + (minor) * 100 + (bugfix) ) + ], [ -+ #if !GR2_VERSION_REQUIRE(1,3,13) ++ #if !GR2_VERSION_REQUIRE(1,3,14) + #error "Insufficient graphite2 version." + #endif + ], [], From owner-svn-ports-branches@freebsd.org Mon May 4 18:27:53 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 37F8B2D6E5E; Mon, 4 May 2020 18:27:53 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49GBDT0mTFz4Yrf; Mon, 4 May 2020 18:27:53 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1581B814; Mon, 4 May 2020 18:27:53 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 044IRqfk078497; Mon, 4 May 2020 18:27:52 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 044IRqLY078492; Mon, 4 May 2020 18:27:52 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005041827.044IRqLY078492@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 4 May 2020 18:27:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r533941 - in branches/2020Q2/security: ca_root_nss nss nss/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2020Q2/security: ca_root_nss nss nss/files X-SVN-Commit-Revision: 533941 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: Mon, 04 May 2020 18:27:53 -0000 Author: jbeich Date: Mon May 4 18:27:51 2020 New Revision: 533941 URL: https://svnweb.freebsd.org/changeset/ports/533941 Log: MFH: r533597 security/nss: update to 3.52 Changes: https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.52_release_notes Changes: https://hg.mozilla.org/projects/nss/shortlog/NSS_3_52_RTM ABI: https://abi-laboratory.pro/tracker/timeline/nss/ Approved by: ports-secteam blanket (required by Firefox 77) Modified: branches/2020Q2/security/ca_root_nss/Makefile branches/2020Q2/security/ca_root_nss/distinfo branches/2020Q2/security/nss/Makefile branches/2020Q2/security/nss/distinfo branches/2020Q2/security/nss/files/patch-lib_softoken_pkcs11c.c Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/security/ca_root_nss/Makefile ============================================================================== --- branches/2020Q2/security/ca_root_nss/Makefile Mon May 4 18:27:51 2020 (r533940) +++ branches/2020Q2/security/ca_root_nss/Makefile Mon May 4 18:27:51 2020 (r533941) @@ -32,7 +32,7 @@ PLIST_SUB+= CERTDIR=${CERTDIR} # !!! Please DO NOT submit patches for new version until it has !!! # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -VERSION_NSS= 3.51.1 +VERSION_NSS= 3.52 #NSS_SUFFIX= -with-ckbi-1.98 CERTDATA_TXT_PATH= nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl Modified: branches/2020Q2/security/ca_root_nss/distinfo ============================================================================== --- branches/2020Q2/security/ca_root_nss/distinfo Mon May 4 18:27:51 2020 (r533940) +++ branches/2020Q2/security/ca_root_nss/distinfo Mon May 4 18:27:51 2020 (r533941) @@ -1,3 +1,3 @@ -TIMESTAMP = 1585948897 -SHA256 (nss-3.51.1.tar.gz) = 085c5eaceef040eddea639e2e068e70f0e368f840327a678ef74ae3d6c15ca78 -SIZE (nss-3.51.1.tar.gz) = 78310874 +TIMESTAMP = 1588367335 +SHA256 (nss-3.52.tar.gz) = 0a0aeb0cdda65ddcb64f746223df58b150f6803f4bfa1a4e876bbe6f9c4c1561 +SIZE (nss-3.52.tar.gz) = 81220587 Modified: branches/2020Q2/security/nss/Makefile ============================================================================== --- branches/2020Q2/security/nss/Makefile Mon May 4 18:27:51 2020 (r533940) +++ branches/2020Q2/security/nss/Makefile Mon May 4 18:27:51 2020 (r533941) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.51.1 +PORTVERSION= 3.52 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src Modified: branches/2020Q2/security/nss/distinfo ============================================================================== --- branches/2020Q2/security/nss/distinfo Mon May 4 18:27:51 2020 (r533940) +++ branches/2020Q2/security/nss/distinfo Mon May 4 18:27:51 2020 (r533941) @@ -1,3 +1,3 @@ -TIMESTAMP = 1585948897 -SHA256 (nss-3.51.1.tar.gz) = 085c5eaceef040eddea639e2e068e70f0e368f840327a678ef74ae3d6c15ca78 -SIZE (nss-3.51.1.tar.gz) = 78310874 +TIMESTAMP = 1588367335 +SHA256 (nss-3.52.tar.gz) = 0a0aeb0cdda65ddcb64f746223df58b150f6803f4bfa1a4e876bbe6f9c4c1561 +SIZE (nss-3.52.tar.gz) = 81220587 Modified: branches/2020Q2/security/nss/files/patch-lib_softoken_pkcs11c.c ============================================================================== --- branches/2020Q2/security/nss/files/patch-lib_softoken_pkcs11c.c Mon May 4 18:27:51 2020 (r533940) +++ branches/2020Q2/security/nss/files/patch-lib_softoken_pkcs11c.c Mon May 4 18:27:51 2020 (r533941) @@ -1,20 +1,20 @@ ---- lib/softoken/pkcs11c.c.orig 2018-08-31 12:55:53 UTC +--- lib/softoken/pkcs11c.c.orig 2020-05-01 21:08:55 UTC +++ lib/softoken/pkcs11c.c -@@ -5772,9 +5772,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki) +@@ -6106,9 +6106,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki) break; case NSSLOWKEYDSAKey: keyType = CKK_DSA; -- crv = (sftk_hasAttribute(key, CKA_NETSCAPE_DB)) ? CKR_OK : CKR_KEY_TYPE_INCONSISTENT; +- crv = (sftk_hasAttribute(key, CKA_NSS_DB)) ? CKR_OK : CKR_KEY_TYPE_INCONSISTENT; - if (crv != CKR_OK) - break; crv = sftk_AddAttributeType(key, CKA_KEY_TYPE, &keyType, sizeof(keyType)); if (crv != CKR_OK) -@@ -5814,9 +5811,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki) +@@ -6148,9 +6145,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki) /* what about fortezza??? */ case NSSLOWKEYECKey: keyType = CKK_EC; -- crv = (sftk_hasAttribute(key, CKA_NETSCAPE_DB)) ? CKR_OK : CKR_KEY_TYPE_INCONSISTENT; +- crv = (sftk_hasAttribute(key, CKA_NSS_DB)) ? CKR_OK : CKR_KEY_TYPE_INCONSISTENT; - if (crv != CKR_OK) - break; crv = sftk_AddAttributeType(key, CKA_KEY_TYPE, &keyType, From owner-svn-ports-branches@freebsd.org Mon May 4 19:21:56 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 94F9B2C0400; Mon, 4 May 2020 19:21:56 +0000 (UTC) (envelope-from salvadore@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49GCQr2lJdz4fpM; Mon, 4 May 2020 19:21:56 +0000 (UTC) (envelope-from salvadore@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 598231353; Mon, 4 May 2020 19:21:56 +0000 (UTC) (envelope-from salvadore@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 044JLurJ017816; Mon, 4 May 2020 19:21:56 GMT (envelope-from salvadore@FreeBSD.org) Received: (from salvadore@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 044JLtpR017812; Mon, 4 May 2020 19:21:55 GMT (envelope-from salvadore@FreeBSD.org) Message-Id: <202005041921.044JLtpR017812@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: salvadore set sender to salvadore@FreeBSD.org using -f From: Lorenzo Salvadore Date: Mon, 4 May 2020 19:21:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r533970 - in branches/2020Q2/sysutils: burp burp-devel burp/files X-SVN-Group: ports-branches X-SVN-Commit-Author: salvadore X-SVN-Commit-Paths: in branches/2020Q2/sysutils: burp burp-devel burp/files X-SVN-Commit-Revision: 533970 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: Mon, 04 May 2020 19:21:56 -0000 Author: salvadore Date: Mon May 4 19:21:55 2020 New Revision: 533970 URL: https://svnweb.freebsd.org/changeset/ports/533970 Log: MFH: r530237 sysutils/burp-devel: Update to 2.3.24 - Protocol 2: warn and skip on verify/restore of unsupported file types. - Resurrect, improve and use sysutils/burp/files/burp.in instead of the rc script from distfile, both for sysutils/burp (master port) and for sysutils/burp-devel (slave port): this is necessary because, while sysutils/burp's distfile still distributes the script, sysutils/burp-devel's distfile does not anymore starting with version 2.3.24. I also made a few modifications to the file so that it behaves well with non standard PREFIX values. - Fix bug #246062. Reviewed by: 0mp, gerald, dbaio, adamw Approved by: tcberner (co-mentor) Differential Revision: https://reviews.freebsd.org/D24104 PR: 246062 Reported by: tictactux@gmail.com Approved by: ports-secteam (joneum), gerald (mentor) Added: branches/2020Q2/sysutils/burp/files/ - copied from r530237, head/sysutils/burp/files/ Modified: branches/2020Q2/sysutils/burp-devel/Makefile branches/2020Q2/sysutils/burp-devel/distinfo branches/2020Q2/sysutils/burp/Makefile branches/2020Q2/sysutils/burp/pkg-plist Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/sysutils/burp-devel/Makefile ============================================================================== --- branches/2020Q2/sysutils/burp-devel/Makefile Mon May 4 19:20:48 2020 (r533969) +++ branches/2020Q2/sysutils/burp-devel/Makefile Mon May 4 19:21:55 2020 (r533970) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTVERSION= 2.3.22 +PORTVERSION= 2.3.24 PORTREVISION= 0 #this is a slave port that needs PORTREVISION to be tracked separately PKGNAMESUFFIX= -devel Modified: branches/2020Q2/sysutils/burp-devel/distinfo ============================================================================== --- branches/2020Q2/sysutils/burp-devel/distinfo Mon May 4 19:20:48 2020 (r533969) +++ branches/2020Q2/sysutils/burp-devel/distinfo Mon May 4 19:21:55 2020 (r533970) @@ -1,3 +1,3 @@ -TIMESTAMP = 1580671041 -SHA256 (grke-burp-2.3.22_GH0.tar.gz) = e8f1c3c2432916bfec631e452c09ef48b13ec77fe715300638e474b6e49d455b -SIZE (grke-burp-2.3.22_GH0.tar.gz) = 628380 +TIMESTAMP = 1583262411 +SHA256 (grke-burp-2.3.24_GH0.tar.gz) = 0d95e8e46bad01164c31cbb0ac173a2d668ef4e56530b19c8e0801ab13f0924b +SIZE (grke-burp-2.3.24_GH0.tar.gz) = 615113 Modified: branches/2020Q2/sysutils/burp/Makefile ============================================================================== --- branches/2020Q2/sysutils/burp/Makefile Mon May 4 19:20:48 2020 (r533969) +++ branches/2020Q2/sysutils/burp/Makefile Mon May 4 19:21:55 2020 (r533970) @@ -3,8 +3,9 @@ PORTNAME= burp PORTVERSION?= 2.2.18 -PORTREVISION?= 2 #whenever PORTREVISION is increased, it must be increased for - #the slave port sysutils/burp-devel too +# whenever PORTREVISION is increased, +# sysutils/burp-devel's PKGVERSION must also increase +PORTREVISION?= 3 CATEGORIES= sysutils MAINTAINER= salvadore@FreeBSD.org @@ -20,8 +21,8 @@ LIB_DEPENDS= librsync.so:net/librsync2 RUN_DEPENDS= bash:shells/bash USES= autoreconf gmake libtool ncurses pkgconfig ssl +USE_RC_SUBR= burp USE_GITHUB= yes - GH_ACCOUNT= grke GNU_CONFIGURE= yes @@ -37,10 +38,15 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= IPV6 IPV6_CONFIGURE_ENABLE= ipv6 -post-patch: - ${REINPLACE_CMD} "s,/usr/local,${LOCALBASE},g" ${WRKSRC}/freebsd/rc.d/burp +CONFIG_FILES= CA.cnf \ + burp-server.conf \ + burp.conf \ + clientconfdir/testclient post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/freebsd/rc.d/burp ${STAGEDIR}${PREFIX}/etc/rc.d/burp +.for FILE in ${CONFIG_FILES} + ${MV} ${STAGEDIR}${ETCDIR}/${FILE} \ + ${STAGEDIR}${ETCDIR}/${FILE}.sample +.endfor .include Modified: branches/2020Q2/sysutils/burp/pkg-plist ============================================================================== --- branches/2020Q2/sysutils/burp/pkg-plist Mon May 4 19:20:48 2020 (r533969) +++ branches/2020Q2/sysutils/burp/pkg-plist Mon May 4 19:21:55 2020 (r533970) @@ -1,10 +1,9 @@ bin/vss_strip -%%ETCDIR%%/CA.cnf -%%ETCDIR%%/burp-server.conf -%%ETCDIR%%/burp.conf +@sample %%ETCDIR%%/CA.cnf.sample +@sample %%ETCDIR%%/burp-server.conf.sample +@sample %%ETCDIR%%/burp.conf.sample %%ETCDIR%%/clientconfdir/incexc/example -%%ETCDIR%%/clientconfdir/testclient -etc/rc.d/burp +@sample %%ETCDIR%%/clientconfdir/testclient.sample man/man8/bedup.8.gz man/man8/bsigs.8.gz man/man8/bsparse.8.gz From owner-svn-ports-branches@freebsd.org Mon May 4 20:39:13 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 76A572C2899; Mon, 4 May 2020 20:39:13 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49GF812Xrpz3HX5; Mon, 4 May 2020 20:39:13 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3893E2133; Mon, 4 May 2020 20:39:13 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 044KdDmW064431; Mon, 4 May 2020 20:39:13 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 044KdCjL064426; Mon, 4 May 2020 20:39:12 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <202005042039.044KdCjL064426@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Mon, 4 May 2020 20:39:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r533984 - in branches/2020Q2/www/gitea: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: adamw X-SVN-Commit-Paths: in branches/2020Q2/www/gitea: . files X-SVN-Commit-Revision: 533984 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: Mon, 04 May 2020 20:39:13 -0000 Author: adamw Date: Mon May 4 20:39:12 2020 New Revision: 533984 URL: https://svnweb.freebsd.org/changeset/ports/533984 Log: MFH: r531612 r531613 r533935 gitea: Update to 1.1.4 Update Gitea to 1.11.4 This release fixes ten bugs. Release notes: https://blog.gitea.io/2020/04/gitea-1.11.4-is-released/ PR: 245602 Submitted by: maintainer gitea: Add GIT_LFS option Add a GIT_LFS option (on by default) for environments that don't want to make LFS available. While here, change the pkg-message UCL to only show when upgrading from < 1.8.0. Approved by: maintainer gitea: Fix wiki page display From the PR: Right now, the version of gitea shipped in ports fails to display wiki pages. Any wiki page opened results in the following error: template: repo/wiki/view:48:14: executing "repo/wiki/view" at <(not $.DisableHTTP) (and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH))>: can't give argument to non-function not $.DisableHTTP This is due to extra parentheses in templates/repo/wiki/view.tmpl and has already been fixed upstream in [1], [2]. I've pulled the single line template fix from upstream and added the patch to our port. As a workaround, users can also fix the problem by placing the corrected template in /usr/local/etc/gitea/templates/repo/wiki/view.tmpl. Cheers, Sascha [1] https://github.com/go-gitea/gitea/issues/10552 [2] https://github.com/zeripath/gitea/commit/1830d0ed5f4a67e3360ecbb55933b5540b6affce PR: 246020 Submitted by: Sascha Biberhofer Approved by: maintainer Approved by: portmgr (with hat) Added: branches/2020Q2/www/gitea/files/patch-templates_repo_wiki_view.tmpl - copied unchanged from r533935, head/www/gitea/files/patch-templates_repo_wiki_view.tmpl Modified: branches/2020Q2/www/gitea/Makefile branches/2020Q2/www/gitea/distinfo branches/2020Q2/www/gitea/pkg-message Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/www/gitea/Makefile ============================================================================== --- branches/2020Q2/www/gitea/Makefile Mon May 4 20:35:06 2020 (r533983) +++ branches/2020Q2/www/gitea/Makefile Mon May 4 20:39:12 2020 (r533984) @@ -2,7 +2,8 @@ PORTNAME= gitea DISTVERSIONPREFIX= v -DISTVERSION= 1.11.3 +DISTVERSION= 1.11.4 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://github.com/go-gitea/gitea/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ DISTNAME= gitea-src-${DISTVERSION} @@ -14,8 +15,7 @@ COMMENT= Compact self-hosted Git service LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= git:devel/git \ - git-lfs:devel/git-lfs +RUN_DEPENDS= git:devel/git USES= gmake go:no_targets USE_RC_SUBR= gitea @@ -26,14 +26,16 @@ SUB_LIST+= GITUSER=${USERS} USERS= git GROUPS= git -OPTIONS_DEFINE= BINDATA PAM SQLITE -OPTIONS_DEFAULT= PAM SQLITE +OPTIONS_DEFINE= BINDATA GIT_LFS PAM SQLITE +OPTIONS_DEFAULT= GIT_LFS PAM SQLITE OPTIONS_SUB= yes BINDATA_DESC= Build a single monolithic binary, with all assets included +GIT_LFS_DESC= Support for Git Large File Storage (LFS) PAM_DESC= Enable support for PAM BINDATA_VARS= GO_TAGS+=bindata +GIT_LFS_RUN_DEPENDS= git-lfs:devel/git-lfs PAM_VARS= GO_TAGS+=pam SQLITE_VARS= GO_TAGS+="sqlite sqlite_unlock_notify" Modified: branches/2020Q2/www/gitea/distinfo ============================================================================== --- branches/2020Q2/www/gitea/distinfo Mon May 4 20:35:06 2020 (r533983) +++ branches/2020Q2/www/gitea/distinfo Mon May 4 20:39:12 2020 (r533984) @@ -1,3 +1,3 @@ -TIMESTAMP = 1584565552 -SHA256 (gitea-src-1.11.3.tar.gz) = 5d0b31295788cc81d9f0033d00e509b6798ffeef0b603c4e1360e1762f3b11ec -SIZE (gitea-src-1.11.3.tar.gz) = 69382786 +TIMESTAMP = 1586790205 +SHA256 (gitea-src-1.11.4.tar.gz) = ee643516bf201296a4ef8cc0d782cddbbd894be2012be1d5fb5746801b9b66a2 +SIZE (gitea-src-1.11.4.tar.gz) = 68915569 Copied: branches/2020Q2/www/gitea/files/patch-templates_repo_wiki_view.tmpl (from r533935, head/www/gitea/files/patch-templates_repo_wiki_view.tmpl) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/www/gitea/files/patch-templates_repo_wiki_view.tmpl Mon May 4 20:39:12 2020 (r533984, copy of r533935, head/www/gitea/files/patch-templates_repo_wiki_view.tmpl) @@ -0,0 +1,11 @@ +--- templates/repo/wiki/view.tmpl.orig 2020-04-29 07:06:03 UTC ++++ templates/repo/wiki/view.tmpl +@@ -45,7 +45,7 @@ + {{else if and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH)}} + + {{end}} +- {{if or ((not $.DisableHTTP) (and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH)))}} ++ {{if or (not $.DisableHTTP) (and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH))}} + Modified: branches/2020Q2/www/gitea/pkg-message ============================================================================== --- branches/2020Q2/www/gitea/pkg-message Mon May 4 20:35:06 2020 (r533983) +++ branches/2020Q2/www/gitea/pkg-message Mon May 4 20:39:12 2020 (r533984) @@ -1,5 +1,6 @@ [ { type: install + maximum_version: 1.7.6 message: < Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B4A172C8CCC; Tue, 5 May 2020 00:59:39 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49GLwW4LDVz43fr; Tue, 5 May 2020 00:59:39 +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 8FFF655BF; Tue, 5 May 2020 00:59:39 +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 0450xdWR026948; Tue, 5 May 2020 00:59:39 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0450xdaA026947; Tue, 5 May 2020 00:59:39 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005050059.0450xdaA026947@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 5 May 2020 00:59:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534001 - branches/2020Q2/emulators/citra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/emulators/citra X-SVN-Commit-Revision: 534001 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, 05 May 2020 00:59:39 -0000 Author: jbeich Date: Tue May 5 00:59:38 2020 New Revision: 534001 URL: https://svnweb.freebsd.org/changeset/ports/534001 Log: MFH: r534000 emulators/citra: update to s20200504 Changes: https://github.com/citra-emu/citra/compare/41bff0e3b...36809b2e2 Approved by: ports-secteam (swills, implicit for snapshots) Modified: branches/2020Q2/emulators/citra/Makefile branches/2020Q2/emulators/citra/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/emulators/citra/Makefile ============================================================================== --- branches/2020Q2/emulators/citra/Makefile Tue May 5 00:58:28 2020 (r534000) +++ branches/2020Q2/emulators/citra/Makefile Tue May 5 00:59:38 2020 (r534001) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20200502 +PORTVERSION= s20200504 PORTREVISION?= 0 CATEGORIES= emulators @@ -21,7 +21,7 @@ LICENSE_FILE_OpenSSL= ${WRKSRC}/externals/libressl/COP USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 41bff0e3b +GH_TAGNAME= 36809b2e2 GH_TUPLE= citra-emu:ext-boost:36603a1:boost/externals/boost \ citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ Modified: branches/2020Q2/emulators/citra/distinfo ============================================================================== --- branches/2020Q2/emulators/citra/distinfo Tue May 5 00:58:28 2020 (r534000) +++ branches/2020Q2/emulators/citra/distinfo Tue May 5 00:59:38 2020 (r534001) @@ -1,6 +1,6 @@ -TIMESTAMP = 1588405351 -SHA256 (citra-emu-citra-s20200502-41bff0e3b_GH0.tar.gz) = f305dc09aa75a13fecaa64b1ddbd6850e2c2807e36d6f4679ad2903bc24443de -SIZE (citra-emu-citra-s20200502-41bff0e3b_GH0.tar.gz) = 5254814 +TIMESTAMP = 1588588382 +SHA256 (citra-emu-citra-s20200504-36809b2e2_GH0.tar.gz) = d6dd66782af9aa1436ed96310c46cf6c385b711d396941640267191906a2cf5c +SIZE (citra-emu-citra-s20200504-36809b2e2_GH0.tar.gz) = 5244190 SHA256 (citra-emu-ext-boost-36603a1_GH0.tar.gz) = a1885cf0f7b1c790f8a83e963fec591bad1232e6b824e64d8db136920ec1b67d SIZE (citra-emu-ext-boost-36603a1_GH0.tar.gz) = 2351603 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3 From owner-svn-ports-branches@freebsd.org Tue May 5 11:03:14 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 007922E1DC3; Tue, 5 May 2020 11:03:14 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49GcJx6B87z3Hk0; Tue, 5 May 2020 11:03:13 +0000 (UTC) (envelope-from dbaio@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 CF854CE4A; Tue, 5 May 2020 11:03:13 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 045B3DYE008934; Tue, 5 May 2020 11:03:13 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 045B3DMl008931; Tue, 5 May 2020 11:03:13 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <202005051103.045B3DMl008931@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Tue, 5 May 2020 11:03:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534065 - branches/2020Q2/net-mgmt/cacti X-SVN-Group: ports-branches X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: branches/2020Q2/net-mgmt/cacti X-SVN-Commit-Revision: 534065 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.30 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 May 2020 11:03:14 -0000 Author: dbaio Date: Tue May 5 11:03:12 2020 New Revision: 534065 URL: https://svnweb.freebsd.org/changeset/ports/534065 Log: MFH: r531284 r534006 net-mgmt/cacti: Update to 1.2.11 Also change maintainer to submitter. Thanks for maintaining this port for the last 5 years Dan, and for stepping up to the plate Michael! Changes this release: https://github.com/Cacti/cacti/blob/release/1.2.11/CHANGELOG PR: 245468 Submitted by: Michael Muenz Approved by: Daniel Austin (maintainer) net-mgmt/cacti: Update to 1.2.12 Changelog: https://github.com/Cacti/cacti/blob/release/1.2.12/CHANGELOG PR: 246161 Submitted by: Michael Muenz (maintainer) X-MFH-with: 531284 Security: cd864f1a-8e5a-11ea-b5b4-641c67a117d8 Approved by: ports-secteam (joneum) Modified: branches/2020Q2/net-mgmt/cacti/Makefile branches/2020Q2/net-mgmt/cacti/distinfo branches/2020Q2/net-mgmt/cacti/pkg-plist Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/net-mgmt/cacti/Makefile ============================================================================== --- branches/2020Q2/net-mgmt/cacti/Makefile Tue May 5 11:01:38 2020 (r534064) +++ branches/2020Q2/net-mgmt/cacti/Makefile Tue May 5 11:03:12 2020 (r534065) @@ -1,12 +1,12 @@ # $FreeBSD$ PORTNAME= cacti -PORTVERSION= 1.2.10 +PORTVERSION= 1.2.12 CATEGORIES= net-mgmt www MASTER_SITES= http://www.cacti.net/downloads/ \ ftp://ftpmirror.uk/freebsd-ports/cacti/ -MAINTAINER= freebsd-ports@dan.me.uk +MAINTAINER= m.muenz@gmail.com COMMENT= Web-driven graphing interface for RRDTool LICENSE= GPLv2+ @@ -55,6 +55,6 @@ do-install: ${MKDIR} ${STAGEDIR}/var/log/cacti ${MKDIR} ${STAGEDIR}/var/db/cacti/rra ${MKDIR} ${STAGEDIR}/var/db/cacti/scripts - cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${CACTIDIR} "! -name '.git\*'" + cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${CACTIDIR} "! -name \.mdl*" .include Modified: branches/2020Q2/net-mgmt/cacti/distinfo ============================================================================== --- branches/2020Q2/net-mgmt/cacti/distinfo Tue May 5 11:01:38 2020 (r534064) +++ branches/2020Q2/net-mgmt/cacti/distinfo Tue May 5 11:03:12 2020 (r534065) @@ -1,3 +1,3 @@ -TIMESTAMP = 1585634591 -SHA256 (cacti-1.2.10.tar.gz) = ca3535c0c52cb5dcb6327eed79373c10eb620a9ebfb9b100b0a60ce228558fa6 -SIZE (cacti-1.2.10.tar.gz) = 24907181 +TIMESTAMP = 1588639885 +SHA256 (cacti-1.2.12.tar.gz) = 0324a2a3fe9f67c66db465d8a8e3fd137440d21ea4f00ffbf3150a7e2894af25 +SIZE (cacti-1.2.12.tar.gz) = 25126474 Modified: branches/2020Q2/net-mgmt/cacti/pkg-plist ============================================================================== --- branches/2020Q2/net-mgmt/cacti/pkg-plist Tue May 5 11:01:38 2020 (r534064) +++ branches/2020Q2/net-mgmt/cacti/pkg-plist Tue May 5 11:03:12 2020 (r534065) @@ -1937,6 +1937,7 @@ %%CACTIDIR%%/include/vendor/phpmailer/get_oauth_token.php %%CACTIDIR%%/include/vendor/phpmailer/index.php %%CACTIDIR%%/include/vendor/phpmailer/language/index.php +%%CACTIDIR%%/include/vendor/phpmailer/language/phpmailer.lang-af.php %%CACTIDIR%%/include/vendor/phpmailer/language/phpmailer.lang-am.php %%CACTIDIR%%/include/vendor/phpmailer/language/phpmailer.lang-ar.php %%CACTIDIR%%/include/vendor/phpmailer/language/phpmailer.lang-az.php @@ -2096,6 +2097,7 @@ %%CACTIDIR%%/install/upgrades/1_2_5.php %%CACTIDIR%%/install/upgrades/1_2_7.php %%CACTIDIR%%/install/upgrades/1_2_8.php +%%CACTIDIR%%/install/upgrades/1_2_11.php %%CACTIDIR%%/install/upgrades/index.php %%CACTIDIR%%/lib/aggregate.php %%CACTIDIR%%/lib/api_aggregate.php From owner-svn-ports-branches@freebsd.org Tue May 5 16:50:58 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7A2F813C7BB; Tue, 5 May 2020 16:50:58 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49Gm2B2k8Rz4DnC; Tue, 5 May 2020 16:50:58 +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 58A70190D7; Tue, 5 May 2020 16:50:58 +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 045GowHJ037701; Tue, 5 May 2020 16:50:58 GMT (envelope-from cmt@FreeBSD.org) Received: (from cmt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 045GowQx037700; Tue, 5 May 2020 16:50:58 GMT (envelope-from cmt@FreeBSD.org) Message-Id: <202005051650.045GowQx037700@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cmt set sender to cmt@FreeBSD.org using -f From: Christoph Moench-Tegeder Date: Tue, 5 May 2020 16:50:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534099 - branches/2020Q2/mail/thunderbird X-SVN-Group: ports-branches X-SVN-Commit-Author: cmt X-SVN-Commit-Paths: branches/2020Q2/mail/thunderbird X-SVN-Commit-Revision: 534099 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.30 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 May 2020 16:50:58 -0000 Author: cmt Date: Tue May 5 16:50:57 2020 New Revision: 534099 URL: https://svnweb.freebsd.org/changeset/ports/534099 Log: MFH: r533707 r534066 update thunderbird to 68.8.0 (rc1) Announcement (soon): https://www.thunderbird.net/en-US/thunderbird/68.8.0/releasenotes/ update thunderbird to 68.8.0 (rc2) Announcement (soon): https://www.thunderbird.net/en-US/thunderbird/68.8.0/releasenotes/ Approved by: ports-secteam (blanket: web browser alike) Modified: branches/2020Q2/mail/thunderbird/Makefile branches/2020Q2/mail/thunderbird/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/mail/thunderbird/Makefile ============================================================================== --- branches/2020Q2/mail/thunderbird/Makefile Tue May 5 16:48:08 2020 (r534098) +++ branches/2020Q2/mail/thunderbird/Makefile Tue May 5 16:50:57 2020 (r534099) @@ -2,10 +2,11 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 68.7.0 +DISTVERSION= 68.8.0 +PORTREVISION= 1 CATEGORIES= mail news net-im 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/2020Q2/mail/thunderbird/distinfo ============================================================================== --- branches/2020Q2/mail/thunderbird/distinfo Tue May 5 16:48:08 2020 (r534098) +++ branches/2020Q2/mail/thunderbird/distinfo Tue May 5 16:50:57 2020 (r534099) @@ -1,3 +1,3 @@ -TIMESTAMP = 1586295741 -SHA256 (thunderbird-68.7.0.source.tar.xz) = bc2efd2fee1d8f856a177e1579d529890dbf3621e6fb32a443c225ff7bf14b84 -SIZE (thunderbird-68.7.0.source.tar.xz) = 339588604 +TIMESTAMP = 1588673269 +SHA256 (thunderbird-68.8.0.source.tar.xz) = ce87c3f2bb37d4ee827a32df16b25396590e98fbf6e8072ca16ba68c0d10cb0b +SIZE (thunderbird-68.8.0.source.tar.xz) = 335068956 From owner-svn-ports-branches@freebsd.org Tue May 5 20:20:34 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C70472C4ACB; Tue, 5 May 2020 20:20:34 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49Grh24wsfz4VWS; Tue, 5 May 2020 20:20:34 +0000 (UTC) (envelope-from madpilot@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 A46E01BA5A; Tue, 5 May 2020 20:20:34 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 045KKYnc064515; Tue, 5 May 2020 20:20:34 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 045KKYCx064514; Tue, 5 May 2020 20:20:34 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <202005052020.045KKYCx064514@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Tue, 5 May 2020 20:20:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534104 - branches/2020Q2/audio/xmms2 X-SVN-Group: ports-branches X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: branches/2020Q2/audio/xmms2 X-SVN-Commit-Revision: 534104 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.30 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 May 2020 20:20:34 -0000 Author: madpilot Date: Tue May 5 20:20:34 2020 New Revision: 534104 URL: https://svnweb.freebsd.org/changeset/ports/534104 Log: MFH: r534084 Change default MDNS backend to the more commonly used avahi one. This avoids conflicting with KDE and other commonly used ports. Reported by: Chris Watson Approved by: ports-secteam (joneum) Modified: branches/2020Q2/audio/xmms2/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/audio/xmms2/Makefile ============================================================================== --- branches/2020Q2/audio/xmms2/Makefile Tue May 5 19:37:14 2020 (r534103) +++ branches/2020Q2/audio/xmms2/Makefile Tue May 5 20:20:34 2020 (r534104) @@ -4,7 +4,7 @@ PORTNAME?= xmms2 PORTVERSION= 0.8 DISTVERSIONSUFFIX= DrO_o -PORTREVISION?= 33 +PORTREVISION?= 34 CATEGORIES?= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX} @@ -34,7 +34,7 @@ OPTIONS_DEFINE= AIRPLAY AO APE AVCODEC CDDA CURL ET FA SNDFILE SPEEX TREMOR VISUAL VOCODER VORBIS WAVPACK XML OPTIONS_SINGLE= MDNS OPTIONS_SINGLE_MDNS= MDNS_APPLE MDNS_AVAHI -OPTIONS_DEFAULT= CURL FAAD FLAC MPG123 MDNS MDNS_APPLE VORBIS +OPTIONS_DEFAULT= CURL FAAD FLAC MPG123 MDNS MDNS_AVAHI VORBIS AIRPLAY_DESC= Support output via Airport Express AVCODEC_DESC= Avcodevc playback support From owner-svn-ports-branches@freebsd.org Tue May 5 22:57:43 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 225B12D8664; Tue, 5 May 2020 22:57:43 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49Gw9M09r9z4fDH; Tue, 5 May 2020 22:57:43 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D6D591D8AD; Tue, 5 May 2020 22:57:42 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 045MvgTD062882; Tue, 5 May 2020 22:57:42 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 045Mvgqh062880; Tue, 5 May 2020 22:57:42 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202005052257.045Mvgqh062880@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Tue, 5 May 2020 22:57:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534109 - in branches/2020Q2/mail/mailman: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in branches/2020Q2/mail/mailman: . files X-SVN-Commit-Revision: 534109 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.30 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 May 2020 22:57:43 -0000 Author: mandree Date: Tue May 5 22:57:42 2020 New Revision: 534109 URL: https://svnweb.freebsd.org/changeset/ports/534109 Log: 2020Q2 specific mail/mailman minimal security fix Backporting 2.1.31 needs more consideration and more than just MFH r534101, so forgo that and for the nonce, plug this information leak quickly with the one-line fix by upstream, and hack additional translations to match into the .po files with REINPLACE_CMD. Approved by: ports-secteam@ (blanket, trivial security fix) Security: 88760f4d-8ef7-11ea-a66d-4b2ef158be83 Added: branches/2020Q2/mail/mailman/files/patch-0-security-88760f4d-8ef7-11ea-a66d-4b2ef158be83 (contents, props changed) Modified: branches/2020Q2/mail/mailman/Makefile Modified: branches/2020Q2/mail/mailman/Makefile ============================================================================== --- branches/2020Q2/mail/mailman/Makefile Tue May 5 22:55:43 2020 (r534108) +++ branches/2020Q2/mail/mailman/Makefile Tue May 5 22:57:42 2020 (r534109) @@ -3,7 +3,7 @@ PORTNAME= mailman DISTVERSION= 2.1.30 -PORTREVISION= 0 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= GNU \ SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \ @@ -178,6 +178,11 @@ post-patch: ${REINPLACE_CMD} -e 's/messages//' ${WRKSRC}/Makefile.in .endif ${MV} ${WRKSRC}/configure.in ${WRKSRC}/configure.ac # suppress warning + # Fix up translations for patch-0-security-88760f4d-8ef7-11ea-a66d-4b2ef158be83. + # Note it's not just search & replace, the pattern needs to be unedited for + # admin.py and edited for options.py. + ${REINPLACE_CMD} -Ee '/Illegal Email Address: %\(safeuser\)/,+1H;$${p;x;s/ *. %\(safeuser\)s//g;}' \ + ${WRKSRC}/messages/*/LC_MESSAGES/mailman.po # post-patch-HTDIG-on is to fix https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=238508 post-patch-HTDIG-on: Added: branches/2020Q2/mail/mailman/files/patch-0-security-88760f4d-8ef7-11ea-a66d-4b2ef158be83 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/mail/mailman/files/patch-0-security-88760f4d-8ef7-11ea-a66d-4b2ef158be83 Tue May 5 22:57:42 2020 (r534109) @@ -0,0 +1,17 @@ +This is to fix vulnerability 88760f4d-8ef7-11ea-a66d-4b2ef158be83, +and was provided by Mark Sapiro, the upstream maintainer. + +Source: https://bugs.launchpad.net/mailman/+bug/1873722 + +--- Mailman/Cgi/options.py 2019-03-06 17:48:32 +0000 ++++ Mailman/Cgi/options.py 2020-04-20 03:10:16 +0000 +@@ -173,7 +173,7 @@ + try: + Utils.ValidateEmail(user) + except Errors.EmailAddressError: +- doc.addError(_('Illegal Email Address: %(safeuser)s')) ++ doc.addError(_('Illegal Email Address')) + loginpage(mlist, doc, None, language) + print doc.Format() + return + From owner-svn-ports-branches@freebsd.org Wed May 6 09:06:49 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DECF013C6B3; Wed, 6 May 2020 09:06:49 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49H9h95cQxz4MNv; Wed, 6 May 2020 09:06:49 +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 BC07D24EF8; Wed, 6 May 2020 09:06:49 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04696neJ042929; Wed, 6 May 2020 09:06:49 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04696ngj042928; Wed, 6 May 2020 09:06:49 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005060906.04696ngj042928@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 6 May 2020 09:06:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534156 - branches/2020Q2/multimedia/wlrobs X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/multimedia/wlrobs X-SVN-Commit-Revision: 534156 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.30 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 May 2020 09:06:49 -0000 Author: jbeich Date: Wed May 6 09:06:49 2020 New Revision: 534156 URL: https://svnweb.freebsd.org/changeset/ports/534156 Log: MFH: r534155 multimedia/wlrobs: unbreak on powerpc64 PR: 243659 Submitted by: pkubaj Approved by: ports-secteam blanket Modified: branches/2020Q2/multimedia/wlrobs/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/multimedia/wlrobs/Makefile ============================================================================== --- branches/2020Q2/multimedia/wlrobs/Makefile Wed May 6 09:05:57 2020 (r534155) +++ branches/2020Q2/multimedia/wlrobs/Makefile Wed May 6 09:06:49 2020 (r534156) @@ -22,6 +22,9 @@ USE_GL= egl DATADIR= ${PREFIX}/lib/obs-plugins PORTDATA= ${PORTNAME}.so +# XXX Move to "pkg-config --cflags libobs" +CFLAGS_powerpc64= -DNO_WARN_X86_INTRINSICS -maltivec -mvsx + do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_LIB} ${INSTALL_WRKSRC}/lib${PORTNAME}.so \ From owner-svn-ports-branches@freebsd.org Thu May 7 07:56:00 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 145ED13C187; Thu, 7 May 2020 07:56:00 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49Hm3z5vvsz3GSn; Thu, 7 May 2020 07:55:59 +0000 (UTC) (envelope-from rene@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 AB0C5DA2F; Thu, 7 May 2020 07:55:59 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0477txUY099122; Thu, 7 May 2020 07:55:59 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0477txwx099119; Thu, 7 May 2020 07:55:59 GMT (envelope-from rene@FreeBSD.org) Message-Id: <202005070755.0477txwx099119@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Thu, 7 May 2020 07:55:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534248 - branches/2020Q2/www/chromium X-SVN-Group: ports-branches X-SVN-Commit-Author: rene X-SVN-Commit-Paths: branches/2020Q2/www/chromium X-SVN-Commit-Revision: 534248 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.30 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 May 2020 07:56:00 -0000 Author: rene Date: Thu May 7 07:55:59 2020 New Revision: 534248 URL: https://svnweb.freebsd.org/changeset/ports/534248 Log: MFH: r534206 www/chromium: update to 81.0.4044.138 Security: https://chromereleases.googleblog.com/2020/05/stable-channel-update-for-desktop.html Approved by: ports-secteam (joneum) Modified: branches/2020Q2/www/chromium/Makefile branches/2020Q2/www/chromium/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/www/chromium/Makefile ============================================================================== --- branches/2020Q2/www/chromium/Makefile Thu May 7 07:19:05 2020 (r534247) +++ branches/2020Q2/www/chromium/Makefile Thu May 7 07:55:59 2020 (r534248) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 81.0.4044.129 +PORTVERSION= 81.0.4044.138 CATEGORIES?= www java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/cpm/chromium/:fonts Modified: branches/2020Q2/www/chromium/distinfo ============================================================================== --- branches/2020Q2/www/chromium/distinfo Thu May 7 07:19:05 2020 (r534247) +++ branches/2020Q2/www/chromium/distinfo Thu May 7 07:55:59 2020 (r534248) @@ -1,7 +1,7 @@ -TIMESTAMP = 1588064566 -SHA256 (chromium-81.0.4044.129.tar.xz) = ff74592f83ed91c082f746c6b0a3acf384bad91f170bd24548971c17f43046d3 -SIZE (chromium-81.0.4044.129.tar.xz) = 785978416 -SHA256 (chromium-81.0.4044.129-testdata.tar.xz) = 4a21196784707f2fca73bbaac6fea31894ecbbe5d064a0ff38be32e0276be728 -SIZE (chromium-81.0.4044.129-testdata.tar.xz) = 257014692 +TIMESTAMP = 1588777393 +SHA256 (chromium-81.0.4044.138.tar.xz) = f478f28b8111cb70231df4c36e754d812ad7a94b7c844e9d0515345a71fd77a6 +SIZE (chromium-81.0.4044.138.tar.xz) = 785960928 +SHA256 (chromium-81.0.4044.138-testdata.tar.xz) = e2083a3c9ae5bd183ebaf3dc0b701c3fc6e990a6864852a2fa961e811c99ec32 +SIZE (chromium-81.0.4044.138-testdata.tar.xz) = 257018904 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1 SIZE (test_fonts.tar.xz) = 200040 From owner-svn-ports-branches@freebsd.org Thu May 7 11:54:51 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 007F72C55A4; Thu, 7 May 2020 11:54:51 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49HsMZ6c61z446P; Thu, 7 May 2020 11:54:50 +0000 (UTC) (envelope-from joneum@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 DDCFF189B9; Thu, 7 May 2020 11:54:50 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 047BsomL048230; Thu, 7 May 2020 11:54:50 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 047BsmEn048216; Thu, 7 May 2020 11:54:48 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <202005071154.047BsmEn048216@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Thu, 7 May 2020 11:54:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534264 - in branches/2020Q2/databases: mysql80-client mysql80-server mysql80-server/files X-SVN-Group: ports-branches X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in branches/2020Q2/databases: mysql80-client mysql80-server mysql80-server/files X-SVN-Commit-Revision: 534264 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.30 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 May 2020 11:54:51 -0000 Author: joneum Date: Thu May 7 11:54:47 2020 New Revision: 534264 URL: https://svnweb.freebsd.org/changeset/ports/534264 Log: MFH: r534263 databases/mysql80-{client, server}: Update to latest release 8.0.20 - Performance: Certain queries against tables with spatial indexes were not performed as efficiently following an upgrade from MySQL 5.7 to MySQL 8.0. - NDB Cluster: NDB defines one SPJ worker per node owning a primary partition of the root table. If this table used read from any replica, DBTC put all SPJ workers in the same DBSPJ instance, which effe - NDB Cluster: Executing the SHOW command using an ndb_mgm client binary from NDB 8.0.16 or earlier to access a management node running NDB 8.0.17 or later produced the error message Unknown field: is_s - On EL7 and EL8, CMake configuration was adjusted to look for GCC 9 before GCC 8. Because libmysqlclient ships with MySQL distributions, client applications built against libmysqlclient on those platfo - The max_length_for_sort_data system variable is now deprecated due to optimizer changes that make it obsolete and of no effect. More Infos: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-20.html Special thanks to: fluffy Security: 21d59ea3-8559-11ea-a5e2-d4c9ef517024 (MySQL - Server) Security: 622b5c47-855b-11ea-a5e2-d4c9ef517024 (MySQL - Client) Sponsored by: Netzkommune GmbH Approved by: ports-secteam (with hat) Deleted: branches/2020Q2/databases/mysql80-server/files/patch-extra_libedit_chartype.h branches/2020Q2/databases/mysql80-server/files/patch-extra_libedit_vi.c Modified: branches/2020Q2/databases/mysql80-client/Makefile branches/2020Q2/databases/mysql80-server/Makefile branches/2020Q2/databases/mysql80-server/distinfo branches/2020Q2/databases/mysql80-server/files/patch-CMakeLists.txt branches/2020Q2/databases/mysql80-server/files/patch-cmake_install_layout.cmake branches/2020Q2/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt branches/2020Q2/databases/mysql80-server/files/patch-router_src_http_src_CMakeLists.txt branches/2020Q2/databases/mysql80-server/files/patch-sql-common_client.cc branches/2020Q2/databases/mysql80-server/files/patch-sql_auth_sha2__password__common.cc branches/2020Q2/databases/mysql80-server/files/patch-sql_sys__vars.cc branches/2020Q2/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.cc branches/2020Q2/databases/mysql80-server/files/patch-utilities_CMakeLists.txt branches/2020Q2/databases/mysql80-server/files/patch-vio_viossl.cc branches/2020Q2/databases/mysql80-server/pkg-plist Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/databases/mysql80-client/Makefile ============================================================================== --- branches/2020Q2/databases/mysql80-client/Makefile Thu May 7 11:51:14 2020 (r534263) +++ branches/2020Q2/databases/mysql80-client/Makefile Thu May 7 11:54:47 2020 (r534264) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) Modified: branches/2020Q2/databases/mysql80-server/Makefile ============================================================================== --- branches/2020Q2/databases/mysql80-server/Makefile Thu May 7 11:51:14 2020 (r534263) +++ branches/2020Q2/databases/mysql80-server/Makefile Thu May 7 11:54:47 2020 (r534264) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 8.0.19 -PORTREVISION?= 2 +PORTVERSION= 8.0.20 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-8.0 PKGNAMESUFFIX?= 80-server @@ -20,6 +20,7 @@ SLAVEDIRS= databases/mysql80-client USES= bison:build cmake:noninja compiler:c++14-lang cpe \ groff:run libedit localbase ncurses perl5 pkgconfig shebangfix ssl +USE_CXXSTD= c++14 USE_PERL5= run MY_DBDIR= /var/db/mysql @@ -78,8 +79,16 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DWITH_PROTOBUF=system \ -DWITH_SSL=${OPENSSLBASE} \ -DBUILD_BUNDLED_ZLIB=0 \ - -DBUILD_BUNDLED_LZ4=0 \ + -DBUILD_BUNDLED_LZ4=0 +# The Mroonga, RocksDB, and TokuDB storage engines are disabled. +# Mroonga is only buildable on little endian archs. +# RocksDB is only buildable on little endian archs and requires POSIX timers. +# TokuDB is only buildable on 64-bit little endian archs. +CMAKE_ARGS+= -DWITHOUT_MROONGA_STORAGE_ENGINE=1 \ + -DWITHOUT_ROCKSDB_STORAGE_ENGINE=1 \ + -DWITHOUT_TOKUDB_STORAGE_ENGINE=1 + SHEBANG_FILES= scripts/*.pl* scripts/*.sh .ifdef USE_MYSQL @@ -156,6 +165,13 @@ FEDERATED_SUB_LIST_OFF+= FEDER="" .endif .include + +# Since 8.0.20 release innodb engine uses new memory alligned allocator +# which is broken on i386 due to different size of types and caused a +# 'static_assert(alignof(T) <= alignof(std::max_align_t))' error +.if ${ARCH} == i386 +CMAKE_ARGS+= -DDISABLE_PSI_MEMORY=1 +.endif .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" Modified: branches/2020Q2/databases/mysql80-server/distinfo ============================================================================== --- branches/2020Q2/databases/mysql80-server/distinfo Thu May 7 11:51:14 2020 (r534263) +++ branches/2020Q2/databases/mysql80-server/distinfo Thu May 7 11:54:47 2020 (r534264) @@ -1,3 +1,3 @@ -TIMESTAMP = 1578922201 -SHA256 (mysql-boost-8.0.19.tar.gz) = 3622d2a53236ed9ca62de0616a7e80fd477a9a3f862ba09d503da188f53ca523 -SIZE (mysql-boost-8.0.19.tar.gz) = 264147972 +TIMESTAMP = 1588248990 +SHA256 (mysql-boost-8.0.20.tar.gz) = b6ad1a09eb146fa913f1afc257bbed8ffab688e2d504fb8ddb652f69f551a9c1 +SIZE (mysql-boost-8.0.20.tar.gz) = 266282970 Modified: branches/2020Q2/databases/mysql80-server/files/patch-CMakeLists.txt ============================================================================== --- branches/2020Q2/databases/mysql80-server/files/patch-CMakeLists.txt Thu May 7 11:51:14 2020 (r534263) +++ branches/2020Q2/databases/mysql80-server/files/patch-CMakeLists.txt Thu May 7 11:54:47 2020 (r534264) @@ -45,7 +45,7 @@ ADD_SUBDIRECTORY(testclients) ADD_SUBDIRECTORY(sql) ENDIF() -@@ -1351,11 +1358,11 @@ ENDIF() +@@ -1497,11 +1504,11 @@ ENDIF() # scripts/mysql_config depends on client and server targets loaded above. # It is referenced by some of the directories below, so we insert it here. ADD_SUBDIRECTORY(scripts) @@ -55,7 +55,7 @@ ADD_SUBDIRECTORY(mysql-test) ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) - ADD_SUBDIRECTORY(support-files) - IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) + IF(WITH_INTERNAL) ADD_SUBDIRECTORY(internal) ENDIF() @@ -1464,6 +1471,7 @@ IF(PACK_SEPARATE_COMPONENTS) Modified: branches/2020Q2/databases/mysql80-server/files/patch-cmake_install_layout.cmake ============================================================================== --- branches/2020Q2/databases/mysql80-server/files/patch-cmake_install_layout.cmake Thu May 7 11:51:14 2020 (r534263) +++ branches/2020Q2/databases/mysql80-server/files/patch-cmake_install_layout.cmake Thu May 7 11:54:47 2020 (r534264) @@ -29,7 +29,7 @@ LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind) IF(ind EQUAL -1) MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}." -@@ -159,6 +163,32 @@ SET(INSTALL_MYSQLKEYRINGDIR_STANDALONE "keyring") +@@ -171,6 +175,32 @@ SET(INSTALL_MYSQLKEYRINGDIR_STANDALONE "keyring") SET(INSTALL_SECURE_FILE_PRIVDIR_STANDALONE ${secure_file_priv_path}) # @@ -62,28 +62,20 @@ # TARGZ layout # SET(INSTALL_BINDIR_TARGZ "bin") -@@ -345,7 +375,7 @@ ENDIF() - - # Install layout for router, follows the same pattern as above. - # --# Supported layouts here are STANDALONE, RPM, DEB, SVR4, TARGZ -+# Supported layouts here are STANDALONE, FREEBSD, RPM, DEB, SVR4, TARGZ - - # Variables ROUTER_INSTALL_${X}DIR, where - # X = BIN, LIB and DOC is using -@@ -387,7 +417,7 @@ ENDIF() +@@ -369,7 +399,7 @@ ENDIF() SET(ROUTER_INSTALL_LAYOUT "${DEFAULT_ROUTER_INSTALL_LAYOUT}" CACHE STRING - "Installation directory layout. Options are: STANDALONE RPM DEB SVR4 TARGZ") + "Installation directory layout. Options are: STANDALONE FREEBSD RPM DEB SVR4 TARGZ") - # If are _pure_ STANDALONE we can write into data/ as it is all ours - # if we are shared STANDALONE with the the server, we shouldn't write -@@ -400,6 +430,13 @@ SET(ROUTER_INSTALL_CONFIGDIR_STANDALONE ".") - SET(ROUTER_INSTALL_DATADIR_STANDALONE "var/lib/mysqlrouter") - SET(ROUTER_INSTALL_LOGDIR_STANDALONE ".") - SET(ROUTER_INSTALL_RUNTIMEDIR_STANDALONE "run") + # If we are shared STANDALONE with the the server, we shouldn't write + # into the server's data/ as that would create a "schemadir" in +@@ -408,6 +438,18 @@ FOREACH(var + ) + SET(ROUTER_INSTALL_${var}DIR_TARGZ ${ROUTER_INSTALL_${var}DIR_STANDALONE}) + ENDFOREACH() ++ +# +# FreeBSD layout +# @@ -91,6 +83,10 @@ +SET(ROUTER_INSTALL_DATADIR_FREEBSD "/var/db/mysqlrouter") +SET(ROUTER_INSTALL_LOGDIR_FREEBSD "/var/log/mysqlrouter") +SET(ROUTER_INSTALL_RUNTIMEDIR_FREEBSD "/var/run/mysqlrouter") ++ ++SET(ROUTER_INSTALL_BINDIR_FREEBSD "bin") ++SET(ROUTER_INSTALL_LIBDIR_FREEBSD "lib/mysql") ++SET(ROUTER_INSTALL_PLUGINDIR_FREEBSD "lib/mysql/mysqlrouter") + # # RPM layout - # Modified: branches/2020Q2/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt ============================================================================== --- branches/2020Q2/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt Thu May 7 11:51:14 2020 (r534263) +++ branches/2020Q2/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt Thu May 7 11:54:47 2020 (r534264) @@ -12,16 +12,12 @@ # # Include protocol tracing infrastructure and the test # trace plugin if enabled by build options. -@@ -240,12 +245,17 @@ IF(WIN32) +@@ -242,11 +247,18 @@ IF(WIN32) LIST(APPEND LIBS_TO_MERGE auth_win_client) ENDIF() -# LDAP authentication SASL client plugin --MESSAGE(STATUS "Creating LDAP authentication SASL client library.") -ADD_SUBDIRECTORY(authentication_ldap) -- --# Merge several convenience libraries into one big mysqlclient --MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development) +IF(WITHOUT_CLIENTLIBS) + # Merge several convenience libraries into one big mysqlclient + MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL) @@ -29,10 +25,13 @@ + # LDAP authentication SASL client plugin + MESSAGE(STATUS "Creating LDAP authentication SASL client library.") + ADD_SUBDIRECTORY(authentication_ldap) -+ + +-# Merge several convenience libraries into one big mysqlclient +-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development) + # Merge several convenience libraries into one big mysqlclient + MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development) +ENDIF(WITHOUT_CLIENTLIBS) ++ TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK}) # Visual Studio users need debug static library for debug projects Modified: branches/2020Q2/databases/mysql80-server/files/patch-router_src_http_src_CMakeLists.txt ============================================================================== --- branches/2020Q2/databases/mysql80-server/files/patch-router_src_http_src_CMakeLists.txt Thu May 7 11:51:14 2020 (r534263) +++ branches/2020Q2/databases/mysql80-server/files/patch-router_src_http_src_CMakeLists.txt Thu May 7 11:54:47 2020 (r534264) @@ -8,3 +8,19 @@ ) ## split library code from the plugin to use them _passwd and tests +@@ -88,7 +87,6 @@ INSTALL(TARGETS http_auth_backend_lib + RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router + ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router + LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router +- NAMELINK_SKIP + ) + TARGET_INCLUDE_DIRECTORIES(http_auth_backend_lib PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +@@ -141,7 +139,6 @@ INSTALL(TARGETS http_auth_realm_lib + RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router + ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router + LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router +- NAMELINK_SKIP + ) + ## the rpath for the bundled openssl + ADD_INSTALL_RPATH_FOR_OPENSSL(http_auth_realm_lib) Modified: branches/2020Q2/databases/mysql80-server/files/patch-sql-common_client.cc ============================================================================== --- branches/2020Q2/databases/mysql80-server/files/patch-sql-common_client.cc Thu May 7 11:51:14 2020 (r534263) +++ branches/2020Q2/databases/mysql80-server/files/patch-sql-common_client.cc Thu May 7 11:54:47 2020 (r534264) @@ -1,11 +1,18 @@ ---- sql-common/client.cc.orig 2019-09-20 08:30:51 UTC +--- sql-common/client.cc.orig 2020-03-26 13:31:45 UTC +++ sql-common/client.cc -@@ -7715,7 +7715,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_opt - #endif +@@ -7752,6 +7752,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_opt + return 1; break; case MYSQL_OPT_SSL_FIPS_MODE: { --#if defined(HAVE_OPENSSL) -+#if defined(HAVE_OPENSSL) && !defined(LIBRESSL_VERSION_NUMBER) ++#if !defined(LIBRESSL_VERSION_NUMBER) char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; ENSURE_EXTENSIONS_PRESENT(&mysql->options); mysql->options.extension->ssl_fips_mode = *static_cast(arg); +@@ -7763,6 +7764,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_opt + "Set Fips mode ON/STRICT failed, detail: '%s'.", ssl_err_string); + return 1; + } ++#endif + } break; + case MYSQL_OPT_SSL_MODE: + ENSURE_EXTENSIONS_PRESENT(&mysql->options); Modified: branches/2020Q2/databases/mysql80-server/files/patch-sql_auth_sha2__password__common.cc ============================================================================== --- branches/2020Q2/databases/mysql80-server/files/patch-sql_auth_sha2__password__common.cc Thu May 7 11:51:14 2020 (r534263) +++ branches/2020Q2/databases/mysql80-server/files/patch-sql_auth_sha2__password__common.cc Thu May 7 11:54:47 2020 (r534264) @@ -3,7 +3,7 @@ @@ -101,7 +101,7 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig return true; } - m_ok = EVP_DigestFinal_ex(md_context, m_digest, NULL); + m_ok = EVP_DigestFinal_ex(md_context, m_digest, nullptr); -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L EVP_MD_CTX_cleanup(md_context); Modified: branches/2020Q2/databases/mysql80-server/files/patch-sql_sys__vars.cc ============================================================================== --- branches/2020Q2/databases/mysql80-server/files/patch-sql_sys__vars.cc Thu May 7 11:51:14 2020 (r534263) +++ branches/2020Q2/databases/mysql80-server/files/patch-sql_sys__vars.cc Thu May 7 11:54:47 2020 (r534264) @@ -1,6 +1,6 @@ --- sql/sys_vars.cc.orig 2019-09-20 08:30:51 UTC +++ sql/sys_vars.cc -@@ -1841,7 +1841,7 @@ static Sys_var_ulong Sys_connect_timeout( +@@ -1875,7 +1875,7 @@ static Sys_var_ulong Sys_connect_timeout( "The number of seconds the mysqld server is waiting for a connect " "packet before responding with 'Bad handshake'", GLOBAL_VAR(connect_timeout), CMD_LINE(REQUIRED_ARG), @@ -9,47 +9,62 @@ static Sys_var_ulong Sys_information_schema_stats_expiry( "information_schema_stats_expiry", -@@ -2890,7 +2890,7 @@ static Sys_var_ulong Sys_net_read_timeout( +@@ -2929,7 +2929,7 @@ static Sys_var_ulong Sys_net_read_timeout( "Number of seconds to wait for more data from a connection before " "aborting the read", SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), + VALID_RANGE(1, INT_MAX32 / 1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), + NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(nullptr), ON_UPDATE(fix_net_read_timeout)); -@@ -2911,7 +2911,7 @@ static Sys_var_ulong Sys_net_write_timeout( +@@ -2950,7 +2950,7 @@ static Sys_var_ulong Sys_net_write_timeout( "Number of seconds to wait for a block to be written to a connection " "before aborting the write", SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), + VALID_RANGE(1, INT_MAX32 / 1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), + NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(nullptr), ON_UPDATE(fix_net_write_timeout)); -@@ -4416,7 +4416,7 @@ static Sys_var_ulong Sys_max_execution_time( - "milliseconds", +@@ -4459,6 +4459,7 @@ static Sys_var_ulong Sys_max_execution_time( HINT_UPDATEABLE SESSION_VAR(max_execution_time), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1)); -- + +#ifndef LIBRESSL_VERSION_NUMBER static bool update_fips_mode(sys_var *, THD *, enum_var_type) { char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) { -@@ -4436,6 +4436,16 @@ static Sys_var_enum Sys_ssl_fips_mode( +@@ -4470,14 +4471,30 @@ static bool update_fips_mode(sys_var *, THD *, enum_va + } + } + ++#endif ++ ++#if defined(LIBRESSL_VERSION_NUMBER) ++static const char *ssl_fips_mode_names[] = {"OFF", 0}; ++#else + static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", nullptr}; ++#endif + static Sys_var_enum Sys_ssl_fips_mode( + "ssl_fips_mode", + "SSL FIPS mode (applies only for OpenSSL); " +- "permitted values are: OFF, ON, STRICT", ++#ifndef LIBRESSL_VERSION_NUMBER ++ "permitted values are: OFF, ON, STRICT", ++#else ++ "permitted values are: OFF", ++#endif GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE), ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, - ON_CHECK(NULL), ON_UPDATE(update_fips_mode), NULL); +- ON_CHECK(nullptr), ON_UPDATE(update_fips_mode), nullptr); ++ ON_CHECK(NULL), ++#ifndef LIBRESSL_VERSION_NUMBER ++ ON_UPDATE(update_fips_mode), +#else -+static const char *ssl_fips_mode_names[] = {"OFF", 0}; -+static Sys_var_enum Sys_ssl_fips_mode( -+ "ssl_fips_mode", -+ "SSL FIPS mode (applies only for OpenSSL); " -+ "permitted values are: OFF", -+ GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE), -+ ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, -+ ON_CHECK(NULL), ON_UPDATE(NULL), NULL); ++ ON_UPDATE(NULL), +#endif ++ NULL); - #if defined(HAVE_OPENSSL) static Sys_var_bool Sys_auto_generate_certs( + "auto_generate_certs", Modified: branches/2020Q2/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.cc ============================================================================== --- branches/2020Q2/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.cc Thu May 7 11:51:14 2020 (r534263) +++ branches/2020Q2/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.cc Thu May 7 11:54:47 2020 (r534264) @@ -1,7 +1,7 @@ --- storage/myisam/mi_dynrec.cc.orig 2019-09-20 08:30:51 UTC +++ storage/myisam/mi_dynrec.cc -@@ -83,17 +83,12 @@ bool mi_dynmap_file(MI_INFO *info, my_off_t size) { - return 1; +@@ -85,17 +85,12 @@ bool mi_dynmap_file(MI_INFO *info, my_off_t size) { + return true; } /* - I wonder if it is good to use MAP_NORESERVE. From the Linux man page: @@ -13,10 +13,10 @@ + MAP_NORESERVE is unimplemented in FreeBSD */ info->s->file_map = (uchar *)my_mmap( - 0, (size_t)size, + nullptr, (size_t)size, info->s->mode == O_RDONLY ? PROT_READ : PROT_READ | PROT_WRITE, - MAP_SHARED | MAP_NORESERVE, info->dfile, 0L); + MAP_SHARED, info->dfile, 0L); if (info->s->file_map == (uchar *)MAP_FAILED) { - info->s->file_map = NULL; - return 1; + info->s->file_map = nullptr; + return true; Modified: branches/2020Q2/databases/mysql80-server/files/patch-utilities_CMakeLists.txt ============================================================================== --- branches/2020Q2/databases/mysql80-server/files/patch-utilities_CMakeLists.txt Thu May 7 11:51:14 2020 (r534263) +++ branches/2020Q2/databases/mysql80-server/files/patch-utilities_CMakeLists.txt Thu May 7 11:54:47 2020 (r534264) @@ -1,20 +1,20 @@ --- utilities/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ utilities/CMakeLists.txt -@@ -22,13 +22,19 @@ - +@@ -23,13 +23,19 @@ ADD_WSHADOW_WARNING() + DISABLE_MISSING_PROFILE_WARNING() -IF(NOT CMAKE_CROSSCOMPILING) +IF(WITHOUT_CLIENTLIBS) MYSQL_ADD_EXECUTABLE(comp_err comp_err.cc - COMPONENT Server + COMPONENT Test LINK_LIBRARIES mysys + SKIP_INSTALL) +ELSE(WITHOUT_CLIENTLIBS) + MYSQL_ADD_EXECUTABLE(comp_err + comp_err.cc -+ COMPONENT Server ++ COMPONENT Test + LINK_LIBRARIES mysys ) -ENDIF() Modified: branches/2020Q2/databases/mysql80-server/files/patch-vio_viossl.cc ============================================================================== --- branches/2020Q2/databases/mysql80-server/files/patch-vio_viossl.cc Thu May 7 11:51:14 2020 (r534263) +++ branches/2020Q2/databases/mysql80-server/files/patch-vio_viossl.cc Thu May 7 11:54:47 2020 (r534264) @@ -10,16 +10,16 @@ #define HAVE_BIO_SET_CALLBACK_EX #endif -@@ -490,7 +490,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, l +@@ -635,7 +636,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, l #if !defined(DBUG_OFF) { - STACK_OF(SSL_COMP) *ssl_comp_methods = NULL; + STACK_OF(SSL_COMP) *ssl_comp_methods = nullptr; - ssl_comp_methods = SSL_COMP_get_compression_methods(); + ssl_comp_methods = (STACK_OF(SSL_COMP) *)SSL_COMP_get_compression_methods(); n = sk_SSL_COMP_num(ssl_comp_methods); DBUG_PRINT("info", ("Available compression methods:\n")); if (n == 0) -@@ -498,7 +498,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, l +@@ -643,7 +644,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, l else for (j = 0; j < n; j++) { SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j); Modified: branches/2020Q2/databases/mysql80-server/pkg-plist ============================================================================== --- branches/2020Q2/databases/mysql80-server/pkg-plist Thu May 7 11:51:14 2020 (r534263) +++ branches/2020Q2/databases/mysql80-server/pkg-plist Thu May 7 11:54:47 2020 (r534264) @@ -27,6 +27,10 @@ lib/mysql/libmysqlrouter.so lib/mysql/libmysqlrouter.so.1 lib/mysql/libmysqlrouter_http.so lib/mysql/libmysqlrouter_http.so.1 +lib/mysql/libmysqlrouter_http_auth_backend.so +lib/mysql/libmysqlrouter_http_auth_backend.so.1 +lib/mysql/libmysqlrouter_http_auth_realm.so +lib/mysql/libmysqlrouter_http_auth_realm.so.1 lib/mysql/mysqlrouter/http_auth_backend.so lib/mysql/mysqlrouter/http_auth_realm.so lib/mysql/mysqlrouter/http_server.so From owner-svn-ports-branches@freebsd.org Thu May 7 16:37:46 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 200F92DDC2F; Thu, 7 May 2020 16:37:46 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49Hzf20S3Cz4Nkw; Thu, 7 May 2020 16:37:46 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0A6591C058; Thu, 7 May 2020 16:37:46 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 047Gbkle020904; Thu, 7 May 2020 16:37:46 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 047GbiOv020899; Thu, 7 May 2020 16:37:45 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202005071637.047GbiOv020899@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Thu, 7 May 2020 16:37:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534274 - in branches/2020Q2/security/openvpn: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in branches/2020Q2/security/openvpn: . files X-SVN-Commit-Revision: 534274 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.30 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 May 2020 16:37:46 -0000 Author: mandree Date: Thu May 7 16:37:44 2020 New Revision: 534274 URL: https://svnweb.freebsd.org/changeset/ports/534274 Log: MFH: r534272 security/openvpn: reliability fixes cherry-picked from upstream Arne Schwabe's OpenSSL fix for Debian Bug#958296 "Fix tls_ctx_client/server_new leaving error on OpenSSL error stack" [1] Selva Nair's auth-pam fixes "Parse static challenge response in auth-pam plugin" "Accept empty password and/or response in auth-pam plugin" Re-diff (with make makepatch) older patches. Reported by: Jonas Andradas via Debian BTS Obtained from: Arne Schwabe, Selva Nair Approved by: ports-secteam@ (blanket for backporting reliability fixes) Added: branches/2020Q2/security/openvpn/files/patch-git-b89e48b015e581a4a0f5c306e2ab20da34c862ea - copied unchanged from r534272, head/security/openvpn/files/patch-git-b89e48b015e581a4a0f5c306e2ab20da34c862ea branches/2020Q2/security/openvpn/files/patch-git-cab48ad43eaba51c54fa23e55b0b2eb436dd921f - copied unchanged from r534272, head/security/openvpn/files/patch-git-cab48ad43eaba51c54fa23e55b0b2eb436dd921f branches/2020Q2/security/openvpn/files/patch-src_openvpn_ssl__openssl.c - copied unchanged from r534272, head/security/openvpn/files/patch-src_openvpn_ssl__openssl.c Modified: branches/2020Q2/security/openvpn/Makefile branches/2020Q2/security/openvpn/files/patch-configure branches/2020Q2/security/openvpn/files/patch-src_openvpn_openssl__compat.h Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/security/openvpn/Makefile ============================================================================== --- branches/2020Q2/security/openvpn/Makefile Thu May 7 16:28:58 2020 (r534273) +++ branches/2020Q2/security/openvpn/Makefile Thu May 7 16:37:44 2020 (r534274) @@ -3,7 +3,7 @@ PORTNAME= openvpn DISTVERSION= 2.4.9 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= security net net-vpn MASTER_SITES= https://swupdate.openvpn.org/community/releases/ \ https://build.openvpn.net/downloads/releases/ \ Modified: branches/2020Q2/security/openvpn/files/patch-configure ============================================================================== --- branches/2020Q2/security/openvpn/files/patch-configure Thu May 7 16:28:58 2020 (r534273) +++ branches/2020Q2/security/openvpn/files/patch-configure Thu May 7 16:37:44 2020 (r534274) @@ -1,6 +1,6 @@ ---- configure.orig 2019-02-20 12:28:34 UTC +--- configure.orig 2020-04-16 13:26:53 UTC +++ configure -@@ -18120,8 +18120,6 @@ fi +@@ -18226,8 +18226,6 @@ fi $as_echo "!! WARNING !! The cmoka git submodule has not been initialized or updated. Unit testing cannot be performed." >&6; } fi else Copied: branches/2020Q2/security/openvpn/files/patch-git-b89e48b015e581a4a0f5c306e2ab20da34c862ea (from r534272, head/security/openvpn/files/patch-git-b89e48b015e581a4a0f5c306e2ab20da34c862ea) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/security/openvpn/files/patch-git-b89e48b015e581a4a0f5c306e2ab20da34c862ea Thu May 7 16:37:44 2020 (r534274, copy of r534272, head/security/openvpn/files/patch-git-b89e48b015e581a4a0f5c306e2ab20da34c862ea) @@ -0,0 +1,214 @@ +From b89e48b015e581a4a0f5c306e2ab20da34c862ea Mon Sep 17 00:00:00 2001 +From: Selva Nair +Date: Tue, 24 Jul 2018 22:34:53 -0400 +Subject: [PATCH] Parse static challenge response in auth-pam plugin + +If static challenge is in use, the password passed to the plugin by openvpn +is of the form "SCRV1:base64-pass:base64-response". Parse this string to +separate it into password and response and use them to respond to queries +in the pam conversation function. + +On the plugin parameters line the substitution keyword for the static +challenge response is "OTP". For example, for pam config named "test" that +prompts for "user", "password" and "pin", use + +plugin openvpn-auth-pam.so "test user USERNAME password PASSWORD pin OTP" + +Signed-off-by: Selva Nair + +Acked-by: Gert Doering +Message-Id: <1532486093-24793-1-git-send-email-selva.nair@gmail.com> +URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg17307.html +Signed-off-by: Gert Doering +(cherry picked from commit 7369d01bf360bcfa02f26c05b86dde5496d120f6) +--- + src/plugins/auth-pam/README.auth-pam | 15 ++++-- + src/plugins/auth-pam/auth-pam.c | 75 +++++++++++++++++++++++++++- + 2 files changed, 84 insertions(+), 6 deletions(-) + +diff --git a/src/plugins/auth-pam/README.auth-pam b/src/plugins/auth-pam/README.auth-pam +index e12369021..908156542 100644 +--- a/src/plugins/auth-pam/README.auth-pam ++++ ./src/plugins/auth-pam/README.auth-pam +@@ -36,19 +36,20 @@ pairs to answer PAM module queries. + + For example: + +- plugin openvpn-auth-pam.so "login login USERNAME password PASSWORD" ++ plugin openvpn-auth-pam.so "login login USERNAME password PASSWORD pin OTP" + + tells auth-pam to (a) use the "login" PAM module, (b) answer a +-"login" query with the username given by the OpenVPN client, and +-(c) answer a "password" query with the password given by the +-OpenVPN client. This provides flexibility in dealing with the different ++"login" query with the username given by the OpenVPN client, ++(c) answer a "password" query with the password, and (d) answer a ++"pin" query with the OTP given by the OpenVPN client. ++This provides flexibility in dealing with different + types of query strings which different PAM modules might generate. + For example, suppose you were using a PAM module called + "test" which queried for "name" rather than "login": + + plugin openvpn-auth-pam.so "test name USERNAME password PASSWORD" + +-While "USERNAME" "COMMONNAME" and "PASSWORD" are special strings which substitute ++While "USERNAME" "COMMONNAME" "PASSWORD" and "OTP" are special strings which substitute + to client-supplied values, it is also possible to name literal values + to use as PAM module query responses. For example, suppose that the + login module queried for a third parameter, "domain" which +@@ -61,6 +62,10 @@ the operation of this plugin: + + client-cert-not-required + username-as-common-name ++ static-challenge ++ ++Use of --static challenege is required to pass a pin (represented by "OTP" in ++parameter substituion) or a second password. + + Run OpenVPN with --verb 7 or higher to get debugging output from + this plugin, including the list of queries presented by the +diff --git a/src/plugins/auth-pam/auth-pam.c b/src/plugins/auth-pam/auth-pam.c +index 5ba4dc4cb..1324307f1 100644 +--- a/src/plugins/auth-pam/auth-pam.c ++++ ./src/plugins/auth-pam/auth-pam.c +@@ -6,6 +6,7 @@ + * packet compression. + * + * Copyright (C) 2002-2018 OpenVPN Inc ++ * Copyright (C) 2016-2018 Selva Nair + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 +@@ -64,6 +65,7 @@ + + /* Pointers to functions exported from openvpn */ + static plugin_secure_memzero_t plugin_secure_memzero = NULL; ++static plugin_base64_decode_t plugin_base64_decode = NULL; + + /* + * Plugin state, used by foreground +@@ -87,6 +89,7 @@ struct auth_pam_context + * "USERNAME" -- substitute client-supplied username + * "PASSWORD" -- substitute client-specified password + * "COMMONNAME" -- substitute client certificate common name ++ * "OTP" -- substitute static challenge response if available + */ + + #define N_NAME_VALUE 16 +@@ -111,6 +114,7 @@ struct user_pass { + char username[128]; + char password[128]; + char common_name[128]; ++ char response[128]; + + const struct name_value_list *name_value_list; + }; +@@ -276,6 +280,66 @@ name_value_match(const char *query, const char *match) + return strncasecmp(match, query, strlen(match)) == 0; + } + ++/* ++ * Split and decode up->password in the form SCRV1:base64_pass:base64_response ++ * into pass and response and save in up->password and up->response. ++ * If the password is not in the expected format, input is not changed. ++ */ ++static void ++split_scrv1_password(struct user_pass *up) ++{ ++ const int skip = strlen("SCRV1:"); ++ if (strncmp(up->password, "SCRV1:", skip) != 0) ++ { ++ return; ++ } ++ ++ char *tmp = strdup(up->password); ++ if (!tmp) ++ { ++ fprintf(stderr, "AUTH-PAM: out of memory parsing static challenge password\n"); ++ goto out; ++ } ++ ++ char *pass = tmp + skip; ++ char *resp = strchr(pass, ':'); ++ if (!resp) /* string not in SCRV1:xx:yy format */ ++ { ++ goto out; ++ } ++ *resp++ = '\0'; ++ ++ int n = plugin_base64_decode(pass, up->password, sizeof(up->password)-1); ++ if (n > 0) ++ { ++ up->password[n] = '\0'; ++ n = plugin_base64_decode(resp, up->response, sizeof(up->response)-1); ++ if (n > 0) ++ { ++ up->response[n] = '\0'; ++ if (DEBUG(up->verb)) ++ { ++ fprintf(stderr, "AUTH-PAM: BACKGROUND: parsed static challenge password\n"); ++ } ++ goto out; ++ } ++ } ++ ++ /* decode error: reinstate original value of up->password and return */ ++ plugin_secure_memzero(up->password, sizeof(up->password)); ++ plugin_secure_memzero(up->response, sizeof(up->response)); ++ strcpy(up->password, tmp); /* tmp is guaranteed to fit in up->password */ ++ ++ fprintf(stderr, "AUTH-PAM: base64 decode error while parsing static challenge password\n"); ++ ++out: ++ if (tmp) ++ { ++ plugin_secure_memzero(tmp, strlen(tmp)); ++ free(tmp); ++ } ++} ++ + OPENVPN_EXPORT int + openvpn_plugin_open_v3(const int v3structver, + struct openvpn_plugin_args_open_in const *args, +@@ -316,6 +380,7 @@ openvpn_plugin_open_v3(const int v3structver, + + /* Save global pointers to functions exported from openvpn */ + plugin_secure_memzero = args->callbacks->plugin_secure_memzero; ++ plugin_base64_decode = args->callbacks->plugin_base64_decode; + + /* + * Make sure we have two string arguments: the first is the .so name, +@@ -599,6 +664,10 @@ my_conv(int n, const struct pam_message **msg_array, + { + aresp[i].resp = searchandreplace(match_value, "COMMONNAME", up->common_name); + } ++ else if (strstr(match_value, "OTP")) ++ { ++ aresp[i].resp = searchandreplace(match_value, "OTP", up->response); ++ } + else + { + aresp[i].resp = strdup(match_value); +@@ -787,6 +856,9 @@ pam_server(int fd, const char *service, int verb, const struct name_value_list * + #endif + } + ++ /* If password is of the form SCRV1:base64:base64 split it up */ ++ split_scrv1_password(&up); ++ + if (pam_auth(service, &up)) /* Succeeded */ + { + if (send_control(fd, RESPONSE_VERIFY_SUCCEEDED) == -1) +@@ -818,10 +890,11 @@ pam_server(int fd, const char *service, int verb, const struct name_value_list * + command); + goto done; + } ++ plugin_secure_memzero(up.response, sizeof(up.response)); + } + done: +- + plugin_secure_memzero(up.password, sizeof(up.password)); ++ plugin_secure_memzero(up.response, sizeof(up.response)); + #ifdef USE_PAM_DLOPEN + dlclose_pam(); + #endif Copied: branches/2020Q2/security/openvpn/files/patch-git-cab48ad43eaba51c54fa23e55b0b2eb436dd921f (from r534272, head/security/openvpn/files/patch-git-cab48ad43eaba51c54fa23e55b0b2eb436dd921f) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/security/openvpn/files/patch-git-cab48ad43eaba51c54fa23e55b0b2eb436dd921f Thu May 7 16:37:44 2020 (r534274, copy of r534272, head/security/openvpn/files/patch-git-cab48ad43eaba51c54fa23e55b0b2eb436dd921f) @@ -0,0 +1,40 @@ +From cab48ad43eaba51c54fa23e55b0b2eb436dd921f Mon Sep 17 00:00:00 2001 +From: Selva Nair +Date: Tue, 7 Aug 2018 22:44:31 -0400 +Subject: [PATCH] Accept empty password and/or response in auth-pam plugin + +In the auth-pam plugin correctly parse the static challenge string +even when password or challenge response is empty. + +Whether an empty user input is an error is determined by the PAM +conversation function depending on whether the PAM module queries +for it or not. + +Signed-off-by: Selva Nair +Acked-by: Gert Doering +Message-Id: <1533696271-21799-2-git-send-email-selva.nair@gmail.com> +URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg17382.html +Signed-off-by: Gert Doering +(cherry picked from commit 7a8109023f4c345fe12f23421c5fa7e88e1ea85b) +--- + src/plugins/auth-pam/auth-pam.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/auth-pam/auth-pam.c b/src/plugins/auth-pam/auth-pam.c +index 1324307f1..88b53204b 100644 +--- a/src/plugins/auth-pam/auth-pam.c ++++ ./src/plugins/auth-pam/auth-pam.c +@@ -310,11 +310,11 @@ split_scrv1_password(struct user_pass *up) + *resp++ = '\0'; + + int n = plugin_base64_decode(pass, up->password, sizeof(up->password)-1); +- if (n > 0) ++ if (n >= 0) + { + up->password[n] = '\0'; + n = plugin_base64_decode(resp, up->response, sizeof(up->response)-1); +- if (n > 0) ++ if (n >= 0) + { + up->response[n] = '\0'; + if (DEBUG(up->verb)) Modified: branches/2020Q2/security/openvpn/files/patch-src_openvpn_openssl__compat.h ============================================================================== --- branches/2020Q2/security/openvpn/files/patch-src_openvpn_openssl__compat.h Thu May 7 16:28:58 2020 (r534273) +++ branches/2020Q2/security/openvpn/files/patch-src_openvpn_openssl__compat.h Thu May 7 16:37:44 2020 (r534274) @@ -1,6 +1,6 @@ ---- src/openvpn/openssl_compat.h.orig 2019-02-20 12:28:23 UTC +--- src/openvpn/openssl_compat.h.orig 2020-04-16 13:26:45 UTC +++ src/openvpn/openssl_compat.h -@@ -735,7 +735,7 @@ SSL_CTX_get_max_proto_version(SSL_CTX *ctx) +@@ -747,7 +747,7 @@ SSL_CTX_get_max_proto_version(SSL_CTX *ctx) } #endif /* SSL_CTX_get_max_proto_version */ @@ -9,7 +9,7 @@ /** Mimics SSL_CTX_set_min_proto_version for OpenSSL < 1.1 */ static inline int SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_ver_min) -@@ -764,7 +764,7 @@ SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_v +@@ -776,7 +776,7 @@ SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_v } #endif /* SSL_CTX_set_min_proto_version */ Copied: branches/2020Q2/security/openvpn/files/patch-src_openvpn_ssl__openssl.c (from r534272, head/security/openvpn/files/patch-src_openvpn_ssl__openssl.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/security/openvpn/files/patch-src_openvpn_ssl__openssl.c Thu May 7 16:37:44 2020 (r534274, copy of r534272, head/security/openvpn/files/patch-src_openvpn_ssl__openssl.c) @@ -0,0 +1,69 @@ +In the corner case that the global OpenSSL has an invalid command like + + MinProtocol = TLSv1.0 + +(Due to OpenSSL's idiosyncrasies MinProtocol = TLSv1 would be correct) + +the SSL_ctx_new function leaves the errors for parsing the config file +on the stack. + +OpenSSL: error:14187180:SSL routines:ssl_do_config:bad value + +Since the later functions, especially the one of loading the +certificates expected a clean error this error got reported at the +wrong place. + +Print the warnings with crypto_msg when we detect that we are in this +situation (this also clears the stack). +--- + src/openvpn/ssl_openssl.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +Acked-by: Gert Doering + +"Explanation and Code make sense, Debian testing confirmed it fixes +the problem observed" (which was a user error in the end, but led to an +unexpected error in openvpn). + +Basic client test run with openssl 1.1.1 on Linux/Gentoo. + +Your patch has been applied to the master and release/2.4 branch. + +commit 75aa88af774abaa168bf72e43e1dbb57be14c044 (master) +commit 125654bfa6f99a251b581522182e85748dd8043a (release/2.4) +Author: Arne Schwabe +Date: Tue Apr 21 12:11:22 2020 +0200 + + Fix tls_ctx_client/server_new leaving error on OpenSSL error stack + + Acked-by: Gert Doering + Message-Id: <20200421101122.24284-1-arne@rfc2549.org> + URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg19802.html + Signed-off-by: Gert Doering + +--- src/openvpn/ssl_openssl.c.orig 2020-04-16 13:26:45 UTC ++++ src/openvpn/ssl_openssl.c +@@ -110,6 +110,11 @@ tls_ctx_server_new(struct tls_root_ctx *ctx) + { + crypto_msg(M_FATAL, "SSL_CTX_new SSLv23_server_method"); + } ++ if (ERR_peek_error() != 0) ++ { ++ crypto_msg(M_WARN, "Warning: TLS server context initialisation " ++ "has warnings."); ++ } + } + + void +@@ -122,6 +127,11 @@ tls_ctx_client_new(struct tls_root_ctx *ctx) + if (ctx->ctx == NULL) + { + crypto_msg(M_FATAL, "SSL_CTX_new SSLv23_client_method"); ++ } ++ if (ERR_peek_error() != 0) ++ { ++ crypto_msg(M_WARN, "Warning: TLS client context initialisation " ++ "has warnings."); + } + } + From owner-svn-ports-branches@freebsd.org Thu May 7 17:17:18 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 43EE02DEE5F; Thu, 7 May 2020 17:17:18 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49J0Wf15l3z4RVc; Thu, 7 May 2020 17:17:18 +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 1CAAF1C7F2; Thu, 7 May 2020 17:17:18 +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 047HHHP6045827; Thu, 7 May 2020 17:17:17 GMT (envelope-from leres@FreeBSD.org) Received: (from leres@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 047HHHIY045825; Thu, 7 May 2020 17:17:17 GMT (envelope-from leres@FreeBSD.org) Message-Id: <202005071717.047HHHIY045825@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: leres set sender to leres@FreeBSD.org using -f From: Craig Leres Date: Thu, 7 May 2020 17:17:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534277 - branches/2020Q2/security/zeek X-SVN-Group: ports-branches X-SVN-Commit-Author: leres X-SVN-Commit-Paths: branches/2020Q2/security/zeek X-SVN-Commit-Revision: 534277 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.30 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 May 2020 17:17:18 -0000 Author: leres Date: Thu May 7 17:17:17 2020 New Revision: 534277 URL: https://svnweb.freebsd.org/changeset/ports/534277 Log: MFH: r534211 security/zeek: Update to 3.0.6 and address multiple vulnerabilites: https://raw.githubusercontent.com/zeek/zeek/v3.0.6/NEWS - Fix buffer over-read in Ident analyzer - Fix SSL scripting error leading to uninitialized field access and memory leak - Fix POP3 analyzer global buffer over-read - Fix potential stack overflows due to use of Variable-Length-Arrays Other changes since 3.0.5 include: - Fix unusable `subscriber.poll()` method in Broker Python bindings - Fix uninitialized field access in `ssl/log-hostcerts-only.zeek` - Fix missing default function for Kerberos constant-lookup-tables - Fix cloning of `TypeType` values - Remove misleading error message on empty bloomfilter lookup - Fix `misc/stats.zeek` skipping log entry on termination Approved by: ports-secteam (joneum) Modified: branches/2020Q2/security/zeek/Makefile branches/2020Q2/security/zeek/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/security/zeek/Makefile ============================================================================== --- branches/2020Q2/security/zeek/Makefile Thu May 7 17:11:41 2020 (r534276) +++ branches/2020Q2/security/zeek/Makefile Thu May 7 17:17:17 2020 (r534277) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= zeek -PORTVERSION= 3.0.4 +PORTVERSION= 3.0.6 CATEGORIES= security MASTER_SITES= https://old.zeek.org/downloads/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Modified: branches/2020Q2/security/zeek/distinfo ============================================================================== --- branches/2020Q2/security/zeek/distinfo Thu May 7 17:11:41 2020 (r534276) +++ branches/2020Q2/security/zeek/distinfo Thu May 7 17:17:17 2020 (r534277) @@ -1,5 +1,5 @@ -TIMESTAMP = 1586896367 -SHA256 (zeek-3.0.4.tar.gz) = 73d609dde02936a8711f0bdede7e1143ad27693253a2ee0ca3d18560ca752207 -SIZE (zeek-3.0.4.tar.gz) = 29329199 +TIMESTAMP = 1588807625 +SHA256 (zeek-3.0.6.tar.gz) = 57cd56c21a1c55dbe3e65f704835496fd8ba6f7b1e3166dac9d8b5579cb78ad1 +SIZE (zeek-3.0.6.tar.gz) = 29331321 SHA256 (bro-bro-netmap-f3620df_GH0.tar.gz) = e51f420781c9a01b0494f93d82f94a1b045725c1cff406c33887974a9940c655 SIZE (bro-bro-netmap-f3620df_GH0.tar.gz) = 24661 From owner-svn-ports-branches@freebsd.org Thu May 7 19:56:39 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8A89B2E3AC4; Thu, 7 May 2020 19:56:39 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49J43W381Kz4fQv; Thu, 7 May 2020 19:56:39 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 672BE1E6C8; Thu, 7 May 2020 19:56:39 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 047Judig044664; Thu, 7 May 2020 19:56:39 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 047JudIS044663; Thu, 7 May 2020 19:56:39 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202005071956.047JudIS044663@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Thu, 7 May 2020 19:56:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534284 - in branches/2020Q2/mail/mailman: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in branches/2020Q2/mail/mailman: . files X-SVN-Commit-Revision: 534284 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.30 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 May 2020 19:56:39 -0000 Author: mandree Date: Thu May 7 19:56:38 2020 New Revision: 534284 URL: https://svnweb.freebsd.org/changeset/ports/534284 Log: mail/mailman: fix another content injection vuln via private archive login This led up to mailman 2.1.33 today. https://bugs.launchpad.net/mailman/+bug/1877379 https://launchpadlibrarian.net/478684932/private.diff https://mail.python.org/archives/list/mailman-developers@python.org/thread/SYBIZ3MNSQZLKN6PVKO7ZKR7QMOBMS45/ Approved by: ports-secteam@ (blanket for security fixes) Security: 88760f4d-8ef7-11ea-a66d-4b2ef158be83 Added: branches/2020Q2/mail/mailman/files/patch-1-security-88760f4d-8ef7-11ea-a66d-4b2ef158be83 (contents, props changed) Modified: branches/2020Q2/mail/mailman/Makefile Modified: branches/2020Q2/mail/mailman/Makefile ============================================================================== --- branches/2020Q2/mail/mailman/Makefile Thu May 7 19:56:00 2020 (r534283) +++ branches/2020Q2/mail/mailman/Makefile Thu May 7 19:56:38 2020 (r534284) @@ -3,7 +3,7 @@ PORTNAME= mailman DISTVERSION= 2.1.30 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= GNU \ SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \ Added: branches/2020Q2/mail/mailman/files/patch-1-security-88760f4d-8ef7-11ea-a66d-4b2ef158be83 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/mail/mailman/files/patch-1-security-88760f4d-8ef7-11ea-a66d-4b2ef158be83 Thu May 7 19:56:38 2020 (r534284) @@ -0,0 +1,29 @@ +This is essentially the same as https://bugs.launchpad.net/mailman/+bug/1873722 +except the vector is the private archive login page and the attack only +succeeds if the list's roster visibility (private_roster) setting is 'Anyone'. + +This is fixed by the attached patch. + +Source: https://bugs.launchpad.net/mailman/+bug/1877379 +Deep: https://launchpadlibrarian.net/478684932/private.diff + +--- Mailman/Cgi/private.py 2019-03-06 17:48:32 +0000 ++++ Mailman/Cgi/private.py 2020-05-07 13:42:03 +0000 +@@ -162,13 +162,9 @@ + if mlist.isMember(username): + mlist.MailUserPassword(username) + elif username: +- # Not a member +- if mlist.private_roster == 0: +- # Public rosters +- safeuser = Utils.websafe(username) +- message = Bold(FontSize('+1', +- _('No such member: %(safeuser)s.'))).Format() +- else: ++ # Not a member. Don't report address in any case. It leads to ++ # Content injection. Just log if roster is not public. ++ if mlist.private_roster != 0: + syslog('mischief', + 'Reminder attempt of non-member w/ private rosters: %s', + username) + From owner-svn-ports-branches@freebsd.org Thu May 7 22:07:36 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 647DE2E70A1; Thu, 7 May 2020 22:07:36 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49J6yc2483z3L15; Thu, 7 May 2020 22:07:36 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 421F020006; Thu, 7 May 2020 22:07:36 +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 047M7aOS026035; Thu, 7 May 2020 22:07:36 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 047M7aYt026034; Thu, 7 May 2020 22:07:36 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005072207.047M7aYt026034@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 7 May 2020 22:07:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534296 - branches/2020Q2/x11-servers/xwayland-devel X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/x11-servers/xwayland-devel X-SVN-Commit-Revision: 534296 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.30 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 May 2020 22:07:36 -0000 Author: jbeich Date: Thu May 7 22:07:35 2020 New Revision: 534296 URL: https://svnweb.freebsd.org/changeset/ports/534296 Log: MFH: r534295 x11-servers/xwayland-devel: regen patches (gitlab bug) -2.24.1 +2.26.2 Reported by: Grzegorz Junka (on ports@ list) Approved by: ports-secteam blanket Modified: branches/2020Q2/x11-servers/xwayland-devel/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/x11-servers/xwayland-devel/distinfo ============================================================================== --- branches/2020Q2/x11-servers/xwayland-devel/distinfo Thu May 7 22:05:42 2020 (r534295) +++ branches/2020Q2/x11-servers/xwayland-devel/distinfo Thu May 7 22:07:35 2020 (r534296) @@ -1,9 +1,9 @@ TIMESTAMP = 1584441922 SHA256 (xorg-xserver-5e91587302e85fd6f0e8d5ffbe30182e18c6913f_GL0.tar.gz) = 662edf94da493f40604635a2501dee2e3812d261efff2845a9a83598d9ba287b SIZE (xorg-xserver-5e91587302e85fd6f0e8d5ffbe30182e18c6913f_GL0.tar.gz) = 5109416 -SHA256 (71749de24509.patch) = b541c7ca7098ed624e815f0dc17e94d1dc48e70af55459e51a8f04b10bcd0116 +SHA256 (71749de24509.patch) = 9b51d61335f128c5fa8f477a647dc68c3088910a77564b438b19991aacaaa5a4 SIZE (71749de24509.patch) = 1392 -SHA256 (1e897704c822.patch) = b5c9e98a8596d4aa854c817f2f44ed7636cbc32de6773ade20e03970deb70717 +SHA256 (1e897704c822.patch) = bd0ff1fdc6dd89df0e4589d5adba2e164b6426ba31422f7280ee73cc06b39d31 SIZE (1e897704c822.patch) = 969 -SHA256 (83cda3ce3195.patch) = 4b0bfd42d558d6634dbac3105d5744c8cb2a8410f3572033fe45211fb8d1ae71 +SHA256 (83cda3ce3195.patch) = 38443a8c5011ebebcbce92200264a3b48ebcf3576b2cd32656995e23ab3675ee SIZE (83cda3ce3195.patch) = 4513 From owner-svn-ports-branches@freebsd.org Thu May 7 22:34:36 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9CD3A2E7A8F; Thu, 7 May 2020 22:34:36 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49J7Ym3Qfvz3ML8; Thu, 7 May 2020 22:34:36 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 70CA02059C; Thu, 7 May 2020 22:34:36 +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 047MYaX6044225; Thu, 7 May 2020 22:34:36 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 047MYarV044224; Thu, 7 May 2020 22:34:36 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005072234.047MYarV044224@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 7 May 2020 22:34:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534298 - branches/2020Q2/multimedia/dav1d X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/multimedia/dav1d X-SVN-Commit-Revision: 534298 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.30 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 May 2020 22:34:36 -0000 Author: jbeich Date: Thu May 7 22:34:36 2020 New Revision: 534298 URL: https://svnweb.freebsd.org/changeset/ports/534298 Log: MFH: r534297 multimedia/dav1d: regen patches (gitlab bug) -2.24.1 +2.26.2 Reported by: pkubaj (via D24742) Approved by: ports-secteam blanket Modified: branches/2020Q2/multimedia/dav1d/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/multimedia/dav1d/distinfo ============================================================================== --- branches/2020Q2/multimedia/dav1d/distinfo Thu May 7 22:34:04 2020 (r534297) +++ branches/2020Q2/multimedia/dav1d/distinfo Thu May 7 22:34:36 2020 (r534298) @@ -3,5 +3,5 @@ SHA256 (videolan-dav1d-efd9e5518e0ed5114f8b4579debd7ee SIZE (videolan-dav1d-efd9e5518e0ed5114f8b4579debd7ee6dbede21f_GL0.tar.gz) = 785514 SHA256 (videolan-dav1d-test-data-0b9501d258b50dcf2b86f97214f14f079a1528d0_GL0.tar.gz) = 1982f7494c00314bbd9d62fe3ae182fa5b8aa7104e74728d5291fe315744b758 SIZE (videolan-dav1d-test-data-0b9501d258b50dcf2b86f97214f14f079a1528d0_GL0.tar.gz) = 50232790 -SHA256 (e04227c5f672.patch) = 63891f8bf430b7800101302b51d4b8acf247bf4cf9d9110cdf212f0176ff46b8 +SHA256 (e04227c5f672.patch) = fc0bf961c32f545e5dc1d17ef2f0085b41a1e5fc0fefc7687d10f432c18d907d SIZE (e04227c5f672.patch) = 1153 From owner-svn-ports-branches@freebsd.org Thu May 7 22:36:54 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 707512E7B2D; Thu, 7 May 2020 22:36:54 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49J7cQ2FyHz3MWV; Thu, 7 May 2020 22:36:54 +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 48B49205A0; Thu, 7 May 2020 22:36:54 +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 047MasZg044545; Thu, 7 May 2020 22:36:54 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 047MasWP044544; Thu, 7 May 2020 22:36:54 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005072236.047MasWP044544@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 7 May 2020 22:36:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534300 - branches/2020Q2/net/waypipe X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/net/waypipe X-SVN-Commit-Revision: 534300 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.30 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 May 2020 22:36:54 -0000 Author: jbeich Date: Thu May 7 22:36:53 2020 New Revision: 534300 URL: https://svnweb.freebsd.org/changeset/ports/534300 Log: MFH: r534299 net/waypipe: regen patches (gitlab bug) -2.24.1 +2.26.2 Approved by: ports-secteam blanket Modified: branches/2020Q2/net/waypipe/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/net/waypipe/distinfo ============================================================================== --- branches/2020Q2/net/waypipe/distinfo Thu May 7 22:36:20 2020 (r534299) +++ branches/2020Q2/net/waypipe/distinfo Thu May 7 22:36:53 2020 (r534300) @@ -1,5 +1,5 @@ TIMESTAMP = 1566861480 SHA256 (mstoeckl-waypipe-f78ad85b04ef95daa9a1671aa0375d0e77d19b2f_GL0.tar.gz) = 4bbfcc046ebde67e210433ab7efbb2d92cea62d7088fc2a95405caf8d93d5593 SIZE (mstoeckl-waypipe-f78ad85b04ef95daa9a1671aa0375d0e77d19b2f_GL0.tar.gz) = 143440 -SHA256 (9f0b9f2e8929.patch) = 0c1e9de788123ab544a234d5bd6583a589fee3100f6a5bae1d5b7158ac3dcff3 +SHA256 (9f0b9f2e8929.patch) = 78dcbb8255507a83789bb7188c93cab8c853442c36aa424092ff3678bce042a5 SIZE (9f0b9f2e8929.patch) = 2774 From owner-svn-ports-branches@freebsd.org Thu May 7 23:00:59 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0C0612E829F; Thu, 7 May 2020 23:00:59 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49J88B6bfKz3Nbm; Thu, 7 May 2020 23:00: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 DD9EC2099C; Thu, 7 May 2020 23:00: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 047N0wot059052; Thu, 7 May 2020 23:00:58 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 047N0wLO059051; Thu, 7 May 2020 23:00:58 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005072300.047N0wLO059051@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 7 May 2020 23:00:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534303 - branches/2020Q2/games/openra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/games/openra X-SVN-Commit-Revision: 534303 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.30 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 May 2020 23:00:59 -0000 Author: jbeich Date: Thu May 7 23:00:58 2020 New Revision: 534303 URL: https://svnweb.freebsd.org/changeset/ports/534303 Log: MFH: r533806 games/openra: update to 20200503 Changes: https://github.com/OpenRA/OpenRA/wiki/Changelog#release-20200503 Approved by: ports-secteam (joneum) Modified: branches/2020Q2/games/openra/Makefile branches/2020Q2/games/openra/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/games/openra/Makefile ============================================================================== --- branches/2020Q2/games/openra/Makefile Thu May 7 22:58:07 2020 (r534302) +++ branches/2020Q2/games/openra/Makefile Thu May 7 23:00:58 2020 (r534303) @@ -2,16 +2,18 @@ PORTNAME= openra DISTVERSIONPREFIX= release- -DISTVERSION= 20200202 +DISTVERSION= 20200503 CATEGORIES= games MASTER_SITES= https://github.com/${GH_ACCOUNT}/SDL2-CS/releases/download/20190907/:SDL2_CS \ - https://github.com/${GH_ACCOUNT}/OpenAL-CS/releases/download/20190907/:OpenAL_CS \ - https://github.com/${GH_ACCOUNT}/Eluant/releases/download/20160124/:Eluant + https://github.com/${GH_ACCOUNT}/OpenAL-CS/releases/download/20200316/:OpenAL_CS \ + https://github.com/${GH_ACCOUNT}/Eluant/releases/download/20160124/:Eluant \ + https://download.ip2location.com/lite/:ip2location DISTFILES= SDL2-CS.dll:SDL2_CS \ SDL2-CS.dll.config:SDL2_CS \ OpenAL-CS.dll:OpenAL_CS \ OpenAL-CS.dll.config:OpenAL_CS \ - Eluant.dll:Eluant + Eluant.dll:Eluant \ + IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP:ip2location EXTRACT_ONLY= ${DISTFILES:C/:.*//:N*.config:N*.dll:N*.nupkg} MAINTAINER= jbeich@FreeBSD.org @@ -23,7 +25,6 @@ BUILD_DEPENDS= msbuild:devel/msbuild LIB_DEPENDS= libfreetype.so:print/freetype2 \ libgdiplus.so:x11-toolkits/libgdiplus NUGET_DEPENDS= FuzzyLogicLibrary=1.2.0 \ - MaxMind.Db=2.0.0 \ NUnit=3.0.1 \ NUnit.Console=3.0.1 \ Open.NAT=2.1.0 \ @@ -57,6 +58,7 @@ TEST_ALL_TARGET=test post-extract: ${CP} ${DISTFILES:C/:.*//:N*.nupkg:N*.tar*:S,^,${_DISTDIR}/,} \ ${NUGET_PACKAGEDIR} + ${CP} ${_DISTDIR}/${DISTFILES:C/:.*//:MIP2LOCATION-*} ${WRKSRC} post-patch: ${REINPLACE_CMD} \ Modified: branches/2020Q2/games/openra/distinfo ============================================================================== --- branches/2020Q2/games/openra/distinfo Thu May 7 22:58:07 2020 (r534302) +++ branches/2020Q2/games/openra/distinfo Thu May 7 23:00:58 2020 (r534303) @@ -1,18 +1,18 @@ -TIMESTAMP = 1580560421 +TIMESTAMP = 1587901122 SHA256 (SDL2-CS.dll) = b06c14a771d14cb37210f476dfd973d4e7d80d97f90566bd5bc78996ade4f7a0 SIZE (SDL2-CS.dll) = 80896 SHA256 (SDL2-CS.dll.config) = 7d75ef450e1ceb3f61e77a0513b034a5bc2e754065182bc1bc9134ac664da6bd SIZE (SDL2-CS.dll.config) = 257 SHA256 (OpenAL-CS.dll) = 4cc20a160107748a8e13dfc5e29f9daacf2675e4b302e066bfbe4a1be0596015 SIZE (OpenAL-CS.dll) = 19456 -SHA256 (OpenAL-CS.dll.config) = 12704a902127e3f67e7d9a3e2331bf2d65e008b59ab96d132807add14e0f2a1c -SIZE (OpenAL-CS.dll.config) = 304 +SHA256 (OpenAL-CS.dll.config) = b443d4546c18d2e4a856fdfbd14b11f31a7045f1991f175a357e2c4c2feb4c06 +SIZE (OpenAL-CS.dll.config) = 271 SHA256 (Eluant.dll) = 218c4ea5424b44d746b5343563123beebc652fd9731967dfd49fed071b58df31 SIZE (Eluant.dll) = 71168 +SHA256 (IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP) = 81d1d4b5743fd6aaebd93178954a0d502c76a85cad318a404f68c41ee37ac08d +SIZE (IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP) = 914610 SHA256 (fuzzylogiclibrary.1.2.0.nupkg) = ca8caf33637ae661dfdd5797589f034950d2fcb4f7192ee858830f6e2525df3f SIZE (fuzzylogiclibrary.1.2.0.nupkg) = 80141 -SHA256 (maxmind.db.2.0.0.nupkg) = 98595abd21c735fe8bb84911a7b254f5d37c910818411f8edded7378e3e7c181 -SIZE (maxmind.db.2.0.0.nupkg) = 28890 SHA256 (nunit.3.0.1.nupkg) = eb0b156b44142622d7cd573073d6dc925f8529f2860637325f5af85f94db423c SIZE (nunit.3.0.1.nupkg) = 1000576 SHA256 (nunit.console.3.0.1.nupkg) = 164ce9124d769ac994a79234e59ce51a21be5089e86210666abfef0791ade07f @@ -27,5 +27,5 @@ SHA256 (stylecopplus.msbuild.4.7.49.5.nupkg) = c98225a SIZE (stylecopplus.msbuild.4.7.49.5.nupkg) = 134291 SHA256 (rix0rrr.beaconlib.1.0.1.nupkg) = ed4d44f176af53a2fcb31b35def9a5af4cd42bb3639bc2c458f843d991f074ec SIZE (rix0rrr.beaconlib.1.0.1.nupkg) = 17989 -SHA256 (openra-OpenRA-release-20200202_GH0.tar.gz) = 2e7b6131d76875ff8ed0e288b06cbe617e5e4cdb4c4fd98812dc17a541a5284f -SIZE (openra-OpenRA-release-20200202_GH0.tar.gz) = 26549978 +SHA256 (openra-OpenRA-release-20200503_GH0.tar.gz) = 11ee0aa738c6e7fc4f39ab23f029a280a29530e28096c7da78eb12b12f1a854f +SIZE (openra-OpenRA-release-20200503_GH0.tar.gz) = 27619299 From owner-svn-ports-branches@freebsd.org Fri May 8 04:47:22 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 198B72C0930; Fri, 8 May 2020 04:47: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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49JHqs6nx9z4Ch3; Fri, 8 May 2020 04:47: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 DF91824BD4; Fri, 8 May 2020 04:47: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 0484lLaC083244; Fri, 8 May 2020 04:47:21 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0484lL84083242; Fri, 8 May 2020 04:47:21 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005080447.0484lL84083242@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 8 May 2020 04:47:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534321 - branches/2020Q2/www/firefox X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/www/firefox X-SVN-Commit-Revision: 534321 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.30 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 May 2020 04:47:22 -0000 Author: jbeich Date: Fri May 8 04:47:21 2020 New Revision: 534321 URL: https://svnweb.freebsd.org/changeset/ports/534321 Log: MFH: r534320 www/firefox: update to 76.0.1 Changes: https://www.mozilla.org/firefox/76.0.1/releasenotes/ Approved by: ports-secteam blanket Modified: branches/2020Q2/www/firefox/Makefile branches/2020Q2/www/firefox/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/www/firefox/Makefile ============================================================================== --- branches/2020Q2/www/firefox/Makefile Fri May 8 04:40:43 2020 (r534320) +++ branches/2020Q2/www/firefox/Makefile Fri May 8 04:47:21 2020 (r534321) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 76.0 -PORTREVISION= 1 +DISTVERSION= 76.0.1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org Modified: branches/2020Q2/www/firefox/distinfo ============================================================================== --- branches/2020Q2/www/firefox/distinfo Fri May 8 04:40:43 2020 (r534320) +++ branches/2020Q2/www/firefox/distinfo Fri May 8 04:47:21 2020 (r534321) @@ -1,3 +1,3 @@ -TIMESTAMP = 1588197340 -SHA256 (firefox-76.0.source.tar.xz) = 3b7b97b0b0625fc6ec23ee28d425988c679d3a56f362d62fd3b225a5d50afdc8 -SIZE (firefox-76.0.source.tar.xz) = 323886744 +TIMESTAMP = 1588879058 +SHA256 (firefox-76.0.1.source.tar.xz) = f61761e32774a6bdfedd5937c4992fbe5e24c3df057c2b9a559fcd0d038777c3 +SIZE (firefox-76.0.1.source.tar.xz) = 323251680 From owner-svn-ports-branches@freebsd.org Fri May 8 13:15:28 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8E1802D726F; Fri, 8 May 2020 13:15:28 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49JW681wQzz3J3q; Fri, 8 May 2020 13:15:28 +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 3D4202CC5; Fri, 8 May 2020 13:15:28 +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 048DFSOW005667; Fri, 8 May 2020 13:15:28 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 048DFSFi005666; Fri, 8 May 2020 13:15:28 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005081315.048DFSFi005666@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 8 May 2020 13:15:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534402 - branches/2020Q2/lang/intel-compute-runtime X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/lang/intel-compute-runtime X-SVN-Commit-Revision: 534402 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.32 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 May 2020 13:15:28 -0000 Author: jbeich Date: Fri May 8 13:15:27 2020 New Revision: 534402 URL: https://svnweb.freebsd.org/changeset/ports/534402 Log: MFH: r534401 lang/intel-compute-runtime: fix version after r529254 $ clinfo | fgrep 'Driver Version' Driver Version 1.0.0 https://github.com/intel/compute-runtime/commit/211375e898e3 https://github.com/intel/compute-runtime/commit/43016c65591b Approved by: ports-secteam blanket Modified: branches/2020Q2/lang/intel-compute-runtime/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/lang/intel-compute-runtime/Makefile ============================================================================== --- branches/2020Q2/lang/intel-compute-runtime/Makefile Fri May 8 13:14:04 2020 (r534401) +++ branches/2020Q2/lang/intel-compute-runtime/Makefile Fri May 8 13:15:27 2020 (r534402) @@ -2,7 +2,7 @@ PORTNAME= compute-runtime DISTVERSION= 20.12.16259 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang PKGNAMEPREFIX= intel- @@ -23,7 +23,7 @@ USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= intel CMAKE_ON= SKIP_UNIT_TESTS -CMAKE_ARGS= -DNEO_DRIVER_VERSION:STRING="${DISTVERSIONFULL}" +CMAKE_ARGS= -DNEO_OCL_DRIVER_VERSION:STRING="${DISTVERSIONFULL}" PLIST_FILES= etc/OpenCL/vendors/intel.icd \ bin/ocloc \ lib/intel-opencl/libigdrcl.so From owner-svn-ports-branches@freebsd.org Fri May 8 18:29:51 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 241502DEC55; Fri, 8 May 2020 18:29:51 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49Jf4v09kzz49nC; Fri, 8 May 2020 18:29:51 +0000 (UTC) (envelope-from gerald@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 F117E6A79; Fri, 8 May 2020 18:29:50 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 048ITojL099638; Fri, 8 May 2020 18:29:50 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 048ITowQ099637; Fri, 8 May 2020 18:29:50 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <202005081829.048ITowQ099637@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Fri, 8 May 2020 18:29:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534414 - branches/2020Q2/emulators/wine-devel X-SVN-Group: ports-branches X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: branches/2020Q2/emulators/wine-devel X-SVN-Commit-Revision: 534414 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.32 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 May 2020 18:29:51 -0000 Author: gerald Date: Fri May 8 18:29:50 2020 New Revision: 534414 URL: https://svnweb.freebsd.org/changeset/ports/534414 Log: MFH: r534205 Push USES=pkgconfig to the global level instead just contingent on the VKD3D option. This makes a real difference for the GNUTLS option (on by default) and others. Accordingly bump PORTREVISION. Reported by: Benny Goemans Approved by: portmgr (blanket: missing dependency) Modified: branches/2020Q2/emulators/wine-devel/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/emulators/wine-devel/Makefile ============================================================================== --- branches/2020Q2/emulators/wine-devel/Makefile Fri May 8 16:49:28 2020 (r534413) +++ branches/2020Q2/emulators/wine-devel/Makefile Fri May 8 18:29:50 2020 (r534414) @@ -3,6 +3,7 @@ PORTNAME= wine DISTVERSION= 5.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ @@ -24,7 +25,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex \ LIB_DEPENDS= libFAudio.so:audio/faudio \ libxml2.so:textproc/libxml2 -USES= bison desktop-file-utils gmake localbase shebangfix tar:xz +USES= bison desktop-file-utils gmake localbase pkgconfig shebangfix tar:xz CONFLICTS_INSTALL= wine-[0-9]* i386-wine-[0-9]* i386-wine-devel-[0-9]* @@ -112,7 +113,6 @@ V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l VKD3D_CONFIGURE_WITH= vkd3d -VKD3D_USES= pkgconfig VKD3D_LIB_DEPENDS= libvkd3d.so:graphics/vkd3d VULKAN_CONFIGURE_WITH= vulkan From owner-svn-ports-branches@freebsd.org Sat May 9 06:47:29 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 39D0A2DE3DF; Sat, 9 May 2020 06:47:29 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49JyS10YN3z4LNQ; Sat, 9 May 2020 06:47:29 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0A0DEFD37; Sat, 9 May 2020 06:47:29 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0496lSdU003688; Sat, 9 May 2020 06:47:28 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0496lSFY003687; Sat, 9 May 2020 06:47:28 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005090647.0496lSFY003687@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 9 May 2020 06:47:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534712 - branches/2020Q2/lang/intel-compute-runtime X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/lang/intel-compute-runtime X-SVN-Commit-Revision: 534712 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.32 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 May 2020 06:47:29 -0000 Author: jbeich Date: Sat May 9 06:47:28 2020 New Revision: 534712 URL: https://svnweb.freebsd.org/changeset/ports/534712 Log: lang/intel-compute-runtime: unbreak on amd64 after r534402 CMake Error at level_zero/CMakeLists.txt:32 (project): VERSION "0.8." format invalid. Reported by: pkg-fallout Approved by: ports-secteam blanket Modified: branches/2020Q2/lang/intel-compute-runtime/Makefile Modified: branches/2020Q2/lang/intel-compute-runtime/Makefile ============================================================================== --- branches/2020Q2/lang/intel-compute-runtime/Makefile Sat May 9 05:10:22 2020 (r534711) +++ branches/2020Q2/lang/intel-compute-runtime/Makefile Sat May 9 06:47:28 2020 (r534712) @@ -23,6 +23,7 @@ USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= intel CMAKE_ON= SKIP_UNIT_TESTS +CMAKE_OFF= BUILD_WITH_L0 CMAKE_ARGS= -DNEO_OCL_DRIVER_VERSION:STRING="${DISTVERSIONFULL}" PLIST_FILES= etc/OpenCL/vendors/intel.icd \ bin/ocloc \ From owner-svn-ports-branches@freebsd.org Sat May 9 07:04:54 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8BCFD2DEA7C; Sat, 9 May 2020 07:04:54 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49Jyr61y8Cz4Mbq; Sat, 9 May 2020 07:04:54 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3E640180FD; Sat, 9 May 2020 07:04:54 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04974sh5016135; Sat, 9 May 2020 07:04:54 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04974r1P016133; Sat, 9 May 2020 07:04:53 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202005090704.04974r1P016133@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 9 May 2020 07:04:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534716 - in branches/2020Q2/x11-fonts/fontconfig: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in branches/2020Q2/x11-fonts/fontconfig: . files X-SVN-Commit-Revision: 534716 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.32 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 May 2020 07:04:54 -0000 Author: tcberner Date: Sat May 9 07:04:53 2020 New Revision: 534716 URL: https://svnweb.freebsd.org/changeset/ports/534716 Log: MFH: r534715 x11-fonts/fontconfig: webfonts on many sites crash www/firefox A "bad" commit [1] included in the recent fontconfig upgrade to 2.13.92, lead to many crashed tabs inside firefox. A fix has been provided upstream in [2], and fixed in fix [3]. Related Mozilla bugreport [4]. [1] https://cgit.freedesktop.org/fontconfig/commit/?id=61573ad5f7c4dd0860d613d99d0086433240eb75 [2] https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/237 [3] https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/6edaaa4d1823518a97fb4cc3004d110b1046f742 [4] https://bugzilla.mozilla.org/show_bug.cgi?id=1629231 PR: 245915 Submitted by: jbeich Reported by: Graham Perrin, jbeich, ehaupt, tcberner Approved by: ports-secteam (implicit) Modified: branches/2020Q2/x11-fonts/fontconfig/Makefile branches/2020Q2/x11-fonts/fontconfig/files/patch-2.13.92.diff Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/x11-fonts/fontconfig/Makefile ============================================================================== --- branches/2020Q2/x11-fonts/fontconfig/Makefile Sat May 9 07:03:56 2020 (r534715) +++ branches/2020Q2/x11-fonts/fontconfig/Makefile Sat May 9 07:04:53 2020 (r534716) @@ -3,7 +3,7 @@ PORTNAME= fontconfig PORTVERSION= 2.13.92 -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH?= 1 CATEGORIES= x11-fonts MASTER_SITES= https://www.freedesktop.org/software/fontconfig/release/ Modified: branches/2020Q2/x11-fonts/fontconfig/files/patch-2.13.92.diff ============================================================================== --- branches/2020Q2/x11-fonts/fontconfig/files/patch-2.13.92.diff Sat May 9 07:03:56 2020 (r534715) +++ branches/2020Q2/x11-fonts/fontconfig/files/patch-2.13.92.diff Sat May 9 07:04:53 2020 (r534716) @@ -28,6 +28,8 @@ # https://cgit.freedesktop.org/fontconfig/commit/?id=71d6866d381a0ab3585eb9ee760aeec98e722359 # Fix memory leaks # https://cgit.freedesktop.org/fontconfig/commit/?id=61573ad5f7c4dd0860d613d99d0086433240eb75 +# Set name_mapping to NULL after freeing to avoid risk of double-free. +# https://cgit.freedesktop.org/fontconfig/commit/?id=6edaaa4d1823518a97fb4cc3004d110b1046f742 # Fix assertion in FcFini() # https://cgit.freedesktop.org/fontconfig/commit/?id=fbc05949ef52c8a8d69233eed77f6636dffec280 # Set exact boolean value to color property @@ -1338,6 +1340,17 @@ test/test-bz1744377.c, test/test-crbug1004254.c, test/ if (FcDebug () & FC_DBG_SCANV) printf ("found full (n %2d p %d e %d l 0x%04x)", sname.name_id, sname.platform_id, +@@ -1624,7 +1627,10 @@ FcFreeTypeQueryFaceInternal (const FT_Fa + } + } + if (!nm_share) ++ { + free (name_mapping); ++ name_mapping = NULL; ++ } + + if (!nfamily && face->family_name && + FcStrCmpIgnoreBlanksAndCase ((FcChar8 *) face->family_name, (FcChar8 *) "") != 0) @@ -1679,6 +1682,61 @@ FcFreeTypeQueryFaceInternal (const FT_Fa ++nfamily; } From owner-svn-ports-branches@freebsd.org Sat May 9 10:14:10 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 53E662E2EF4; Sat, 9 May 2020 10:14:10 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49K32V1LlZz4XqF; Sat, 9 May 2020 10:14:10 +0000 (UTC) (envelope-from wen@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 298B31A51D; Sat, 9 May 2020 10:14:10 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 049AEAC1037260; Sat, 9 May 2020 10:14:10 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 049AE9p0037255; Sat, 9 May 2020 10:14:09 GMT (envelope-from wen@FreeBSD.org) Message-Id: <202005091014.049AE9p0037255@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Sat, 9 May 2020 10:14:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534731 - in branches/2020Q2/lang: python-doc-html python27 X-SVN-Group: ports-branches X-SVN-Commit-Author: wen X-SVN-Commit-Paths: in branches/2020Q2/lang: python-doc-html python27 X-SVN-Commit-Revision: 534731 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.32 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 May 2020 10:14:10 -0000 Author: wen Date: Sat May 9 10:14:08 2020 New Revision: 534731 URL: https://svnweb.freebsd.org/changeset/ports/534731 Log: MFH: r534040 - Update to 2.7.18 [1] (include security fix) - Fix build with OPTION of DEBUG THREADS [2] PR: 245776 Submitted by: vvd@unislabs.com [1], takefu@airport.fm [2] Exp-run by: antoine@ [1] Security: CVE-2019-18348, CVE-2020-8492 Approved by: ports-secteam@(joneum@) Modified: branches/2020Q2/lang/python-doc-html/distinfo branches/2020Q2/lang/python27/Makefile branches/2020Q2/lang/python27/Makefile.version branches/2020Q2/lang/python27/distinfo branches/2020Q2/lang/python27/pkg-plist Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/lang/python-doc-html/distinfo ============================================================================== --- branches/2020Q2/lang/python-doc-html/distinfo Sat May 9 10:08:13 2020 (r534730) +++ branches/2020Q2/lang/python-doc-html/distinfo Sat May 9 10:14:08 2020 (r534731) @@ -1,12 +1,12 @@ -TIMESTAMP = 1584095619 -SHA256 (python/python-2.7.17-docs-html.tar.bz2) = d7388cfcf28591e5ab09932f70d180b1288130942779ead1fb40f750d72c18eb -SIZE (python/python-2.7.17-docs-html.tar.bz2) = 4605137 -SHA256 (python/python-2.7.17-docs-pdf-a4.tar.bz2) = b4e09d093f03dd879ad207a9043212d6adb9a40e90540f1526315c361faf2219 -SIZE (python/python-2.7.17-docs-pdf-a4.tar.bz2) = 11441433 -SHA256 (python/python-2.7.17-docs-pdf-letter.tar.bz2) = 9fe275a4a318dfd260b5439afd0fe85ffbcefeacdb93815f2565c3f9faef1c6e -SIZE (python/python-2.7.17-docs-pdf-letter.tar.bz2) = 11440298 -SHA256 (python/python-2.7.17-docs-text.tar.bz2) = ee7c3678718870ab76f3b7d2269f79ba9e84c91788a1ce8fc4b13b7401c9891a -SIZE (python/python-2.7.17-docs-text.tar.bz2) = 1630849 +TIMESTAMP = 1587430333 +SHA256 (python/python-2.7.18-docs-html.tar.bz2) = 3d05142817615e77cec99f686dca58289bbfe008af22f94a93262e8663db81c7 +SIZE (python/python-2.7.18-docs-html.tar.bz2) = 4732851 +SHA256 (python/python-2.7.18-docs-pdf-a4.tar.bz2) = ead357695e43c824ae1a83dd6cd3b4a47215658f3fa20111726ff7ef16a16dd2 +SIZE (python/python-2.7.18-docs-pdf-a4.tar.bz2) = 11455585 +SHA256 (python/python-2.7.18-docs-pdf-letter.tar.bz2) = 0e1259b379982ceb623f25af9a15ab3d9fcd054b5efcb9d5c173404f7b80048a +SIZE (python/python-2.7.18-docs-pdf-letter.tar.bz2) = 11455989 +SHA256 (python/python-2.7.18-docs-text.tar.bz2) = c2396b36632ecdefa3fbf9f73c80641c315e8d4a515da5e6616f4450e0ca74ff +SIZE (python/python-2.7.18-docs-text.tar.bz2) = 1633624 SHA256 (python/python-3.5.9-docs-html.tar.bz2) = b0cfe724c612b563da7e5fceb7b4b70eedd40b2f01b04d199a073090f0908b9f SIZE (python/python-3.5.9-docs-html.tar.bz2) = 5780603 SHA256 (python/python-3.5.9-docs-pdf-a4.tar.bz2) = c8fa8c4f0f313569d3893d9ff9c7fed6564d4d4e961c4f796ee870c1f9e59d75 Modified: branches/2020Q2/lang/python27/Makefile ============================================================================== --- branches/2020Q2/lang/python27/Makefile Sat May 9 10:08:13 2020 (r534730) +++ branches/2020Q2/lang/python27/Makefile Sat May 9 10:14:08 2020 (r534731) @@ -2,7 +2,6 @@ PORTNAME= python PORTVERSION= ${PYTHON_PORTVERSION} -PORTREVISION= 1 CATEGORIES= lang python MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} PKGNAMESUFFIX= 27 Modified: branches/2020Q2/lang/python27/Makefile.version ============================================================================== --- branches/2020Q2/lang/python27/Makefile.version Sat May 9 10:08:13 2020 (r534730) +++ branches/2020Q2/lang/python27/Makefile.version Sat May 9 10:14:08 2020 (r534731) @@ -3,4 +3,4 @@ # Do not forget to update python documentation (lang/python-doc-*) # Run "make -C lang/python-doc-html makesum" -PYTHON_PORTVERSION= 2.7.17 +PYTHON_PORTVERSION= 2.7.18 Modified: branches/2020Q2/lang/python27/distinfo ============================================================================== --- branches/2020Q2/lang/python27/distinfo Sat May 9 10:08:13 2020 (r534730) +++ branches/2020Q2/lang/python27/distinfo Sat May 9 10:14:08 2020 (r534731) @@ -1,3 +1,3 @@ -TIMESTAMP = 1571538094 -SHA256 (python/Python-2.7.17.tar.xz) = 4d43f033cdbd0aa7b7023c81b0e986fd11e653b5248dac9144d508f11812ba41 -SIZE (python/Python-2.7.17.tar.xz) = 12855568 +TIMESTAMP = 1587426078 +SHA256 (python/Python-2.7.18.tar.xz) = b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43 +SIZE (python/Python-2.7.18.tar.xz) = 12854736 Modified: branches/2020Q2/lang/python27/pkg-plist ============================================================================== --- branches/2020Q2/lang/python27/pkg-plist Sat May 9 10:08:13 2020 (r534730) +++ branches/2020Q2/lang/python27/pkg-plist Sat May 9 10:14:08 2020 (r534731) @@ -1915,9 +1915,13 @@ lib/python2.7/lib-dynload/_io.so lib/python2.7/lib-dynload/_json.so lib/python2.7/lib-dynload/_locale.so lib/python2.7/lib-dynload/_lsprof.so +%%DEBUG%%lib/python2.7/lib-dynload/_md5.so lib/python2.7/lib-dynload/_multibytecodec.so -lib/python2.7/lib-dynload/_multiprocessing.so +%%THREADS%%lib/python2.7/lib-dynload/_multiprocessing.so lib/python2.7/lib-dynload/_random.so +%%DEBUG%%lib/python2.7/lib-dynload/_sha.so +%%DEBUG%%lib/python2.7/lib-dynload/_sha256.so +%%DEBUG%%lib/python2.7/lib-dynload/_sha512.so lib/python2.7/lib-dynload/_socket.so lib/python2.7/lib-dynload/_ssl.so lib/python2.7/lib-dynload/_struct.so From owner-svn-ports-branches@freebsd.org Sat May 9 13:24:42 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8B2FA2E986B; Sat, 9 May 2020 13:24:42 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49K7GL36m0z3J2R; Sat, 9 May 2020 13:24:42 +0000 (UTC) (envelope-from gjb@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 660E91C965; Sat, 9 May 2020 13:24:42 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 049DOgHN054622; Sat, 9 May 2020 13:24:42 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 049DOeQ8054614; Sat, 9 May 2020 13:24:40 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202005091324.049DOeQ8054614@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sat, 9 May 2020 13:24:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534740 - in branches/2020Q2/misc/freebsd-release-manifests: . files/MANIFESTS X-SVN-Group: ports-branches X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in branches/2020Q2/misc/freebsd-release-manifests: . files/MANIFESTS X-SVN-Commit-Revision: 534740 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.32 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 May 2020 13:24:42 -0000 Author: gjb Date: Sat May 9 13:24:40 2020 New Revision: 534740 URL: https://svnweb.freebsd.org/changeset/ports/534740 Log: MFH: r534739 Add MANIFEST files for 11.4-BETA1. Sponsored by: Rubicon Communications, LLC (netgate.com) Approved by: portmgr (implicit, re blanket) Added: branches/2020Q2/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.4-BETA1 - copied unchanged from r534739, head/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.4-BETA1 branches/2020Q2/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.4-BETA1 - copied unchanged from r534739, head/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.4-BETA1 branches/2020Q2/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.4-BETA1 - copied unchanged from r534739, head/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.4-BETA1 branches/2020Q2/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.4-BETA1 - copied unchanged from r534739, head/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.4-BETA1 branches/2020Q2/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.4-BETA1 - copied unchanged from r534739, head/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.4-BETA1 branches/2020Q2/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.4-BETA1 - copied unchanged from r534739, head/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.4-BETA1 Modified: branches/2020Q2/misc/freebsd-release-manifests/Makefile branches/2020Q2/misc/freebsd-release-manifests/pkg-plist Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/misc/freebsd-release-manifests/Makefile ============================================================================== --- branches/2020Q2/misc/freebsd-release-manifests/Makefile Sat May 9 13:23:14 2020 (r534739) +++ branches/2020Q2/misc/freebsd-release-manifests/Makefile Sat May 9 13:24:40 2020 (r534740) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= freebsd-release-manifests -DISTVERSION= 20191104 +DISTVERSION= 20200509 PORTREVISION= 0 CATEGORIES= misc MASTER_SITES= # Copied: branches/2020Q2/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.4-BETA1 (from r534739, head/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.4-BETA1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.4-BETA1 Sat May 9 13:24:40 2020 (r534740, copy of r534739, head/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.4-BETA1) @@ -0,0 +1,10 @@ +base-dbg.txz 8b83490bca78e79ecc9cb382c961f96fff90890b04532a0a1ea95e6f65cc05c4 1500 base_dbg "Base system (Debugging)" off +base.txz 3d5cc4c819fb0035ddc3816ad0429b7ad3496d8b2f3feb53d9cfcd2686065383 23524 base "Base system (MANDATORY)" on +doc.txz 9f2bc814a4ed09827d1ffa8a49dfb3412948104736788f1321379b6c0cba7503 120 doc "Additional Documentation" off +kernel-dbg.txz 74fd65ffb3b8a008ef1b14dcd85fa39036fccc7c9110715cb0d10e180111aa53 877 kernel_dbg "Kernel (Debugging)" off +kernel.txz d6ac140ce27dafda76f5b3873a8723a2f9f2241aea31fe241bce74b65c99994d 886 kernel "Kernel (MANDATORY)" on +lib32-dbg.txz 054bd992b49a255c8844060394cb69ce1ed4b1046231ba085ef103b78df1313c 229 lib32_dbg "32-bit compatibility libraries (Debugging)" off +lib32.txz 5c4afcbecca53ae5e1516e1a50242243de9b0c778adb74a71f3961959e185514 973 lib32 "32-bit compatibility libraries" on +ports.txz 8706c4f27d61cbbd1e2f75840db36b9d3e30ae6a188f61aac9d089edbff2ab7d 174786 ports "Ports tree" on +src.txz 2cbab45d9a982a9284e5c1eb966b19ef86ab57fd3b0a4f4e235c30bf83610817 82285 src "System source tree" off +tests.txz ef1f2e546bebe209d76c2426416692eeb06d981c03ddbbbfa3a8b76ee03f8a68 4185 tests "Test suite" off Copied: branches/2020Q2/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.4-BETA1 (from r534739, head/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.4-BETA1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.4-BETA1 Sat May 9 13:24:40 2020 (r534740, copy of r534739, head/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.4-BETA1) @@ -0,0 +1,8 @@ +base-dbg.txz e19aa372add07ceaaf71bc32e21c6a19a792d6a410dc77ce9635133cb0df3497 1443 base_dbg "Base system (Debugging)" off +base.txz 5c26b72e93d1f005ef8dbd794fadc9c2186e9bf0660ded7a457776eb831c7f50 22814 base "Base system (MANDATORY)" on +doc.txz 6c6a0a861addff44b7d8d38fdd941fcaf4ffcf98ece64faaa2121fc095e0d56f 120 doc "Additional Documentation" off +kernel-dbg.txz de809c954c2c69ea34955c8a6170933f245e140f8a49008612246582d121c353 588 kernel_dbg "Kernel (Debugging)" off +kernel.txz 905eb915bfe3a83ea2fcf095a22da2af453e100c5a9738a6b3abc667f5d022c9 596 kernel "Kernel (MANDATORY)" on +ports.txz 8706c4f27d61cbbd1e2f75840db36b9d3e30ae6a188f61aac9d089edbff2ab7d 174786 ports "Ports tree" on +src.txz 2cbab45d9a982a9284e5c1eb966b19ef86ab57fd3b0a4f4e235c30bf83610817 82285 src "System source tree" off +tests.txz 7b20ab35789c606a466db9262cdd6df674a052584978085861e932d71dabd35d 4182 tests "Test suite" off Copied: branches/2020Q2/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.4-BETA1 (from r534739, head/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.4-BETA1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.4-BETA1 Sat May 9 13:24:40 2020 (r534740, copy of r534739, head/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.4-BETA1) @@ -0,0 +1,8 @@ +base-dbg.txz 236b0d650497b79ae7b1252334931c457fd22b8d4f414819cbc85f5943d7b676 1474 base_dbg "Base system (Debugging)" off +base.txz 9dbb102769f8737a58e09e9b39da256b892026820e9f858f2438a3b0c8b4b751 23200 base "Base system (MANDATORY)" on +doc.txz ec94f6c558669ebd4b01927586e2e162a88d8723ca8c6b28fa14d346cf5d753b 120 doc "Additional Documentation" off +kernel-dbg.txz 327fea3f91e70a9ecf68919c773358906fab509f2e775053a54247b5baf0b3ae 884 kernel_dbg "Kernel (Debugging)" off +kernel.txz b843f597e6bac7da1373638565811a5109edf9faa888e53f79f9be7b21703ee5 893 kernel "Kernel (MANDATORY)" on +ports.txz 8706c4f27d61cbbd1e2f75840db36b9d3e30ae6a188f61aac9d089edbff2ab7d 174786 ports "Ports tree" on +src.txz 2cbab45d9a982a9284e5c1eb966b19ef86ab57fd3b0a4f4e235c30bf83610817 82285 src "System source tree" off +tests.txz ae8f3842d2bd35d25cecde88948557362675e64cd09c3eecbbac81bb62827872 4185 tests "Test suite" off Copied: branches/2020Q2/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.4-BETA1 (from r534739, head/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.4-BETA1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.4-BETA1 Sat May 9 13:24:40 2020 (r534740, copy of r534739, head/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.4-BETA1) @@ -0,0 +1,8 @@ +base-dbg.txz f5cd2711ebd98fc55918f8e4b65ca6ff5d162cc48c36bdc40ed4cc05bd622f3a 1439 base_dbg "Base system (Debugging)" off +base.txz 37380f19d18ac440041aa608798285e2a1a25960fb3814c37d8dafc0e2dbad3f 22952 base "Base system (MANDATORY)" on +doc.txz 22f5c8907572cb46439aad8f6146200fe34dff5eb718d2c69bd6549667dd6cc4 120 doc "Additional Documentation" off +kernel-dbg.txz 562a8aeb31deeb2dc6742469fc7ca1fe6b468597483a9ca4c9f2203be0d57959 598 kernel_dbg "Kernel (Debugging)" off +kernel.txz 0ad116e10e8d28594288b4f65c69092e2797f20b9ed041593f2b60e5e9a725bf 606 kernel "Kernel (MANDATORY)" on +ports.txz 8706c4f27d61cbbd1e2f75840db36b9d3e30ae6a188f61aac9d089edbff2ab7d 174786 ports "Ports tree" on +src.txz 2cbab45d9a982a9284e5c1eb966b19ef86ab57fd3b0a4f4e235c30bf83610817 82285 src "System source tree" off +tests.txz 1bdf27ea5f919983717532ae8cd72d7017a130fdc1e7cec92cff4a99509bdb57 4181 tests "Test suite" off Copied: branches/2020Q2/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.4-BETA1 (from r534739, head/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.4-BETA1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.4-BETA1 Sat May 9 13:24:40 2020 (r534740, copy of r534739, head/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.4-BETA1) @@ -0,0 +1,10 @@ +base-dbg.txz 25dc333e76b6d1e8c8e4b434a9260352dc8ce4372fb53739c51777a829cb4f08 1441 base_dbg "Base system (Debugging)" off +base.txz 7f3044370cf3a66ebf0ba97221b5ec78b12e814abfc97528ed15ec737fb4606d 22971 base "Base system (MANDATORY)" on +doc.txz 0abc73a9d8e042117c4b11251c16135bd02218297ff534e8cef25055844dbb0c 120 doc "Additional Documentation" off +kernel-dbg.txz 665c6624c1545198d30c409ab8b0173c3ae5e0410f80f9a11ec94c92022affe3 692 kernel_dbg "Kernel (Debugging)" off +kernel.txz 82053dca969b4390042a7f56e550ed49ad1b4b015176e9f59f131bc274383320 700 kernel "Kernel (MANDATORY)" on +lib32-dbg.txz b9556e85a78f6958e7bf94e35b8529e9dcdf55c228ca11a8c6185dc50ec5da3f 209 lib32_dbg "32-bit compatibility libraries (Debugging)" off +lib32.txz e71b709ec1370cc92736e24e338b88d600737b90f0ca4fe1226dd766b06280c9 740 lib32 "32-bit compatibility libraries" on +ports.txz 8706c4f27d61cbbd1e2f75840db36b9d3e30ae6a188f61aac9d089edbff2ab7d 174786 ports "Ports tree" on +src.txz 9dc35a58680460f30e516a31c5c15ebdadfaf1ccc25cd9ff6d5557987a49143c 82286 src "System source tree" off +tests.txz 5b0687bb354fd4544476c7ecb51fc996c4137bf7957a17e4fc379c7de675f4c0 4181 tests "Test suite" off Copied: branches/2020Q2/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.4-BETA1 (from r534739, head/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.4-BETA1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.4-BETA1 Sat May 9 13:24:40 2020 (r534740, copy of r534739, head/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.4-BETA1) @@ -0,0 +1,8 @@ +base-dbg.txz dba55534989e04d1281ea73f14aa4926efb2a430fb4938dbb3706c8e82190a11 1437 base_dbg "Base system (Debugging)" off +base.txz 8db7c870246bbe55cd1f0efb49bc078bab0e34d9d5a40c801aa1bdda544b2c12 22887 base "Base system (MANDATORY)" on +doc.txz b55d784aaed8633e7fd637b07f7ce61d99ef5b6f3f9b627c8acb96025b36ca63 120 doc "Additional Documentation" off +kernel-dbg.txz 54dc7bb189ee68c53dbe59500f816a235bdae34c52bf1baba3c371cde8c3de6d 582 kernel_dbg "Kernel (Debugging)" off +kernel.txz 131fd2632a266e9ea58c3dfc8f24283ce5f4507ac200e7f2483dbd6ebd99a419 590 kernel "Kernel (MANDATORY)" on +ports.txz 8706c4f27d61cbbd1e2f75840db36b9d3e30ae6a188f61aac9d089edbff2ab7d 174786 ports "Ports tree" on +src.txz 2cbab45d9a982a9284e5c1eb966b19ef86ab57fd3b0a4f4e235c30bf83610817 82285 src "System source tree" off +tests.txz d446e7db9b240009f03f9a017f7b1ae4da8f4de14658a9da950740cfb178db1e 4177 tests "Test suite" off Modified: branches/2020Q2/misc/freebsd-release-manifests/pkg-plist ============================================================================== --- branches/2020Q2/misc/freebsd-release-manifests/pkg-plist Sat May 9 13:23:14 2020 (r534739) +++ branches/2020Q2/misc/freebsd-release-manifests/pkg-plist Sat May 9 13:24:40 2020 (r534740) @@ -88,3 +88,9 @@ %%DATADIR%%/MANIFESTS/powerpc-powerpc64-12.1-RELEASE %%DATADIR%%/MANIFESTS/powerpc-powerpcspe-12.1-RELEASE %%DATADIR%%/MANIFESTS/sparc64-sparc64-12.1-RELEASE +%%DATADIR%%/MANIFESTS/amd64-amd64-11.4-BETA1 +%%DATADIR%%/MANIFESTS/arm64-aarch64-11.4-BETA1 +%%DATADIR%%/MANIFESTS/i386-i386-11.4-BETA1 +%%DATADIR%%/MANIFESTS/powerpc-powerpc-11.4-BETA1 +%%DATADIR%%/MANIFESTS/powerpc-powerpc64-11.4-BETA1 +%%DATADIR%%/MANIFESTS/sparc64-sparc64-11.4-BETA1 From owner-svn-ports-branches@freebsd.org Sat May 9 16:55:25 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0D4DE2F0CFB; Sat, 9 May 2020 16:55:25 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49KCxS6dbqz45rk; Sat, 9 May 2020 16:55:24 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DF1811F165; Sat, 9 May 2020 16:55:24 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 049GtOuP088901; Sat, 9 May 2020 16:55:24 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 049GtOZK088900; Sat, 9 May 2020 16:55:24 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202005091655.049GtOZK088900@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sat, 9 May 2020 16:55:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r534789 - branches/2020Q2/graphics/darktable/files X-SVN-Group: ports-branches X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: branches/2020Q2/graphics/darktable/files X-SVN-Commit-Revision: 534789 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.32 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 May 2020 16:55:25 -0000 Author: mandree Date: Sat May 9 16:55:24 2020 New Revision: 534789 URL: https://svnweb.freebsd.org/changeset/ports/534789 Log: MFH: r534788 graphics/darktable: fix broken build, data/kernels/ related This patch is to fix this problem: | CMake Error at data/kernels/CMakeLists.txt:34 (foreach): | Unknown argument: | /usr/ports/graphics/darktable/work/darktable-3.0.0/data/kernels/atrous.cl Approved by: portmgr@ (blanket approval to fix broken builds) Note that his revealed a Tools/scripts/mfh bug where it does not currently check out the port directory, but only files/. https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=246336 Added: branches/2020Q2/graphics/darktable/files/patch-data_kernels_CMakeLists.txt - copied unchanged from r534788, head/graphics/darktable/files/patch-data_kernels_CMakeLists.txt Modified: Directory Properties: branches/2020Q2/ (props changed) Copied: branches/2020Q2/graphics/darktable/files/patch-data_kernels_CMakeLists.txt (from r534788, head/graphics/darktable/files/patch-data_kernels_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/graphics/darktable/files/patch-data_kernels_CMakeLists.txt Sat May 9 16:55:24 2020 (r534789, copy of r534788, head/graphics/darktable/files/patch-data_kernels_CMakeLists.txt) @@ -0,0 +1,13 @@ +--- data/kernels/CMakeLists.txt.orig 2020-04-15 07:10:53 UTC ++++ data/kernels/CMakeLists.txt +@@ -31,8 +31,8 @@ macro (testcompile_opencl_kernel IN) + endmacro (testcompile_opencl_kernel) + + if (TESTBUILD_OPENCL_PROGRAMS) +- foreach(IN ${DT_OPENCL_KERNELS}) +- testcompile_opencl_kernel(${IN}) ++ foreach(i ${DT_OPENCL_KERNELS}) ++ testcompile_opencl_kernel(${i}) + endforeach() + endif() +