From owner-svn-ports-branches@freebsd.org Sun Jan 5 04:07:05 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 A07E81D7A5D; Sun, 5 Jan 2020 04:07:05 +0000 (UTC) (envelope-from linimon@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 47r4pd2c6hz3K4W; Sun, 5 Jan 2020 04:07:05 +0000 (UTC) (envelope-from linimon@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 379E71FCB1; Sun, 5 Jan 2020 04:07:05 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 005474iO048021; Sun, 5 Jan 2020 04:07:04 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 005474nY048017; Sun, 5 Jan 2020 04:07:04 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <202001050407.005474nY048017@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Sun, 5 Jan 2020 04:07:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522086 - branches/2020Q1/security/palisade X-SVN-Group: ports-branches X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: branches/2020Q1/security/palisade X-SVN-Commit-Revision: 522086 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, 05 Jan 2020 04:07:05 -0000 Author: linimon Date: Sun Jan 5 04:07:04 2020 New Revision: 522086 URL: https://svnweb.freebsd.org/changeset/ports/522086 Log: MFH: r522080 Add compiler:c++11-lang to USES to try to fix build on GCC-based systems: CMake Error at CMakeLists.txt:112 (message): GCC version must be at least 6.1! Unfortunately this merely gets to a failure later on in the build for powerpc64. Approved by: portmgr (tier-2 blanket) Modified: branches/2020Q1/security/palisade/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/security/palisade/Makefile ============================================================================== --- branches/2020Q1/security/palisade/Makefile Sun Jan 5 04:06:59 2020 (r522085) +++ branches/2020Q1/security/palisade/Makefile Sun Jan 5 04:07:04 2020 (r522086) @@ -12,10 +12,11 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/License.md BROKEN_i386= fails to build: a declaration of 'Mul128' must be available +BROKEN_powerpc64= fails to build: math/native_int/binint.h:510:11: error: Architecture not supported for MultD() BUILD_DEPENDS= autoconf:devel/autoconf # possibly a mistake in the project -USES= cmake:noninja localbase +USES= cmake:noninja compiler:c++11-lang localbase USE_GITLAB= yes USE_GITHUB= nodefault GL_PROJECT= palisade-development From owner-svn-ports-branches@freebsd.org Sun Jan 5 04:49: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 D1FD21DCB25; Sun, 5 Jan 2020 04:49:42 +0000 (UTC) (envelope-from linimon@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 47r5lp4zfnz3NVp; Sun, 5 Jan 2020 04:49:42 +0000 (UTC) (envelope-from linimon@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 A1FA6203F9; Sun, 5 Jan 2020 04:49:42 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0054ngOB074419; Sun, 5 Jan 2020 04:49:42 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0054ng43074417; Sun, 5 Jan 2020 04:49:42 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <202001050449.0054ng43074417@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Sun, 5 Jan 2020 04:49:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522108 - branches/2020Q1/sysutils/cpuid2cpuflags X-SVN-Group: ports-branches X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: branches/2020Q1/sysutils/cpuid2cpuflags X-SVN-Commit-Revision: 522108 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, 05 Jan 2020 04:49:42 -0000 Author: linimon Date: Sun Jan 5 04:49:42 2020 New Revision: 522108 URL: https://svnweb.freebsd.org/changeset/ports/522108 Log: MFH: r522107 Mark as broken on powerpc64: src/hwcap.c:20:3: error: #error "Platform not supported (only Linux supported at the moment)" src/hwcap.c:23:3: error: #error "Platform not supported (no getauxval())" Approved by: portmgr (tier-2 blanket) Modified: branches/2020Q1/sysutils/cpuid2cpuflags/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/sysutils/cpuid2cpuflags/Makefile ============================================================================== --- branches/2020Q1/sysutils/cpuid2cpuflags/Makefile Sun Jan 5 04:45:45 2020 (r522107) +++ branches/2020Q1/sysutils/cpuid2cpuflags/Makefile Sun Jan 5 04:49:42 2020 (r522108) @@ -11,6 +11,8 @@ COMMENT= Tool to generate CPU_FLAGS_* for your CPU LICENSE= BSD2CLAUSE +BROKEN_powerpc64= fails to build: error "Platform not supported (only Linux supported at the moment)" + USES= autoreconf USE_GITHUB= yes GH_ACCOUNT= mgorny From owner-svn-ports-branches@freebsd.org Sun Jan 5 06:00:06 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 614561E45B8; Sun, 5 Jan 2020 06:00:06 +0000 (UTC) (envelope-from tobik@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 47r7K21zz1z3RBT; Sun, 5 Jan 2020 06:00:06 +0000 (UTC) (envelope-from tobik@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 3F713210B5; Sun, 5 Jan 2020 06:00:06 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0056064D016447; Sun, 5 Jan 2020 06:00:06 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0056055B016445; Sun, 5 Jan 2020 06:00:05 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202001050600.0056055B016445@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 5 Jan 2020 06:00:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522112 - branches/2020Q1/www/newsboat X-SVN-Group: ports-branches X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: branches/2020Q1/www/newsboat X-SVN-Commit-Revision: 522112 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, 05 Jan 2020 06:00:06 -0000 Author: tobik Date: Sun Jan 5 06:00:05 2020 New Revision: 522112 URL: https://svnweb.freebsd.org/changeset/ports/522112 Log: MFH: r522111 www/newsboat: Bump openssl-sys crate to fix build with LibreSSL 3.x libc bump is not really needed but mirrors https://github.com/newsboat/newsboat/commit/d9f143bf5d4cf87effae2532b9f2ef0c2be0139d PR: 242826 Reported by: p5B2E9A8F@t-online.de Submitted by: mt@markoturk.info (maintainer) Tested by: w.schwarzenfeld@utanet.at Approved by: ports-secteam build fix blanket Modified: branches/2020Q1/www/newsboat/Makefile branches/2020Q1/www/newsboat/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/www/newsboat/Makefile ============================================================================== --- branches/2020Q1/www/newsboat/Makefile Sun Jan 5 05:59:11 2020 (r522111) +++ branches/2020Q1/www/newsboat/Makefile Sun Jan 5 06:00:05 2020 (r522112) @@ -3,6 +3,7 @@ PORTNAME= newsboat PORTVERSION= 2.18 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://newsboat.org/releases/${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -61,7 +62,7 @@ CARGO_CRATES= aho-corasick-0.6.9 \ kernel32-sys-0.2.2 \ lazy_static-0.2.11 \ lazy_static-1.2.0 \ - libc-0.2.50 \ + libc-0.2.66 \ libz-sys-1.0.17 \ locale_config-0.2.2 \ lock_api-0.1.5 \ @@ -73,7 +74,7 @@ CARGO_CRATES= aho-corasick-0.6.9 \ num-integer-0.1.39 \ num-traits-0.2.6 \ once_cell-0.1.8 \ - openssl-sys-0.9.46 \ + openssl-sys-0.9.53 \ parking_lot-0.7.1 \ parking_lot_core-0.4.0 \ percent-encoding-1.0.1 \ Modified: branches/2020Q1/www/newsboat/distinfo ============================================================================== --- branches/2020Q1/www/newsboat/distinfo Sun Jan 5 05:59:11 2020 (r522111) +++ branches/2020Q1/www/newsboat/distinfo Sun Jan 5 06:00:05 2020 (r522112) @@ -1,4 +1,4 @@ -TIMESTAMP = 1577045369 +TIMESTAMP = 1578203423 SHA256 (newsboat-2.18.tar.xz) = f23932c0226ec3f69eac7668da444e73175048498e15e9d773451648b2cba4b0 SIZE (newsboat-2.18.tar.xz) = 577632 SHA256 (rust/crates/aho-corasick-0.6.9.tar.gz) = 1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e @@ -57,8 +57,8 @@ SHA256 (rust/crates/lazy_static-0.2.11.tar.gz) = 76f03 SIZE (rust/crates/lazy_static-0.2.11.tar.gz) = 12361 SHA256 (rust/crates/lazy_static-1.2.0.tar.gz) = a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1 SIZE (rust/crates/lazy_static-1.2.0.tar.gz) = 10840 -SHA256 (rust/crates/libc-0.2.50.tar.gz) = aab692d7759f5cd8c859e169db98ae5b52c924add2af5fbbca11d12fefb567c1 -SIZE (rust/crates/libc-0.2.50.tar.gz) = 392277 +SHA256 (rust/crates/libc-0.2.66.tar.gz) = d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558 +SIZE (rust/crates/libc-0.2.66.tar.gz) = 457815 SHA256 (rust/crates/libz-sys-1.0.17.tar.gz) = 44ebbc760fd2d2f4d93de09a0e13d97e057612052e871da9985cedcb451e6bd5 SIZE (rust/crates/libz-sys-1.0.17.tar.gz) = 632674 SHA256 (rust/crates/locale_config-0.2.2.tar.gz) = 14fbee0e39bc2dd6a2427c4fdea66e9826cc1fd09b0a0b7550359f5f6efe1dab @@ -81,8 +81,8 @@ SHA256 (rust/crates/num-traits-0.2.6.tar.gz) = 0b3a5d7 SIZE (rust/crates/num-traits-0.2.6.tar.gz) = 39923 SHA256 (rust/crates/once_cell-0.1.8.tar.gz) = 532c29a261168a45ce28948f9537ddd7a5dd272cc513b3017b1e82a88f962c37 SIZE (rust/crates/once_cell-0.1.8.tar.gz) = 14908 -SHA256 (rust/crates/openssl-sys-0.9.46.tar.gz) = 05636e06b4f8762d4b81d24a351f3966f38bd25ccbcfd235606c91fdb82cc60f -SIZE (rust/crates/openssl-sys-0.9.46.tar.gz) = 44219 +SHA256 (rust/crates/openssl-sys-0.9.53.tar.gz) = 465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f +SIZE (rust/crates/openssl-sys-0.9.53.tar.gz) = 45434 SHA256 (rust/crates/parking_lot-0.7.1.tar.gz) = ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337 SIZE (rust/crates/parking_lot-0.7.1.tar.gz) = 32670 SHA256 (rust/crates/parking_lot_core-0.4.0.tar.gz) = 94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9 From owner-svn-ports-branches@freebsd.org Sun Jan 5 10:59: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 6F48A1DF560; Sun, 5 Jan 2020 10:59:20 +0000 (UTC) (envelope-from pkubaj@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 47rFyJ2P2Cz4BHy; Sun, 5 Jan 2020 10:59:20 +0000 (UTC) (envelope-from pkubaj@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 4D71124788; Sun, 5 Jan 2020 10:59:20 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 005AxKeE097460; Sun, 5 Jan 2020 10:59:20 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 005AxKxa097459; Sun, 5 Jan 2020 10:59:20 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202001051059.005AxKxa097459@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Sun, 5 Jan 2020 10:59:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522138 - branches/2020Q1/mail/rspamd-devel X-SVN-Group: ports-branches X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: branches/2020Q1/mail/rspamd-devel X-SVN-Commit-Revision: 522138 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, 05 Jan 2020 10:59:20 -0000 Author: pkubaj Date: Sun Jan 5 10:59:19 2020 New Revision: 522138 URL: https://svnweb.freebsd.org/changeset/ports/522138 Log: MFH: r522137 mail/rspamd-devel: use luajit only on amd64, armv7, i386 and powerpc to fix build on other architectures It's possible that there are other architectures that luajit works on, but I couldn't test it. PR: 243059 Approved by: vsevolod (maintainer) Approved by: portmgr (fix build blanket) Modified: branches/2020Q1/mail/rspamd-devel/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/mail/rspamd-devel/Makefile ============================================================================== --- branches/2020Q1/mail/rspamd-devel/Makefile Sun Jan 5 10:58:30 2020 (r522137) +++ branches/2020Q1/mail/rspamd-devel/Makefile Sun Jan 5 10:59:19 2020 (r522138) @@ -12,9 +12,13 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.md LIB_DEPENDS= libpcre.so:devel/pcre \ - libluajit-5.1.so:lang/luajit \ libicui18n.so:devel/icu \ - libsodium.so:security/libsodium + libsodium.so:security/libsodium \ + ${LIB_DEPENDS_${ARCH}} +LIB_DEPENDS_amd64= libluajit-5.1.so:lang/luajit +LIB_DEPENDS_armv7= libluajit-5.1.so:lang/luajit +LIB_DEPENDS_i386= libluajit-5.1.so:lang/luajit +LIB_DEPENDS_powerpc= libluajit-5.1.so:lang/luajit BUILD_DEPENDS= ragel:devel/ragel RUN_DEPENDS= ca_root_nss>=3.*:security/ca_root_nss From owner-svn-ports-branches@freebsd.org Sun Jan 5 14:58:07 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 5D1C21F7E0A; Sun, 5 Jan 2020 14:58:07 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.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 47rMFq1s80z4NCy; Sun, 5 Jan 2020 14:58:07 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3ADB527296; Sun, 5 Jan 2020 14:58:07 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 005Ew7Up039878; Sun, 5 Jan 2020 14:58:07 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 005Ew6EH039872; Sun, 5 Jan 2020 14:58:06 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <202001051458.005Ew6EH039872@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 5 Jan 2020 14:58:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522142 - branches/2020Q1/multimedia/mkvtoolnix X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2020Q1/multimedia/mkvtoolnix X-SVN-Commit-Revision: 522142 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, 05 Jan 2020 14:58:07 -0000 Author: riggs Date: Sun Jan 5 14:58:06 2020 New Revision: 522142 URL: https://svnweb.freebsd.org/changeset/ports/522142 Log: MFH: r522141 Update to upstream version 42.0.0 Details: - Bug fixes and enhancements, see https://mkvtoolnix.download/doc/NEWS.md including segfault in mkv reader and use of uninitialised memory in MPEG stream parser. Approved by: ports-secteam (riggs) Modified: branches/2020Q1/multimedia/mkvtoolnix/Makefile branches/2020Q1/multimedia/mkvtoolnix/distinfo branches/2020Q1/multimedia/mkvtoolnix/pkg-plist Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/multimedia/mkvtoolnix/Makefile ============================================================================== --- branches/2020Q1/multimedia/mkvtoolnix/Makefile Sun Jan 5 14:56:38 2020 (r522141) +++ branches/2020Q1/multimedia/mkvtoolnix/Makefile Sun Jan 5 14:58:06 2020 (r522142) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= mkvtoolnix -PORTVERSION= 41.0.0 -PORTREVISION= 1 +PORTVERSION= 42.0.0 CATEGORIES= multimedia audio MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ \ https://mkvtoolnix.download/sources/ Modified: branches/2020Q1/multimedia/mkvtoolnix/distinfo ============================================================================== --- branches/2020Q1/multimedia/mkvtoolnix/distinfo Sun Jan 5 14:56:38 2020 (r522141) +++ branches/2020Q1/multimedia/mkvtoolnix/distinfo Sun Jan 5 14:58:06 2020 (r522142) @@ -1,3 +1,3 @@ -TIMESTAMP = 1575764206 -SHA256 (mkvtoolnix-41.0.0.tar.xz) = 7cdd6ad9144324162604172b7e96cb13cdbb7913e07c4ad7633344aac20e4103 -SIZE (mkvtoolnix-41.0.0.tar.xz) = 7401548 +TIMESTAMP = 1578140550 +SHA256 (mkvtoolnix-42.0.0.tar.xz) = 2c8215c22a3a75925c0f1568235fbe2e34172021e43fb45081400b7c6b610033 +SIZE (mkvtoolnix-42.0.0.tar.xz) = 7486620 Modified: branches/2020Q1/multimedia/mkvtoolnix/pkg-plist ============================================================================== --- branches/2020Q1/multimedia/mkvtoolnix/pkg-plist Sun Jan 5 14:56:38 2020 (r522141) +++ branches/2020Q1/multimedia/mkvtoolnix/pkg-plist Sun Jan 5 14:58:06 2020 (r522142) @@ -23,6 +23,16 @@ bin/mkvpropedit %%MANTRANS%%man/es/man1/mkvmerge.1.gz %%MANTRANS%%man/es/man1/mkvpropedit.1.gz %%MANTRANS%%%%QT5%%man/es/man1/mkvtoolnix-gui.1.gz +%%MANTRANS%%man/fr/man1/mkvextract.1.gz +%%MANTRANS%%man/fr/man1/mkvinfo.1.gz +%%MANTRANS%%man/fr/man1/mkvmerge.1.gz +%%MANTRANS%%man/fr/man1/mkvpropedit.1.gz +%%MANTRANS%%%%QT5%%man/fr/man1/mkvtoolnix-gui.1.gz +%%MANTRANS%%man/it/man1/mkvextract.1.gz +%%MANTRANS%%man/it/man1/mkvinfo.1.gz +%%MANTRANS%%man/it/man1/mkvmerge.1.gz +%%MANTRANS%%man/it/man1/mkvpropedit.1.gz +%%MANTRANS%%%%QT5%%man/it/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/ja/man1/mkvextract.1.gz %%MANTRANS%%man/ja/man1/mkvinfo.1.gz %%MANTRANS%%man/ja/man1/mkvmerge.1.gz @@ -33,6 +43,16 @@ bin/mkvpropedit %%MANTRANS%%man/ko/man1/mkvmerge.1.gz %%MANTRANS%%man/ko/man1/mkvpropedit.1.gz %%MANTRANS%%%%QT5%%man/ko/man1/mkvtoolnix-gui.1.gz +%%MANTRANS%%man/ru/man1/mkvextract.1.gz +%%MANTRANS%%man/ru/man1/mkvinfo.1.gz +%%MANTRANS%%man/ru/man1/mkvmerge.1.gz +%%MANTRANS%%man/ru/man1/mkvpropedit.1.gz +%%MANTRANS%%%%QT5%%man/ru/man1/mkvtoolnix-gui.1.gz +%%MANTRANS%%man/zh_TW/man1/mkvextract.1.gz +%%MANTRANS%%man/zh_TW/man1/mkvinfo.1.gz +%%MANTRANS%%man/zh_TW/man1/mkvmerge.1.gz +%%MANTRANS%%man/zh_TW/man1/mkvpropedit.1.gz +%%MANTRANS%%%%QT5%%man/zh_TW/man1/mkvtoolnix-gui.1.gz man/man1/mkvextract.1.gz man/man1/mkvinfo.1.gz man/man1/mkvmerge.1.gz From owner-svn-ports-branches@freebsd.org Sun Jan 5 16:18:26 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 4CB551FE805; Sun, 5 Jan 2020 16:18:26 +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 47rP2V1P6Dz4STT; Sun, 5 Jan 2020 16:18:26 +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 2B12117F; Sun, 5 Jan 2020 16:18:26 +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 005GIQ4K089551; Sun, 5 Jan 2020 16:18:26 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 005GIPHf089549; Sun, 5 Jan 2020 16:18:25 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <202001051618.005GIPHf089549@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Sun, 5 Jan 2020 16:18:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522162 - in branches/2020Q1/net/geoipupdate: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: adamw X-SVN-Commit-Paths: in branches/2020Q1/net/geoipupdate: . files X-SVN-Commit-Revision: 522162 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, 05 Jan 2020 16:18:26 -0000 Author: adamw Date: Sun Jan 5 16:18:25 2020 New Revision: 522162 URL: https://svnweb.freebsd.org/changeset/ports/522162 Log: MFH: r522160 geoipupdate: Add instructions for getting account ID/key MaxMind now requires a (free) registered account to download any of the databases, including the free ones. Registration and download remain free--they just require an account now. Approved by: portmgr (with hat) Added: branches/2020Q1/net/geoipupdate/files/pkg-message.in - copied unchanged from r522160, head/net/geoipupdate/files/pkg-message.in Modified: branches/2020Q1/net/geoipupdate/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/net/geoipupdate/Makefile ============================================================================== --- branches/2020Q1/net/geoipupdate/Makefile Sun Jan 5 16:18:12 2020 (r522161) +++ branches/2020Q1/net/geoipupdate/Makefile Sun Jan 5 16:18:25 2020 (r522162) @@ -3,6 +3,7 @@ PORTNAME= geoipupdate PORTVERSION= 4.1.5 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= net geography @@ -41,6 +42,7 @@ PLIST_FILES= bin/geoipupdate \ '@sample etc/GeoIP.conf.sample' \ '@dir share/GeoIP' PORTDOCS= GeoIP.conf.md geoipupdate.md +SUB_FILES= pkg-message post-extract: ${RM} ${WRKSRC}/go.mod Copied: branches/2020Q1/net/geoipupdate/files/pkg-message.in (from r522160, head/net/geoipupdate/files/pkg-message.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/net/geoipupdate/files/pkg-message.in Sun Jan 5 16:18:25 2020 (r522162, copy of r522160, head/net/geoipupdate/files/pkg-message.in) @@ -0,0 +1,28 @@ +[ +{ type: upgrade + maximum_version: 4.1.5 + 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 6BA031EA7B8; Sun, 5 Jan 2020 23:51:07 +0000 (UTC) (envelope-from pkubaj@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 47rb4q2Cgpz3Qxl; Sun, 5 Jan 2020 23:51:07 +0000 (UTC) (envelope-from pkubaj@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 4739D5935; Sun, 5 Jan 2020 23:51:07 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 005Np7SL059200; Sun, 5 Jan 2020 23:51:07 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 005Np7bJ059199; Sun, 5 Jan 2020 23:51:07 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202001052351.005Np7bJ059199@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Sun, 5 Jan 2020 23:51:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522173 - branches/2020Q1/games/xmoto X-SVN-Group: ports-branches X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: branches/2020Q1/games/xmoto X-SVN-Commit-Revision: 522173 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, 05 Jan 2020 23:51:07 -0000 Author: pkubaj Date: Sun Jan 5 23:51:06 2020 New Revision: 522173 URL: https://svnweb.freebsd.org/changeset/ports/522173 Log: MFH: r522172 games/xmoto: fix build on GCC architectures Builds fine using new GCC. Approved by: portmgr (fix build blanket) Modified: branches/2020Q1/games/xmoto/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/games/xmoto/Makefile ============================================================================== --- branches/2020Q1/games/xmoto/Makefile Sun Jan 5 23:49:17 2020 (r522172) +++ branches/2020Q1/games/xmoto/Makefile Sun Jan 5 23:51:06 2020 (r522173) @@ -20,10 +20,8 @@ LIB_DEPENDS= libode.so:devel/ode \ libcurl.so:ftp/curl \ libxdg-basedir.so:x11/libxdg-basedir -BROKEN_powerpc64= fails to compile: hashtable.h: no match for call to __gnu_cxx::hash - GNU_CONFIGURE= yes -USES= compiler:features dos2unix gl gmake gnome jpeg localbase lua:51 sdl sqlite xorg +USES= compiler:c++11-lang dos2unix gl gmake gnome jpeg localbase lua:51 sdl sqlite xorg USE_GNOME= libxml2 USE_SDL= sdl mixer ttf net USE_GL= gl glu @@ -58,12 +56,6 @@ ASIAN_TTF_CONFIGURE_OFF=--without-asian-ttf-file NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -.include - -.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42 -BROKEN= does not build with gcc 4.2 -.endif - post-extract: @${RM} -r ${WRKSRC}/src/ode @@ -76,4 +68,4 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ .endfor -.include +.include From owner-svn-ports-branches@freebsd.org Mon Jan 6 01:52: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 15D351ED83D; Mon, 6 Jan 2020 01:52:59 +0000 (UTC) (envelope-from yuri@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 47rdnQ6sMSz435p; Mon, 6 Jan 2020 01:52:58 +0000 (UTC) (envelope-from yuri@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 E6A617090; Mon, 6 Jan 2020 01:52:58 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0061qwSi036949; Mon, 6 Jan 2020 01:52:58 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0061qv11036943; Mon, 6 Jan 2020 01:52:57 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202001060152.0061qv11036943@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Mon, 6 Jan 2020 01:52:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522184 - in branches/2020Q1/cad: . cascade-compiler cascade-compiler/files X-SVN-Group: ports-branches X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in branches/2020Q1/cad: . cascade-compiler cascade-compiler/files X-SVN-Commit-Revision: 522184 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, 06 Jan 2020 01:52:59 -0000 Author: yuri Date: Mon Jan 6 01:52:57 2020 New Revision: 522184 URL: https://svnweb.freebsd.org/changeset/ports/522184 Log: MFH: r522114 r522170 r522177 r522178 New port: cad/cascade-compiler: Just-In-Time Compiler for Verilog from VMware Research cad/cascade-compiler: Update g20200104 -> g20200105 Tests now pass. Fix build on GCC-based systems: CMake Error in src/CMakeLists.txt: Target "libcascade" requires the language dialect "CXX17" (with compiler extensions), but CMake does not know the compile flags to use to enable it. Approved by: portmgr (tier-2 blanket) cad/cascade-compiler: Update g20200105 -> g20200105.1 Approved by: secteam Added: branches/2020Q1/cad/cascade-compiler/ - copied from r522114, head/cad/cascade-compiler/ Deleted: branches/2020Q1/cad/cascade-compiler/files/patch-src_CMakeLists.txt Modified: branches/2020Q1/cad/Makefile branches/2020Q1/cad/cascade-compiler/Makefile branches/2020Q1/cad/cascade-compiler/distinfo branches/2020Q1/cad/cascade-compiler/files/patch-CMakeLists.txt branches/2020Q1/cad/cascade-compiler/pkg-descr branches/2020Q1/cad/cascade-compiler/pkg-plist Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/cad/Makefile ============================================================================== --- branches/2020Q1/cad/Makefile Mon Jan 6 01:45:46 2020 (r522183) +++ branches/2020Q1/cad/Makefile Mon Jan 6 01:52:57 2020 (r522184) @@ -18,6 +18,7 @@ SUBDIR += calculix-ccx SUBDIR += caneda SUBDIR += cascade + SUBDIR += cascade-compiler SUBDIR += chipvault SUBDIR += cura-engine SUBDIR += digital Modified: branches/2020Q1/cad/cascade-compiler/Makefile ============================================================================== --- head/cad/cascade-compiler/Makefile Sun Jan 5 08:08:14 2020 (r522114) +++ branches/2020Q1/cad/cascade-compiler/Makefile Mon Jan 6 01:52:57 2020 (r522184) @@ -1,13 +1,10 @@ # $FreeBSD$ PORTNAME= cascade -PORTVERSION= g20200104 +PORTVERSION= g20200105.1 CATEGORIES= cad PKGNAMESUFFIX= -compiler -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ -PATCHFILES= efe9940dcb93a6db6347ffd99225d52449e27c4d.patch:-p1 - MAINTAINER= yuri@FreeBSD.org COMMENT= Just-In-Time Compiler for Verilog from VMware Research @@ -19,10 +16,10 @@ RUN_DEPENDS= verilator:cad/verilator TEST_DEPENDS= benchmark>0:devel/benchmark \ googletest>0:devel/googletest -USES= bison cmake localbase:ldflags ncurses perl5 +USES= bison cmake compiler:c++17-lang localbase:ldflags ncurses perl5 USE_GITHUB= yes GH_ACCOUNT= vmware -GH_TAGNAME= 25e1050ab41c242c77014d7436998611e0b3fb82 +GH_TAGNAME= f4f7ae8bd1dd379790c0e58c286df90b8d1cdcde MAKE_ENV= FREEBSD_WRKSRC=${WRKSRC} FREEBSD_LOCALBASE=${LOCALBASE} @@ -33,12 +30,10 @@ BINARY_ALIAS= flex=${FILESDIR}/flex flex.real=${LOCALB post-patch: # cascade needs the latest flex, not one from the base system @${FIND} ${WRKSRC} -name "*.h" | ${XARGS} ${REINPLACE_CMD} -i '' 's|#include |#include <${LOCALBASE}/include/flex/FlexLexer.h>|' - # no need in bash: https://github.com/vmware/cascade/issues/207 + # don't need bash: https://github.com/vmware/cascade/issues/207 @${FIND} ${WRKSRC} -name "*.sh" | ${XARGS} ${REINPLACE_CMD} -i '' 's|#!/bin/bash|#!/bin/sh|' - # replace with CXX C++ compiler: https://github.com/vmware/cascade/issues/208 - @${FIND} ${WRKSRC} -name "*.sh" | ${XARGS} ${REINPLACE_CMD} -i '' 's|g++ |${CXX} |' -do-test: # the below command fails, but 'run_regression' passes 100%, something minor is wrong +do-test: cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ Modified: branches/2020Q1/cad/cascade-compiler/distinfo ============================================================================== --- head/cad/cascade-compiler/distinfo Sun Jan 5 08:08:14 2020 (r522114) +++ branches/2020Q1/cad/cascade-compiler/distinfo Mon Jan 6 01:52:57 2020 (r522184) @@ -1,5 +1,3 @@ -TIMESTAMP = 1578206252 -SHA256 (vmware-cascade-g20200104-25e1050ab41c242c77014d7436998611e0b3fb82_GH0.tar.gz) = 3d7ccd4ef27ccf857cb660fa815bdf8b2d7f7d7e3beb926bdbc12a20d7e03689 -SIZE (vmware-cascade-g20200104-25e1050ab41c242c77014d7436998611e0b3fb82_GH0.tar.gz) = 12260374 -SHA256 (efe9940dcb93a6db6347ffd99225d52449e27c4d.patch) = 6f3b59b1d313a4a7111c6dd8b0e70d180e3324890c3a4a01c297729d6d910b22 -SIZE (efe9940dcb93a6db6347ffd99225d52449e27c4d.patch) = 615 +TIMESTAMP = 1578272762 +SHA256 (vmware-cascade-g20200105.1-f4f7ae8bd1dd379790c0e58c286df90b8d1cdcde_GH0.tar.gz) = b76107bebbe2c9f8737a652ff4e3c8ebf3fcbf13f672b34aa65c9899e7ab8442 +SIZE (vmware-cascade-g20200105.1-f4f7ae8bd1dd379790c0e58c286df90b8d1cdcde_GH0.tar.gz) = 12262109 Modified: branches/2020Q1/cad/cascade-compiler/files/patch-CMakeLists.txt ============================================================================== --- head/cad/cascade-compiler/files/patch-CMakeLists.txt Sun Jan 5 08:08:14 2020 (r522114) +++ branches/2020Q1/cad/cascade-compiler/files/patch-CMakeLists.txt Mon Jan 6 01:52:57 2020 (r522184) @@ -1,6 +1,16 @@ ---- CMakeLists.txt.orig 2020-01-04 03:07:22 UTC +--- CMakeLists.txt.orig 2020-01-06 00:29:10 UTC +++ CMakeLists.txt -@@ -42,5 +42,7 @@ include_directories(share/cascade) +@@ -35,7 +35,8 @@ set(CMAKE_CXX_FLAGS "-g -O0 -fprofile-arcs -ftest-cove + set(CMAKE_C_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage") + endif() + +-include_directories(${FLEX_INCLUDE_DIRS}) ++#include_directories(${FLEX_INCLUDE_DIRS}) # cmake always finds base flex header: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=243068 ++include_directories(${CMAKE_INSTALL_PREFIX}/include/flex) + include_directories(${CMAKE_BINARY_DIR}/src) + include_directories(.) + include_directories(src/cascade) +@@ -43,5 +44,7 @@ include_directories(src/cascade) add_subdirectory(include) add_subdirectory(share) add_subdirectory(src) Modified: branches/2020Q1/cad/cascade-compiler/pkg-descr ============================================================================== --- head/cad/cascade-compiler/pkg-descr Sun Jan 5 08:08:14 2020 (r522114) +++ branches/2020Q1/cad/cascade-compiler/pkg-descr Mon Jan 6 01:52:57 2020 (r522184) @@ -1,9 +1,11 @@ -Cascade is a novel solution to this problem, the world's first just-in-time -compiler for Verilog. Cascade executes code immediately in a software simulator, -and performs compilation in the background. When compilation is finished, -the code is moved into hardware, and from the user's perspective it simply -getsfaster over time. Cascade's ability to move code back and forth between -software and hardware also makes it the first platform to provide generic -support for the execution of unsynthesizable Verilog from hardware. +Cascade is a novel solution to the problem that FPGAs take a long time to +program, with complex programs taking hours to be compiled to run on FPGA. +Cascade is a first just-in-time compiler for Verilog. Cascade executes code +immediately in a software simulator, and performs compilation in the +background. When compilation is finished, the code is moved into hardware, and +from the user's perspective it simply gets faster over time. Cascade's ability +to move code back and forth between software and hardware also makes it the +first platform to provide generic support for the execution of unsynthesizable +Verilog from hardware. WWW: https://github.com/vmware/cascade Modified: branches/2020Q1/cad/cascade-compiler/pkg-plist ============================================================================== --- head/cad/cascade-compiler/pkg-plist Sun Jan 5 08:08:14 2020 (r522114) +++ branches/2020Q1/cad/cascade-compiler/pkg-plist Mon Jan 6 01:52:57 2020 (r522184) @@ -60,8 +60,10 @@ include/cascade/target/core/avmm/de10/de10_gpio.h include/cascade/target/core/avmm/de10/de10_led.h include/cascade/target/core/avmm/de10/de10_logic.h include/cascade/target/core/avmm/de10/de10_pad.h +include/cascade/target/core/avmm/de10/hps.h include/cascade/target/core/avmm/de10/io.h include/cascade/target/core/avmm/de10/quartus_server.h +include/cascade/target/core/avmm/de10/socal.h include/cascade/target/core/avmm/machinify.h include/cascade/target/core/avmm/rewrite.h include/cascade/target/core/avmm/text_mangle.h @@ -209,8 +211,6 @@ lib/libcascade.a %%DATADIR%%/de10/generate_hps_qsys_header.sh %%DATADIR%%/de10/hps_common_board_info.xml %%DATADIR%%/de10/hps_sdram_p0_summary.csv -%%DATADIR%%/de10/include/hps.h -%%DATADIR%%/de10/include/socal.h %%DATADIR%%/de10/ip/altsource_probe/hps_reset.qip %%DATADIR%%/de10/ip/altsource_probe/hps_reset.v %%DATADIR%%/de10/ip/altsource_probe/hps_reset_bb.v From owner-svn-ports-branches@freebsd.org Mon Jan 6 09:46:15 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 8EA7B1FEFC2; Mon, 6 Jan 2020 09:46:15 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.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 47rrHW3H4Tz4Tsh; Mon, 6 Jan 2020 09:46:15 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6BC8DC7E3; Mon, 6 Jan 2020 09:46:15 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0069kFk5020133; Mon, 6 Jan 2020 09:46:15 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0069kFGW020132; Mon, 6 Jan 2020 09:46:15 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <202001060946.0069kFGW020132@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Mon, 6 Jan 2020 09:46:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522212 - branches/2020Q1/net/remmina X-SVN-Group: ports-branches X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: branches/2020Q1/net/remmina X-SVN-Commit-Revision: 522212 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, 06 Jan 2020 09:46:15 -0000 Author: woodsb02 Date: Mon Jan 6 09:46:14 2020 New Revision: 522212 URL: https://svnweb.freebsd.org/changeset/ports/522212 Log: MFH: r522081 net/remmina: Fix build with NLS option disabled PR: 242991 Submitted by: Trond.Endrestol@ximalas.info Approved by: ports-secteam (joneum) Modified: branches/2020Q1/net/remmina/pkg-plist Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/net/remmina/pkg-plist ============================================================================== --- branches/2020Q1/net/remmina/pkg-plist Mon Jan 6 09:34:05 2020 (r522211) +++ branches/2020Q1/net/remmina/pkg-plist Mon Jan 6 09:46:14 2020 (r522212) @@ -73,65 +73,65 @@ share/icons/hicolor/scalable/emblems/remmina-sftp-symb share/icons/hicolor/scalable/emblems/remmina-ssh-symbolic.svg share/icons/hicolor/scalable/panel/remmina-panel-inverted.svg share/icons/hicolor/scalable/panel/remmina-panel.svg -share/locale/ar/LC_MESSAGES/remmina.mo -share/locale/ast/LC_MESSAGES/remmina.mo -share/locale/bg/LC_MESSAGES/remmina.mo -share/locale/bn/LC_MESSAGES/remmina.mo -share/locale/bs/LC_MESSAGES/remmina.mo -share/locale/ca/LC_MESSAGES/remmina.mo -share/locale/ca@valencia/LC_MESSAGES/remmina.mo -share/locale/cs/LC_MESSAGES/remmina.mo -share/locale/da/LC_MESSAGES/remmina.mo -share/locale/de/LC_MESSAGES/remmina.mo -share/locale/el/LC_MESSAGES/remmina.mo -share/locale/en_AU/LC_MESSAGES/remmina.mo -share/locale/en_GB/LC_MESSAGES/remmina.mo -share/locale/es/LC_MESSAGES/remmina.mo -share/locale/es_VE/LC_MESSAGES/remmina.mo -share/locale/et/LC_MESSAGES/remmina.mo -share/locale/eu/LC_MESSAGES/remmina.mo -share/locale/fi/LC_MESSAGES/remmina.mo -share/locale/fr/LC_MESSAGES/remmina.mo -share/locale/gl/LC_MESSAGES/remmina.mo -share/locale/he/LC_MESSAGES/remmina.mo -share/locale/hr/LC_MESSAGES/remmina.mo -share/locale/hu/LC_MESSAGES/remmina.mo -share/locale/id/LC_MESSAGES/remmina.mo -share/locale/ie/LC_MESSAGES/remmina.mo -share/locale/it/LC_MESSAGES/remmina.mo -share/locale/ja/LC_MESSAGES/remmina.mo -share/locale/kk/LC_MESSAGES/remmina.mo -share/locale/km/LC_MESSAGES/remmina.mo -share/locale/kn/LC_MESSAGES/remmina.mo -share/locale/ko/LC_MESSAGES/remmina.mo -share/locale/lt/LC_MESSAGES/remmina.mo -share/locale/lv/LC_MESSAGES/remmina.mo -share/locale/ms/LC_MESSAGES/remmina.mo -share/locale/my/LC_MESSAGES/remmina.mo -share/locale/nb/LC_MESSAGES/remmina.mo -share/locale/nl/LC_MESSAGES/remmina.mo -share/locale/oc/LC_MESSAGES/remmina.mo -share/locale/pl/LC_MESSAGES/remmina.mo -share/locale/pt/LC_MESSAGES/remmina.mo -share/locale/pt_BR/LC_MESSAGES/remmina.mo -share/locale/pt_PT/LC_MESSAGES/remmina.mo -share/locale/ro/LC_MESSAGES/remmina.mo -share/locale/ru/LC_MESSAGES/remmina.mo -share/locale/shn/LC_MESSAGES/remmina.mo -share/locale/si/LC_MESSAGES/remmina.mo -share/locale/sk/LC_MESSAGES/remmina.mo -share/locale/sl/LC_MESSAGES/remmina.mo -share/locale/sq/LC_MESSAGES/remmina.mo -share/locale/sr/LC_MESSAGES/remmina.mo -share/locale/sv/LC_MESSAGES/remmina.mo -share/locale/te/LC_MESSAGES/remmina.mo -share/locale/th/LC_MESSAGES/remmina.mo -share/locale/tr/LC_MESSAGES/remmina.mo -share/locale/ug/LC_MESSAGES/remmina.mo -share/locale/uk/LC_MESSAGES/remmina.mo -share/locale/uz@cyrillic/LC_MESSAGES/remmina.mo -share/locale/zh_CN/LC_MESSAGES/remmina.mo -share/locale/zh_TW/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/ar/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/ast/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/bg/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/bn/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/bs/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/ca/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/ca@valencia/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/cs/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/da/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/de/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/el/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/en_AU/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/en_GB/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/es/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/es_VE/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/et/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/eu/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/fi/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/fr/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/gl/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/he/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/hr/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/hu/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/id/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/ie/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/it/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/ja/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/kk/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/km/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/kn/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/ko/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/lt/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/lv/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/ms/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/my/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/nb/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/nl/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/oc/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/pl/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/pt/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/pt_PT/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/ro/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/ru/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/shn/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/si/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/sk/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/sl/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/sq/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/sr/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/sv/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/te/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/th/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/tr/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/ug/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/uk/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/uz@cyrillic/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/remmina.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/remmina.mo share/metainfo/org.remmina.Remmina.appdata.xml share/mime/packages/remmina-mime.xml %%DATADIR%%/external_tools/functions.sh From owner-svn-ports-branches@freebsd.org Mon Jan 6 09:48: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 AFC5A1FF023; Mon, 6 Jan 2020 09:48:20 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.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 47rrKw49zyz4V0d; Mon, 6 Jan 2020 09:48:20 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8A62AC80A; Mon, 6 Jan 2020 09:48:20 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0069mKXn020433; Mon, 6 Jan 2020 09:48:20 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0069mKuD020431; Mon, 6 Jan 2020 09:48:20 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <202001060948.0069mKuD020431@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Mon, 6 Jan 2020 09:48:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522213 - in branches/2020Q1/security/nmap: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: in branches/2020Q1/security/nmap: . files X-SVN-Commit-Revision: 522213 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, 06 Jan 2020 09:48:20 -0000 Author: woodsb02 Date: Mon Jan 6 09:48:19 2020 New Revision: 522213 URL: https://svnweb.freebsd.org/changeset/ports/522213 Log: MFH: r522159 security/nmap: Fix build on 11i386, 11arm, 11arm64 Fix patches to configure scripts to only add -libverbs if found in base PR: 242987 Reported by: Dries Michiels Reported by: garga Approved by: ports-secteam (joneum) Deleted: branches/2020Q1/security/nmap/files/patch-ncat_configure branches/2020Q1/security/nmap/files/patch-nping_configure Modified: branches/2020Q1/security/nmap/Makefile branches/2020Q1/security/nmap/files/patch-configure Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/security/nmap/Makefile ============================================================================== --- branches/2020Q1/security/nmap/Makefile Mon Jan 6 09:46:14 2020 (r522212) +++ branches/2020Q1/security/nmap/Makefile Mon Jan 6 09:48:19 2020 (r522213) @@ -56,6 +56,15 @@ CONFIGURE_ARGS+=--without-localdirs \ post-extract: @${RM} -r ${WRKSRC}/mswin32 +.if exists(/usr/lib/libibverbs.a) +# Link with libibverbs is needed by static libpcap +post-patch-PCAP-on: + @${REINPLACE_CMD} -E -e "s|(PCAP_LIBS=['\"].*)(['\"])$$|\1 -libverbs\2|" \ + ${WRKSRC}/configure \ + ${WRKSRC}/nping/configure \ + ${WRKSRC}/ncat/configure +.endif + post-configure: @${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|" ${WRKSRC}/Makefile Modified: branches/2020Q1/security/nmap/files/patch-configure ============================================================================== --- branches/2020Q1/security/nmap/files/patch-configure Mon Jan 6 09:46:14 2020 (r522212) +++ branches/2020Q1/security/nmap/files/patch-configure Mon Jan 6 09:48:19 2020 (r522213) @@ -18,12 +18,3 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_CC+:} false; then : -@@ -6365,7 +6365,7 @@ if test $have_libpcap != yes; then - else - CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$libpcapdir" - fi -- LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a' -+ LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a -libverbs' - PCAP_BUILD="build-pcap" - PCAP_CLEAN="clean-pcap" - PCAP_DIST_CLEAN="distclean-pcap" From owner-svn-ports-branches@freebsd.org Mon Jan 6 10:03: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 CBAC21FFA2E; Mon, 6 Jan 2020 10:03:34 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.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 47rrgV53SCz4WPw; Mon, 6 Jan 2020 10:03:34 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A8B66CBC0; Mon, 6 Jan 2020 10:03:34 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 006A3Yar032407; Mon, 6 Jan 2020 10:03:34 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 006A3Y7E032404; Mon, 6 Jan 2020 10:03:34 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <202001061003.006A3Y7E032404@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Mon, 6 Jan 2020 10:03:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522214 - in branches/2020Q1/www/gitlab-ce: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in branches/2020Q1/www/gitlab-ce: . files X-SVN-Commit-Revision: 522214 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, 06 Jan 2020 10:03:34 -0000 Author: mfechner Date: Mon Jan 6 10:03:33 2020 New Revision: 522214 URL: https://svnweb.freebsd.org/changeset/ports/522214 Log: MFH: r521948 Security upgrade to 12.6.2. Changelog: https://about.gitlab.com/blog/2020/01/02/security-release-gitlab-12-6-2-released/ Security: 01bde18a-2e09-11ea-a935-001b217b3468 Approved by: ports-secteam (joneum) Modified: branches/2020Q1/www/gitlab-ce/Makefile branches/2020Q1/www/gitlab-ce/distinfo branches/2020Q1/www/gitlab-ce/files/patch-config_gitlab.yml.example Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/www/gitlab-ce/Makefile ============================================================================== --- branches/2020Q1/www/gitlab-ce/Makefile Mon Jan 6 09:48:19 2020 (r522213) +++ branches/2020Q1/www/gitlab-ce/Makefile Mon Jan 6 10:03:33 2020 (r522214) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= gitlab-ce -PORTVERSION= 12.6.1 -PORTREVISION= 2 +PORTVERSION= 12.6.2 +PORTREVISION= 0 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -240,7 +240,7 @@ USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT= a0094541f8725b2f9852086033be08d20caa4f01 +GL_COMMIT= 3041661dec5d75d18b06ffa26e82bdfff3132f21 USERS= git GROUPS= git Modified: branches/2020Q1/www/gitlab-ce/distinfo ============================================================================== --- branches/2020Q1/www/gitlab-ce/distinfo Mon Jan 6 09:48:19 2020 (r522213) +++ branches/2020Q1/www/gitlab-ce/distinfo Mon Jan 6 10:03:33 2020 (r522214) @@ -1,3 +1,3 @@ -TIMESTAMP = 1577538634 -SHA256 (gitlab-org-gitlab-foss-a0094541f8725b2f9852086033be08d20caa4f01_GL0.tar.gz) = ad23fdfdd8b1ee75002f1cd32f5d6c0a53743d04c888b7e658ddda9840c7544e -SIZE (gitlab-org-gitlab-foss-a0094541f8725b2f9852086033be08d20caa4f01_GL0.tar.gz) = 99797830 +TIMESTAMP = 1578065890 +SHA256 (gitlab-org-gitlab-foss-3041661dec5d75d18b06ffa26e82bdfff3132f21_GL0.tar.gz) = e300c710c5497134fda9303d4e18f9458a391a10fe8673d381226b56e7f132a9 +SIZE (gitlab-org-gitlab-foss-3041661dec5d75d18b06ffa26e82bdfff3132f21_GL0.tar.gz) = 99797386 Modified: branches/2020Q1/www/gitlab-ce/files/patch-config_gitlab.yml.example ============================================================================== --- branches/2020Q1/www/gitlab-ce/files/patch-config_gitlab.yml.example Mon Jan 6 09:48:19 2020 (r522213) +++ branches/2020Q1/www/gitlab-ce/files/patch-config_gitlab.yml.example Mon Jan 6 10:03:33 2020 (r522214) @@ -1,6 +1,6 @@ ---- config/gitlab.yml.example.orig 2019-12-03 11:22:02 UTC +--- config/gitlab.yml.example.orig 2020-01-02 15:06:44 UTC +++ config/gitlab.yml.example -@@ -902,7 +902,7 @@ production: &base +@@ -910,7 +910,7 @@ production: &base # Gitaly settings gitaly: # Path to the directory containing Gitaly client executables. @@ -9,7 +9,7 @@ # Default Gitaly authentication token. Can be overridden per storage. Can # be left blank when Gitaly is running locally on a Unix socket, which # is the normal way to deploy Gitaly. -@@ -920,8 +920,8 @@ production: &base +@@ -928,8 +928,8 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -20,7 +20,7 @@ # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings -@@ -967,12 +967,12 @@ production: &base +@@ -975,12 +975,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -36,7 +36,7 @@ # Git over HTTP upload_pack: true -@@ -997,7 +997,7 @@ production: &base +@@ -1005,7 +1005,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: From owner-svn-ports-branches@freebsd.org Mon Jan 6 14:01: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 271781E2663; Mon, 6 Jan 2020 14:01: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 47rxxv0HWfz3GkS; Mon, 6 Jan 2020 14:01: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 E038BF728; Mon, 6 Jan 2020 14:01:22 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 006E1MwO080005; Mon, 6 Jan 2020 14:01:22 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 006E1MDP080004; Mon, 6 Jan 2020 14:01:22 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202001061401.006E1MDP080004@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 6 Jan 2020 14:01:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522233 - in branches/2020Q1/x11-wm/cage: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2020Q1/x11-wm/cage: . files X-SVN-Commit-Revision: 522233 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, 06 Jan 2020 14:01:23 -0000 Author: jbeich Date: Mon Jan 6 14:01:22 2020 New Revision: 522233 URL: https://svnweb.freebsd.org/changeset/ports/522233 Log: MFH: r522232 x11-wm/cage: fix DRM session after r521656 After VT switch nothing was rendered. From debug log before/after: [backend/drm/drm.c:1485] Requesting modeset for 'DP-1' +[backend/drm/drm.c:697] Modesetting 'DP-1' with '3840x2160@60000 mHz' +[backend/drm/drm.c:592] Initializing renderer on connector 'DP-1' +[GLES2] FS SIMD8 shader: 5 inst, 0 loops, 24 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 80 to 48 bytes. +[GLES2] FS SIMD16 shader: 5 inst, 0 loops, 34 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 80 to 48 bytes. +[GLES2] VS SIMD8 shader: 28 inst, 0 loops, 116 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 448 to 336 bytes. +[GLES2] FS SIMD16 shader: 2 inst, 0 loops, 0 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 32 to 32 bytes. Approved by: ports-secteam blanket Modified: branches/2020Q1/x11-wm/cage/Makefile branches/2020Q1/x11-wm/cage/files/patch-wlroots-0.9 Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/x11-wm/cage/Makefile ============================================================================== --- branches/2020Q1/x11-wm/cage/Makefile Mon Jan 6 14:00:48 2020 (r522232) +++ branches/2020Q1/x11-wm/cage/Makefile Mon Jan 6 14:01:22 2020 (r522233) @@ -3,7 +3,7 @@ PORTNAME= cage DISTVERSIONPREFIX= v DISTVERSION= 0.1.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-wm MAINTAINER= jbeich@FreeBSD.org Modified: branches/2020Q1/x11-wm/cage/files/patch-wlroots-0.9 ============================================================================== --- branches/2020Q1/x11-wm/cage/files/patch-wlroots-0.9 Mon Jan 6 14:00:48 2020 (r522232) +++ branches/2020Q1/x11-wm/cage/files/patch-wlroots-0.9 Mon Jan 6 14:01:22 2020 (r522233) @@ -1,4 +1,5 @@ https://github.com/Hjdskes/cage/commit/33bb3c818c59 +https://github.com/Hjdskes/cage/commit/51e6c760da51 --- cage.c.orig 2019-06-03 17:55:52 UTC +++ cage.c @@ -18,3 +19,15 @@ https://github.com/Hjdskes/cage/commit/33bb3c818c59 wlr_output_layout_destroy(server.output_layout); /* This function is not null-safe, but we only ever get here with a proper wl_display. */ +--- output.c.orig 2019-06-03 17:55:52 UTC ++++ output.c +@@ -386,6 +386,9 @@ handle_new_output(struct wl_listener *listener, void * + /* Place the cursor in the center of the screen. */ + wlr_cursor_warp(server->seat->cursor, NULL, wlr_output->width / 2, wlr_output->height / 2); + wlr_output_damage_add_whole(server->output->damage); ++ ++ wlr_output_enable(wlr_output, true); ++ wlr_output_commit(wlr_output); + } + + void From owner-svn-ports-branches@freebsd.org Mon Jan 6 14:14: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 E4ED41E3BF9; Mon, 6 Jan 2020 14:14: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 47ryDs5qLxz3HWG; Mon, 6 Jan 2020 14:14: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 A9FA5F95A; Mon, 6 Jan 2020 14:14: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 006EEL6P091454; Mon, 6 Jan 2020 14:14:21 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 006EELKQ091450; Mon, 6 Jan 2020 14:14:21 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202001061414.006EELKQ091450@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 6 Jan 2020 14:14:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522236 - branches/2020Q1/x11-toolkits/wlroots X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q1/x11-toolkits/wlroots X-SVN-Commit-Revision: 522236 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, 06 Jan 2020 14:14:22 -0000 Author: jbeich Date: Mon Jan 6 14:14:20 2020 New Revision: 522236 URL: https://svnweb.freebsd.org/changeset/ports/522236 Log: MFH: r522235 x11-toolkits/wlroots: update to 0.9.1 Changes: https://github.com/swaywm/wlroots/releases/tag/0.9.1 Reported by: GitHub (watch releases) Approved by: ports-secteam blanket (reliability fixes) Modified: branches/2020Q1/x11-toolkits/wlroots/Makefile branches/2020Q1/x11-toolkits/wlroots/distinfo branches/2020Q1/x11-toolkits/wlroots/pkg-plist Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/x11-toolkits/wlroots/Makefile ============================================================================== --- branches/2020Q1/x11-toolkits/wlroots/Makefile Mon Jan 6 14:13:29 2020 (r522235) +++ branches/2020Q1/x11-toolkits/wlroots/Makefile Mon Jan 6 14:14:20 2020 (r522236) @@ -1,12 +1,8 @@ # $FreeBSD$ PORTNAME= wlroots -DISTVERSION= 0.9.0 -PORTREVISION= 1 +DISTVERSION= 0.9.1 CATEGORIES= x11-toolkits - -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 5bbb44482b41.patch:-p1 MAINTAINER= jbeich@FreeBSD.org COMMENT= Modular Wayland compositor library Modified: branches/2020Q1/x11-toolkits/wlroots/distinfo ============================================================================== --- branches/2020Q1/x11-toolkits/wlroots/distinfo Mon Jan 6 14:13:29 2020 (r522235) +++ branches/2020Q1/x11-toolkits/wlroots/distinfo Mon Jan 6 14:14:20 2020 (r522236) @@ -1,7 +1,5 @@ -TIMESTAMP = 1577805114 -SHA256 (swaywm-wlroots-0.9.0_GH0.tar.gz) = 334220a1d550dc5b20d28fb7b27b9b7c23f9c6d5ef5ad82c67ef127458ce2790 -SIZE (swaywm-wlroots-0.9.0_GH0.tar.gz) = 464755 -SHA256 (5bbb44482b41.patch) = c6921152a4c59cf7a1c609744367a5af82e4c81f15e0b64aa3ab60f4456db8d3 -SIZE (5bbb44482b41.patch) = 1218 +TIMESTAMP = 1578319270 +SHA256 (swaywm-wlroots-0.9.1_GH0.tar.gz) = 2ddd8371b8cf847b6a9b20628512474b1405171393e6ec8a071e46afc73ca2e7 +SIZE (swaywm-wlroots-0.9.1_GH0.tar.gz) = 464941 SHA256 (606b009fcdd1.patch) = ece828c41a8a155426f481f840a5de252fa1d5856aca91d728721f98e2055a69 SIZE (606b009fcdd1.patch) = 27824 Modified: branches/2020Q1/x11-toolkits/wlroots/pkg-plist ============================================================================== --- branches/2020Q1/x11-toolkits/wlroots/pkg-plist Mon Jan 6 14:13:29 2020 (r522235) +++ branches/2020Q1/x11-toolkits/wlroots/pkg-plist Mon Jan 6 14:14:20 2020 (r522236) @@ -85,5 +85,5 @@ include/wlr/xcursor.h %%X11%%include/wlr/xwayland.h lib/libwlroots.so lib/libwlroots.so.4 -lib/libwlroots.so.4.7.1 +lib/libwlroots.so.4.8.1 libdata/pkgconfig/wlroots.pc From owner-svn-ports-branches@freebsd.org Mon Jan 6 21:33: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 7811B1F1A5B; Mon, 6 Jan 2020 21:33:53 +0000 (UTC) (envelope-from crees@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 47s8013CTLz4G4V; Mon, 6 Jan 2020 21:33:53 +0000 (UTC) (envelope-from crees@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 694081CA5F; Mon, 6 Jan 2020 21:33:53 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 006LXrnF083287; Mon, 6 Jan 2020 21:33:53 GMT (envelope-from crees@FreeBSD.org) Received: (from crees@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 006LXqRd083282; Mon, 6 Jan 2020 21:33:52 GMT (envelope-from crees@FreeBSD.org) Message-Id: <202001062133.006LXqRd083282@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: crees set sender to crees@FreeBSD.org using -f From: Chris Rees Date: Mon, 6 Jan 2020 21:33:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522282 - in branches/2020Q1/x11/cde: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: crees X-SVN-Commit-Paths: in branches/2020Q1/x11/cde: . files X-SVN-Commit-Revision: 522282 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, 06 Jan 2020 21:33:53 -0000 Author: crees Date: Mon Jan 6 21:33:52 2020 New Revision: 522282 URL: https://svnweb.freebsd.org/changeset/ports/522282 Log: MFH: r522277 x11/cde: update to 2.3.1 and unbreak Merged, as the original CDE in this branch is broken anyway. PR: ports/242663 Submitted by: mikael.urankar@gmail.com Approved by: portmgr (blanket, build fixes) Added: branches/2020Q1/x11/cde/files/patch-lib_DtHelp_Imakefile - copied unchanged from r522277, head/x11/cde/files/patch-lib_DtHelp_Imakefile Modified: branches/2020Q1/x11/cde/Makefile branches/2020Q1/x11/cde/distinfo branches/2020Q1/x11/cde/pkg-plist Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/x11/cde/Makefile ============================================================================== --- branches/2020Q1/x11/cde/Makefile Mon Jan 6 21:33:40 2020 (r522281) +++ branches/2020Q1/x11/cde/Makefile Mon Jan 6 21:33:52 2020 (r522282) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cde -DISTVERSION= 2.3.0 -PORTREVISION= 3 +DISTVERSION= 2.3.1 CATEGORIES= x11 MASTER_SITES= SF/cdesktopenv/src/ @@ -11,9 +10,6 @@ COMMENT= Common Desktop Environment LICENSE= LGPL21 -.if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld -BROKEN= Fails to build: ld: error: ../../../exports/lib/libDtHelp.so: undefined reference to jpeg_CreateDecompress -.endif BROKEN_mips64= fails to build: ./config/imake/imake: No such file or directory BROKEN_powerpc64= fails to build: ./config/imake/imake: No such file or directory @@ -28,10 +24,9 @@ RUN_DEPENDS= ${LOCALBASE}/bin/fc-cache:x11-fonts/fontc xrdb:x11/xrdb \ xset:x11/xset -USES= iconv:wchar_t motif perl5 shebangfix tcl:85 xorg +USES= iconv:wchar_t jpeg motif perl5 shebangfix tcl:86 xorg SHEBANG_LANG= pl ksh tcl -SHEBANG_FILES= programs/dtdocbook/sgmls/sgmls.pl \ - programs/dtinfo/tools/bin/ccdate \ +SHEBANG_FILES= programs/dtinfo/tools/bin/ccdate \ programs/dtdocbook/doc2sdl/docbook.tcl \ programs/dtdocbook/doc2sdl/dtdocbook USE_LDCONFIG= ${PREFIX}/dt/lib @@ -73,8 +68,9 @@ post-patch: # Fix all hardcoded path @${REINPLACE_CMD} -e 's|/usr/bin/perl|${LOCALBASE}/bin/perl|g' \ ${WRKSRC}/config/cf/Imake.tmpl \ - ${WRKSRC}/programs/dtdocbook/sgmls/sgmls.pl \ ${WRKSRC}/programs/dtinfo/tools/bin/ccdate + @${REINPLACE_CMD} -e 's|/bin/ksh|${LOCALBASE}/bin/ksh93|g' \ + ${WRKSRC}/programs/dtopen/dtopen.src @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \ 's|/usr/dt|${LOCALBASE}/dt|g ; \ s|/etc/dt|${LOCALBASE}/etc/dt|g' Modified: branches/2020Q1/x11/cde/distinfo ============================================================================== --- branches/2020Q1/x11/cde/distinfo Mon Jan 6 21:33:40 2020 (r522281) +++ branches/2020Q1/x11/cde/distinfo Mon Jan 6 21:33:52 2020 (r522282) @@ -1,3 +1,3 @@ -TIMESTAMP = 1541358342 -SHA256 (cde-2.3.0.tar.gz) = 2f82c32a9ec7d81130336959c01942eedaa2ffab810df2ee69f3aefd8d2ae641 -SIZE (cde-2.3.0.tar.gz) = 57941186 +TIMESTAMP = 1576421538 +SHA256 (cde-2.3.1.tar.gz) = f414ff60b1a4d7a7c96589d10b64cfafc08602a7b3a87d78b69c3f315e66c7a1 +SIZE (cde-2.3.1.tar.gz) = 57549415 Copied: branches/2020Q1/x11/cde/files/patch-lib_DtHelp_Imakefile (from r522277, head/x11/cde/files/patch-lib_DtHelp_Imakefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/x11/cde/files/patch-lib_DtHelp_Imakefile Mon Jan 6 21:33:52 2020 (r522282, copy of r522277, head/x11/cde/files/patch-lib_DtHelp_Imakefile) @@ -0,0 +1,11 @@ +--- lib/DtHelp/Imakefile.orig 2019-12-15 16:29:42.835693000 +0100 ++++ lib/DtHelp/Imakefile 2019-12-15 16:29:57.238969000 +0100 +@@ -42,6 +42,8 @@ DEFINES = -DDTLIB $(LOCAL_DEFINES) \ + REQUIREDLIBS = SharedDtHelpReqs + #endif + ++REQUIREDLIBS += -ljpeg ++ + HEADERS = \ + CanvasP.h CanvasSegP.h Help.h \ + HelpDialog.h HelpDialogP.h HelpP.h \ Modified: branches/2020Q1/x11/cde/pkg-plist ============================================================================== --- branches/2020Q1/x11/cde/pkg-plist Mon Jan 6 21:33:40 2020 (r522281) +++ branches/2020Q1/x11/cde/pkg-plist Mon Jan 6 21:33:52 2020 (r522282) @@ -21,6 +21,7 @@ dt/app-defaults/C/Dtscreen dt/app-defaults/C/Dtsession dt/app-defaults/C/Dtstyle dt/app-defaults/C/Dtterm +dt/app-defaults/C/Dtudcfonted dt/app-defaults/C/Dtwm dt/app-defaults/C/Ttsnoop dt/app-defaults/C/UNIXbindings @@ -44,6 +45,7 @@ dt/app-defaults/de_DE.ISO8859-1/Dtscreen dt/app-defaults/de_DE.ISO8859-1/Dtsession dt/app-defaults/de_DE.ISO8859-1/Dtstyle dt/app-defaults/de_DE.ISO8859-1/Dtterm +dt/app-defaults/de_DE.ISO8859-1/Dtudcfonted dt/app-defaults/de_DE.ISO8859-1/Dtwm dt/app-defaults/es_ES.ISO8859-1/Dt dt/app-defaults/es_ES.ISO8859-1/Dtbuilder @@ -65,6 +67,7 @@ dt/app-defaults/es_ES.ISO8859-1/Dtscreen dt/app-defaults/es_ES.ISO8859-1/Dtsession dt/app-defaults/es_ES.ISO8859-1/Dtstyle dt/app-defaults/es_ES.ISO8859-1/Dtterm +dt/app-defaults/es_ES.ISO8859-1/Dtudcfonted dt/app-defaults/es_ES.ISO8859-1/Dtwm dt/app-defaults/fr_FR.ISO8859-1/Dt dt/app-defaults/fr_FR.ISO8859-1/Dtbuilder @@ -86,6 +89,7 @@ dt/app-defaults/fr_FR.ISO8859-1/Dtscreen dt/app-defaults/fr_FR.ISO8859-1/Dtsession dt/app-defaults/fr_FR.ISO8859-1/Dtstyle dt/app-defaults/fr_FR.ISO8859-1/Dtterm +dt/app-defaults/fr_FR.ISO8859-1/Dtudcfonted dt/app-defaults/fr_FR.ISO8859-1/Dtwm dt/app-defaults/it_IT.ISO8859-1/Dt dt/app-defaults/it_IT.ISO8859-1/Dtbuilder @@ -107,6 +111,7 @@ dt/app-defaults/it_IT.ISO8859-1/Dtscreen dt/app-defaults/it_IT.ISO8859-1/Dtsession dt/app-defaults/it_IT.ISO8859-1/Dtstyle dt/app-defaults/it_IT.ISO8859-1/Dtterm +dt/app-defaults/it_IT.ISO8859-1/Dtudcfonted dt/app-defaults/it_IT.ISO8859-1/Dtwm dt/appconfig/appmanager/C/Desktop_Apps/DtLoadInfoLib dt/appconfig/appmanager/C/Desktop_Apps/DtPrintManager @@ -169,9 +174,70 @@ dt/appconfig/appmanager/C/Desktop_Tools/XtermRlogin dt/appconfig/appmanager/C/Desktop_Tools/Xwd dt/appconfig/appmanager/C/Desktop_Tools/Xwininfo dt/appconfig/appmanager/C/Desktop_Tools/Xwud +dt/appconfig/appmanager/C/Education/gcompris +dt/appconfig/appmanager/C/Education/geogebra +dt/appconfig/appmanager/C/Education/stellarium +dt/appconfig/appmanager/C/Education/tuxpaint +dt/appconfig/appmanager/C/Games/dreamchess +dt/appconfig/appmanager/C/Games/eboard +dt/appconfig/appmanager/C/Games/gcompris +dt/appconfig/appmanager/C/Games/ktuberling +dt/appconfig/appmanager/C/Games/lbreakout2 +dt/appconfig/appmanager/C/Games/powermanga +dt/appconfig/appmanager/C/Games/pychess +dt/appconfig/appmanager/C/Games/supertux +dt/appconfig/appmanager/C/Games/xboard +dt/appconfig/appmanager/C/Graphics/fontforge +dt/appconfig/appmanager/C/Graphics/gimp +dt/appconfig/appmanager/C/Graphics/inkscape +dt/appconfig/appmanager/C/Graphics/okular +dt/appconfig/appmanager/C/Graphics/xv dt/appconfig/appmanager/C/Information/OpenDtIntro dt/appconfig/appmanager/C/Information/README +dt/appconfig/appmanager/C/Internet/chromium +dt/appconfig/appmanager/C/Internet/firefox +dt/appconfig/appmanager/C/Internet/nxclient +dt/appconfig/appmanager/C/Internet/skype +dt/appconfig/appmanager/C/Internet/thunderbird +dt/appconfig/appmanager/C/Media_Tools/amarok +dt/appconfig/appmanager/C/Media_Tools/brasero +dt/appconfig/appmanager/C/Media_Tools/k3b +dt/appconfig/appmanager/C/Media_Tools/k9copy +dt/appconfig/appmanager/C/Media_Tools/pavucontrol +dt/appconfig/appmanager/C/Media_Tools/rhythmbox +dt/appconfig/appmanager/C/Media_Tools/rosegarden +dt/appconfig/appmanager/C/Media_Tools/sound-juicer +dt/appconfig/appmanager/C/Media_Tools/vlc +dt/appconfig/appmanager/C/Media_Tools/xine +dt/appconfig/appmanager/C/Office/acroread +dt/appconfig/appmanager/C/Office/libreoffice-base +dt/appconfig/appmanager/C/Office/libreoffice-calc +dt/appconfig/appmanager/C/Office/libreoffice-draw +dt/appconfig/appmanager/C/Office/libreoffice-impress +dt/appconfig/appmanager/C/Office/libreoffice-main +dt/appconfig/appmanager/C/Office/libreoffice-math +dt/appconfig/appmanager/C/Office/libreoffice-writer +dt/appconfig/appmanager/C/Office/nedit +dt/appconfig/appmanager/C/Office/xournal +dt/appconfig/appmanager/C/Office/xpdf +dt/appconfig/appmanager/C/System/caja +dt/appconfig/appmanager/C/System/engrampa +dt/appconfig/appmanager/C/System/file-roller +dt/appconfig/appmanager/C/System/firestarter +dt/appconfig/appmanager/C/System/pgadmin +dt/appconfig/appmanager/C/System/synaptic +dt/appconfig/appmanager/C/System/virtualbox +dt/appconfig/appmanager/C/System/wicd dt/appconfig/appmanager/C/System_Admin/README +dt/appconfig/appmanager/C/TeX/TeX +dt/appconfig/appmanager/C/TeX/acroread +dt/appconfig/appmanager/C/TeX/emacs +dt/appconfig/appmanager/C/TeX/gv +dt/appconfig/appmanager/C/TeX/kile +dt/appconfig/appmanager/C/TeX/mgv +dt/appconfig/appmanager/C/TeX/xdvi +dt/appconfig/appmanager/C/TeX/xournal +dt/appconfig/appmanager/C/TeX/xpdf dt/appconfig/appmanager/de_DE.ISO8859-1/Desktop_Apps/DtLoadInfoLib dt/appconfig/appmanager/de_DE.ISO8859-1/Desktop_Apps/DtPrintManager dt/appconfig/appmanager/de_DE.ISO8859-1/Desktop_Apps/Dtappbuild @@ -2866,6 +2932,9 @@ dt/appconfig/icons/C/DtColor_m.bm dt/appconfig/icons/C/DtDtwm.bm dt/appconfig/icons/C/DtDtwm.pm dt/appconfig/icons/C/DtDtwm_m.bm +dt/appconfig/icons/C/DtEducation.l.pm +dt/appconfig/icons/C/DtEducation.m.pm +dt/appconfig/icons/C/DtEducation.t.pm dt/appconfig/icons/C/DtFlag.m.bm dt/appconfig/icons/C/DtFlag.m.pm dt/appconfig/icons/C/DtFlag.m_m.bm @@ -2875,6 +2944,12 @@ dt/appconfig/icons/C/DtFlag.t_m.bm dt/appconfig/icons/C/DtFont.bm dt/appconfig/icons/C/DtFont.pm dt/appconfig/icons/C/DtFont_m.bm +dt/appconfig/icons/C/DtGamesCards.l.pm +dt/appconfig/icons/C/DtGamesCards.m.pm +dt/appconfig/icons/C/DtGamesCards.t.pm +dt/appconfig/icons/C/DtGraphics.l.pm +dt/appconfig/icons/C/DtGraphics.m.pm +dt/appconfig/icons/C/DtGraphics.t.pm dt/appconfig/icons/C/DtI18N.bm dt/appconfig/icons/C/DtI18N.pm dt/appconfig/icons/C/DtI18N_m.bm @@ -2941,6 +3016,9 @@ dt/appconfig/icons/C/DtMrfc.m_m.bm dt/appconfig/icons/C/DtMrfc.t.bm dt/appconfig/icons/C/DtMrfc.t.pm dt/appconfig/icons/C/DtMrfc.t_m.bm +dt/appconfig/icons/C/DtOffice.l.pm +dt/appconfig/icons/C/DtOffice.m.pm +dt/appconfig/icons/C/DtOffice.t.pm dt/appconfig/icons/C/DtPrtjb.m.bm dt/appconfig/icons/C/DtPrtjb.m.pm dt/appconfig/icons/C/DtPrtjb.m_m.bm @@ -2980,6 +3058,9 @@ dt/appconfig/icons/C/DtScrn_m.bm dt/appconfig/icons/C/DtStart.bm dt/appconfig/icons/C/DtStart.pm dt/appconfig/icons/C/DtStart_m.bm +dt/appconfig/icons/C/DtSystem.l.pm +dt/appconfig/icons/C/DtSystem.m.pm +dt/appconfig/icons/C/DtSystem.t.pm dt/appconfig/icons/C/Dtactn.l.bm dt/appconfig/icons/C/Dtactn.l.pm dt/appconfig/icons/C/Dtactn.l_m.bm @@ -3022,6 +3103,9 @@ dt/appconfig/icons/C/Dtainfo.m_m.bm dt/appconfig/icons/C/Dtainfo.t.bm dt/appconfig/icons/C/Dtainfo.t.pm dt/appconfig/icons/C/Dtainfo.t_m.bm +dt/appconfig/icons/C/Dtapplications-multimedia.l.pm +dt/appconfig/icons/C/Dtapplications-multimedia.m.pm +dt/appconfig/icons/C/Dtapplications-multimedia.t.pm dt/appconfig/icons/C/Dtapps.m.bm dt/appconfig/icons/C/Dtapps.m.pm dt/appconfig/icons/C/Dtapps.m_m.bm @@ -3956,57 +4040,276 @@ dt/appconfig/icons/C/IcMxbdy.l_m.bm dt/appconfig/icons/C/IcMxbdy.m.bm dt/appconfig/icons/C/IcMxbdy.m.pm dt/appconfig/icons/C/IcMxbdy.m_m.bm +dt/appconfig/icons/C/SDthtml.m.pm +dt/appconfig/icons/C/SDthtml.t.pm +dt/appconfig/icons/C/SDturlweb.l.pm +dt/appconfig/icons/C/SDturlweb.m.pm +dt/appconfig/icons/C/SDturlweb.t.pm +dt/appconfig/icons/C/SDtwebbr.l.pm +dt/appconfig/icons/C/SDtwebbr.m.pm +dt/appconfig/icons/C/SDtwebbr.t.pm +dt/appconfig/icons/C/TeXGroup.l.pm +dt/appconfig/icons/C/TeXGroup.m.pm +dt/appconfig/icons/C/TeXGroup.t.pm +dt/appconfig/icons/C/acroread.l.pm +dt/appconfig/icons/C/acroread.m.pm +dt/appconfig/icons/C/acroread.t.pm +dt/appconfig/icons/C/amarok.l.pm +dt/appconfig/icons/C/amarok.m.pm +dt/appconfig/icons/C/amarok.t.pm dt/appconfig/icons/C/bomb dt/appconfig/icons/C/bomb16 dt/appconfig/icons/C/bomb16m dt/appconfig/icons/C/bomb32 dt/appconfig/icons/C/bomb32m dt/appconfig/icons/C/bombm +dt/appconfig/icons/C/brasero.l.pm +dt/appconfig/icons/C/brasero.m.pm +dt/appconfig/icons/C/brasero.t.pm dt/appconfig/icons/C/browse.xbm dt/appconfig/icons/C/browse_ins.xbm +dt/appconfig/icons/C/caja.l.pm +dt/appconfig/icons/C/caja.m.pm +dt/appconfig/icons/C/caja.t.pm +dt/appconfig/icons/C/camera.l.pm +dt/appconfig/icons/C/camera.m.pm +dt/appconfig/icons/C/camera.t.pm +dt/appconfig/icons/C/chrome.l.pm +dt/appconfig/icons/C/chrome.m.pm +dt/appconfig/icons/C/chrome.t.pm dt/appconfig/icons/C/default.xpm dt/appconfig/icons/C/deiconify.xbm dt/appconfig/icons/C/detached.xpm +dt/appconfig/icons/C/dia.l.pm +dt/appconfig/icons/C/dia.m.pm +dt/appconfig/icons/C/dia.t.pm +dt/appconfig/icons/C/dreamchess.l.pm +dt/appconfig/icons/C/dreamchess.m.pm +dt/appconfig/icons/C/dreamchess.t.pm +dt/appconfig/icons/C/dvi.l.pm +dt/appconfig/icons/C/dvi.m.pm +dt/appconfig/icons/C/dvi.t.pm +dt/appconfig/icons/C/eboard.l.pm +dt/appconfig/icons/C/eboard.m.pm +dt/appconfig/icons/C/eboard.t.pm +dt/appconfig/icons/C/emacs.l.pm +dt/appconfig/icons/C/emacs.m.pm +dt/appconfig/icons/C/emacs.t.pm +dt/appconfig/icons/C/engrampa.l.pm +dt/appconfig/icons/C/engrampa.m.pm +dt/appconfig/icons/C/engrampa.t.pm +dt/appconfig/icons/C/eom.l.pm +dt/appconfig/icons/C/eom.m.pm +dt/appconfig/icons/C/eom.t.pm +dt/appconfig/icons/C/f-spot.l.pm +dt/appconfig/icons/C/f-spot.m.pm +dt/appconfig/icons/C/f-spot.t.pm +dt/appconfig/icons/C/file-roller.l.pm +dt/appconfig/icons/C/file-roller.m.pm +dt/appconfig/icons/C/file-roller.t.pm +dt/appconfig/icons/C/firefox.l.pm +dt/appconfig/icons/C/firefox.m.pm +dt/appconfig/icons/C/firefox.t.pm +dt/appconfig/icons/C/firestarter.l.pm +dt/appconfig/icons/C/firestarter.m.pm +dt/appconfig/icons/C/firestarter.t.pm +dt/appconfig/icons/C/fontforge.l.pm +dt/appconfig/icons/C/fontforge.m.pm +dt/appconfig/icons/C/fontforge.t.pm +dt/appconfig/icons/C/gcompris.l.pm +dt/appconfig/icons/C/gcompris.m.pm +dt/appconfig/icons/C/gcompris.t.pm +dt/appconfig/icons/C/geogebra.l.pm +dt/appconfig/icons/C/geogebra.m.pm +dt/appconfig/icons/C/geogebra.t.pm +dt/appconfig/icons/C/gimp.l.pm +dt/appconfig/icons/C/gimp.m.pm +dt/appconfig/icons/C/gimp.t.pm +dt/appconfig/icons/C/gscan2pdf.l.pm +dt/appconfig/icons/C/gscan2pdf.m.pm +dt/appconfig/icons/C/gscan2pdf.t.pm +dt/appconfig/icons/C/gv.l.pm +dt/appconfig/icons/C/gv.m.pm +dt/appconfig/icons/C/gv.t.pm dt/appconfig/icons/C/help.xbm dt/appconfig/icons/C/help_ins.xbm dt/appconfig/icons/C/history.xbm dt/appconfig/icons/C/history_ins.xbm dt/appconfig/icons/C/iconify.xbm +dt/appconfig/icons/C/inkscape.l.pm +dt/appconfig/icons/C/inkscape.m.pm +dt/appconfig/icons/C/inkscape.t.pm +dt/appconfig/icons/C/k3b.l.pm +dt/appconfig/icons/C/k3b.m.pm +dt/appconfig/icons/C/k3b.t.pm +dt/appconfig/icons/C/k9copy.l.pm +dt/appconfig/icons/C/k9copy.m.pm +dt/appconfig/icons/C/k9copy.t.pm +dt/appconfig/icons/C/kile.l.pm +dt/appconfig/icons/C/kile.m.pm +dt/appconfig/icons/C/kile.t.pm +dt/appconfig/icons/C/ktuberling.l.pm +dt/appconfig/icons/C/ktuberling.m.pm +dt/appconfig/icons/C/ktuberling.t.pm dt/appconfig/icons/C/landscap.pm +dt/appconfig/icons/C/lbreakout2.l.pm +dt/appconfig/icons/C/lbreakout2.m.pm +dt/appconfig/icons/C/lbreakout2.t.pm dt/appconfig/icons/C/lduplex.pm +dt/appconfig/icons/C/libreoffice-base.l.pm +dt/appconfig/icons/C/libreoffice-base.m.pm +dt/appconfig/icons/C/libreoffice-base.t.pm +dt/appconfig/icons/C/libreoffice-calc.l.pm +dt/appconfig/icons/C/libreoffice-calc.m.pm +dt/appconfig/icons/C/libreoffice-calc.t.pm +dt/appconfig/icons/C/libreoffice-draw.l.pm +dt/appconfig/icons/C/libreoffice-draw.m.pm +dt/appconfig/icons/C/libreoffice-draw.t.pm +dt/appconfig/icons/C/libreoffice-impress.l.pm +dt/appconfig/icons/C/libreoffice-impress.m.pm +dt/appconfig/icons/C/libreoffice-impress.t.pm +dt/appconfig/icons/C/libreoffice-main.l.pm +dt/appconfig/icons/C/libreoffice-main.m.pm +dt/appconfig/icons/C/libreoffice-main.t.pm +dt/appconfig/icons/C/libreoffice-math.l.pm +dt/appconfig/icons/C/libreoffice-math.m.pm +dt/appconfig/icons/C/libreoffice-math.t.pm +dt/appconfig/icons/C/libreoffice-startcenter.l.pm +dt/appconfig/icons/C/libreoffice-startcenter.m.pm +dt/appconfig/icons/C/libreoffice-startcenter.t.pm +dt/appconfig/icons/C/libreoffice-writer.l.pm +dt/appconfig/icons/C/libreoffice-writer.m.pm +dt/appconfig/icons/C/libreoffice-writer.t.pm dt/appconfig/icons/C/locked.xbm dt/appconfig/icons/C/lsimplex.pm dt/appconfig/icons/C/ltumble.pm dt/appconfig/icons/C/marks.xbm dt/appconfig/icons/C/marks_ins.xbm +dt/appconfig/icons/C/mgv.l.pm +dt/appconfig/icons/C/mgv.m.pm +dt/appconfig/icons/C/mgv.pm +dt/appconfig/icons/C/mgv.t.pm +dt/appconfig/icons/C/mp3.l.pm +dt/appconfig/icons/C/mp3.m.pm +dt/appconfig/icons/C/mp3.t.pm +dt/appconfig/icons/C/nedit.l.pm +dt/appconfig/icons/C/nedit.m.pm +dt/appconfig/icons/C/nedit.t.pm +dt/appconfig/icons/C/nxclient-desktop.l.pm +dt/appconfig/icons/C/nxclient-desktop.m.pm +dt/appconfig/icons/C/nxclient-desktop.t.pm +dt/appconfig/icons/C/nxclient-icon.l.pm +dt/appconfig/icons/C/nxclient-icon.m.pm +dt/appconfig/icons/C/okular.l.pm +dt/appconfig/icons/C/okular.m.pm +dt/appconfig/icons/C/okular.t.pm dt/appconfig/icons/C/pduplex.pm +dt/appconfig/icons/C/pgadmin3.l.pm +dt/appconfig/icons/C/pgadmin3.m.pm +dt/appconfig/icons/C/pgadmin3.t.pm dt/appconfig/icons/C/pinin.xbm dt/appconfig/icons/C/pinmid.xbm dt/appconfig/icons/C/pinout.xbm dt/appconfig/icons/C/portrait.pm +dt/appconfig/icons/C/powermanga.l.pm +dt/appconfig/icons/C/powermanga.m.pm +dt/appconfig/icons/C/powermanga.t.pm dt/appconfig/icons/C/psimplex.pm dt/appconfig/icons/C/ptumble.pm +dt/appconfig/icons/C/pychess.l.pm +dt/appconfig/icons/C/pychess.m.pm +dt/appconfig/icons/C/pychess.t.pm dt/appconfig/icons/C/quit.xbm +dt/appconfig/icons/C/rhythmbox.l.pm +dt/appconfig/icons/C/rhythmbox.m.pm +dt/appconfig/icons/C/rhythmbox.t.pm dt/appconfig/icons/C/rlandsca.pm +dt/appconfig/icons/C/rosegarden.l.pm +dt/appconfig/icons/C/rosegarden.m.pm +dt/appconfig/icons/C/rosegarden.t.pm dt/appconfig/icons/C/rportrai.pm dt/appconfig/icons/C/search.xbm dt/appconfig/icons/C/search_ins.xbm dt/appconfig/icons/C/semilocked.xbm +dt/appconfig/icons/C/shotwell.l.pm +dt/appconfig/icons/C/shotwell.m.pm +dt/appconfig/icons/C/shotwell.t.pm +dt/appconfig/icons/C/skype.l.pm +dt/appconfig/icons/C/skype.m.pm +dt/appconfig/icons/C/skype.t.pm +dt/appconfig/icons/C/sound-juicer.l.pm +dt/appconfig/icons/C/sound-juicer.m.pm +dt/appconfig/icons/C/sound-juicer.t.pm +dt/appconfig/icons/C/stellarium.l.pm +dt/appconfig/icons/C/stellarium.m.pm +dt/appconfig/icons/C/stellarium.t.pm +dt/appconfig/icons/C/supertux.l.pm +dt/appconfig/icons/C/supertux.m.pm +dt/appconfig/icons/C/supertux.t.pm +dt/appconfig/icons/C/synaptic.l.pm +dt/appconfig/icons/C/synaptic.m.pm +dt/appconfig/icons/C/synaptic.t.pm +dt/appconfig/icons/C/thunderbird.l.pm +dt/appconfig/icons/C/thunderbird.m.pm +dt/appconfig/icons/C/thunderbird.t.pm +dt/appconfig/icons/C/tuxpaint.l.pm +dt/appconfig/icons/C/tuxpaint.m.pm +dt/appconfig/icons/C/tuxpaint.t.pm dt/appconfig/icons/C/unlocked.xbm +dt/appconfig/icons/C/video.l.pm +dt/appconfig/icons/C/video.m.pm +dt/appconfig/icons/C/video.t.pm +dt/appconfig/icons/C/virtualbox.l.pm +dt/appconfig/icons/C/virtualbox.m.pm +dt/appconfig/icons/C/virtualbox.t.pm +dt/appconfig/icons/C/vlc.l.pm +dt/appconfig/icons/C/vlc.m.pm +dt/appconfig/icons/C/vlc.t.pm dt/appconfig/icons/C/web_browse.xbm dt/appconfig/icons/C/web_browse_ins.xbm -dt/appconfig/icons/C/xm_hour16 -dt/appconfig/icons/C/xm_hour16m -dt/appconfig/icons/C/xm_hour32 -dt/appconfig/icons/C/xm_hour32m -dt/appconfig/icons/C/xm_noenter16 -dt/appconfig/icons/C/xm_noenter16m -dt/appconfig/icons/C/xm_noenter32 -dt/appconfig/icons/C/xm_noenter32m +dt/appconfig/icons/C/wicd.l.pm +dt/appconfig/icons/C/wicd.m.pm +dt/appconfig/icons/C/wicd.t.pm +dt/appconfig/icons/C/xboard.l.pm +dt/appconfig/icons/C/xboard.m.pm +dt/appconfig/icons/C/xboard.t.pm +dt/appconfig/icons/C/xdvi.l.pm +dt/appconfig/icons/C/xdvi.m.pm +dt/appconfig/icons/C/xdvi.t.pm +dt/appconfig/icons/C/xine.l.pm +dt/appconfig/icons/C/xine.m.pm +dt/appconfig/icons/C/xine.t.pm +dt/appconfig/icons/C/xournal.l.pm +dt/appconfig/icons/C/xournal.m.pm +dt/appconfig/icons/C/xournal.t.pm +dt/appconfig/icons/C/xpdf.l.pm +dt/appconfig/icons/C/xpdf.m.pm +dt/appconfig/icons/C/xpdf.t.pm +dt/appconfig/icons/C/xv.l.pm +dt/appconfig/icons/C/xv.m.pm +dt/appconfig/icons/C/xv.t.pm dt/appconfig/tttypes/types.xdr +dt/appconfig/types/C/DisplayImage.dt +dt/appconfig/types/C/DisplayPDF.dt +dt/appconfig/types/C/DisplayPS.dt +dt/appconfig/types/C/DisplayVideo.dt +dt/appconfig/types/C/Education.dt +dt/appconfig/types/C/Games.dt +dt/appconfig/types/C/Graphics.dt +dt/appconfig/types/C/Internet.dt +dt/appconfig/types/C/Media_Tools.dt +dt/appconfig/types/C/Office.dt +dt/appconfig/types/C/System.dt +dt/appconfig/types/C/TeX.dt +dt/appconfig/types/C/acroread.dt +dt/appconfig/types/C/amarok.dt dt/appconfig/types/C/autoStart.dt +dt/appconfig/types/C/brasero.dt +dt/appconfig/types/C/caja.dt +dt/appconfig/types/C/chromium.dt dt/appconfig/types/C/datatypes.dt dt/appconfig/types/C/develop.dt +dt/appconfig/types/C/dreamchess.dt dt/appconfig/types/C/dt.dt dt/appconfig/types/C/dtappman.dt dt/appconfig/types/C/dtbuilder.dt @@ -4021,10 +4324,61 @@ dt/appconfig/types/C/dtmail.dt dt/appconfig/types/C/dtpad.dt dt/appconfig/types/C/dtscreen.dt dt/appconfig/types/C/dtwm.fp +dt/appconfig/types/C/eboard.dt +dt/appconfig/types/C/emacs.dt +dt/appconfig/types/C/engrampa.dt +dt/appconfig/types/C/file-roller.dt +dt/appconfig/types/C/firefox.dt +dt/appconfig/types/C/firestarter.dt +dt/appconfig/types/C/fontforge.dt +dt/appconfig/types/C/gcompris.dt +dt/appconfig/types/C/geogebra.dt +dt/appconfig/types/C/gimp.dt +dt/appconfig/types/C/gv.dt +dt/appconfig/types/C/inkscape.dt +dt/appconfig/types/C/k3b.dt +dt/appconfig/types/C/k9copy.dt +dt/appconfig/types/C/kile.dt +dt/appconfig/types/C/ktuberling.dt +dt/appconfig/types/C/lbreakout2.dt +dt/appconfig/types/C/libreoffice-base.dt +dt/appconfig/types/C/libreoffice-calc.dt +dt/appconfig/types/C/libreoffice-draw.dt +dt/appconfig/types/C/libreoffice-impress.dt +dt/appconfig/types/C/libreoffice-main.dt +dt/appconfig/types/C/libreoffice-math.dt +dt/appconfig/types/C/libreoffice-writer.dt +dt/appconfig/types/C/mgv.dt +dt/appconfig/types/C/nedit.dt +dt/appconfig/types/C/nxclient.dt +dt/appconfig/types/C/okular.dt +dt/appconfig/types/C/pavucontrol.dt +dt/appconfig/types/C/pgadmin.dt +dt/appconfig/types/C/powermanga.dt dt/appconfig/types/C/print.dt +dt/appconfig/types/C/pychess.dt +dt/appconfig/types/C/rhythmbox.dt +dt/appconfig/types/C/rosegarden.dt +dt/appconfig/types/C/skype.dt +dt/appconfig/types/C/sound-juicer.dt +dt/appconfig/types/C/stellarium.dt +dt/appconfig/types/C/supertux.dt +dt/appconfig/types/C/synaptic.dt +dt/appconfig/types/C/thunderbird.dt +dt/appconfig/types/C/tuxpaint.dt dt/appconfig/types/C/user-prefs.dt dt/appconfig/types/C/uxstd.dt +dt/appconfig/types/C/videoTypes.dt +dt/appconfig/types/C/virtualbox.dt +dt/appconfig/types/C/vlc.dt +dt/appconfig/types/C/wicd.dt +dt/appconfig/types/C/xboard.dt dt/appconfig/types/C/xclients.dt +dt/appconfig/types/C/xdvi.dt +dt/appconfig/types/C/xine.dt +dt/appconfig/types/C/xournal.dt +dt/appconfig/types/C/xpdf.dt +dt/appconfig/types/C/xv.dt dt/appconfig/types/de_DE.ISO8859-1/autoStart.dt dt/appconfig/types/de_DE.ISO8859-1/datatypes.dt dt/appconfig/types/de_DE.ISO8859-1/develop.dt @@ -4154,6 +4508,11 @@ dt/bin/dtlogin dt/bin/dtlp @(,mail,2755) dt/bin/dtmail @(,mail,2755) dt/bin/dtmailpr +dt/bin/dtopen +dt/bin/dtopen_image +dt/bin/dtopen_pdf +dt/bin/dtopen_ps +dt/bin/dtopen_video dt/bin/dtpad dt/bin/dtpdm dt/bin/dtpdmd @@ -4174,6 +4533,8 @@ dt/bin/dtsrload dt/bin/dtstyle @(,,2755) dt/bin/dtterm dt/bin/dttypes +dt/bin/dtudcexch +dt/bin/dtudcfonted dt/bin/dtwm dt/bin/huffcode dt/bin/rpc.cmsd @@ -4196,6 +4557,7 @@ dt/config/C/Xresources.d/0120.session dt/config/C/Xresources.d/0140.session dt/config/C/Xresources.d/0160.session dt/config/C/dtfile.config +dt/config/C/fonts.list dt/config/C/sys.dtwmrc dt/config/C/sys.font dt/config/C/sys.resources @@ -4415,6 +4777,14 @@ dt/infolib/etc/online.feature.spec dt/infolib/etc/valBase dt/infolib/etc/validator dt/lib/dtksh/DtFuncs.dtsh +dt/lib/dtudcfonted/dtaddcpf +dt/lib/dtudcfonted/dtbdftocpf +dt/lib/dtudcfonted/dtcpftobdf +dt/lib/dtudcfonted/dtcpftogpf +dt/lib/dtudcfonted/dtcpgpf +dt/lib/dtudcfonted/dtgpftobdf +dt/lib/dtudcfonted/dtgpftocpf +dt/lib/dtudcfonted/dtlsgpf dt/lib/libDtHelp.so dt/lib/libDtHelp.so.2 dt/lib/libDtMmdb.so @@ -4475,6 +4845,8 @@ dt/lib/nls/msg/C/dtsession.cat dt/lib/nls/msg/C/dtstyle.cat dt/lib/nls/msg/C/dtterm.cat dt/lib/nls/msg/C/dttypes.cat +dt/lib/nls/msg/C/dtudcexch.cat +dt/lib/nls/msg/C/dtudcfonted.cat dt/lib/nls/msg/C/dtwm.cat dt/lib/nls/msg/C/fmt_tbl.cat dt/lib/nls/msg/C/libDtMail.cat @@ -4517,6 +4889,8 @@ dt/lib/nls/msg/de_DE.ISO8859-1/dtsession.cat dt/lib/nls/msg/de_DE.ISO8859-1/dtstyle.cat dt/lib/nls/msg/de_DE.ISO8859-1/dtterm.cat dt/lib/nls/msg/de_DE.ISO8859-1/dttypes.cat +dt/lib/nls/msg/de_DE.ISO8859-1/dtudcexch.cat +dt/lib/nls/msg/de_DE.ISO8859-1/dtudcfonted.cat dt/lib/nls/msg/de_DE.ISO8859-1/dtwm.cat dt/lib/nls/msg/de_DE.ISO8859-1/fmt_tbl.cat dt/lib/nls/msg/de_DE.ISO8859-1/libDtMail.cat @@ -4559,6 +4933,8 @@ dt/lib/nls/msg/es_ES.ISO8859-1/dtsession.cat dt/lib/nls/msg/es_ES.ISO8859-1/dtstyle.cat dt/lib/nls/msg/es_ES.ISO8859-1/dtterm.cat dt/lib/nls/msg/es_ES.ISO8859-1/dttypes.cat +dt/lib/nls/msg/es_ES.ISO8859-1/dtudcexch.cat +dt/lib/nls/msg/es_ES.ISO8859-1/dtudcfonted.cat dt/lib/nls/msg/es_ES.ISO8859-1/dtwm.cat dt/lib/nls/msg/es_ES.ISO8859-1/fmt_tbl.cat dt/lib/nls/msg/es_ES.ISO8859-1/libDtMail.cat @@ -4601,6 +4977,8 @@ dt/lib/nls/msg/fr_FR.ISO8859-1/dtsession.cat dt/lib/nls/msg/fr_FR.ISO8859-1/dtstyle.cat dt/lib/nls/msg/fr_FR.ISO8859-1/dtterm.cat dt/lib/nls/msg/fr_FR.ISO8859-1/dttypes.cat +dt/lib/nls/msg/fr_FR.ISO8859-1/dtudcexch.cat +dt/lib/nls/msg/fr_FR.ISO8859-1/dtudcfonted.cat dt/lib/nls/msg/fr_FR.ISO8859-1/dtwm.cat dt/lib/nls/msg/fr_FR.ISO8859-1/fmt_tbl.cat dt/lib/nls/msg/fr_FR.ISO8859-1/libDtMail.cat @@ -4643,6 +5021,8 @@ dt/lib/nls/msg/it_IT.ISO8859-1/dtsession.cat dt/lib/nls/msg/it_IT.ISO8859-1/dtstyle.cat dt/lib/nls/msg/it_IT.ISO8859-1/dtterm.cat dt/lib/nls/msg/it_IT.ISO8859-1/dttypes.cat +dt/lib/nls/msg/it_IT.ISO8859-1/dtudcexch.cat +dt/lib/nls/msg/it_IT.ISO8859-1/dtudcfonted.cat dt/lib/nls/msg/it_IT.ISO8859-1/dtwm.cat dt/lib/nls/msg/it_IT.ISO8859-1/fmt_tbl.cat dt/lib/nls/msg/it_IT.ISO8859-1/libDtMail.cat @@ -4939,6 +5319,8 @@ dt/share/man/man1/dtsrload.1.gz dt/share/man/man1/dtstyle.1.gz dt/share/man/man1/dtterm.1.gz dt/share/man/man1/dttypes.1.gz +dt/share/man/man1/dtudcexch.1.gz +dt/share/man/man1/dtudcfonted.1.gz dt/share/man/man1/dtwm.1.gz dt/share/man/man1/huffcode.1.gz dt/share/man/man1/ksh.1.gz @@ -5590,8 +5972,8 @@ dt/share/palettes/desc.de_DE.ISO8859-1 dt/share/palettes/desc.es_ES.ISO8859-1 dt/share/palettes/desc.fr_FR.ISO8859-1 dt/share/palettes/desc.it_IT.ISO8859-1 -etc/pam.d/cde.conf etc/man.d/cde.conf +etc/pam.d/cde.conf @dir dt/appconfig/appmanager/de_DE.ISO8859-1/System_Admin @dir dt/appconfig/appmanager/es_ES.ISO8859-1/System_Admin @dir dt/appconfig/appmanager/fr_FR.ISO8859-1/System_Admin From owner-svn-ports-branches@freebsd.org Mon Jan 6 22:35:02 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 5442B1F7976; Mon, 6 Jan 2020 22:35:02 +0000 (UTC) (envelope-from kai@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 47s9LZ1VMlz4KsS; Mon, 6 Jan 2020 22:35:02 +0000 (UTC) (envelope-from kai@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 2A3731D560; Mon, 6 Jan 2020 22:35:02 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 006MZ1ZM019471; Mon, 6 Jan 2020 22:35:01 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 006MZ13q019468; Mon, 6 Jan 2020 22:35:01 GMT (envelope-from kai@FreeBSD.org) Message-Id: <202001062235.006MZ13q019468@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Mon, 6 Jan 2020 22:35:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522286 - branches/2020Q1/net-mgmt/cacti X-SVN-Group: ports-branches X-SVN-Commit-Author: kai X-SVN-Commit-Paths: branches/2020Q1/net-mgmt/cacti X-SVN-Commit-Revision: 522286 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, 06 Jan 2020 22:35:02 -0000 Author: kai Date: Mon Jan 6 22:35:01 2020 New Revision: 522286 URL: https://svnweb.freebsd.org/changeset/ports/522286 Log: MFH: r522267 net-mgmt/cacti: Update to 1.2.8 * Sort pkg-plist to make future patching/comparing easier. While I'm here: * Use ${COPYTREE_SHARE} to correctly install a whole set of files instead of using "cp -R". * Also remove a very outdated test was required when updating to the 0.8.7a release of net-mgmt/cacti. It was introduced +12 years ago in r203859 and is no longer required nowadays. Changelog: https://github.com/Cacti/cacti/releases/tag/release%2F1.2.8 PR: 242834 Submitted by: Michael Muenz (based on) Approved by: maintainer timeout (14 days) Security: 86224a04-26de-11ea-97f2-001a8c5c04b6 Approved by: ports-secteam (joneum) Modified: branches/2020Q1/net-mgmt/cacti/Makefile branches/2020Q1/net-mgmt/cacti/distinfo branches/2020Q1/net-mgmt/cacti/pkg-plist Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/net-mgmt/cacti/Makefile ============================================================================== --- branches/2020Q1/net-mgmt/cacti/Makefile Mon Jan 6 22:25:31 2020 (r522285) +++ branches/2020Q1/net-mgmt/cacti/Makefile Mon Jan 6 22:35:01 2020 (r522286) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cacti -PORTVERSION= 1.2.7 +PORTVERSION= 1.2.8 CATEGORIES= net-mgmt www MASTER_SITES= http://www.cacti.net/downloads/ \ ftp://ftpmirror.uk/freebsd-ports/cacti/ @@ -55,12 +55,6 @@ do-install: ${MKDIR} ${STAGEDIR}/var/log/cacti ${MKDIR} ${STAGEDIR}/var/db/cacti/rra ${MKDIR} ${STAGEDIR}/var/db/cacti/scripts - ${CP} -R ${WRKSRC}/* ${STAGEDIR}/${PREFIX}/${CACTIDIR} - if [ -f ${PREFIX}/${CACTIDIR}/include/db-settings.php ]; then \ - ${ECHO_CMD} "======================================================================="; \ - ${ECHO_CMD} "WARNING! You have to move DB settings from"; \ - ${ECHO_CMD} "${PREFIX}/${CACTIDIR}/include/db-settings.php file to"; \ - ${ECHO_CMD} "${PREFIX}/${CACTIDIR}/include/config.php and remove db-settings.php"; \ - fi + cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${CACTIDIR} "! -name '.git\*'" .include Modified: branches/2020Q1/net-mgmt/cacti/distinfo ============================================================================== --- branches/2020Q1/net-mgmt/cacti/distinfo Mon Jan 6 22:25:31 2020 (r522285) +++ branches/2020Q1/net-mgmt/cacti/distinfo Mon Jan 6 22:35:01 2020 (r522286) @@ -1,3 +1,3 @@ -TIMESTAMP = 1569956243 -SHA256 (cacti-1.2.7.tar.gz) = 45b4d57964aa2e11176f03f866be9c4e5850eaa5abe83137b61b3fe9d7ddce34 -SIZE (cacti-1.2.7.tar.gz) = 24819135 +TIMESTAMP = 1577112723 +SHA256 (cacti-1.2.8.tar.gz) = ca4b83d1963a358c9ab60276becc46553fa0125d1ad906c2d26278a485615a29 +SIZE (cacti-1.2.8.tar.gz) = 24881361 Modified: branches/2020Q1/net-mgmt/cacti/pkg-plist ============================================================================== --- branches/2020Q1/net-mgmt/cacti/pkg-plist Mon Jan 6 22:25:31 2020 (r522285) +++ branches/2020Q1/net-mgmt/cacti/pkg-plist Mon Jan 6 22:35:01 2020 (r522286) @@ -27,7 +27,6 @@ %%CACTIDIR%%/cacti.sql %%CACTIDIR%%/cdef.php %%CACTIDIR%%/cli/.htaccess -%%CACTIDIR%%/cli/index.php %%CACTIDIR%%/cli/add_data_query.php %%CACTIDIR%%/cli/add_datasource.php %%CACTIDIR%%/cli/add_device.php @@ -42,10 +41,11 @@ %%CACTIDIR%%/cli/copy_user.php %%CACTIDIR%%/cli/host_update_template.php %%CACTIDIR%%/cli/import_package.php +%%CACTIDIR%%/cli/import_template.php +%%CACTIDIR%%/cli/index.php %%CACTIDIR%%/cli/input_whitelist.php %%CACTIDIR%%/cli/install_cacti.php %%CACTIDIR%%/cli/md5sum.php -%%CACTIDIR%%/cli/import_template.php %%CACTIDIR%%/cli/poller_data_sources_reapply_names.php %%CACTIDIR%%/cli/poller_graphs_reapply_names.php %%CACTIDIR%%/cli/poller_output_empty.php @@ -73,8 +73,8 @@ %%CACTIDIR%%/data_debug.php %%CACTIDIR%%/data_input.php %%CACTIDIR%%/data_queries.php -%%CACTIDIR%%/data_sources.php %%CACTIDIR%%/data_source_profiles.php +%%CACTIDIR%%/data_sources.php %%CACTIDIR%%/data_templates.php %%CACTIDIR%%/docs/Aggregate-Templates.html %%CACTIDIR%%/docs/Aggregates.html @@ -111,6 +111,7 @@ %%CACTIDIR%%/docs/How-To-Data-Query-Templates.html %%CACTIDIR%%/docs/How-To-Determine-Template-Version.html %%CACTIDIR%%/docs/How-To-SSH-Tunnels.html +%%CACTIDIR%%/docs/How-To-Setup-Remote-Pollers.html %%CACTIDIR%%/docs/How-to-Graph-Your-Network.html %%CACTIDIR%%/docs/How-to-Graph-a-Custom-Collection-Script.html %%CACTIDIR%%/docs/Import-Template.html @@ -128,6 +129,7 @@ %%CACTIDIR%%/docs/Plugins.html %%CACTIDIR%%/docs/Principles-of-Operation.html %%CACTIDIR%%/docs/RRDTool-Specific-Features.html +%%CACTIDIR%%/docs/RRDproxy.html %%CACTIDIR%%/docs/Requirements.html %%CACTIDIR%%/docs/SNMP-Data-Queries-Walkthrough.html %%CACTIDIR%%/docs/SNMP-New-Data-Query-Walkthrough.html @@ -510,8 +512,8 @@ %%CACTIDIR%%/images/cacti_backdrop2.gif %%CACTIDIR%%/images/cacti_error_image.png %%CACTIDIR%%/images/cacti_logo.gif -%%CACTIDIR%%/images/cacti_logo_new.gif %%CACTIDIR%%/images/cacti_logo.svg +%%CACTIDIR%%/images/cacti_logo_new.gif %%CACTIDIR%%/images/calendar.gif %%CACTIDIR%%/images/chart_curve_go.png %%CACTIDIR%%/images/cog.png @@ -782,6 +784,7 @@ %%CACTIDIR%%/include/js/d3.js %%CACTIDIR%%/include/js/dygraph-combined.js %%CACTIDIR%%/include/js/index.php +%%CACTIDIR%%/include/js/jquery-ui.js %%CACTIDIR%%/include/js/jquery.colorpicker.js %%CACTIDIR%%/include/js/jquery.cookie.js %%CACTIDIR%%/include/js/jquery.dropdown.js @@ -798,7 +801,6 @@ %%CACTIDIR%%/include/js/jquery.timepicker.js %%CACTIDIR%%/include/js/jquery.ui.touch.punch.js %%CACTIDIR%%/include/js/jquery.zoom.js -%%CACTIDIR%%/include/js/jquery-ui.js %%CACTIDIR%%/include/js/js.storage.js %%CACTIDIR%%/include/js/jstree.js %%CACTIDIR%%/include/js/pace.js @@ -2038,12 +2040,12 @@ %%CACTIDIR%%/install/colors.csv %%CACTIDIR%%/install/functions.php %%CACTIDIR%%/install/index.php -%%CACTIDIR%%/install/templates/Cisco_Router.xml.gz %%CACTIDIR%%/install/install.css %%CACTIDIR%%/install/install.js %%CACTIDIR%%/install/install.php %%CACTIDIR%%/install/step_json.php %%CACTIDIR%%/install/templates/Cacti_Stats.xml.gz +%%CACTIDIR%%/install/templates/Cisco_Router.xml.gz %%CACTIDIR%%/install/templates/Generic_SNMP_Device.xml.gz %%CACTIDIR%%/install/templates/Local_Linux_Machine.xml.gz %%CACTIDIR%%/install/templates/NetSNMP_Device.xml.gz @@ -2070,14 +2072,10 @@ %%CACTIDIR%%/install/upgrades/1_0_0.php %%CACTIDIR%%/install/upgrades/1_0_4.php %%CACTIDIR%%/install/upgrades/1_0_5.php -%%CACTIDIR%%/install/upgrades/1_1_2.php -%%CACTIDIR%%/install/upgrades/1_1_4.php -%%CACTIDIR%%/install/upgrades/1_1_6.php -%%CACTIDIR%%/install/upgrades/1_1_7.php -%%CACTIDIR%%/install/upgrades/1_1_8.php %%CACTIDIR%%/install/upgrades/1_1_11.php %%CACTIDIR%%/install/upgrades/1_1_14.php %%CACTIDIR%%/install/upgrades/1_1_17.php +%%CACTIDIR%%/install/upgrades/1_1_2.php %%CACTIDIR%%/install/upgrades/1_1_20.php %%CACTIDIR%%/install/upgrades/1_1_26.php %%CACTIDIR%%/install/upgrades/1_1_28.php @@ -2086,12 +2084,17 @@ %%CACTIDIR%%/install/upgrades/1_1_35.php %%CACTIDIR%%/install/upgrades/1_1_36.php %%CACTIDIR%%/install/upgrades/1_1_37.php +%%CACTIDIR%%/install/upgrades/1_1_4.php +%%CACTIDIR%%/install/upgrades/1_1_6.php +%%CACTIDIR%%/install/upgrades/1_1_7.php +%%CACTIDIR%%/install/upgrades/1_1_8.php %%CACTIDIR%%/install/upgrades/1_2_0.php %%CACTIDIR%%/install/upgrades/1_2_1.php %%CACTIDIR%%/install/upgrades/1_2_2.php %%CACTIDIR%%/install/upgrades/1_2_3.php %%CACTIDIR%%/install/upgrades/1_2_5.php %%CACTIDIR%%/install/upgrades/1_2_7.php +%%CACTIDIR%%/install/upgrades/1_2_8.php %%CACTIDIR%%/install/upgrades/index.php %%CACTIDIR%%/lib/aggregate.php %%CACTIDIR%%/lib/api_aggregate.php @@ -2283,9 +2286,9 @@ @comment @owner %%CACTIUSER%% @group %%CACTIGROUP%% -@dir /var/log/cacti @dir /var/db/cacti/rra @dir /var/db/cacti/scripts @dir /var/db/cacti +@dir /var/log/cacti @group wheel @owner root From owner-svn-ports-branches@freebsd.org Mon Jan 6 22:39:15 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 182A71F813B; Mon, 6 Jan 2020 22:39:15 +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 47s9RQ6xwgz4LT7; Mon, 6 Jan 2020 22:39:14 +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 E9DCA1D575; Mon, 6 Jan 2020 22:39:14 +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 006MdEer020432; Mon, 6 Jan 2020 22:39:14 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 006MdEoq020431; Mon, 6 Jan 2020 22:39:14 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202001062239.006MdEoq020431@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 6 Jan 2020 22:39:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522292 - branches/2020Q1/multimedia/libvpx X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q1/multimedia/libvpx X-SVN-Commit-Revision: 522292 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, 06 Jan 2020 22:39:15 -0000 Author: jbeich Date: Mon Jan 6 22:39:14 2020 New Revision: 522292 URL: https://svnweb.freebsd.org/changeset/ports/522292 Log: MFH: r522287 multimedia/libvpx: document current Firefox limit See https://bugzilla.mozilla.org/show_bug.cgi?id=1225221 Approved by: ports-secteam blanket Modified: branches/2020Q1/multimedia/libvpx/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/multimedia/libvpx/Makefile ============================================================================== --- branches/2020Q1/multimedia/libvpx/Makefile Mon Jan 6 22:37:59 2020 (r522291) +++ branches/2020Q1/multimedia/libvpx/Makefile Mon Jan 6 22:39:14 2020 (r522292) @@ -54,7 +54,7 @@ SHARED_CONFIGURE_ON= --enable-shared SIZE_LIMIT_DESC= Maximum size allowed by decoder: ${SIZE_LIMIT} SIZE_LIMIT_CONFIGURE_ON=--size-limit=${SIZE_LIMIT} -SIZE_LIMIT?= 16384x16384 # Chromium; Firefox has 4000x3000 +SIZE_LIMIT?= 16384x16384 # Chromium; Firefox has 8192x4608 TEST_CONFIGURE_OFF= --disable-unit-tests From owner-svn-ports-branches@freebsd.org Mon Jan 6 22:39:47 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 508531F819C; Mon, 6 Jan 2020 22:39:47 +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 47s9S31W9Jz4Ldd; Mon, 6 Jan 2020 22:39:47 +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 2F3691D577; Mon, 6 Jan 2020 22:39:47 +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 006MdlbK020592; Mon, 6 Jan 2020 22:39:47 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 006MdlPk020591; Mon, 6 Jan 2020 22:39:47 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202001062239.006MdlPk020591@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 6 Jan 2020 22:39:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522294 - branches/2020Q1/multimedia/libvpx X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q1/multimedia/libvpx X-SVN-Commit-Revision: 522294 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, 06 Jan 2020 22:39:47 -0000 Author: jbeich Date: Mon Jan 6 22:39:46 2020 New Revision: 522294 URL: https://svnweb.freebsd.org/changeset/ports/522294 Log: MFH: r522289 multimedia/libvpx: fix RTCPU=OFF and POSTPROC=off Approved by: ports-secteam blanket Modified: branches/2020Q1/multimedia/libvpx/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/multimedia/libvpx/Makefile ============================================================================== --- branches/2020Q1/multimedia/libvpx/Makefile Mon Jan 6 22:39:14 2020 (r522293) +++ branches/2020Q1/multimedia/libvpx/Makefile Mon Jan 6 22:39:46 2020 (r522294) @@ -43,11 +43,12 @@ MULTIRES_DESC= Enable multi-resolution encoding MULTIRES_CONFIGURE_ON= --enable-multi-res-encoding POSTPROC_DESC= Enable postprocessing -POSTPROC_CONFIGURE_ON= --enable-postproc --enable-vp9-postproc \ +POSTPROC_CONFIGURE_ON= --enable-vp9-postproc \ --enable-vp9-temporal-denoising +POSTPROC_CONFIGURE_OFF= --disable-postproc RTCPU_DESC= Detect CPU capabilities at runtime -RTCPU_CONFIGURE_ON= --enable-runtime-cpu-detect +RTCPU_CONFIGURE_OFF= --disable-runtime-cpu-detect SHARED_DESC= Enable shared-library support SHARED_CONFIGURE_ON= --enable-shared From owner-svn-ports-branches@freebsd.org Mon Jan 6 23:02: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 D86FA1FA524; Mon, 6 Jan 2020 23:02:30 +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 47s9yG5Qbcz4NMB; Mon, 6 Jan 2020 23:02:30 +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 B57F11DAF8; Mon, 6 Jan 2020 23:02:30 +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 006N2UcF038529; Mon, 6 Jan 2020 23:02:30 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 006N2Ui5038528; Mon, 6 Jan 2020 23:02:30 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <202001062302.006N2Ui5038528@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Mon, 6 Jan 2020 23:02:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522298 - branches/2020Q1/net/geoipupdate/files X-SVN-Group: ports-branches X-SVN-Commit-Author: adamw X-SVN-Commit-Paths: branches/2020Q1/net/geoipupdate/files X-SVN-Commit-Revision: 522298 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, 06 Jan 2020 23:02:30 -0000 Author: adamw Date: Mon Jan 6 23:02:30 2020 New Revision: 522298 URL: https://svnweb.freebsd.org/changeset/ports/522298 Log: MFH: r522297 geoipupdate: Take out unusable URL from instructions Reported by: Dewayne Geraghty Approved by: portmgr (with hat) Modified: branches/2020Q1/net/geoipupdate/files/pkg-message.in Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/net/geoipupdate/files/pkg-message.in ============================================================================== --- branches/2020Q1/net/geoipupdate/files/pkg-message.in Mon Jan 6 23:01:03 2020 (r522297) +++ branches/2020Q1/net/geoipupdate/files/pkg-message.in Mon Jan 6 23:02:30 2020 (r522298) @@ -7,7 +7,7 @@ registered account. See: https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/ Register for an account: https://www.maxmind.com/en/geolite2/signup -Get a license key: https://www.maxmind.com/en/accounts/155743/license-key +Get a (free) license key from your accounts page. Place the generated account key and license key into %%DATADIR%%/GeoIP.conf From owner-svn-ports-branches@freebsd.org Mon Jan 6 23:18: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 5B00A1FBB70; Mon, 6 Jan 2020 23:18:57 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.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 47sBKF1lDxz4PM5; Mon, 6 Jan 2020 23:18:57 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3727E1DCDA; Mon, 6 Jan 2020 23:18:57 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 006NIvAB045784; Mon, 6 Jan 2020 23:18:57 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 006NIvWM045783; Mon, 6 Jan 2020 23:18:57 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202001062318.006NIvWM045783@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 6 Jan 2020 23:18:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522305 - branches/2020Q1/multimedia/libvpx X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q1/multimedia/libvpx X-SVN-Commit-Revision: 522305 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, 06 Jan 2020 23:18:57 -0000 Author: jbeich Date: Mon Jan 6 23:18:56 2020 New Revision: 522305 URL: https://svnweb.freebsd.org/changeset/ports/522305 Log: MFH: r522304 multimedia/libvpx: update COMMENT Only decoder and encoder are installed. Other features are not maintained by the port. Besides, ffmpeg provides alternative decoder while svt-vp9 provides alternative encoder. Approved by: ports-secteam blanket Modified: branches/2020Q1/multimedia/libvpx/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/multimedia/libvpx/Makefile ============================================================================== --- branches/2020Q1/multimedia/libvpx/Makefile Mon Jan 6 23:18:02 2020 (r522304) +++ branches/2020Q1/multimedia/libvpx/Makefile Mon Jan 6 23:18:56 2020 (r522305) @@ -7,7 +7,7 @@ DISTVERSION= 1.8.2 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org -COMMENT= VP8/VP9 Codec SDK +COMMENT= VP8/VP9 reference encoder/decoder LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE From owner-svn-ports-branches@freebsd.org Tue Jan 7 11:46:24 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 9ABAF225FAE; Tue, 7 Jan 2020 11:46:24 +0000 (UTC) (envelope-from pkubaj@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 47sVvh3fd4z42WS; Tue, 7 Jan 2020 11:46:24 +0000 (UTC) (envelope-from pkubaj@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 78B2026634; Tue, 7 Jan 2020 11:46:24 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 007BkO9G098209; Tue, 7 Jan 2020 11:46:24 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 007BkOBJ098208; Tue, 7 Jan 2020 11:46:24 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202001071146.007BkOBJ098208@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Tue, 7 Jan 2020 11:46:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522327 - branches/2020Q1/net-p2p/monero-cli X-SVN-Group: ports-branches X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: branches/2020Q1/net-p2p/monero-cli X-SVN-Commit-Revision: 522327 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, 07 Jan 2020 11:46:24 -0000 Author: pkubaj Date: Tue Jan 7 11:46:24 2020 New Revision: 522327 URL: https://svnweb.freebsd.org/changeset/ports/522327 Log: MFH: r522326 net-p2p/monero-cli: fix build on non-x86 Architectures that don't have libunwind available should disable stack trace. Otherwise, the following linking error is encountered: /usr/local/bin/ld: src/common/libcommon.a(stack_trace.cpp.o): in function `tools::log_stack_trace(char const*)': stack_trace.cpp:(.text+0x71c): undefined reference to `el::base::debug::StackTrace::generateNew()' /usr/local/bin/ld: stack_trace.cpp:(.text+0x72c): undefined reference to `el::base::debug::operator<<(std::ostream&, el::base::debug::StackTrace const&)' collect2: error: ld returned 1 exit status PR: 242846 Approved by: vd (maintainer timeout) Approved by: portmgr (fix build blanket) Modified: branches/2020Q1/net-p2p/monero-cli/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/net-p2p/monero-cli/Makefile ============================================================================== --- branches/2020Q1/net-p2p/monero-cli/Makefile Tue Jan 7 11:45:07 2020 (r522326) +++ branches/2020Q1/net-p2p/monero-cli/Makefile Tue Jan 7 11:46:24 2020 (r522327) @@ -82,6 +82,8 @@ CMAKE_ARGS+= -DLD_RAW_FLAGS:STRING=-m${LD_EMULATION} # keep in sync with all platforms where libunwind is available .if (${ARCH} == amd64 || ${ARCH} == i386) LIB_DEPENDS+= libunwind.so:devel/libunwind +.else +CMAKE_ARGS+= -DSTACK_TRACE:BOOL=OFF .endif CMAKE_ARGS+= -DMANUAL_SUBMODULES:BOOL=ON From owner-svn-ports-branches@freebsd.org Tue Jan 7 11:49: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 E32B12262B1; Tue, 7 Jan 2020 11:49:20 +0000 (UTC) (envelope-from pkubaj@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 47sVz45kWLz42nn; Tue, 7 Jan 2020 11:49:20 +0000 (UTC) (envelope-from pkubaj@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 C00BB26643; Tue, 7 Jan 2020 11:49:20 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 007BnK8k098647; Tue, 7 Jan 2020 11:49:20 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 007BnKoC098646; Tue, 7 Jan 2020 11:49:20 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202001071149.007BnKoC098646@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Tue, 7 Jan 2020 11:49:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522329 - branches/2020Q1/x11-wm/compiz X-SVN-Group: ports-branches X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: branches/2020Q1/x11-wm/compiz X-SVN-Commit-Revision: 522329 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, 07 Jan 2020 11:49:21 -0000 Author: pkubaj Date: Tue Jan 7 11:49:20 2020 New Revision: 522329 URL: https://svnweb.freebsd.org/changeset/ports/522329 Log: MFH: r522328 x11-wm/compiz: depend on nvidia-settings only on amd64 and i386 Nvidia drivers are not available on other architectures. PR: 242832 Approved by: freebsd-ports@dan.me.uk (maintainer timeout) Approved by: portmgr (fix build blanket) Modified: branches/2020Q1/x11-wm/compiz/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/x11-wm/compiz/Makefile ============================================================================== --- branches/2020Q1/x11-wm/compiz/Makefile Tue Jan 7 11:48:18 2020 (r522328) +++ branches/2020Q1/x11-wm/compiz/Makefile Tue Jan 7 11:49:20 2020 (r522329) @@ -21,7 +21,9 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libpng.so:graphics/png \ libstartup-notification-1.so:x11/startup-notification RUN_DEPENDS= glxinfo:graphics/mesa-demos \ - nvidia-settings:x11/nvidia-settings + ${RUN_DEPENDS_${ARCH}} +RUN_DEPENDS_amd64= nvidia-settings:x11/nvidia-settings +RUN_DEPENDS_i386= nvidia-settings:x11/nvidia-settings USES= gettext-runtime gettext-tools gl gmake gnome libtool \ localbase pathfix tar:bzip2 xorg xorg-cat:app From owner-svn-ports-branches@freebsd.org Tue Jan 7 12:39: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 7ABB11DC3B6; Tue, 7 Jan 2020 12:39:00 +0000 (UTC) (envelope-from dvl@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 47sX4N2lS7z45RQ; Tue, 7 Jan 2020 12:39:00 +0000 (UTC) (envelope-from dvl@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 597C526F82; Tue, 7 Jan 2020 12:39:00 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 007Cd0Kf028833; Tue, 7 Jan 2020 12:39:00 GMT (envelope-from dvl@FreeBSD.org) Received: (from dvl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 007Cd051028832; Tue, 7 Jan 2020 12:39:00 GMT (envelope-from dvl@FreeBSD.org) Message-Id: <202001071239.007Cd051028832@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dvl set sender to dvl@FreeBSD.org using -f From: Dan Langille Date: Tue, 7 Jan 2020 12:39:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522331 - branches/2020Q1/devel/p5-Proc-BackOff X-SVN-Group: ports-branches X-SVN-Commit-Author: dvl X-SVN-Commit-Paths: branches/2020Q1/devel/p5-Proc-BackOff X-SVN-Commit-Revision: 522331 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, 07 Jan 2020 12:39:00 -0000 Author: dvl Date: Tue Jan 7 12:38:59 2020 New Revision: 522331 URL: https://svnweb.freebsd.org/changeset/ports/522331 Log: MFH: r522307 Add missing dependency: devel/p5-Class-Accessor re: https://metacpan.org/source/DLO/Proc-BackOff-0.02/Build.PL#L11 Encountered this error: Base class package "Class::Accessor" is empty. (Perhaps you need to 'use' the module which defines that package first, or make that module available in @INC (@INC contains: /usr/local/sbin/../lib /usr/local/lib/perl5/site_perl/mach/5.30 /usr/local/lib/perl5/site_perl /usr/local/lib/perl5/5.30/mach /usr/local/lib/perl5/5.30). at /usr/local/lib/perl5/site_perl/Proc/BackOff.pm line 4. Approved by: portmgr blanket Modified: branches/2020Q1/devel/p5-Proc-BackOff/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/devel/p5-Proc-BackOff/Makefile ============================================================================== --- branches/2020Q1/devel/p5-Proc-BackOff/Makefile Tue Jan 7 11:49:56 2020 (r522330) +++ branches/2020Q1/devel/p5-Proc-BackOff/Makefile Tue Jan 7 12:38:59 2020 (r522331) @@ -3,13 +3,15 @@ PORTNAME= Proc-BackOff PORTVERSION= 0.02 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Perl module that provides methods to backoff on failures + +RUN_DEPENDS+= p5-Class-Accessor>0:devel/p5-Class-Accessor LICENSE= ART10 From owner-svn-ports-branches@freebsd.org Tue Jan 7 15:57: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 3C54D1EB86D; Tue, 7 Jan 2020 15:57:25 +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 47scTK0tHyz4GvB; Tue, 7 Jan 2020 15:57:25 +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 19770147F; Tue, 7 Jan 2020 15:57:25 +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 007FvOIQ049620; Tue, 7 Jan 2020 15:57:24 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 007FvOQE049614; Tue, 7 Jan 2020 15:57:24 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202001071557.007FvOQE049614@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 7 Jan 2020 15:57:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522342 - in branches/2020Q1/emulators: citra yuzu X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2020Q1/emulators: citra yuzu X-SVN-Commit-Revision: 522342 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, 07 Jan 2020 15:57:25 -0000 Author: jbeich Date: Tue Jan 7 15:57:23 2020 New Revision: 522342 URL: https://svnweb.freebsd.org/changeset/ports/522342 Log: MFH: r522341 emulators/{citra,yuzu}: integrate cubeb patch to simplify updates Approved by: ports-secteam blanket Modified: branches/2020Q1/emulators/citra/Makefile branches/2020Q1/emulators/citra/distinfo branches/2020Q1/emulators/yuzu/Makefile branches/2020Q1/emulators/yuzu/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/emulators/citra/Makefile ============================================================================== --- branches/2020Q1/emulators/citra/Makefile Tue Jan 7 15:56:49 2020 (r522341) +++ branches/2020Q1/emulators/citra/Makefile Tue Jan 7 15:57:23 2020 (r522342) @@ -5,10 +5,6 @@ PORTVERSION= s20191218 PORTREVISION?= 2 CATEGORIES= emulators -PATCH_SITES= https://github.com/kinetiknz/cubeb/commit/:cubeb -PATCHFILES+= c0a9ea4cc6e2.patch:-p1:cubeb -PATCH_DIST_STRIP= -d ${WRKSRC_cubeb} - MAINTAINER= jbeich@FreeBSD.org COMMENT= Nintendo 3DS emulator/debugger @@ -37,7 +33,7 @@ GH_TUPLE= citra-emu:ext-libressl-portable:7d01cb0:libr catchorg:Catch2:v2.3.0:catch/externals/catch \ fmtlib:fmt:6.0.0-56-g4b8f8fac:fmt/externals/fmt \ herumi:xbyak:v5.71:xbyak/externals/xbyak \ - kinetiknz:cubeb:cubeb-0.2-1171-gaa63601:cubeb/externals/cubeb \ + kinetiknz:cubeb:cubeb-0.2-1172-g3ab5075:cubeb/externals/cubeb \ lsalzman:enet:0eaf48e:enet/externals/enet \ lvandeve:lodepng:31d9704:lodepng/externals/lodepng/lodepng \ neobrain:nihstro:fd69de1:nihstro/externals/nihstro \ Modified: branches/2020Q1/emulators/citra/distinfo ============================================================================== --- branches/2020Q1/emulators/citra/distinfo Tue Jan 7 15:56:49 2020 (r522341) +++ branches/2020Q1/emulators/citra/distinfo Tue Jan 7 15:57:23 2020 (r522342) @@ -19,8 +19,8 @@ SHA256 (fmtlib-fmt-6.0.0-56-g4b8f8fac_GH0.tar.gz) = f9 SIZE (fmtlib-fmt-6.0.0-56-g4b8f8fac_GH0.tar.gz) = 713067 SHA256 (herumi-xbyak-v5.71_GH0.tar.gz) = 27e5dd6f7fa7194802db9194b893f94b64edf6e585bf567feebb2b15baf11008 SIZE (herumi-xbyak-v5.71_GH0.tar.gz) = 213882 -SHA256 (kinetiknz-cubeb-cubeb-0.2-1171-gaa63601_GH0.tar.gz) = 2ff5bee3b51bedca4620b3148986277c78595c0e4e2cc383435b86b5f6bdbf93 -SIZE (kinetiknz-cubeb-cubeb-0.2-1171-gaa63601_GH0.tar.gz) = 194928 +SHA256 (kinetiknz-cubeb-cubeb-0.2-1172-g3ab5075_GH0.tar.gz) = 561391dfb3fff49d206c7f6f05583767f7278a6a2c5254c7fad4c9004c70e03c +SIZE (kinetiknz-cubeb-cubeb-0.2-1172-g3ab5075_GH0.tar.gz) = 194932 SHA256 (lsalzman-enet-0eaf48e_GH0.tar.gz) = 50c3a47329096908d53ac906b18d5759f06600b4c6612120d18be2aee481e216 SIZE (lsalzman-enet-0eaf48e_GH0.tar.gz) = 79503 SHA256 (lvandeve-lodepng-31d9704_GH0.tar.gz) = 86e140a13d1f425d45f891a082111435d3333385d36b66c94a031c029f4422c1 @@ -31,5 +31,3 @@ SHA256 (weidai11-cryptopp-CRYPTOPP_7_0_0-23-gf320e7d9_ SIZE (weidai11-cryptopp-CRYPTOPP_7_0_0-23-gf320e7d9_GH0.tar.gz) = 7209489 SHA256 (wwylele-teakra-e6ea0ea_GH0.tar.gz) = 114851491219d09dd116e34ffce2432c3b83f8869080dcbe24e9a99850df37a3 SIZE (wwylele-teakra-e6ea0ea_GH0.tar.gz) = 562458 -SHA256 (c0a9ea4cc6e2.patch) = abcd581daaa44d8eb0744cdc6f1999fcfec33894fbc236d94b55e42ecabd1478 -SIZE (c0a9ea4cc6e2.patch) = 1211 Modified: branches/2020Q1/emulators/yuzu/Makefile ============================================================================== --- branches/2020Q1/emulators/yuzu/Makefile Tue Jan 7 15:56:49 2020 (r522341) +++ branches/2020Q1/emulators/yuzu/Makefile Tue Jan 7 15:57:23 2020 (r522342) @@ -5,10 +5,6 @@ PORTVERSION= s20191230 PORTREVISION?= 0 CATEGORIES= emulators -PATCH_SITES= https://github.com/kinetiknz/cubeb/commit/:cubeb -PATCHFILES+= c0a9ea4cc6e2.patch:-p1:cubeb -PATCH_DIST_STRIP= -d ${WRKSRC_cubeb} - MAINTAINER= jbeich@FreeBSD.org COMMENT= Nintendo Switch emulator/debugger @@ -45,7 +41,7 @@ GH_TUPLE= yuzu-emu:unicorn:1.0.1-153-g73f45735:unicorn citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ facebook:zstd:v1.3.8:zstd/externals/zstd \ fmtlib:fmt:6.0.0-56-g4b8f8fac:fmt/externals/fmt \ - kinetiknz:cubeb:cubeb-0.2-1171-gaa63601:cubeb/externals/cubeb \ + kinetiknz:cubeb:cubeb-0.2-1172-g3ab5075:cubeb/externals/cubeb \ lz4:lz4:v1.8.0-8-g4db65c1:lz4/externals/lz4 \ madler:zlib:v1.2.11:zlib/externals/zlib/zlib \ nih-at:libzip:rel-1-5-2-93-g89bd6d63:libzip/externals/libzip/libzip \ Modified: branches/2020Q1/emulators/yuzu/distinfo ============================================================================== --- branches/2020Q1/emulators/yuzu/distinfo Tue Jan 7 15:56:49 2020 (r522341) +++ branches/2020Q1/emulators/yuzu/distinfo Tue Jan 7 15:57:23 2020 (r522342) @@ -27,8 +27,8 @@ SHA256 (facebook-zstd-v1.3.8_GH0.tar.gz) = 90d902a1282 SIZE (facebook-zstd-v1.3.8_GH0.tar.gz) = 1875233 SHA256 (fmtlib-fmt-6.0.0-56-g4b8f8fac_GH0.tar.gz) = f9ea86d434fe49d50ee62d9a4166ece47872690a2d60956252103dff9c722d2e SIZE (fmtlib-fmt-6.0.0-56-g4b8f8fac_GH0.tar.gz) = 713067 -SHA256 (kinetiknz-cubeb-cubeb-0.2-1171-gaa63601_GH0.tar.gz) = 2ff5bee3b51bedca4620b3148986277c78595c0e4e2cc383435b86b5f6bdbf93 -SIZE (kinetiknz-cubeb-cubeb-0.2-1171-gaa63601_GH0.tar.gz) = 194928 +SHA256 (kinetiknz-cubeb-cubeb-0.2-1172-g3ab5075_GH0.tar.gz) = 561391dfb3fff49d206c7f6f05583767f7278a6a2c5254c7fad4c9004c70e03c +SIZE (kinetiknz-cubeb-cubeb-0.2-1172-g3ab5075_GH0.tar.gz) = 194932 SHA256 (lz4-lz4-v1.8.0-8-g4db65c1_GH0.tar.gz) = 31a61b29dcb0204c9ac283d24cd53ae4d7e15e6f4e7dd88919d965ff9cf8ced5 SIZE (lz4-lz4-v1.8.0-8-g4db65c1_GH0.tar.gz) = 222985 SHA256 (madler-zlib-v1.2.11_GH0.tar.gz) = 629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff @@ -41,5 +41,3 @@ SHA256 (weidai11-cryptopp-CRYPTOPP_7_0_0-23-gf320e7d9_ SIZE (weidai11-cryptopp-CRYPTOPP_7_0_0-23-gf320e7d9_GH0.tar.gz) = 7209489 SHA256 (xiph-opus-v1.3.1-4-gad8fe90d_GH0.tar.gz) = a5169e4de7266dca46f8fe08cdc3b9d331c14eaaffc7d9d8abc02d70c4f555da SIZE (xiph-opus-v1.3.1-4-gad8fe90d_GH0.tar.gz) = 828993 -SHA256 (c0a9ea4cc6e2.patch) = abcd581daaa44d8eb0744cdc6f1999fcfec33894fbc236d94b55e42ecabd1478 -SIZE (c0a9ea4cc6e2.patch) = 1211 From owner-svn-ports-branches@freebsd.org Tue Jan 7 16:30:52 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 368591EC37F; Tue, 7 Jan 2020 16:30:52 +0000 (UTC) (envelope-from kai@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 47sdCw0XB9z4JjM; Tue, 7 Jan 2020 16:30:52 +0000 (UTC) (envelope-from kai@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 0D82B1A16; Tue, 7 Jan 2020 16:30:52 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 007GUpgX070633; Tue, 7 Jan 2020 16:30:51 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 007GUpuA070631; Tue, 7 Jan 2020 16:30:51 GMT (envelope-from kai@FreeBSD.org) Message-Id: <202001071630.007GUpuA070631@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Tue, 7 Jan 2020 16:30:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522344 - in branches/2020Q1/net-mgmt/netbox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: kai X-SVN-Commit-Paths: in branches/2020Q1/net-mgmt/netbox: . files X-SVN-Commit-Revision: 522344 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, 07 Jan 2020 16:30:52 -0000 Author: kai Date: Tue Jan 7 16:30:51 2020 New Revision: 522344 URL: https://svnweb.freebsd.org/changeset/ports/522344 Log: MFH: r522268 r522343 net-mgmt/netbox: Update to 2.6.11 * Remove the patch that fixed a regression when accessing the API documentation as it's no longer required. [1] Changelog since 2.6.9: Enhancements: * Add ability to move inventory items between devices * Extend admin UI to allow deleting old report results * Add assigned_to_interface filter for IP addresses * Fail gracefully on custom link rendering exception * Provide request context when executing custom scripts * Add date/time picker widgets * Enable partial search for inventory items * Optimize size of pages containing a dynamic selection field * Allow filtering console/power/interface connections by device ID Bug Fixes: * Restrict queryset of chained fields when form validation fails * Include A/Z termination sites for circuits in global search * Scrolling to target (hash) did not account for the header size * Fix AttributeError exception in API docs [1] * Filter platform by manufacturer when editing devices * Fix filtering of racks by group on device list * Fix exception when editing a device bay (regression since 2.6.7) * Fix API-driven filter field rendering (regression since 2.6.10) * Add missing region filters for multiple objects https://github.com/netbox-community/netbox/releases/tag/v2.6.11 https://github.com/netbox-community/netbox/releases/tag/v2.6.10 net-mgmt/netbox: Relax RUN_DEPENDS * The 2020Q1 branch has 0.24.0 of www/py-dj22-django-taggit thus relax its version requirement of the RUN_DEPENDS to avoid a build failure there. Although net-mgmt/netbox requires the 1.1.0 release of www/py-dj22-django-taggit (pinned with "==" by upstream), it runs fine with either 0.24.0 (in 2020Q1) or 1.2.0 (since r521999). Approved by: ports-secteam (joneum) ports-secteam build fix blanket (remaining part) Deleted: branches/2020Q1/net-mgmt/netbox/files/patch-netbox_extras_api_customfields.py Modified: branches/2020Q1/net-mgmt/netbox/Makefile branches/2020Q1/net-mgmt/netbox/distinfo branches/2020Q1/net-mgmt/netbox/pkg-plist Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/net-mgmt/netbox/Makefile ============================================================================== --- branches/2020Q1/net-mgmt/netbox/Makefile Tue Jan 7 16:24:19 2020 (r522343) +++ branches/2020Q1/net-mgmt/netbox/Makefile Tue Jan 7 16:30:51 2020 (r522344) @@ -2,7 +2,7 @@ PORTNAME= netbox DISTVERSIONPREFIX= v -DISTVERSION= 2.6.9 +DISTVERSION= 2.6.11 CATEGORIES= net-mgmt MAINTAINER= kai@FreeBSD.org Modified: branches/2020Q1/net-mgmt/netbox/distinfo ============================================================================== --- branches/2020Q1/net-mgmt/netbox/distinfo Tue Jan 7 16:24:19 2020 (r522343) +++ branches/2020Q1/net-mgmt/netbox/distinfo Tue Jan 7 16:30:51 2020 (r522344) @@ -1,3 +1,3 @@ -TIMESTAMP = 1576569679 -SHA256 (netbox-community-netbox-v2.6.9_GH0.tar.gz) = 82b993a4002ad68f0d572591f81958aa88a37244c9d76646c01c210fdd57bdb9 -SIZE (netbox-community-netbox-v2.6.9_GH0.tar.gz) = 2417598 +TIMESTAMP = 1578134297 +SHA256 (netbox-community-netbox-v2.6.11_GH0.tar.gz) = 7d395f8b9fdffdce162030f117d36258aa478c72ca6612b82b3e98c6d397c89d +SIZE (netbox-community-netbox-v2.6.11_GH0.tar.gz) = 2440647 Modified: branches/2020Q1/net-mgmt/netbox/pkg-plist ============================================================================== --- branches/2020Q1/net-mgmt/netbox/pkg-plist Tue Jan 7 16:24:19 2020 (r522343) +++ branches/2020Q1/net-mgmt/netbox/pkg-plist Tue Jan 7 16:30:51 2020 (r522344) @@ -46,6 +46,7 @@ %%PORTDOCS%%%%DOCSDIR%%/media/screenshot2.png %%PORTDOCS%%%%DOCSDIR%%/media/screenshot3.png %%PORTDOCS%%%%DOCSDIR%%/netbox_logo.png +%%PORTDOCS%%%%DOCSDIR%%/netbox_logo.svg %%PORTDOCS%%%%DOCSDIR%%/release-notes/index.md %%PORTDOCS%%%%DOCSDIR%%/release-notes/version-1.0.md %%PORTDOCS%%%%DOCSDIR%%/release-notes/version-1.1.md @@ -359,6 +360,9 @@ %%DATADIR%%/project-static/bootstrap-3.4.1-dist/js/npm.js %%DATADIR%%/project-static/clipboard-2.0.4.min.js %%DATADIR%%/project-static/css/base.css +%%DATADIR%%/project-static/flatpickr-4.6.3/flatpickr.min.js +%%DATADIR%%/project-static/flatpickr-4.6.3/themes/dark.css +%%DATADIR%%/project-static/flatpickr-4.6.3/themes/light.css %%DATADIR%%/project-static/font-awesome-4.7.0/css/font-awesome.css %%DATADIR%%/project-static/font-awesome-4.7.0/css/font-awesome.min.css %%DATADIR%%/project-static/font-awesome-4.7.0/fonts/FontAwesome.otf @@ -397,7 +401,9 @@ %%DATADIR%%/project-static/font-awesome-4.7.0/scss/font-awesome.scss %%DATADIR%%/project-static/img/ajax-loader.gif %%DATADIR%%/project-static/img/netbox.ico +%%DATADIR%%/project-static/img/netbox_icon.svg %%DATADIR%%/project-static/img/netbox_logo.png +%%DATADIR%%/project-static/img/netbox_logo.svg %%DATADIR%%/project-static/img/tint_20.png %%DATADIR%%/project-static/jquery-ui-1.12.1/AUTHORS.txt %%DATADIR%%/project-static/jquery-ui-1.12.1/LICENSE.txt @@ -793,6 +799,7 @@ %%DATADIR%%/utilities/templates/buttons/export.html %%DATADIR%%/utilities/templates/buttons/import.html %%DATADIR%%/utilities/templates/widgets/colorselect_option.html +%%DATADIR%%/utilities/templates/widgets/select_api.html %%DATADIR%%/utilities/templates/widgets/select_contenttype.html %%DATADIR%%/utilities/templates/widgets/select_option_with_pk.html %%DATADIR%%/utilities/templates/widgets/selectwithdisabled_option.html From owner-svn-ports-branches@freebsd.org Tue Jan 7 22:10: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 506DC1F3FDF; Tue, 7 Jan 2020 22:10:48 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47smm81JFWz3DcS; Tue, 7 Jan 2020 22:10:48 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mail.j.mat.cc (owncloud.cube.mat.cc [79.143.240.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.mat.cc", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id EE8213CA4; Tue, 7 Jan 2020 22:10:47 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from atuin.in.mat.cc (unknown [IPv6:2a01:678:42:ffff:592a:1631:818:41f7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mat@mat.cc) by mail.j.mat.cc (Postfix) with ESMTPSA id 29DC8942D81; Tue, 7 Jan 2020 22:10:46 +0000 (UTC) Date: Tue, 7 Jan 2020 23:10:45 +0100 From: Mathieu Arnold To: Jan Beich Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: Re: svn commit: r522342 - in branches/2020Q1/emulators: citra yuzu Message-ID: <20200107221045.elrypif56jfelis7@atuin.in.mat.cc> References: <202001071557.007FvOQE049614@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="qil2qebmd3z65h4k" Content-Disposition: inline In-Reply-To: <202001071557.007FvOQE049614@repo.freebsd.org> 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, 07 Jan 2020 22:10:48 -0000 --qil2qebmd3z65h4k Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jan 07, 2020 at 03:57:24PM +0000, Jan Beich wrote: > Author: jbeich > Date: Tue Jan 7 15:57:23 2020 > New Revision: 522342 > URL: https://svnweb.freebsd.org/changeset/ports/522342 >=20 > Log: > MFH: r522341 > =20 > emulators/{citra,yuzu}: integrate cubeb patch to simplify updates > =20 > Approved by: ports-secteam blanket Which part of the blanket is that exactly? > Modified: > branches/2020Q1/emulators/citra/Makefile > branches/2020Q1/emulators/citra/distinfo > branches/2020Q1/emulators/yuzu/Makefile > branches/2020Q1/emulators/yuzu/distinfo > Directory Properties: > branches/2020Q1/ (props changed) >=20 > Modified: branches/2020Q1/emulators/citra/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- branches/2020Q1/emulators/citra/Makefile Tue Jan 7 15:56:49 2020 (r5= 22341) > +++ branches/2020Q1/emulators/citra/Makefile Tue Jan 7 15:57:23 2020 (r5= 22342) > @@ -5,10 +5,6 @@ PORTVERSION=3D s20191218 > PORTREVISION?=3D 2 > CATEGORIES=3D emulators > =20 > -PATCH_SITES=3D https://github.com/kinetiknz/cubeb/commit/:cubeb > -PATCHFILES+=3D c0a9ea4cc6e2.patch:-p1:cubeb > -PATCH_DIST_STRIP=3D -d ${WRKSRC_cubeb} > - > MAINTAINER=3D jbeich@FreeBSD.org > COMMENT=3D Nintendo 3DS emulator/debugger > =20 > @@ -37,7 +33,7 @@ GH_TUPLE=3D citra-emu:ext-libressl-portable:7d01cb0:libr > catchorg:Catch2:v2.3.0:catch/externals/catch \ > fmtlib:fmt:6.0.0-56-g4b8f8fac:fmt/externals/fmt \ > herumi:xbyak:v5.71:xbyak/externals/xbyak \ > - kinetiknz:cubeb:cubeb-0.2-1171-gaa63601:cubeb/externals/cubeb \ > + kinetiknz:cubeb:cubeb-0.2-1172-g3ab5075:cubeb/externals/cubeb \ > lsalzman:enet:0eaf48e:enet/externals/enet \ > lvandeve:lodepng:31d9704:lodepng/externals/lodepng/lodepng \ > neobrain:nihstro:fd69de1:nihstro/externals/nihstro \ >=20 > Modified: branches/2020Q1/emulators/citra/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- branches/2020Q1/emulators/citra/distinfo Tue Jan 7 15:56:49 2020 (r5= 22341) > +++ branches/2020Q1/emulators/citra/distinfo Tue Jan 7 15:57:23 2020 (r5= 22342) > @@ -19,8 +19,8 @@ SHA256 (fmtlib-fmt-6.0.0-56-g4b8f8fac_GH0.tar.gz) =3D f9 > SIZE (fmtlib-fmt-6.0.0-56-g4b8f8fac_GH0.tar.gz) =3D 713067 > SHA256 (herumi-xbyak-v5.71_GH0.tar.gz) =3D 27e5dd6f7fa7194802db9194b893f= 94b64edf6e585bf567feebb2b15baf11008 > SIZE (herumi-xbyak-v5.71_GH0.tar.gz) =3D 213882 > -SHA256 (kinetiknz-cubeb-cubeb-0.2-1171-gaa63601_GH0.tar.gz) =3D 2ff5bee3= b51bedca4620b3148986277c78595c0e4e2cc383435b86b5f6bdbf93 > -SIZE (kinetiknz-cubeb-cubeb-0.2-1171-gaa63601_GH0.tar.gz) =3D 194928 > +SHA256 (kinetiknz-cubeb-cubeb-0.2-1172-g3ab5075_GH0.tar.gz) =3D 561391df= b3fff49d206c7f6f05583767f7278a6a2c5254c7fad4c9004c70e03c > +SIZE (kinetiknz-cubeb-cubeb-0.2-1172-g3ab5075_GH0.tar.gz) =3D 194932 > SHA256 (lsalzman-enet-0eaf48e_GH0.tar.gz) =3D 50c3a47329096908d53ac906b1= 8d5759f06600b4c6612120d18be2aee481e216 > SIZE (lsalzman-enet-0eaf48e_GH0.tar.gz) =3D 79503 > SHA256 (lvandeve-lodepng-31d9704_GH0.tar.gz) =3D 86e140a13d1f425d45f891a= 082111435d3333385d36b66c94a031c029f4422c1 > @@ -31,5 +31,3 @@ SHA256 (weidai11-cryptopp-CRYPTOPP_7_0_0-23-gf320e7d9_ > SIZE (weidai11-cryptopp-CRYPTOPP_7_0_0-23-gf320e7d9_GH0.tar.gz) =3D 7209= 489 > SHA256 (wwylele-teakra-e6ea0ea_GH0.tar.gz) =3D 114851491219d09dd116e34ff= ce2432c3b83f8869080dcbe24e9a99850df37a3 > SIZE (wwylele-teakra-e6ea0ea_GH0.tar.gz) =3D 562458 > -SHA256 (c0a9ea4cc6e2.patch) =3D abcd581daaa44d8eb0744cdc6f1999fcfec33894= fbc236d94b55e42ecabd1478 > -SIZE (c0a9ea4cc6e2.patch) =3D 1211 >=20 > Modified: branches/2020Q1/emulators/yuzu/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- branches/2020Q1/emulators/yuzu/Makefile Tue Jan 7 15:56:49 2020 (r52= 2341) > +++ branches/2020Q1/emulators/yuzu/Makefile Tue Jan 7 15:57:23 2020 (r52= 2342) > @@ -5,10 +5,6 @@ PORTVERSION=3D s20191230 > PORTREVISION?=3D 0 > CATEGORIES=3D emulators > =20 > -PATCH_SITES=3D https://github.com/kinetiknz/cubeb/commit/:cubeb > -PATCHFILES+=3D c0a9ea4cc6e2.patch:-p1:cubeb > -PATCH_DIST_STRIP=3D -d ${WRKSRC_cubeb} > - > MAINTAINER=3D jbeich@FreeBSD.org > COMMENT=3D Nintendo Switch emulator/debugger > =20 > @@ -45,7 +41,7 @@ GH_TUPLE=3D yuzu-emu:unicorn:1.0.1-153-g73f45735:unicorn > citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ > facebook:zstd:v1.3.8:zstd/externals/zstd \ > fmtlib:fmt:6.0.0-56-g4b8f8fac:fmt/externals/fmt \ > - kinetiknz:cubeb:cubeb-0.2-1171-gaa63601:cubeb/externals/cubeb \ > + kinetiknz:cubeb:cubeb-0.2-1172-g3ab5075:cubeb/externals/cubeb \ > lz4:lz4:v1.8.0-8-g4db65c1:lz4/externals/lz4 \ > madler:zlib:v1.2.11:zlib/externals/zlib/zlib \ > nih-at:libzip:rel-1-5-2-93-g89bd6d63:libzip/externals/libzip/libzip \ >=20 > Modified: branches/2020Q1/emulators/yuzu/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- branches/2020Q1/emulators/yuzu/distinfo Tue Jan 7 15:56:49 2020 (r52= 2341) > +++ branches/2020Q1/emulators/yuzu/distinfo Tue Jan 7 15:57:23 2020 (r52= 2342) > @@ -27,8 +27,8 @@ SHA256 (facebook-zstd-v1.3.8_GH0.tar.gz) =3D 90d902a1282 > SIZE (facebook-zstd-v1.3.8_GH0.tar.gz) =3D 1875233 > SHA256 (fmtlib-fmt-6.0.0-56-g4b8f8fac_GH0.tar.gz) =3D f9ea86d434fe49d50e= e62d9a4166ece47872690a2d60956252103dff9c722d2e > SIZE (fmtlib-fmt-6.0.0-56-g4b8f8fac_GH0.tar.gz) =3D 713067 > -SHA256 (kinetiknz-cubeb-cubeb-0.2-1171-gaa63601_GH0.tar.gz) =3D 2ff5bee3= b51bedca4620b3148986277c78595c0e4e2cc383435b86b5f6bdbf93 > -SIZE (kinetiknz-cubeb-cubeb-0.2-1171-gaa63601_GH0.tar.gz) =3D 194928 > +SHA256 (kinetiknz-cubeb-cubeb-0.2-1172-g3ab5075_GH0.tar.gz) =3D 561391df= b3fff49d206c7f6f05583767f7278a6a2c5254c7fad4c9004c70e03c > +SIZE (kinetiknz-cubeb-cubeb-0.2-1172-g3ab5075_GH0.tar.gz) =3D 194932 > SHA256 (lz4-lz4-v1.8.0-8-g4db65c1_GH0.tar.gz) =3D 31a61b29dcb0204c9ac283= d24cd53ae4d7e15e6f4e7dd88919d965ff9cf8ced5 > SIZE (lz4-lz4-v1.8.0-8-g4db65c1_GH0.tar.gz) =3D 222985 > SHA256 (madler-zlib-v1.2.11_GH0.tar.gz) =3D 629380c90a77b964d896ed37163f= 5c3a34f6e6d897311f1df2a7016355c45eff > @@ -41,5 +41,3 @@ SHA256 (weidai11-cryptopp-CRYPTOPP_7_0_0-23-gf320e7d9_ > SIZE (weidai11-cryptopp-CRYPTOPP_7_0_0-23-gf320e7d9_GH0.tar.gz) =3D 7209= 489 > SHA256 (xiph-opus-v1.3.1-4-gad8fe90d_GH0.tar.gz) =3D a5169e4de7266dca46f= 8fe08cdc3b9d331c14eaaffc7d9d8abc02d70c4f555da > SIZE (xiph-opus-v1.3.1-4-gad8fe90d_GH0.tar.gz) =3D 828993 > -SHA256 (c0a9ea4cc6e2.patch) =3D abcd581daaa44d8eb0744cdc6f1999fcfec33894= fbc236d94b55e42ecabd1478 > -SIZE (c0a9ea4cc6e2.patch) =3D 1211 >=20 --=20 Mathieu Arnold --qil2qebmd3z65h4k Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEOraXidLtEhBkQLpbOkUW81GDzkgFAl4VAeVfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNB QjY5Nzg5RDJFRDEyMTA2NDQwQkE1QjNBNDUxNkYzNTE4M0NFNDgACgkQOkUW81GD zkgIxRAAmOe0kX99nI2TMrWOeFQd+rqC9DwH5A9pxj0bP03jrDqiXcCEBSiRqnI6 3T+VXNB8StXg6Yb4szZFl333fjNfAc2ij3jkNxfD3ilKBiLqBvycNRTzOqf6njX1 P4OaBPMNqJw3eknLEhLDC3r+COL7oDKwjUNAoGTxleX1zpwMfzTNL9Y7bHTTIqTb lBEHVkQ/kC0rfA9WRxU81ZxKI5YhmB3SuBKdHZaOGZPR5UoXZGfWArEVbcQuyKm1 EM8IC0KXJqqr1BvWctK1CqoGhhfOZGorHSR6bh/YvFPzhL6+qxqKxIYta2UEyDE/ zzDX4hNFlR4znQ7j42NR3CqDTiV4SsJIvb1xLAhzCmFP7/t78XfbjUfEKFv4vCpu 6BxH3gl//8fSturgmSSyzoLeA5d+T2AWZFuFapMGofIpOl3BDSsbWcSiKb0ZCC92 Ex/Re2t2g2u+Bn21EqD7sY+ATLEaXBQJTPQ/9ZF3YTApS1NOyh5h0KOjd3xCP7d1 f+UR86HY7M/UqsmvyIi6qS2X/aPDrbXMy4mNaa/Rx7xAQyvMzIt1UvCqNaMfzX95 u7hZIKe3z7W7fdnoOrianQT/WrWipCq5Xy+QF0OVs40xYAUglRKaAYx9Q340oznm Oa5JrAduMEKco3BHyGuWQg4nrXOKbVUuG1dv9qnG43c/ZKpBMWs= =zi3B -----END PGP SIGNATURE----- --qil2qebmd3z65h4k-- From owner-svn-ports-branches@freebsd.org Tue Jan 7 23:00:50 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 0A18F1F52E4; Tue, 7 Jan 2020 23:00:50 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47snss6ZyFz3HFP; Tue, 7 Jan 2020 23:00:49 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1354) id CFCB0ED00; Tue, 7 Jan 2020 23:00:49 +0000 (UTC) From: Jan Beich To: Mathieu Arnold Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: Re: svn commit: r522342 - in branches/2020Q1/emulators: citra yuzu References: <202001071557.007FvOQE049614@repo.freebsd.org> <20200107221045.elrypif56jfelis7@atuin.in.mat.cc> Date: Wed, 08 Jan 2020 00:00:47 +0100 In-Reply-To: <20200107221045.elrypif56jfelis7@atuin.in.mat.cc> (Mathieu Arnold's message of "Tue, 7 Jan 2020 23:10:45 +0100") Message-ID: <5zhm-27og-wny@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain 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, 07 Jan 2020 23:00:50 -0000 Mathieu Arnold writes: > On Tue, Jan 07, 2020 at 03:57:24PM +0000, Jan Beich wrote: > >> Author: jbeich >> Date: Tue Jan 7 15:57:23 2020 >> New Revision: 522342 >> URL: https://svnweb.freebsd.org/changeset/ports/522342 >> >> Log: >> MFH: r522341 >> >> emulators/{citra,yuzu}: integrate cubeb patch to simplify updates >> >> Approved by: ports-secteam blanket > > Which part of the blanket is that exactly? "Fixes that do not result in a change in contents of the resulting package." PATCH_DIST_STRIP could break build if another patch was added from different source e.g., upstream rpcs3 fix for a runtime issue. From owner-svn-ports-branches@freebsd.org Wed Jan 8 16:03:55 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 EE7301F3168; Wed, 8 Jan 2020 16:03:55 +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 47tDZM62bnz3GGy; Wed, 8 Jan 2020 16:03:55 +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 CA0471A811; Wed, 8 Jan 2020 16:03:55 +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 008G3thk025155; Wed, 8 Jan 2020 16:03:55 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 008G3tDN025153; Wed, 8 Jan 2020 16:03:55 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202001081603.008G3tDN025153@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 8 Jan 2020 16:03:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522432 - branches/2020Q1/x11-wm/sway X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q1/x11-wm/sway X-SVN-Commit-Revision: 522432 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jan 2020 16:03:56 -0000 Author: jbeich Date: Wed Jan 8 16:03:55 2020 New Revision: 522432 URL: https://svnweb.freebsd.org/changeset/ports/522432 Log: MFH: r522431 x11-wm/sway: update to 1.3.r2 Changes: https://github.com/swaywm/sway/releases/tag/1.3-rc2 Reported by: GitHub (watch releases) Approved by: ports-secteam blanket (reliability fixes) Modified: branches/2020Q1/x11-wm/sway/Makefile branches/2020Q1/x11-wm/sway/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/x11-wm/sway/Makefile ============================================================================== --- branches/2020Q1/x11-wm/sway/Makefile Wed Jan 8 16:00:46 2020 (r522431) +++ branches/2020Q1/x11-wm/sway/Makefile Wed Jan 8 16:03:55 2020 (r522432) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= sway -DISTVERSION= 1.3-rc1 +DISTVERSION= 1.3-rc2 CATEGORIES= x11-wm MAINTAINER= jbeich@FreeBSD.org Modified: branches/2020Q1/x11-wm/sway/distinfo ============================================================================== --- branches/2020Q1/x11-wm/sway/distinfo Wed Jan 8 16:00:46 2020 (r522431) +++ branches/2020Q1/x11-wm/sway/distinfo Wed Jan 8 16:03:55 2020 (r522432) @@ -1,3 +1,3 @@ -TIMESTAMP = 1577806391 -SHA256 (swaywm-sway-1.3-rc1_GH0.tar.gz) = d4c10c5beec9d80dcda78cf202fd6be4f802205d3c84d12b2f8fb3c85f51f7b2 -SIZE (swaywm-sway-1.3-rc1_GH0.tar.gz) = 5513709 +TIMESTAMP = 1578497240 +SHA256 (swaywm-sway-1.3-rc2_GH0.tar.gz) = 428734799e72a416beadc5cda2e180c30dbf075f8113b148ed0a252552c17645 +SIZE (swaywm-sway-1.3-rc2_GH0.tar.gz) = 5514289 From owner-svn-ports-branches@freebsd.org Wed Jan 8 19:18: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 59F5C1F87DB; Wed, 8 Jan 2020 19:18:46 +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 47tJvB1l5kz434h; Wed, 8 Jan 2020 19:18:46 +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 36E071CCC9; Wed, 8 Jan 2020 19:18:46 +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 008JIkXi042100; Wed, 8 Jan 2020 19:18:46 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 008JIjx1042099; Wed, 8 Jan 2020 19:18:45 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202001081918.008JIjx1042099@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 8 Jan 2020 19:18:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522455 - branches/2020Q1/www/firefox X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q1/www/firefox X-SVN-Commit-Revision: 522455 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jan 2020 19:18:46 -0000 Author: jbeich Date: Wed Jan 8 19:18:45 2020 New Revision: 522455 URL: https://svnweb.freebsd.org/changeset/ports/522455 Log: MFH: r522453 www/firefox: update to 72.0.1 Changes: https://www.mozilla.org/firefox/72.0.1/releasenotes/ PR: 242605 Security: CVE-2019-17026 Approved by: ports-secteam blanket Modified: branches/2020Q1/www/firefox/Makefile branches/2020Q1/www/firefox/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/www/firefox/Makefile ============================================================================== --- branches/2020Q1/www/firefox/Makefile Wed Jan 8 19:17:51 2020 (r522454) +++ branches/2020Q1/www/firefox/Makefile Wed Jan 8 19:18:45 2020 (r522455) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 72.0 -PORTREVISION= 1 +DISTVERSION= 72.0.1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build4/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org Modified: branches/2020Q1/www/firefox/distinfo ============================================================================== --- branches/2020Q1/www/firefox/distinfo Wed Jan 8 19:17:51 2020 (r522454) +++ branches/2020Q1/www/firefox/distinfo Wed Jan 8 19:18:45 2020 (r522455) @@ -1,3 +1,3 @@ -TIMESTAMP = 1578077931 -SHA256 (firefox-72.0.source.tar.xz) = 6473b2d854828b5d3dbe4b01093e8993141de7707d5d01eb32bd16a469b46708 -SIZE (firefox-72.0.source.tar.xz) = 314344204 +TIMESTAMP = 1578446642 +SHA256 (firefox-72.0.1.source.tar.xz) = 1fa59aedc8469c3e6ffb12449ab7de2f93776f7679eedebfb74aa309b694956f +SIZE (firefox-72.0.1.source.tar.xz) = 314963588 From owner-svn-ports-branches@freebsd.org Wed Jan 8 19:19:15 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 C63A01F8822; Wed, 8 Jan 2020 19:19:15 +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 47tJvl4yDwz439N; Wed, 8 Jan 2020 19:19:15 +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 A56CE1CCCB; Wed, 8 Jan 2020 19:19:15 +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 008JJFBQ042258; Wed, 8 Jan 2020 19:19:15 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 008JJF8S042256; Wed, 8 Jan 2020 19:19:15 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202001081919.008JJF8S042256@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 8 Jan 2020 19:19:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522456 - branches/2020Q1/www/firefox-esr X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q1/www/firefox-esr X-SVN-Commit-Revision: 522456 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jan 2020 19:19:15 -0000 Author: jbeich Date: Wed Jan 8 19:19:15 2020 New Revision: 522456 URL: https://svnweb.freebsd.org/changeset/ports/522456 Log: MFH: r522454 www/firefox-esr: update to 68.4.1 Changes: https://www.mozilla.org/firefox/68.4.1/releasenotes/ Security: CVE-2019-17026 Approved by: ports-secteam blanket Modified: branches/2020Q1/www/firefox-esr/Makefile branches/2020Q1/www/firefox-esr/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/www/firefox-esr/Makefile ============================================================================== --- branches/2020Q1/www/firefox-esr/Makefile Wed Jan 8 19:18:45 2020 (r522455) +++ branches/2020Q1/www/firefox-esr/Makefile Wed Jan 8 19:19:15 2020 (r522456) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 68.4.0 +DISTVERSION= 68.4.1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ Modified: branches/2020Q1/www/firefox-esr/distinfo ============================================================================== --- branches/2020Q1/www/firefox-esr/distinfo Wed Jan 8 19:18:45 2020 (r522455) +++ branches/2020Q1/www/firefox-esr/distinfo Wed Jan 8 19:19:15 2020 (r522456) @@ -1,3 +1,3 @@ -TIMESTAMP = 1577724664 -SHA256 (firefox-68.4.0esr.source.tar.xz) = 58ab6fd342698107585da91e240c02e9b1067ca667143abfbee89184cf16f91c -SIZE (firefox-68.4.0esr.source.tar.xz) = 321283916 +TIMESTAMP = 1578446936 +SHA256 (firefox-68.4.1esr.source.tar.xz) = a00a7712d0f919162ce8181a9a3fc3e9ef37adf1caff0945a863b4c0c1d9f360 +SIZE (firefox-68.4.1esr.source.tar.xz) = 318559576 From owner-svn-ports-branches@freebsd.org Wed Jan 8 19:37:47 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 65A351F903E; Wed, 8 Jan 2020 19:37:47 +0000 (UTC) (envelope-from pkubaj@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 47tKK71xDWz44Db; Wed, 8 Jan 2020 19:37:47 +0000 (UTC) (envelope-from pkubaj@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 3DB291D0C9; Wed, 8 Jan 2020 19:37:47 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 008Jblqk054479; Wed, 8 Jan 2020 19:37:47 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 008Jbltn054478; Wed, 8 Jan 2020 19:37:47 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202001081937.008Jbltn054478@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Wed, 8 Jan 2020 19:37:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522458 - branches/2020Q1/net/xrdp X-SVN-Group: ports-branches X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: branches/2020Q1/net/xrdp X-SVN-Commit-Revision: 522458 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jan 2020 19:37:47 -0000 Author: pkubaj Date: Wed Jan 8 19:37:46 2020 New Revision: 522458 URL: https://svnweb.freebsd.org/changeset/ports/522458 Log: MFH: r522457 net/xrdp: fix build on GCC architectures C11 compiler is necessary: irp.h:33: error: redefinition of typedef 'XFUSE_INFO' chansrv_fuse.h:47: error: previous declaration of 'XFUSE_INFO' was here Approved by: portmgr (fix build blanket) Modified: branches/2020Q1/net/xrdp/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/net/xrdp/Makefile ============================================================================== --- branches/2020Q1/net/xrdp/Makefile Wed Jan 8 19:36:47 2020 (r522457) +++ branches/2020Q1/net/xrdp/Makefile Wed Jan 8 19:37:46 2020 (r522458) @@ -21,7 +21,8 @@ RUN_DEPENDS= xterm:x11/xterm \ ${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp \ ${LOCALBASE}/lib/pulse-13.0/modules/module-xrdp-sink.so:audio/pulseaudio-module-xrdp -USES= autoreconf:build jpeg localbase libtool pkgconfig ssl xorg +USES= autoreconf:build compiler:c11 jpeg localbase libtool pkgconfig \ + ssl xorg USE_XORG= ice pixman sm x11 xfixes xrandr USE_LDCONFIG= ${PREFIX}/lib/xrdp USE_GITHUB= yes From owner-svn-ports-branches@freebsd.org Wed Jan 8 21:40: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 68FCA1FBF4A; Wed, 8 Jan 2020 21:40:20 +0000 (UTC) (envelope-from pkubaj@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 47tN2X27mXz4BwD; Wed, 8 Jan 2020 21:40:20 +0000 (UTC) (envelope-from pkubaj@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 27D1A1E6E9; Wed, 8 Jan 2020 21:40:20 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 008LeKLE026009; Wed, 8 Jan 2020 21:40:20 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 008LeJ9L026007; Wed, 8 Jan 2020 21:40:19 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202001082140.008LeJ9L026007@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Wed, 8 Jan 2020 21:40:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522461 - branches/2020Q1/multimedia/obs-studio X-SVN-Group: ports-branches X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: branches/2020Q1/multimedia/obs-studio X-SVN-Commit-Revision: 522461 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jan 2020 21:40:20 -0000 Author: pkubaj Date: Wed Jan 8 21:40:19 2020 New Revision: 522461 URL: https://svnweb.freebsd.org/changeset/ports/522461 Log: MFH: r522460 multimedia/obs-studio: fix build on powerpc64 Merge upstream commit to use GCC's SSE->AltiVec translation. Since it depends on compiling with GCC, it only works on ELFv1. Hopefully it will be possible to build it on ELFv2 in the future. Also use luajit only where it's actually available. Since it's optional, the port builds anyway. PR: 243199 Approved by: yuri (maintainer) Approved by: portmgr (fix build blanket) Modified: branches/2020Q1/multimedia/obs-studio/Makefile branches/2020Q1/multimedia/obs-studio/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/multimedia/obs-studio/Makefile ============================================================================== --- branches/2020Q1/multimedia/obs-studio/Makefile Wed Jan 8 21:36:57 2020 (r522460) +++ branches/2020Q1/multimedia/obs-studio/Makefile Wed Jan 8 21:40:19 2020 (r522461) @@ -5,6 +5,9 @@ DISTVERSION= 24.0.5 PORTREVISION= 1 CATEGORIES= multimedia +PATCH_SITES= https://github.com/obsproject/${PORTNAME}/commit/ +PATCHFILES= 03ab7274959a8a19e3c0c91416290f15be7e6ccd.patch:-p1 + MAINTAINER= yuri@FreeBSD.org COMMENT= Open source streaming/recording software @@ -23,14 +26,18 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libfreetype.so:print/freetype2 \ libjack.so:audio/jack \ libjansson.so:devel/jansson \ - libluajit-5.1.so:lang/luajit \ libmbedtls.so:security/mbedtls \ libpulse.so:audio/pulseaudio \ libspeexdsp.so:audio/speexdsp \ libsysinfo.so:devel/libsysinfo \ libudev.so:devel/libudev-devd \ libv4l2.so:multimedia/libv4l \ - libx264.so:multimedia/libx264 + libx264.so:multimedia/libx264 \ + ${LIB_DEPENDS_${ARCH}} +LIB_DEPENDS_amd64= libluajit-5.1.so:lang/luajit +LIB_DEPENDS_armv7= libluajit-5.1.so:lang/luajit +LIB_DEPENDS_i386= libluajit-5.1.so:lang/luajit +LIB_DEPENDS_powerpc= libluajit-5.1.so:lang/luajit USES= cmake compiler:c++11-lib gl lua pkgconfig python:3.4+ qt:5 xorg USE_GITHUB= yes Modified: branches/2020Q1/multimedia/obs-studio/distinfo ============================================================================== --- branches/2020Q1/multimedia/obs-studio/distinfo Wed Jan 8 21:36:57 2020 (r522460) +++ branches/2020Q1/multimedia/obs-studio/distinfo Wed Jan 8 21:40:19 2020 (r522461) @@ -1,3 +1,5 @@ -TIMESTAMP = 1576306573 +TIMESTAMP = 1578433418 SHA256 (obsproject-obs-studio-24.0.5_GH0.tar.gz) = b3d65f36ad2bfcd6ffde1771be64662ce8e8771349fab82bb49f80dbb1f5f2e6 SIZE (obsproject-obs-studio-24.0.5_GH0.tar.gz) = 7901198 +SHA256 (03ab7274959a8a19e3c0c91416290f15be7e6ccd.patch) = aae42499f9654e892d1afd9ad73f8d465a0adc891be3345d7dc5f4d0e589bf7d +SIZE (03ab7274959a8a19e3c0c91416290f15be7e6ccd.patch) = 1773 From owner-svn-ports-branches@freebsd.org Wed Jan 8 22:53: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 6C0AD1FDCD5; Wed, 8 Jan 2020 22:53: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 47tPg71zkHz4GlB; Wed, 8 Jan 2020 22:53: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 3F70D1F576; Wed, 8 Jan 2020 22:53: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 008MrdoL073477; Wed, 8 Jan 2020 22:53:39 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 008MrcjS073469; Wed, 8 Jan 2020 22:53:38 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202001082253.008MrcjS073469@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 8 Jan 2020 22:53:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522463 - in branches/2020Q1/security: ca_root_nss nss nss/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2020Q1/security: ca_root_nss nss nss/files X-SVN-Commit-Revision: 522463 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jan 2020 22:53:39 -0000 Author: jbeich Date: Wed Jan 8 22:53:37 2020 New Revision: 522463 URL: https://svnweb.freebsd.org/changeset/ports/522463 Log: MFH: r522462 security/nss: update to 3.49 Changes: https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.49_release_notes Changes: https://hg.mozilla.org/projects/nss/shortlog/NSS_3_49_RTM ABI: https://abi-laboratory.pro/tracker/timeline/nss/ Reported by: Repology Approved by: ports-secteam blanket (required by Firefox 73) Modified: branches/2020Q1/security/ca_root_nss/Makefile branches/2020Q1/security/ca_root_nss/distinfo branches/2020Q1/security/nss/Makefile branches/2020Q1/security/nss/distinfo branches/2020Q1/security/nss/files/patch-bug1575843 branches/2020Q1/security/nss/files/patch-lib_freebl_blinit.c Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/security/ca_root_nss/Makefile ============================================================================== --- branches/2020Q1/security/ca_root_nss/Makefile Wed Jan 8 22:51:12 2020 (r522462) +++ branches/2020Q1/security/ca_root_nss/Makefile Wed Jan 8 22:53:37 2020 (r522463) @@ -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.48 +VERSION_NSS= 3.49 #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/2020Q1/security/ca_root_nss/distinfo ============================================================================== --- branches/2020Q1/security/ca_root_nss/distinfo Wed Jan 8 22:51:12 2020 (r522462) +++ branches/2020Q1/security/ca_root_nss/distinfo Wed Jan 8 22:53:37 2020 (r522463) @@ -1,3 +1,3 @@ -TIMESTAMP = 1575417811 -SHA256 (nss-3.48.tar.gz) = 3f9c822a86a4e3e1bfe63e2ed0f922d8b7c2e0b7cafe36774b1c627970d0f8ac -SIZE (nss-3.48.tar.gz) = 76481237 +TIMESTAMP = 1578083263 +SHA256 (nss-3.49.tar.gz) = 6738094dc4fd63061118a122bf3999a64fe8c7117fc52f6e81c2279181bde71d +SIZE (nss-3.49.tar.gz) = 76488781 Modified: branches/2020Q1/security/nss/Makefile ============================================================================== --- branches/2020Q1/security/nss/Makefile Wed Jan 8 22:51:12 2020 (r522462) +++ branches/2020Q1/security/nss/Makefile Wed Jan 8 22:53:37 2020 (r522463) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.48 +PORTVERSION= 3.49 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src Modified: branches/2020Q1/security/nss/distinfo ============================================================================== --- branches/2020Q1/security/nss/distinfo Wed Jan 8 22:51:12 2020 (r522462) +++ branches/2020Q1/security/nss/distinfo Wed Jan 8 22:53:37 2020 (r522463) @@ -1,3 +1,3 @@ -TIMESTAMP = 1575417811 -SHA256 (nss-3.48.tar.gz) = 3f9c822a86a4e3e1bfe63e2ed0f922d8b7c2e0b7cafe36774b1c627970d0f8ac -SIZE (nss-3.48.tar.gz) = 76481237 +TIMESTAMP = 1578083263 +SHA256 (nss-3.49.tar.gz) = 6738094dc4fd63061118a122bf3999a64fe8c7117fc52f6e81c2279181bde71d +SIZE (nss-3.49.tar.gz) = 76488781 Modified: branches/2020Q1/security/nss/files/patch-bug1575843 ============================================================================== --- branches/2020Q1/security/nss/files/patch-bug1575843 Wed Jan 8 22:51:12 2020 (r522462) +++ branches/2020Q1/security/nss/files/patch-bug1575843 Wed Jan 8 22:53:37 2020 (r522463) @@ -2,9 +2,9 @@ Detect ARM CPU features on FreeBSD. elf_aux_info is similar to getauxval but is nop on aarch64. ---- lib/freebl/blinit.c.orig 2019-08-30 15:46:32 UTC +--- lib/freebl/blinit.c.orig 2020-01-03 20:27:43 UTC +++ lib/freebl/blinit.c -@@ -96,8 +96,8 @@ CheckX86CPUSupport() +@@ -101,8 +101,8 @@ CheckX86CPUSupport() #ifndef __has_include #define __has_include(x) 0 #endif @@ -15,7 +15,7 @@ elf_aux_info is similar to getauxval but is nop on aar /* This might be conflict with host compiler */ #if !defined(__ANDROID__) #include -@@ -106,6 +106,10 @@ extern unsigned long getauxval(unsigned long type) __a +@@ -111,6 +111,10 @@ extern unsigned long getauxval(unsigned long type) __a #else static unsigned long (*getauxval)(unsigned long) = NULL; #endif /* defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__)*/ @@ -26,7 +26,7 @@ elf_aux_info is similar to getauxval but is nop on aar #ifndef AT_HWCAP2 #define AT_HWCAP2 26 -@@ -118,6 +122,9 @@ static unsigned long (*getauxval)(unsigned long) = NUL +@@ -123,6 +127,9 @@ static unsigned long (*getauxval)(unsigned long) = NUL /* clang-format on */ #if defined(__aarch64__) @@ -36,15 +36,16 @@ elf_aux_info is similar to getauxval but is nop on aar // Defines from hwcap.h in Linux kernel - ARM64 #ifndef HWCAP_AES #define HWCAP_AES (1 << 3) -@@ -138,6 +145,7 @@ CheckARMSupport() - char *disable_arm_neon = PR_GetEnvSecure("NSS_DISABLE_ARM_NEON"); - char *disable_hw_aes = PR_GetEnvSecure("NSS_DISABLE_HW_AES"); - char *disable_pmull = PR_GetEnvSecure("NSS_DISABLE_PMULL"); -+#if defined(__linux__) +@@ -149,7 +156,7 @@ CheckARMSupport() + arm_pmull_support_ = arm_crypto_support && disable_pmull == NULL; + arm_sha1_support_ = arm_crypto_support; + arm_sha2_support_ = arm_crypto_support; +-#else ++#elif defined(__linux__) if (getauxval) { long hwcaps = getauxval(AT_HWCAP); arm_aes_support_ = hwcaps & HWCAP_AES && disable_hw_aes == NULL; -@@ -145,6 +153,23 @@ CheckARMSupport() +@@ -157,7 +164,23 @@ CheckARMSupport() arm_sha1_support_ = hwcaps & HWCAP_SHA1; arm_sha2_support_ = hwcaps & HWCAP_SHA2; } @@ -64,11 +65,11 @@ elf_aux_info is similar to getauxval but is nop on aar + arm_pmull_support_ = ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL && disable_pmull == NULL; + arm_sha1_support_ = ID_AA64ISAR0_SHA1_VAL(id_aa64isar0) == ID_AA64ISAR0_SHA1_BASE; + arm_sha2_support_ = ID_AA64ISAR0_SHA2_VAL(id_aa64isar0) >= ID_AA64ISAR0_SHA2_BASE; -+#endif /* defined(__linux__) */ + #endif /* aarch64 must support NEON. */ arm_neon_support_ = disable_arm_neon == NULL; } -@@ -187,7 +203,7 @@ GetNeonSupport() +@@ -200,7 +223,7 @@ GetNeonSupport() // If no getauxval, compiler generate NEON instruction by default, // we should allow NOEN support. return PR_TRUE; @@ -77,7 +78,7 @@ elf_aux_info is similar to getauxval but is nop on aar // Android's cpu-features.c detects features by the following logic // // - Call getauxval(AT_HWCAP) -@@ -201,6 +217,10 @@ GetNeonSupport() +@@ -214,6 +237,10 @@ GetNeonSupport() if (getauxval) { return (getauxval(AT_HWCAP) & HWCAP_NEON); } @@ -88,7 +89,7 @@ elf_aux_info is similar to getauxval but is nop on aar #endif /* defined(__ARM_NEON) || defined(__ARM_NEON__) */ return PR_FALSE; } -@@ -249,6 +269,7 @@ void +@@ -262,6 +289,7 @@ void CheckARMSupport() { char *disable_hw_aes = PR_GetEnvSecure("NSS_DISABLE_HW_AES"); @@ -96,7 +97,7 @@ elf_aux_info is similar to getauxval but is nop on aar if (getauxval) { // Android's cpu-features.c uses AT_HWCAP2 for newer features. // AT_HWCAP2 is implemented on newer devices / kernel, so we can trust -@@ -257,13 +278,19 @@ CheckARMSupport() +@@ -270,13 +298,19 @@ CheckARMSupport() // AT_HWCAP2 isn't supported by glibc or Linux kernel, getauxval will // returns 0. long hwcaps = getauxval(AT_HWCAP2); Modified: branches/2020Q1/security/nss/files/patch-lib_freebl_blinit.c ============================================================================== --- branches/2020Q1/security/nss/files/patch-lib_freebl_blinit.c Wed Jan 8 22:51:12 2020 (r522462) +++ branches/2020Q1/security/nss/files/patch-lib_freebl_blinit.c Wed Jan 8 22:53:37 2020 (r522463) @@ -2,9 +2,9 @@ qemu:handle_cpu_signal received signal outside vCPU co https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=240037 ---- lib/freebl/blinit.c.orig 2019-08-30 15:46:32 UTC +--- lib/freebl/blinit.c.orig 2020-01-03 20:27:43 UTC +++ lib/freebl/blinit.c -@@ -163,12 +163,14 @@ CheckARMSupport() +@@ -174,12 +174,14 @@ CheckARMSupport() #ifndef ID_AA64ISAR0_SHA2_VAL #define ID_AA64ISAR0_SHA2_VAL ID_AA64ISAR0_SHA2 #endif @@ -22,6 +22,6 @@ https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=2400 + arm_sha1_support_ = ID_AA64ISAR0_SHA1_VAL(id_aa64isar0) == ID_AA64ISAR0_SHA1_BASE; + arm_sha2_support_ = ID_AA64ISAR0_SHA2_VAL(id_aa64isar0) >= ID_AA64ISAR0_SHA2_BASE; + } - #endif /* defined(__linux__) */ + #endif /* aarch64 must support NEON. */ arm_neon_support_ = disable_arm_neon == NULL; From owner-svn-ports-branches@freebsd.org Thu Jan 9 06:40: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 05B7C22B007; Thu, 9 Jan 2020 06:40:28 +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 47tc1l6Q7nz3CMr; Thu, 9 Jan 2020 06:40:27 +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 D318224A7D; Thu, 9 Jan 2020 06:40:27 +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 0096eR4X048031; Thu, 9 Jan 2020 06:40:27 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0096eQ6Z048025; Thu, 9 Jan 2020 06:40:26 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <202001090640.0096eQ6Z048025@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Thu, 9 Jan 2020 06:40:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522469 - in branches/2020Q1/databases: mysql56-client mysql56-client/files mysql56-server mysql56-server/files X-SVN-Group: ports-branches X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in branches/2020Q1/databases: mysql56-client mysql56-client/files mysql56-server mysql56-server/files X-SVN-Commit-Revision: 522469 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jan 2020 06:40:28 -0000 Author: joneum Date: Thu Jan 9 06:40:26 2020 New Revision: 522469 URL: https://svnweb.freebsd.org/changeset/ports/522469 Log: MFH: r521874 databases/mysql56-{client, server}: Update to latest release 5.6.46 Bugfix: - Improper locking during storage engine initialization could cause a server exit. - A query with a WHERE clause whose predicate contained a numeric value in scientific notation was not handled correctly. - VS2019 produced compilation errors with debug compilation selected due to use of the /ZI flag. Now /Z7 is used instead. - For MySQL Community Edition, the cipher order specified by the client was used in preference to the order on the server side, unless the server was confi - Password masking was incomplete for SHOW PROCESSLIST and some INFORMATION_SCHEMA and Performance Schema tables. - The -DWITH_EXAMPLE_STORAGE_ENGINE=1 CMake option was ignored but should not have been. If -DWITH_EXAMPLE_STORAGE_ENGINE=0 is given, the EXAMPLE storage e More Info: https://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-46.html Approved by: mmokhi (maintainer, implicit) Security: fc91f2ef-fd7b-11e9-a1c7-b499baebfeaf Sponsored by: Netzkommune GmbH Approved by: ports-secteam (with hat) Deleted: branches/2020Q1/databases/mysql56-server/files/patch-PR225888.diff Modified: branches/2020Q1/databases/mysql56-client/Makefile branches/2020Q1/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake branches/2020Q1/databases/mysql56-server/Makefile branches/2020Q1/databases/mysql56-server/distinfo branches/2020Q1/databases/mysql56-server/files/patch-CMakeLists.txt branches/2020Q1/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/databases/mysql56-client/Makefile ============================================================================== --- branches/2020Q1/databases/mysql56-client/Makefile Thu Jan 9 03:56:24 2020 (r522468) +++ branches/2020Q1/databases/mysql56-client/Makefile Thu Jan 9 06:40:26 2020 (r522469) @@ -31,6 +31,5 @@ MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 CLIENT_ONLY= yes -EXTRA_PATCHES+= ${MASTERDIR}/files/patch-PR225888.diff .include "${MASTERDIR}/Makefile" Modified: branches/2020Q1/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake ============================================================================== --- branches/2020Q1/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake Thu Jan 9 03:56:24 2020 (r522468) +++ branches/2020Q1/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake Thu Jan 9 06:40:26 2020 (r522469) @@ -1,6 +1,6 @@ ---- cmake/build_configurations/compiler_options.cmake.orig 2016-03-03 16:35:33.000000000 +0100 -+++ cmake/build_configurations/compiler_options.cmake 2016-04-19 17:30:13.345558666 +0200 -@@ -25,7 +25,7 @@ IF(UNIX) +--- cmake/build_configurations/compiler_options.cmake.orig 2020-01-01 21:24:49.736077000 +0100 ++++ cmake/build_configurations/compiler_options.cmake 2020-01-01 21:25:22.307418000 +0100 +@@ -32,7 +32,7 @@ IF(UNIX) # Default GCC flags IF(CMAKE_COMPILER_IS_GNUCC) @@ -9,10 +9,10 @@ # Disable inline optimizations for valgrind testing to avoid false positives IF(WITH_VALGRIND) SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") -@@ -34,7 +34,7 @@ IF(UNIX) - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") - ENDIF() - IF(CMAKE_COMPILER_IS_GNUCXX) +@@ -47,7 +47,7 @@ IF(UNIX) + IF(GXX_VERSION VERSION_EQUAL 6.0 OR GXX_VERSION VERSION_GREATER 6.0) + SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++03") + ENDIF() - SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") + SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") # Disable inline optimizations for valgrind testing to avoid false positives Modified: branches/2020Q1/databases/mysql56-server/Makefile ============================================================================== --- branches/2020Q1/databases/mysql56-server/Makefile Thu Jan 9 03:56:24 2020 (r522468) +++ branches/2020Q1/databases/mysql56-server/Makefile Thu Jan 9 06:40:26 2020 (r522469) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.6.45 +PORTVERSION= 5.6.46 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-5.6 Modified: branches/2020Q1/databases/mysql56-server/distinfo ============================================================================== --- branches/2020Q1/databases/mysql56-server/distinfo Thu Jan 9 03:56:24 2020 (r522468) +++ branches/2020Q1/databases/mysql56-server/distinfo Thu Jan 9 06:40:26 2020 (r522469) @@ -1,3 +1,3 @@ -TIMESTAMP = 1565035854 -SHA256 (mysql-5.6.45.tar.gz) = 404d798974dd89aca4a19e67194b534eddc7508489982175978966360607aabb -SIZE (mysql-5.6.45.tar.gz) = 32525559 +TIMESTAMP = 1577785560 +SHA256 (mysql-5.6.46.tar.gz) = 12e1fbabf2086e6175359767ca89fa8a58f9274fcad40434aa6a56e582d65f49 +SIZE (mysql-5.6.46.tar.gz) = 32395002 Modified: branches/2020Q1/databases/mysql56-server/files/patch-CMakeLists.txt ============================================================================== --- branches/2020Q1/databases/mysql56-server/files/patch-CMakeLists.txt Thu Jan 9 03:56:24 2020 (r522468) +++ branches/2020Q1/databases/mysql56-server/files/patch-CMakeLists.txt Thu Jan 9 06:40:26 2020 (r522469) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2014-07-18 15:48:39.000000000 +0000 -+++ CMakeLists.txt 2014-08-04 14:18:38.795491147 +0000 -@@ -500,12 +500,10 @@ +--- CMakeLists.txt.orig 2020-01-01 20:46:13.771078000 +0100 ++++ CMakeLists.txt 2020-01-01 20:49:28.631677000 +0100 +@@ -558,12 +558,10 @@ IF(UNIX) ENDIF() IF(NOT WITHOUT_SERVER) @@ -13,7 +13,7 @@ ENDIF(WITH_EMBEDDED_SERVER) ENDIF() -@@ -514,10 +512,7 @@ +@@ -572,10 +570,7 @@ ENDIF() ADD_SUBDIRECTORY(scripts) IF(NOT WITHOUT_SERVER) @@ -24,18 +24,19 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) ENDIF() -@@ -572,6 +567,7 @@ +@@ -634,6 +629,7 @@ ENDIF() # # RPM installs documentation directly from the source tree # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES COPYING LICENSE.mysql - DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -597,5 +593,6 @@ + INSTALL(FILES + README +@@ -652,6 +648,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") + PATTERN "mysql.info" EXCLUDE PATTERN "sp-imp-spec.txt" EXCLUDE ) - ENDIF() +ENDIF() + ENDIF() INCLUDE(CPack) Modified: branches/2020Q1/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt ============================================================================== --- branches/2020Q1/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt Thu Jan 9 03:56:24 2020 (r522468) +++ branches/2020Q1/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt Thu Jan 9 06:40:26 2020 (r522469) @@ -1,15 +1,15 @@ ---- libmysql/CMakeLists.txt.orig 2013-07-10 18:17:29.000000000 +0200 -+++ libmysql/CMakeLists.txt 2013-08-12 08:59:49.000000000 +0200 -@@ -173,7 +173,7 @@ +--- libmysql/CMakeLists.txt.orig 2020-01-01 21:38:55.670126000 +0100 ++++ libmysql/CMakeLists.txt 2020-01-01 21:47:51.799099000 +0100 +@@ -205,7 +205,7 @@ IF(WIN32) ENDIF() # Merge several convenience libraries into one big mysqlclient --MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) -+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) +-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development) ++MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development NOINSTALL) + TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK}) # Visual Studio users need debug static library for debug projects - IF(MSVC) -@@ -200,19 +200,22 @@ +@@ -234,20 +234,23 @@ IF(UNIX) ENDMACRO() ENDIF() @@ -25,15 +25,16 @@ IF(NOT DISABLE_SHARED) # Merge several convenience libraries into one big mysqlclient # and link them together into shared library. - MERGE_LIBRARIES(libmysql SHARED ${LIBS} + MERGE_LIBRARIES(libmysql SHARED ${LIBS_TO_MERGE} EXPORTS ${CLIENT_API_FUNCTIONS} - COMPONENT SharedLibraries) -+ COMPONENT SharedLibraries NOINSTALL) -+ IF(FALSE) ++ COMPONENT SharedLibraries NOINSTALL) + TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK}) ++ IF(FALSE) IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -271,4 +274,5 @@ +@@ -316,4 +319,5 @@ IF(NOT DISABLE_SHARED) ${INSTALL_LIBDIR} SharedLibraries) ENDFOREACH() ENDIF() From owner-svn-ports-branches@freebsd.org Thu Jan 9 06:41: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 0DBFF22B05E; Thu, 9 Jan 2020 06:41:49 +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 47tc3J6KvMz3Cd9; Thu, 9 Jan 2020 06:41:48 +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 D425E24BF3; Thu, 9 Jan 2020 06:41:48 +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 0096fmG6052945; Thu, 9 Jan 2020 06:41:48 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0096fiAg052922; Thu, 9 Jan 2020 06:41:44 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <202001090641.0096fiAg052922@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Thu, 9 Jan 2020 06:41:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522470 - in branches/2020Q1/databases: mysql80-client mysql80-client/files mysql80-server mysql80-server/files X-SVN-Group: ports-branches X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in branches/2020Q1/databases: mysql80-client mysql80-client/files mysql80-server mysql80-server/files X-SVN-Commit-Revision: 522470 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jan 2020 06:41:49 -0000 Author: joneum Date: Thu Jan 9 06:41:44 2020 New Revision: 522470 URL: https://svnweb.freebsd.org/changeset/ports/522470 Log: MFH: r522436 databases/mysql80-{client, server}: Update to latest release 8.0.18 switch patch-files to mysql80-server to make it easy for maintain. Bugfix: - CMake now enables use of fastcov if it is available. fastcov is faster than lcov or gcov. This requires GCC and gcov versions of 9 or higher. - The DISABLE_SHARED CMake option was unused and has been removed. - The CMake code to find Protobuf executables now works on platforms that split these into multiple packages. - The new ADD_GDB_INDEX CMake option determines whether to enable generation of a .gdb_index section in binaries, which makes loading them in a debugger faster. The option is disabled by default. It has no effect if a linker other than lld or GNU gold is used. - For the INSTALL_LAYOUT CMake option, the SLES and WIN option values were not used and have been removed. - The max_prepared_stmt_count system variable maximum value has been increased from 1 million (1,048,576) to 4 million (4,194,304). The default value remains unchanged at 16,382. - MySQL 8.0 no longer supports building using wolfSSL. All MySQL builds now use OpenSSL. - The RE2 library is no longer used by MySQL. The library is no longer bundled with source distributions and the WITH_RE2 CMake option is obsolete. More Infos: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-18.html A big thanks to @fluffy for his help with this update Security: fc91f2ef-fd7b-11e9-a1c7-b499baebfeaf Sponsored by: Netzkommune GmbH Approved by: ports-secteam (wit hat) Added: branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_DragonFly.cmake - copied unchanged from r522436, head/databases/mysql80-server/files/patch-cmake_os_DragonFly.cmake branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake - copied unchanged from r522436, head/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_chartype.h - copied unchanged from r522436, head/databases/mysql80-server/files/patch-extra_libedit_chartype.h branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_vi.c - copied unchanged from r522436, head/databases/mysql80-server/files/patch-extra_libedit_vi.c branches/2020Q1/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h - copied unchanged from r522436, head/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h branches/2020Q1/databases/mysql80-server/files/patch-include_violite.h - copied unchanged from r522436, head/databases/mysql80-server/files/patch-include_violite.h branches/2020Q1/databases/mysql80-server/files/patch-mysys_my__default.cc - copied unchanged from r522436, head/databases/mysql80-server/files/patch-mysys_my__default.cc branches/2020Q1/databases/mysql80-server/files/patch-mysys_my__md5.cc - copied unchanged from r522436, head/databases/mysql80-server/files/patch-mysys_my__md5.cc branches/2020Q1/databases/mysql80-server/files/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c - copied unchanged from r522436, head/databases/mysql80-server/files/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_authentication_sha256__scramble__generator.cc - copied unchanged from r522436, head/databases/mysql80-server/files/patch-plugin_x_client_authentication_sha256__scramble__generator.cc branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__client__context.cc - copied unchanged from r522436, head/databases/mysql80-server/files/patch-router_src_http_src_tls__client__context.cc branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__context.cc - copied unchanged from r522436, head/databases/mysql80-server/files/patch-router_src_http_src_tls__context.cc branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__server__context.cc - copied unchanged from r522436, head/databases/mysql80-server/files/patch-router_src_http_src_tls__server__context.cc branches/2020Q1/databases/mysql80-server/files/patch-utilities_CMakeLists.txt - copied unchanged from r522436, head/databases/mysql80-server/files/patch-utilities_CMakeLists.txt branches/2020Q1/databases/mysql80-server/files/patch-vio_viossl.cc - copied unchanged from r522436, head/databases/mysql80-server/files/patch-vio_viossl.cc Deleted: branches/2020Q1/databases/mysql80-client/files/ branches/2020Q1/databases/mysql80-server/files/patch-cmd-line-utils_libedit_chartype.h branches/2020Q1/databases/mysql80-server/files/patch-cmd-line-utils_libedit_vi.c branches/2020Q1/databases/mysql80-server/files/patch-mysys__ssl_my__default.cc branches/2020Q1/databases/mysql80-server/files/patch-mysys__ssl_my__md5.cc branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_sha256__scramble__generator.cc Modified: branches/2020Q1/databases/mysql80-client/Makefile branches/2020Q1/databases/mysql80-client/pkg-plist branches/2020Q1/databases/mysql80-server/Makefile branches/2020Q1/databases/mysql80-server/distinfo branches/2020Q1/databases/mysql80-server/files/patch-CMakeLists.txt branches/2020Q1/databases/mysql80-server/files/patch-client_CMakeLists.txt branches/2020Q1/databases/mysql80-server/files/patch-cmake_plugin.cmake branches/2020Q1/databases/mysql80-server/files/patch-cmake_ssl.cmake branches/2020Q1/databases/mysql80-server/files/patch-include_CMakeLists.txt branches/2020Q1/databases/mysql80-server/files/patch-include_my__compare.h branches/2020Q1/databases/mysql80-server/files/patch-include_my__thread__os__id.h branches/2020Q1/databases/mysql80-server/files/patch-include_myisam.h branches/2020Q1/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt branches/2020Q1/databases/mysql80-server/files/patch-libservices_CMakeLists.txt branches/2020Q1/databases/mysql80-server/files/patch-man_CMakeLists.txt branches/2020Q1/databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_configure.cmake branches/2020Q1/databases/mysql80-server/files/patch-scripts_CMakeLists.txt branches/2020Q1/databases/mysql80-server/files/patch-sql-common_client.cc branches/2020Q1/databases/mysql80-server/files/patch-sql_auth_sha2__password__common.cc branches/2020Q1/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc branches/2020Q1/databases/mysql80-server/files/patch-sql_mysqld.cc branches/2020Q1/databases/mysql80-server/files/patch-sql_sys__vars.cc branches/2020Q1/databases/mysql80-server/files/patch-storage_innobase_include_srv0mon.h branches/2020Q1/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.cc branches/2020Q1/databases/mysql80-server/files/patch-support-files_CMakeLists.txt branches/2020Q1/databases/mysql80-server/files/patch-vio_viosslfactories.cc branches/2020Q1/databases/mysql80-server/pkg-plist Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/databases/mysql80-client/Makefile ============================================================================== --- branches/2020Q1/databases/mysql80-client/Makefile Thu Jan 9 06:40:26 2020 (r522469) +++ branches/2020Q1/databases/mysql80-client/Makefile Thu Jan 9 06:41:44 2020 (r522470) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) @@ -12,7 +12,7 @@ LICENSE+= LGPL21 MASTERDIR= ${.CURDIR}/../mysql80-server PKGMESSAGE= ${.CURDIR}/pkg-message -PATCHDIR= ${.CURDIR}/files +PATCHDIR= ${MASTERDIR}/files PLIST= ${.CURDIR}/pkg-plist CONFLICTS_INSTALL= mysql8[1-9]-client-* \ @@ -24,11 +24,21 @@ CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILES USE_LDCONFIG+= ${PREFIX}/lib/mysql -MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \ - mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \ - mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 +MMAN1= comp_err.1 lz4_decompress.1 mysql.1 mysql_config.1 mysql_config_editor.1 \ + mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlman.1 \ + mysqlpump.1 mysqlshow.1 mysqlslap.1 perror.1 zlib_decompress.1 CLIENT_ONLY= yes + +OPTIONS_GROUP+= PLUGINS +PLUGINS_DESC= Default Client Plugins +OPTIONS_GROUP_PLUGINS= SASLCLIENT +SASLCLIENT_DESC= SASL client plugin module +SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP +SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 +SASLCLIENT_USE= OPENLDAP=yes +OPTIONS_DEFAULT+= SASLCLIENT +OPTIONS_SUB= yes # issue 166367: adding symlinks for back-compatibility with ${lib}_r post-install: Modified: branches/2020Q1/databases/mysql80-client/pkg-plist ============================================================================== --- branches/2020Q1/databases/mysql80-client/pkg-plist Thu Jan 9 06:40:26 2020 (r522469) +++ branches/2020Q1/databases/mysql80-client/pkg-plist Thu Jan 9 06:41:44 2020 (r522470) @@ -1,7 +1,7 @@ +bin/my_print_defaults bin/mysql bin/mysql_config bin/mysql_config_editor -bin/mysql_ssl_rsa_setup bin/mysqladmin bin/mysqlbinlog bin/mysqlcheck @@ -10,6 +10,8 @@ bin/mysqlimport bin/mysqlpump bin/mysqlshow bin/mysqlslap +bin/perror +bin/zlib_decompress include/mysql/base64.h include/mysql/big_endian.h include/mysql/c_string_less.h @@ -41,6 +43,7 @@ include/mysql/my_check_opt.h include/mysql/my_command.h include/mysql/my_compare.h include/mysql/my_compiler.h +include/mysql/my_compress.h include/mysql/my_dbug.h include/mysql/my_default.h include/mysql/my_dir.h @@ -181,8 +184,10 @@ lib/mysql/libmysqlclient.so.21 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.21 +%%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so libdata/pkgconfig/mysqlclient.pc man/man1/comp_err.1.gz +man/man1/lz4_decompress.1.gz man/man1/mysql.1.gz man/man1/mysql_config.1.gz man/man1/mysql_config_editor.1.gz @@ -191,6 +196,10 @@ man/man1/mysqlbinlog.1.gz man/man1/mysqlcheck.1.gz man/man1/mysqldump.1.gz man/man1/mysqlimport.1.gz +man/man1/mysqlman.1.gz +man/man1/mysqlpump.1.gz man/man1/mysqlshow.1.gz man/man1/mysqlslap.1.gz +man/man1/perror.1.gz +man/man1/zlib_decompress.1.gz share/aclocal/mysql.m4 Modified: branches/2020Q1/databases/mysql80-server/Makefile ============================================================================== --- branches/2020Q1/databases/mysql80-server/Makefile Thu Jan 9 06:40:26 2020 (r522469) +++ branches/2020Q1/databases/mysql80-server/Makefile Thu Jan 9 06:41:44 2020 (r522470) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 8.0.17 -PORTREVISION?= 2 +PORTVERSION= 8.0.18 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-8.0 PKGNAMESUFFIX?= 80-server @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVER SLAVEDIRS= databases/mysql80-client USES= bison:build cmake:noninja compiler:c++14-lang cpe \ - libedit localbase perl5 pkgconfig shebangfix ssl + libedit localbase ncurses perl5 pkgconfig shebangfix ssl USE_PERL5= run @@ -26,10 +26,11 @@ MY_DBDIR= /var/db/mysql MY_SECDIR= /var/db/mysql_secure MY_TMPDIR= /var/db/mysql_tmpdir -LIB_DEPENDS+= libevent.so:devel/libevent \ +LIB_DEPENDS+= libcurl.so:ftp/curl \ + libevent.so:devel/libevent \ libicutu.so:devel/icu \ liblz4.so:archivers/liblz4 \ - libre2.so:devel/re2 \ + libzstd.so:archivers/zstd \ libprotobuf.so:devel/protobuf \ libunwind.so:devel/libunwind @@ -51,7 +52,7 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \ -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ - -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ + -DINSTALL_MYSQLTESTDIR="" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ @@ -65,11 +66,13 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DWITH_LIBEVENT=system \ -DWITH_LZ4=system \ -DWITH_ICU=system \ - -DWITH_RE2=system \ + -DWITH_CURL=system \ + -DWITH_ZLIB=system \ + -DWITH_ZSTD=system \ -DWITH_PROTOBUF=system \ + -DWITH_SSL=${OPENSSLBASE} \ -DBUILD_BUNDLED_ZLIB=0 \ -DBUILD_BUNDLED_LZ4=0 \ - -DINSTALL_MYSQLTESTDIR=0 SHEBANG_FILES= scripts/*.pl* scripts/*.sh @@ -105,14 +108,14 @@ GROUPS= mysql USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin -MMAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \ - mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \ - mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \ - mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \ - mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ - mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 +MMAN1= ibd2sdi.1 innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \ + myisamlog.1 myisampack.1 mysql_secure_installation.1 mysql_ssl_rsa_setup.1 \ + mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql.server.1 mysqldumpslow.1 mysqld_multi.1 \ + mysqld_safe.1 mysqlrouter_passwd.1 mysqlrouter_plugin_info.1 mysqlrouter.1 +MMAN8= mysqld.8 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" +CMAKE_ARGS+= -DWITHOUT_CLIENTLIBS="ON" OPTIONS_GROUP= STORAGE OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA @@ -156,17 +159,8 @@ SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .include -.if ${SSL_DEFAULT} == base -CMAKE_ARGS+= -DWITH_SSL=system -.else -CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} -.endif - post-extract: @${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h - -post-patch: - @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt .if !defined(CLIENT_ONLY) post-install: Modified: branches/2020Q1/databases/mysql80-server/distinfo ============================================================================== --- branches/2020Q1/databases/mysql80-server/distinfo Thu Jan 9 06:40:26 2020 (r522469) +++ branches/2020Q1/databases/mysql80-server/distinfo Thu Jan 9 06:41:44 2020 (r522470) @@ -1,3 +1,3 @@ -TIMESTAMP = 1565048626 -SHA256 (mysql-boost-8.0.17.tar.gz) = d44231316ce30a1d1189125ceed86d3388409778e17d0e3b9a060f532463e29a -SIZE (mysql-boost-8.0.17.tar.gz) = 189322239 +TIMESTAMP = 1578004259 +SHA256 (mysql-boost-8.0.18.tar.gz) = 0eccd9d79c04ba0ca661136bb29085e3833d9c48ed022d0b9aba12236994186b +SIZE (mysql-boost-8.0.18.tar.gz) = 194953221 Modified: branches/2020Q1/databases/mysql80-server/files/patch-CMakeLists.txt ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-CMakeLists.txt Thu Jan 9 06:40:26 2020 (r522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-CMakeLists.txt Thu Jan 9 06:41:44 2020 (r522470) @@ -1,35 +1,76 @@ ---- CMakeLists.txt.orig 2019-01-21 19:00:53 UTC +--- CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ CMakeLists.txt -@@ -1045,7 +1045,6 @@ IF(UNIX) +@@ -1181,10 +1181,10 @@ ENDIF() + MYSQL_CHECK_SSL() + MYSQL_CHECK_SSL_DLLS() + +-# Add system/bundled editline. +-MYSQL_CHECK_EDITLINE() + # Add libevent +-MYSQL_CHECK_LIBEVENT() ++IF(NOT WITHOUT_SERVER) ++ MYSQL_CHECK_LIBEVENT() ++ENDIF() + # Add lz4 library + MYSQL_CHECK_LZ4() + # Add icu library +@@ -1273,7 +1273,9 @@ IF(WITH_UNIT_TESTS) + INCLUDE(googletest) ENDIF() +-ADD_SUBDIRECTORY(include) ++IF(NOT WITHOUT_CLIENTLIBS) ++ ADD_SUBDIRECTORY(include) ++ENDIF(NOT WITHOUT_CLIENTLIBS) + ADD_SUBDIRECTORY(strings) + ADD_SUBDIRECTORY(vio) + ADD_SUBDIRECTORY(mysys) +@@ -1314,24 +1316,29 @@ IF(WITH_UNIT_TESTS) + ADD_SUBDIRECTORY(unittest/mytap/t) + ENDIF() + +-ADD_SUBDIRECTORY(client) ++IF(NOT WITHOUT_TOOLS) ++ # Add system/bundled editline ++ MYSQL_CHECK_EDITLINE() ++ ADD_SUBDIRECTORY(client) ++ENDIF(NOT WITHOUT_TOOLS) ++ + ADD_SUBDIRECTORY(utilities) +-ADD_SUBDIRECTORY(share) + ADD_SUBDIRECTORY(libservices) + IF(NOT WITHOUT_SERVER) -- ADD_SUBDIRECTORY(testclients) + ADD_SUBDIRECTORY(testclients) ++ ADD_SUBDIRECTORY(share) ADD_SUBDIRECTORY(sql) ENDIF() -@@ -1054,8 +1053,6 @@ 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) ++ADD_SUBDIRECTORY(support-files) IF(NOT WITHOUT_SERVER) -- ADD_SUBDIRECTORY(mysql-test) -- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) - ADD_SUBDIRECTORY(support-files) + ADD_SUBDIRECTORY(mysql-test) + ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) +- ADD_SUBDIRECTORY(support-files) IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) -@@ -1152,6 +1149,7 @@ ENDIF() - # - # RPM installs documentation directly from the source tree - # + ENDIF() +@@ -1440,6 +1447,7 @@ IF(PACK_SEPARATE_COMPONENTS) + SET(CPACK_COMPONENTS_GROUPING IGNORE) + ENDIF() + +IF(FALSE) - IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES README LICENSE DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme) - INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR}) -@@ -1170,6 +1168,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") + IF(UNIX) + INSTALL(FILES + Docs/mysql.info +@@ -1474,6 +1482,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") + PATTERN "sp-imp-spec.txt" EXCLUDE PATTERN "README.build" EXCLUDE ) - ENDIF() +ENDIF() + ENDIF() # Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests, - # we can safely enable ASan on Clang/Win32 if needed. Modified: branches/2020Q1/databases/mysql80-server/files/patch-client_CMakeLists.txt ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-client_CMakeLists.txt Thu Jan 9 06:40:26 2020 (r522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-client_CMakeLists.txt Thu Jan 9 06:41:44 2020 (r522470) @@ -1,52 +1,75 @@ ---- client/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC +--- client/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ client/CMakeLists.txt -@@ -26,14 +26,14 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil - +@@ -23,8 +23,11 @@ ## Subdirectory with common client code. ADD_SUBDIRECTORY(base) --## Subdirectory for mysqlpump code. --ADD_SUBDIRECTORY(dump) + ## Subdirectory for mysqlpump code. ++IF(WITHOUT_SERVER) + ADD_SUBDIRECTORY(dump) ++ENDIF() -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc pattern_matcher.cc ${CMAKE_SOURCE_DIR}/sql/net_ns.cc) - TARGET_LINK_LIBRARIES(mysql mysqlclient) - IF(UNIX) - TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) - ENDIF(UNIX) ++IF(NOT WITHOUT_CLIENTLIBS) + MYSQL_ADD_EXECUTABLE(mysql + ${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc + completion_hash.cc +@@ -33,6 +36,7 @@ MYSQL_ADD_EXECUTABLE(mysql + readline.cc + LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY} + ) +ENDIF() IF(NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc) -@@ -56,6 +56,7 @@ ADD_DEPENDENCIES(mysqltest GenError GenC - ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) - TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) + MYSQL_ADD_EXECUTABLE(mysql_upgrade +@@ -48,6 +52,7 @@ IF(SOLARIS_SPARC AND CMAKE_BUILD_TYPE_UPPER STREQUAL " + ) + ENDIF() -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc) - TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core) - -@@ -68,7 +69,9 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc - - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.cc) - TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) ++IF(NOT WITHOUT_SERVER) + MYSQL_ADD_EXECUTABLE(mysqltest + mysqltest.cc + mysqltest/error_names.cc +@@ -63,6 +68,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest + ENABLE_EXPORTS + LINK_LIBRARIES mysqlclient + ) +ENDIF() ++ ++IF(WITHOUT_SERVER) + MYSQL_ADD_EXECUTABLE(mysqlcheck + check/mysqlcheck.cc + check/mysqlcheck_core.cc +@@ -80,6 +88,7 @@ MYSQL_ADD_EXECUTABLE(mysqlshow + mysqlshow.cc + LINK_LIBRARIES mysqlclient + ) ++ + MYSQL_ADD_EXECUTABLE(mysqlbinlog + mysqlbinlog.cc + ${CMAKE_SOURCE_DIR}/sql/json_binary.cc +@@ -104,7 +113,9 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - SET(MYSQLBINLOG_LIB_SOURCES - ${CMAKE_SOURCE_DIR}/strings/decimal.cc -@@ -107,12 +110,15 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli - - MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) - TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) + TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX) + TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql) +ENDIF() - MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) - TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc) - TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys) ++IF(WITHOUT_SERVER) + MYSQL_ADD_EXECUTABLE(mysqladmin + mysqladmin.cc + LINK_LIBRARIES mysqlclient +@@ -117,6 +128,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor + mysql_config_editor.cc + LINK_LIBRARIES mysqlclient + ) ++ENDIF() ++ ++IF(NOT WITHOUT_SERVER) + MYSQL_ADD_EXECUTABLE(mysql_secure_installation + mysql_secure_installation.cc + LINK_LIBRARIES mysqlclient +@@ -127,6 +141,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup + path.cc + LINK_LIBRARIES mysys + ) +ENDIF() # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". Copied: branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_DragonFly.cmake (from r522436, head/databases/mysql80-server/files/patch-cmake_os_DragonFly.cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_DragonFly.cmake Thu Jan 9 06:41:44 2020 (r522470, copy of r522436, head/databases/mysql80-server/files/patch-cmake_os_DragonFly.cmake) @@ -0,0 +1,27 @@ +--- cmake/os/DragonFly.cmake.orig 2016-04-14 10:16:17 UTC ++++ cmake/os/DragonFly.cmake +@@ -0,0 +1,24 @@ ++INCLUDE(CheckCSourceRuns) ++ ++# We require at least GCC 4.4 or Clang 3.3. ++IF(NOT FORCE_UNSUPPORTED_COMPILER) ++ IF(CMAKE_COMPILER_IS_GNUCC) ++ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion ++ OUTPUT_VARIABLE GCC_VERSION) ++ IF(GCC_VERSION VERSION_LESS 4.4) ++ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") ++ ENDIF() ++ ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang") ++ CHECK_C_SOURCE_RUNS(" ++ int main() ++ { ++ return (__clang_major__ < 3) || ++ (__clang_major__ == 3 && __clang_minor__ < 3); ++ }" HAVE_SUPPORTED_CLANG_VERSION) ++ IF(NOT HAVE_SUPPORTED_CLANG_VERSION) ++ MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!") ++ ENDIF() ++ ELSE() ++ MESSAGE(FATAL_ERROR "Unsupported compiler!") ++ ENDIF() ++ENDIF() Copied: branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake (from r522436, head/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake Thu Jan 9 06:41:44 2020 (r522470, copy of r522436, head/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake) @@ -0,0 +1,25 @@ +--- cmake/os/FreeBSD.cmake.orig 2019-09-20 08:30:51 UTC ++++ cmake/os/FreeBSD.cmake +@@ -45,8 +45,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) + MESSAGE(FATAL_ERROR + "GCC 5.3 or newer is required (-dumpversion says ${GCC_VERSION})") + ENDIF() +- ELSE() +- MESSAGE(FATAL_ERROR "Unsupported compiler!") ++ CHECK_C_SOURCE_RUNS(" ++ int main() ++ { ++ return (__clang_major__ >= 4); ++ }" I386_ATOMIC_BUILTINS) ++ IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS)) ++ SET(HAVE_GCC_ATOMIC_BUILTINS CACHE INTERNAL "") ++ ENDIF() ++ ELSEIF(CMAKE_COMPILER_IS_GNUCC) ++ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion ++ OUTPUT_VARIABLE GCC_VERSION) ++ IF(GCC_VERSION VERSION_LESS 4.4) ++ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") ++ ENDIF() + ENDIF() + ENDIF() + Modified: branches/2020Q1/databases/mysql80-server/files/patch-cmake_plugin.cmake ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-cmake_plugin.cmake Thu Jan 9 06:40:26 2020 (r522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-cmake_plugin.cmake Thu Jan 9 06:41:44 2020 (r522470) @@ -1,12 +1,12 @@ ---- cmake/plugin.cmake.orig 2017-06-27 11:44:29 UTC +--- cmake/plugin.cmake.orig 2019-09-20 08:30:51 UTC +++ cmake/plugin.cmake -@@ -207,9 +207,6 @@ MACRO(MYSQL_ADD_PLUGIN) +@@ -226,9 +226,6 @@ MACRO(MYSQL_ADD_PLUGIN) MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT ${INSTALL_COMPONENT}) - INSTALL_DEBUG_TARGET(${target} - DESTINATION ${INSTALL_PLUGINDIR}/debug - COMPONENT ${INSTALL_COMPONENT}) - # For internal testing in PB2, append collections files - IF(DEFINED ENV{PB2WORKDIR}) - PLUGIN_APPEND_COLLECTIONS(${plugin}) + ENDIF() + ELSE() + IF(WITHOUT_${plugin}) Modified: branches/2020Q1/databases/mysql80-server/files/patch-cmake_ssl.cmake ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-cmake_ssl.cmake Thu Jan 9 06:40:26 2020 (r522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-cmake_ssl.cmake Thu Jan 9 06:41:44 2020 (r522470) @@ -1,14 +1,28 @@ ---- cmake/ssl.cmake.orig 2018-04-29 16:21:47 UTC +--- cmake/ssl.cmake.orig 2019-09-20 08:30:51 UTC +++ cmake/ssl.cmake -@@ -265,10 +265,10 @@ MACRO (MYSQL_CHECK_SSL) - OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" +@@ -199,7 +199,7 @@ MACRO (MYSQL_CHECK_SSL) + # Encoded as MNNFFPPS: major minor fix patch status + FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" + OPENSSL_VERSION_NUMBER +- REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" ++ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" ) + STRING(REGEX REPLACE + "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" +@@ -214,13 +214,14 @@ MACRO (MYSQL_CHECK_SSL) + OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}" + ) ENDIF() +- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0") ++ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) ++ IF(HAVE_TLS1_3_VERSION) + ADD_DEFINITIONS(-DHAVE_TLSv13) + ENDIF() IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY AND CRYPTO_LIBRARY AND - OPENSSL_MAJOR_VERSION STREQUAL "1" -+ (OPENSSL_MAJOR_VERSION STREQUAL "1" OR OPENSSL_MAJOR_VERSION STREQUAL "2") ++ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1" ) SET(OPENSSL_FOUND TRUE) FIND_PROGRAM(OPENSSL_EXECUTABLE openssl Copied: branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_chartype.h (from r522436, head/databases/mysql80-server/files/patch-extra_libedit_chartype.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_chartype.h Thu Jan 9 06:41:44 2020 (r522470, copy of r522436, head/databases/mysql80-server/files/patch-extra_libedit_chartype.h) @@ -0,0 +1,11 @@ +--- extra/libedit/chartype.h.orig 2019-09-20 08:30:51 UTC ++++ extra/libedit/chartype.h +@@ -49,7 +49,7 @@ + TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */ + #if !defined(__NetBSD__) && !defined(__sun) \ + && !(defined(__APPLE__) && defined(__MACH__)) \ +- && !defined(__FreeBSD__) && !defined(_AIX) ++ && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__) + #ifndef __STDC_ISO_10646__ + /* In many places it is assumed that the first 127 code points are ASCII + * compatible, so ensure wchar_t indeed does ISO 10646 and not some other Copied: branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_vi.c (from r522436, head/databases/mysql80-server/files/patch-extra_libedit_vi.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_vi.c Thu Jan 9 06:41:44 2020 (r522470, copy of r522436, head/databases/mysql80-server/files/patch-extra_libedit_vi.c) @@ -0,0 +1,20 @@ +--- extra/libedit/vi.c.orig 2019-09-20 08:30:51 UTC ++++ extra/libedit/vi.c +@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __attribute__((__un + * NB: posix implies that we should enter insert mode, however + * this is against historical precedent... + */ +-#if defined(__weak_reference) && !defined(__FreeBSD__) ++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) + __weakref_visible char *my_get_alias_text(const char *) + __weak_reference(get_alias_text); + #endif +@@ -928,7 +928,7 @@ protected el_action_t + vi_alias(EditLine *el __attribute__((__unused__)), + Int c __attribute__((__unused__))) + { +-#if defined(__weak_reference) && !defined(__FreeBSD__) ++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) + char alias_name[3]; + char *alias_text; + Copied: branches/2020Q1/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h (from r522436, head/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h Thu Jan 9 06:41:44 2020 (r522470, copy of r522436, head/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h) @@ -0,0 +1,19 @@ +--- extra/libevent/openssl-compat.h.orig 2019-09-20 08:30:51 UTC ++++ extra/libevent/openssl-compat.h +@@ -24,12 +24,15 @@ static inline BIO_METHOD *BIO_meth_new(int type, const + #define BIO_set_init(b, val) (b)->init = (val) + #define BIO_set_data(b, val) (b)->ptr = (val) + #define BIO_set_shutdown(b, val) (b)->shutdown = (val) +-#define BIO_get_init(b) (b)->init + #define BIO_get_data(b) (b)->ptr + #define BIO_get_shutdown(b) (b)->shutdown + + #define TLS_method SSLv23_method + + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ ++ ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#define BIO_get_init(b) (b)->init ++#endif + + #endif /* OPENSSL_COMPAT_H */ Modified: branches/2020Q1/databases/mysql80-server/files/patch-include_CMakeLists.txt ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-include_CMakeLists.txt Thu Jan 9 06:40:26 2020 (r522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-include_CMakeLists.txt Thu Jan 9 06:41:44 2020 (r522470) @@ -1,10 +1,174 @@ ---- include/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC +--- include/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ include/CMakeLists.txt -@@ -37,5 +37,7 @@ SET(HEADERS_MYSQL_DIR +@@ -37,10 +37,171 @@ SET(HEADERS + ${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h + ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h + field_types.h ++ base64.h ++ big_endian.h ++ c_string_less.h ++ crypt_genhash_impl.h ++ decimal.h ++ depth_first_search.h ++ dur_prop.h ++ errmsg.h ++ ft_global.h ++ heap.h ++ keycache.h ++ lex_string.h ++ lf.h ++ little_endian.h ++ m_ctype.h ++ m_string.h ++ map_helpers.h ++ mf_wcomp.h ++ mutex_lock.h ++ my_aes.h ++ my_alloc.h ++ my_atomic.h ++ my_base.h ++ my_bit.h ++ my_bitmap.h ++ my_byteorder.h ++ my_check_opt.h ++ my_command.h ++ my_compare.h ++ my_compiler.h ++ my_dbug.h ++ my_default.h ++ my_dir.h ++ my_double2ulonglong.h ++ my_getopt.h ++ my_hash_combine.h ++ my_icp.h ++ my_inttypes.h ++ my_io.h ++ my_list.h ++ my_loglevel.h ++ my_macros.h ++ my_md5.h ++ my_md5_size.h ++ my_murmur3.h ++ my_pointer_arithmetic.h ++ my_psi_config.h ++ my_rapidjson_size_t.h ++ my_rdtsc.h ++ my_rnd.h ++ my_sharedlib.h ++ my_shm_defaults.h ++ my_sqlcommand.h ++ my_stacktrace.h ++ my_sys.h ++ my_systime.h ++ my_table_map.h ++ my_thread.h ++ my_thread_local.h ++ my_thread_os_id.h ++ my_time.h ++ my_timer.h ++ my_tree.h ++ my_uctype.h ++ my_user.h ++ my_xml.h ++ myisam.h ++ myisammrg.h ++ myisampack.h ++ mysql.h ++ mysql.h.pp ++ mysql_com.h ++ mysql_com_server.h ++ mysql_time.h ++ mysql_version.h.in ++ mysys_err.h ++ nullable.h ++ password.h ++ pfs_cond_provider.h ++ pfs_error_provider.h ++ pfs_file_provider.h ++ pfs_idle_provider.h ++ pfs_memory_provider.h ++ pfs_metadata_provider.h ++ pfs_mutex_provider.h ++ pfs_rwlock_provider.h ++ pfs_socket_provider.h ++ pfs_stage_provider.h ++ pfs_statement_provider.h ++ pfs_table_provider.h ++ pfs_thread_provider.h ++ pfs_transaction_provider.h ++ prealloced_array.h ++ print_version.h ++ priority_queue.h ++ rwlock_scoped_lock.h ++ scope_guard.h ++ service_versions.h ++ sha1.h ++ sha2.h ++ sql_chars.h ++ sql_common.h ++ sql_string.h ++ sslopt-case.h ++ sslopt-longopts.h ++ sslopt-vars.h ++ template_utils.h ++ thr_cond.h ++ thr_lock.h ++ thr_mutex.h ++ thr_rwlock.h ++ typelib.h ++ varlen_sort.h ++ violite.h ++ welcome_copyright_notice.h + ) + SET(HEADERS_MYSQL_DIR + mysql/client_plugin.h + mysql/plugin_auth_common.h ++ mysql/udf_registration_types.h ++ mysql/client_authentication.h ++ mysql/client_plugin.h.pp ++ mysql/com_data.h ++ mysql/get_password.h ++ mysql/group_replication_priv.h ++ mysql/innodb_priv.h ++ mysql/mysql_lex_string.h ++ mysql/plugin.h ++ mysql/plugin_audit.h ++ mysql/plugin_audit.h.pp ++ mysql/plugin_auth.h ++ mysql/plugin_auth.h.pp ++ mysql/plugin_auth_common.h ++ mysql/plugin_ftparser.h ++ mysql/plugin_ftparser.h.pp ++ mysql/plugin_group_replication.h ++ mysql/plugin_keyring.h ++ mysql/plugin_keyring.h.pp ++ mysql/plugin_query_rewrite.h ++ mysql/plugin_trace.h ++ mysql/plugin_validate_password.h ++ mysql/service_command.h ++ mysql/service_locking.h ++ mysql/service_my_plugin_log.h ++ mysql/service_mysql_alloc.h ++ mysql/service_mysql_keyring.h ++ mysql/service_mysql_password_policy.h ++ mysql/service_mysql_string.h ++ mysql/service_parser.h ++ mysql/service_plugin_registry.h ++ mysql/service_rpl_transaction_ctx.h ++ mysql/service_rpl_transaction_write_set.h ++ mysql/service_rules_table.h ++ mysql/service_security_context.h ++ mysql/service_srv_session.h ++ mysql/service_srv_session_info.h ++ mysql/service_ssl_wrapper.h ++ mysql/service_thd_alloc.h ++ mysql/service_thd_engine_lock.h ++ mysql/service_thd_wait.h ++ mysql/service_thread_scheduler.h ++ mysql/services.h ++ mysql/services.h.pp ++ mysql/thread_pool_priv.h ++ mysql/thread_type.h mysql/udf_registration_types.h ) -+IF(FALSE) - INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) - INSTALL(FILES ${HEADERS_MYSQL_DIR} DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development) -+ENDIF() Modified: branches/2020Q1/databases/mysql80-server/files/patch-include_my__compare.h ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-include_my__compare.h Thu Jan 9 06:40:26 2020 (r522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-include_my__compare.h Thu Jan 9 06:41:44 2020 (r522470) @@ -1,4 +1,4 @@ ---- include/my_compare.h.orig 2018-04-08 06:44:49 UTC +--- include/my_compare.h.orig 2019-09-20 08:30:51 UTC +++ include/my_compare.h @@ -49,7 +49,7 @@ But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. Modified: branches/2020Q1/databases/mysql80-server/files/patch-include_my__thread__os__id.h ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-include_my__thread__os__id.h Thu Jan 9 06:40:26 2020 (r522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-include_my__thread__os__id.h Thu Jan 9 06:41:44 2020 (r522470) @@ -1,6 +1,6 @@ ---- include/my_thread_os_id.h.orig 2016-03-28 18:06:12 UTC +--- include/my_thread_os_id.h.orig 2019-09-20 08:30:51 UTC +++ include/my_thread_os_id.h -@@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa +@@ -84,8 +84,12 @@ static inline my_thread_os_id_t my_thread_os_id() { return pthread_getthreadid_np(); #else #ifdef HAVE_INTEGER_PTHREAD_SELF Modified: branches/2020Q1/databases/mysql80-server/files/patch-include_myisam.h ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-include_myisam.h Thu Jan 9 06:40:26 2020 (r522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-include_myisam.h Thu Jan 9 06:41:44 2020 (r522470) @@ -1,4 +1,4 @@ ---- include/myisam.h.orig 2018-04-08 06:44:49 UTC +--- include/myisam.h.orig 2019-09-20 08:30:51 UTC +++ include/myisam.h @@ -59,7 +59,7 @@ The following defines can be increased if necessary. Copied: branches/2020Q1/databases/mysql80-server/files/patch-include_violite.h (from r522436, head/databases/mysql80-server/files/patch-include_violite.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql80-server/files/patch-include_violite.h Thu Jan 9 06:41:44 2020 (r522470, copy of r522436, head/databases/mysql80-server/files/patch-include_violite.h) @@ -0,0 +1,14 @@ +--- include/violite.h.orig 2019-09-20 08:30:51 UTC ++++ include/violite.h +@@ -269,9 +269,11 @@ struct st_VioSSLFd *new_VioSSLConnectorFd( + + long process_tls_version(const char *tls_version); + ++#ifndef LIBRESSL_VERSION_NUMBER + int set_fips_mode(const uint fips_mode, char *err_string); + + uint get_fips_mode(); ++#endif + + struct st_VioSSLFd *new_VioSSLAcceptorFd( + const char *key_file, const char *cert_file, const char *ca_file, Modified: branches/2020Q1/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt Thu Jan 9 06:40:26 2020 (r522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt Thu Jan 9 06:41:44 2020 (r522470) @@ -1,31 +1,70 @@ ---- libmysql/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC +--- libmysql/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ libmysql/CMakeLists.txt -@@ -239,7 +239,7 @@ MESSAGE(STATUS "Creating LDAP authentica - ADD_SUBDIRECTORY(authentication_ldap) - - # Merge several convenience libraries into one big mysqlclient +@@ -192,6 +192,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C) + ) + ENDIF() + ++INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) ++IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ ADD_COMPILE_FLAGS(${CLIENT_SOURCES} COMPILE_FLAGS "-fPIC") ++ENDIF() ++ + # + # Include protocol tracing infrastructure and the test + # trace plugin if enabled by build options. +@@ -240,12 +245,17 @@ 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) -+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL) ++IF(WITHOUT_CLIENTLIBS) ++ # Merge several convenience libraries into one big mysqlclient ++ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL) ++ELSE(WITHOUT_CLIENTLIBS) ++ # 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) ++ENDIF(WITHOUT_CLIENTLIBS) TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK}) # Visual Studio users need debug static library for debug projects -@@ -280,9 +280,10 @@ IF(NOT DISABLE_SHARED) - # and link them together into shared library. - MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} - EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} ${CLIENT_API_NONBLOCKING_FUNCTIONS} -- COMPONENT SharedLibraries) -+ COMPONENT SharedLibraries SKIP_INSTALL) - TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK}) +@@ -281,12 +291,22 @@ ENDIF() -+IF(FALSE) - IF(WIN32) - # So that libmysql_api_test below can find the .dll - ADD_CUSTOM_COMMAND(TARGET libmysql POST_BUILD -@@ -338,6 +339,7 @@ ENDIF() - # to initialize api_calls[] array in api_test.c - # - SET(CLIENT_API_FUNCTION_LIST "") -+ ENDIF() - FOREACH(api ${CLIENT_API_FUNCTIONS}) - SET(CLIENT_API_FUNCTION_LIST "${CLIENT_API_FUNCTION_LIST} ${api},") - ENDFOREACH() + # Merge several convenience libraries into one big mysqlclient + # and link them together into shared library. ++IF(WITHOUT_CLIENTLIBS) + MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} + EXPORTS + ${CLIENT_API_FUNCTIONS} + ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} + ${CLIENT_API_NONBLOCKING_FUNCTIONS} ++ COMPONENT SharedLibraries ++ SKIP_INSTALL ) ++ELSE(WITHOUT_CLIENTLIBS) ++MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} ++ EXPORTS ++ ${CLIENT_API_FUNCTIONS} ++ ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} ++ ${CLIENT_API_NONBLOCKING_FUNCTIONS} + COMPONENT SharedLibraries) ++ENDIF(WITHOUT_CLIENTLIBS) + TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK}) + + IF(WIN32) +@@ -300,7 +320,7 @@ ENDIF() + + IF(UNIX) + # libtool compatability +- IF(FREEBSD OR APPLE) ++ IF(FREEBSD OR APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly") + SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") + ELSE() + SET(OS_SHARED_LIB_VERSION Modified: branches/2020Q1/databases/mysql80-server/files/patch-libservices_CMakeLists.txt ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-libservices_CMakeLists.txt Thu Jan 9 06:40:26 2020 (r522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-libservices_CMakeLists.txt Thu Jan 9 06:41:44 2020 (r522470) @@ -1,4 +1,4 @@ ---- libservices/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC +--- libservices/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ libservices/CMakeLists.txt @@ -45,7 +45,9 @@ SET(MYSQLSERVICES_SOURCES plugin_registry_service.c) @@ -10,4 +10,3 @@ DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) +ENDIF() ENDIF() - Modified: branches/2020Q1/databases/mysql80-server/files/patch-man_CMakeLists.txt ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-man_CMakeLists.txt Thu Jan 9 06:40:26 2020 (r522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-man_CMakeLists.txt Thu Jan 9 06:41:44 2020 (r522470) @@ -1,14 +1,74 @@ ---- man/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC +--- man/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ man/CMakeLists.txt -@@ -21,9 +21,8 @@ - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +@@ -23,29 +23,14 @@ # Copy man pages --FILE(GLOB MAN1 *.1) --FILE(GLOB MAN1_NDB ndb*.1) --FILE(GLOB MAN1_ROUTER mysqlrouter*.1) -+FILE(GLOB MAN1 *.1) -+FILE(GLOB MAN1_ROUTER mysqlroutermy_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1) - FILE(GLOB MAN8 *.8) - FILE(GLOB MAN8_NDB ndb*.8) - IF(MAN1_NDB AND NOT WITH_NDBCLUSTER) + SET(MAN1 + comp_err.1 +- ibd2sdi.1 +- innochecksum.1 + lz4_decompress.1 +- my_print_defaults.1 +- myisam_ftdump.1 +- myisamchk.1 +- myisamlog.1 +- myisampack.1 + mysql.1 +- mysql.server.1 + mysql_config.1 + mysql_config_editor.1 +- mysql_secure_installation.1 +- mysql_ssl_rsa_setup.1 +- mysql_tzinfo_to_sql.1 +- mysql_upgrade.1 + mysqladmin.1 + mysqlbinlog.1 + mysqlcheck.1 +- mysqld_multi.1 +- mysqld_safe.1 + mysqldump.1 +- mysqldumpslow.1 + mysqlimport.1 + mysqlman.1 + mysqlpump.1 +@@ -54,6 +39,23 @@ SET(MAN1 + perror.1 + zlib_decompress.1 + ) ++SET(MAN1_TOOLS ++ ibd2sdi.1 ++ innochecksum.1 ++ my_print_defaults.1 ++ myisam_ftdump.1 ++ myisamchk.1 ++ myisamlog.1 ++ myisampack.1 ++ mysql.server.1 ++ mysql_secure_installation.1 ++ mysql_ssl_rsa_setup.1 ++ mysql_tzinfo_to_sql.1 ++ mysql_upgrade.1 ++ mysqldumpslow.1 ++ mysqld_multi.1 ++ mysqld_safe.1 ++ ) + SET(MAN1_NDB + ndb-common-options.1 + ndb_blob_tool.1 +@@ -99,8 +101,15 @@ SET(MAN8_NDB + ndbmtd.8 + ) + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Fri Jan 10 12: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 924031E6E3A; Fri, 10 Jan 2020 12:47:29 +0000 (UTC) (envelope-from pkubaj@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 47vN6n3Qrkz4Yvd; Fri, 10 Jan 2020 12:47:29 +0000 (UTC) (envelope-from pkubaj@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 70C1E1A384; Fri, 10 Jan 2020 12:47:29 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00AClTsS047888; Fri, 10 Jan 2020 12:47:29 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00AClT9S047887; Fri, 10 Jan 2020 12:47:29 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202001101247.00AClT9S047887@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Fri, 10 Jan 2020 12:47:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522568 - branches/2020Q1/games/arx-libertatis X-SVN-Group: ports-branches X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: branches/2020Q1/games/arx-libertatis X-SVN-Commit-Revision: 522568 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jan 2020 12:47:29 -0000 Author: pkubaj Date: Fri Jan 10 12:47:29 2020 New Revision: 522568 URL: https://svnweb.freebsd.org/changeset/ports/522568 Log: MFH: r522567 games/arx-libertatis: fix build on GCC architectures OpenAL needs C++11 compiler: /usr/local/lib/libopenal.so: undefined reference to `std::thread::join()@GLIBCXX_3.4.11' Approved by: portmgr (fix build blanket) Modified: branches/2020Q1/games/arx-libertatis/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/games/arx-libertatis/Makefile ============================================================================== --- branches/2020Q1/games/arx-libertatis/Makefile Fri Jan 10 12:46:29 2020 (r522567) +++ branches/2020Q1/games/arx-libertatis/Makefile Fri Jan 10 12:47:29 2020 (r522568) @@ -17,14 +17,13 @@ LICENSE_FILE= ${WRKSRC}/ARX_PUBLIC_LICENSE.txt LIB_DEPENDS= libfreetype.so:print/freetype2 BUILD_DEPENDS= ${LOCALBASE}/include/boost/foreach.hpp:devel/boost-libs -USES= cmake gl openal sdl tar:xz +USES= cmake compiler:c++11-lang gl openal sdl tar:xz USE_SDL= sdl USE_GL= gl glew LLD_UNSAFE= yes CMAKE_ARGS= -DDATA_DIR=arx \ -DSTRICT_USE=ON \ -DBUILD_CRASHREPORTER=OFF -CFLAGS_powerpc64+= -mminimal-toc SUB_FILES= pkg-message @@ -33,6 +32,12 @@ PORTDOCS= AUTHORS CHANGELOG README.md OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes +.include + +.if defined(PPC_ABI) && ${PPC_ABI} == ELFv1 +CFLAGS+= -mminimal-toc +.endif + post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/CMakeLists.txt @@ -42,4 +47,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ .endfor -.include +.include From owner-svn-ports-branches@freebsd.org Fri Jan 10 13:35:47 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 6882F1E7ACD; Fri, 10 Jan 2020 13:35:47 +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 47vPBW254Nz4bjH; Fri, 10 Jan 2020 13:35:47 +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 4255D1AD05; Fri, 10 Jan 2020 13:35:47 +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 00ADZlKa078094; Fri, 10 Jan 2020 13:35:47 GMT (envelope-from cmt@FreeBSD.org) Received: (from cmt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00ADZkPD078093; Fri, 10 Jan 2020 13:35:46 GMT (envelope-from cmt@FreeBSD.org) Message-Id: <202001101335.00ADZkPD078093@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cmt set sender to cmt@FreeBSD.org using -f From: Christoph Moench-Tegeder Date: Fri, 10 Jan 2020 13:35:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522570 - in branches/2020Q1/mail/thunderbird: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: cmt X-SVN-Commit-Paths: in branches/2020Q1/mail/thunderbird: . files X-SVN-Commit-Revision: 522570 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jan 2020 13:35:47 -0000 Author: cmt Date: Fri Jan 10 13:35:46 2020 New Revision: 522570 URL: https://svnweb.freebsd.org/changeset/ports/522570 Log: MFH: r522569 mail/thunderbird: update to 68.4.1 https://www.thunderbird.net/en-US/thunderbird/68.4.1/releasenotes/ Approved by: portmgr (blanket: web browser alike) Deleted: branches/2020Q1/mail/thunderbird/files/patch-bindgen-rust1390 Modified: branches/2020Q1/mail/thunderbird/Makefile branches/2020Q1/mail/thunderbird/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/mail/thunderbird/Makefile ============================================================================== --- branches/2020Q1/mail/thunderbird/Makefile Fri Jan 10 13:33:36 2020 (r522569) +++ branches/2020Q1/mail/thunderbird/Makefile Fri Jan 10 13:35:46 2020 (r522570) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 68.3.1 -PORTREVISION= 3 +DISTVERSION= 68.4.1 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Modified: branches/2020Q1/mail/thunderbird/distinfo ============================================================================== --- branches/2020Q1/mail/thunderbird/distinfo Fri Jan 10 13:33:36 2020 (r522569) +++ branches/2020Q1/mail/thunderbird/distinfo Fri Jan 10 13:35:46 2020 (r522570) @@ -1,3 +1,3 @@ -TIMESTAMP = 1576518952 -SHA256 (thunderbird-68.3.1.source.tar.xz) = 76284cd3f192ac5678bbf10e1ce9308e913c2e6dde89e055d3ffe568e0e71fa6 -SIZE (thunderbird-68.3.1.source.tar.xz) = 338866820 +TIMESTAMP = 1578659921 +SHA256 (thunderbird-68.4.1.source.tar.xz) = dc7fc4bfd9daafcfc5fd4cb743cd1cf15de2f5fe5041a6ad7015ab7b345c52b7 +SIZE (thunderbird-68.4.1.source.tar.xz) = 331482720 From owner-svn-ports-branches@freebsd.org Fri Jan 10 14:19:01 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 C70171E8E99; Fri, 10 Jan 2020 14:19:01 +0000 (UTC) (envelope-from dan@langille.org) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 47vQ8P0D8xz4f8F; Fri, 10 Jan 2020 14:19:00 +0000 (UTC) (envelope-from dan@langille.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 31BD1210D8; Fri, 10 Jan 2020 09:19:00 -0500 (EST) Received: from imap36 ([10.202.2.86]) by compute4.internal (MEProxy); Fri, 10 Jan 2020 09:19:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=langille.org; h= mime-version:message-id:in-reply-to:references:date:from:to :subject:content-type; s=fm3; bh=Rx4qVQVqWBCYsHWFc0ziKTUpGblb3op bwlXV5hJW+1k=; b=YwY9EkQT2HzPUtQjzHK/W/PM2gYYzFS0SALS12Mv2xXc3Pt 0jIDS5PgJuwMwCtECxV2TdGPLb2dSpaAoNs53A6XJgGPCW1TGUf/CvOPrgibDRvN 45JXb1HeCYieoNYMFLPIbI+7UuItTQSf8DQOjzE3QO23SfidPN/IxAHEtTz3BlR5 3/vXuC4fqzGR9fApY6mXKQ1i3kl3u0qQdH9pcxrFtgz0u+DWqfBskEvac5xQ6aKv 1SnUkH4DtS2jSIvu1L8GlIQQodBRygSnNTnZ9RlgXkFZmWjF32XlNCq8mZFjszSP bFkGA9+gB+RC3OaVXRYbVsook3OZhbHCKLOP4+Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=Rx4qVQ VqWBCYsHWFc0ziKTUpGblb3opbwlXV5hJW+1k=; b=FLI2qlfSvjS1v6tMp+sTrA owJ8oyAnOrTh8gz3yToTHoYfdLxaaWpvKFF2O3idzAbCdjYsro3KaxaDvr7wxc0l fT0BfxwPVM76xwJFSzobvfgh6bfp0OjC9kLIogRPlRU5t8nagMnoUI0Nsk3rC9If ygiyrkCYO/dQfz/IuYWqcvLe17x2rw8q0+tY0HKdSe+oUjMjueAWIQdDb2LbEH6p 5hTaNImBZUz2QJhvxzTtHOWv4jMFh2cckIkom6XEEkQpQCwhF/qGJVIeTlmR478e c8jRiDLf3pNcgq8QBvnibEENDNPGdSPGPZV3xq+x+ImNKkCc6lgrEzjoKJaS2Lug == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrvdeifedgheelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepofgfggfkjghffffhvffutgesthdtredtreerjeenucfhrhhomhepfdffrghn ucfnrghnghhilhhlvgdfuceouggrnheslhgrnhhgihhllhgvrdhorhhgqeenucffohhmrg hinhepfhhrvggvsghsugdrohhrghdpphhrvgdrmhhkpdhhthhtphgpshhrtggpthhlshgp pghsvghrvhgvrhgppggtohhnthgvgihtrdgttgdpmhihshhqlhdrtghomhdphhhtthhppg hsrhgtpghtlhhspggptghlihgvnhhtpggptghonhhtvgigthdrtggtpdihhidrtggtpdhh thhtphgpshhrtggpthhlshgppggtohhnthgvgihtrdgttgenucfrrghrrghmpehmrghilh hfrhhomhepuggrnheslhgrnhhgihhllhgvrdhorhhgnecuvehluhhsthgvrhfuihiivgep td X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id BDAC5188005C; Fri, 10 Jan 2020 09:18:59 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.1.7-740-g7d9d84e-fmstable-20200109v1 Mime-Version: 1.0 Message-Id: In-Reply-To: <202001090641.0096fiAg052922@repo.freebsd.org> References: <202001090641.0096fiAg052922@repo.freebsd.org> Date: Fri, 10 Jan 2020 09:18:39 -0500 From: "Dan Langille" To: "Jochen Neumeister" , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: =?UTF-8?Q?Re:_svn_commit:_r522470_-_in_branches/2020Q1/databases:_mysql8?= =?UTF-8?Q?0-client_mysql80-client/files_mysql80-server_mysql80-server/f?= =?UTF-8?Q?iles?= Content-Type: text/plain X-Rspamd-Queue-Id: 47vQ8P0D8xz4f8F X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=langille.org header.s=fm3 header.b=YwY9EkQT; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=FLI2qlfS; dmarc=pass (policy=none) header.from=langille.org; spf=pass (mx1.freebsd.org: domain of dan@langille.org designates 66.111.4.29 as permitted sender) smtp.mailfrom=dan@langille.org X-Spamd-Result: default: False [-4.38 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[langille.org:s=fm3,messagingengine.com:s=fm1]; XM_UA_NO_VERSION(0.01)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.29]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; MV_CASE(0.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; TO_DN_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; IP_SCORE(-3.49)[ip: (-9.83), ipnet: 66.111.4.0/24(-4.88), asn: 11403(-2.68), country: US(-0.05)]; DKIM_TRACE(0.00)[langille.org:+,messagingengine.com:+]; DMARC_POLICY_ALLOW(-0.50)[langille.org,none]; SUBJ_EXCESS_QP(1.20)[]; RCVD_IN_DNSWL_LOW(-0.10)[29.4.111.66.list.dnswl.org : 127.0.5.1]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:11403, ipnet:66.111.4.0/24, country:US]; RCVD_TLS_LAST(0.00)[]; MID_RHS_WWW(0.50)[] X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jan 2020 14:19:01 -0000 Thank you for this. I know from trying one myself, MySQL updates are a great deal of work. It is not easy. -- Dan Langille dan@langille.org On Thu, Jan 9, 2020, at 1:41 AM, Jochen Neumeister wrote: > Author: joneum > Date: Thu Jan 9 06:41:44 2020 > New Revision: 522470 > URL: https://svnweb.freebsd.org/changeset/ports/522470 > > Log: > MFH: r522436 > > databases/mysql80-{client, server}: Update to latest release 8.0.18 > > switch patch-files to mysql80-server to make it easy for maintain. > > Bugfix: > - CMake now enables use of fastcov if it is available. fastcov is > faster than lcov or gcov. This requires GCC and gcov versions of 9 or > higher. > - The DISABLE_SHARED CMake option was unused and has been removed. > - The CMake code to find Protobuf executables now works on platforms > that split these into multiple packages. > - The new ADD_GDB_INDEX CMake option determines whether to enable > generation of a .gdb_index section in binaries, which makes loading > them in a debugger faster. The option is disabled by default. It has no > effect if a linker other than lld or GNU gold is used. > - For the INSTALL_LAYOUT CMake option, the SLES and WIN option values > were not used and have been removed. > - The max_prepared_stmt_count system variable maximum value has been > increased from 1 million (1,048,576) to 4 million (4,194,304). The > default value remains unchanged at 16,382. > - MySQL 8.0 no longer supports building using wolfSSL. All MySQL > builds now use OpenSSL. > - The RE2 library is no longer used by MySQL. The library is no > longer bundled with source distributions and the WITH_RE2 CMake option > is obsolete. > > More Infos: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-18.html > > A big thanks to @fluffy for his help with this update > > Security: fc91f2ef-fd7b-11e9-a1c7-b499baebfeaf > Sponsored by: Netzkommune GmbH > > Approved by: ports-secteam (wit hat) > > Added: > > branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_DragonFly.cmake > - copied unchanged from r522436, > head/databases/mysql80-server/files/patch-cmake_os_DragonFly.cmake > > branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake > - copied unchanged from r522436, > head/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake > > branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_chartype.h > - copied unchanged from r522436, > head/databases/mysql80-server/files/patch-extra_libedit_chartype.h > > branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_vi.c > - copied unchanged from r522436, > head/databases/mysql80-server/files/patch-extra_libedit_vi.c > > branches/2020Q1/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h > - copied unchanged from r522436, > head/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h > branches/2020Q1/databases/mysql80-server/files/patch-include_violite.h > - copied unchanged from r522436, > head/databases/mysql80-server/files/patch-include_violite.h > > branches/2020Q1/databases/mysql80-server/files/patch-mysys_my__default.cc > - copied unchanged from r522436, > head/databases/mysql80-server/files/patch-mysys_my__default.cc > branches/2020Q1/databases/mysql80-server/files/patch-mysys_my__md5.cc > - copied unchanged from r522436, > head/databases/mysql80-server/files/patch-mysys_my__md5.cc > > branches/2020Q1/databases/mysql80-server/files/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c > - copied unchanged from r522436, > head/databases/mysql80-server/files/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c > > branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_authentication_sha256__scramble__generator.cc > - copied unchanged from r522436, > head/databases/mysql80-server/files/patch-plugin_x_client_authentication_sha256__scramble__generator.cc > > branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__client__context.cc > - copied unchanged from r522436, > head/databases/mysql80-server/files/patch-router_src_http_src_tls__client__context.cc > > branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__context.cc > - copied unchanged from r522436, > head/databases/mysql80-server/files/patch-router_src_http_src_tls__context.cc > > branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__server__context.cc > - copied unchanged from r522436, > head/databases/mysql80-server/files/patch-router_src_http_src_tls__server__context.cc > > branches/2020Q1/databases/mysql80-server/files/patch-utilities_CMakeLists.txt > - copied unchanged from r522436, > head/databases/mysql80-server/files/patch-utilities_CMakeLists.txt > branches/2020Q1/databases/mysql80-server/files/patch-vio_viossl.cc > - copied unchanged from r522436, > head/databases/mysql80-server/files/patch-vio_viossl.cc > Deleted: > branches/2020Q1/databases/mysql80-client/files/ > > branches/2020Q1/databases/mysql80-server/files/patch-cmd-line-utils_libedit_chartype.h > > branches/2020Q1/databases/mysql80-server/files/patch-cmd-line-utils_libedit_vi.c > > branches/2020Q1/databases/mysql80-server/files/patch-mysys__ssl_my__default.cc > > branches/2020Q1/databases/mysql80-server/files/patch-mysys__ssl_my__md5.cc > > branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_sha256__scramble__generator.cc > Modified: > branches/2020Q1/databases/mysql80-client/Makefile > branches/2020Q1/databases/mysql80-client/pkg-plist > branches/2020Q1/databases/mysql80-server/Makefile > branches/2020Q1/databases/mysql80-server/distinfo > branches/2020Q1/databases/mysql80-server/files/patch-CMakeLists.txt > > branches/2020Q1/databases/mysql80-server/files/patch-client_CMakeLists.txt > > branches/2020Q1/databases/mysql80-server/files/patch-cmake_plugin.cmake > branches/2020Q1/databases/mysql80-server/files/patch-cmake_ssl.cmake > > branches/2020Q1/databases/mysql80-server/files/patch-include_CMakeLists.txt > > branches/2020Q1/databases/mysql80-server/files/patch-include_my__compare.h > > branches/2020Q1/databases/mysql80-server/files/patch-include_my__thread__os__id.h > branches/2020Q1/databases/mysql80-server/files/patch-include_myisam.h > > branches/2020Q1/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt > > branches/2020Q1/databases/mysql80-server/files/patch-libservices_CMakeLists.txt > > branches/2020Q1/databases/mysql80-server/files/patch-man_CMakeLists.txt > > branches/2020Q1/databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc > > branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt > > branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc > > branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_configure.cmake > > branches/2020Q1/databases/mysql80-server/files/patch-scripts_CMakeLists.txt > > branches/2020Q1/databases/mysql80-server/files/patch-sql-common_client.cc > > branches/2020Q1/databases/mysql80-server/files/patch-sql_auth_sha2__password__common.cc > > branches/2020Q1/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc > branches/2020Q1/databases/mysql80-server/files/patch-sql_mysqld.cc > branches/2020Q1/databases/mysql80-server/files/patch-sql_sys__vars.cc > > branches/2020Q1/databases/mysql80-server/files/patch-storage_innobase_include_srv0mon.h > > branches/2020Q1/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.cc > > branches/2020Q1/databases/mysql80-server/files/patch-support-files_CMakeLists.txt > > branches/2020Q1/databases/mysql80-server/files/patch-vio_viosslfactories.cc > branches/2020Q1/databases/mysql80-server/pkg-plist > Directory Properties: > branches/2020Q1/ (props changed) > > Modified: branches/2020Q1/databases/mysql80-client/Makefile > ============================================================================== > --- branches/2020Q1/databases/mysql80-client/Makefile Thu Jan 9 > 06:40:26 2020 (r522469) > +++ branches/2020Q1/databases/mysql80-client/Makefile Thu Jan 9 > 06:41:44 2020 (r522470) > @@ -2,7 +2,7 @@ > # $FreeBSD$ > > PORTNAME= mysql > -PORTREVISION= 1 > +PORTREVISION= 0 > PKGNAMESUFFIX= 80-client > > COMMENT= Multithreaded SQL database (client) > @@ -12,7 +12,7 @@ LICENSE+= LGPL21 > MASTERDIR= ${.CURDIR}/../mysql80-server > > PKGMESSAGE= ${.CURDIR}/pkg-message > -PATCHDIR= ${.CURDIR}/files > +PATCHDIR= ${MASTERDIR}/files > PLIST= ${.CURDIR}/pkg-plist > > CONFLICTS_INSTALL= mysql8[1-9]-client-* \ > @@ -24,11 +24,21 @@ CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILES > > USE_LDCONFIG+= ${PREFIX}/lib/mysql > > -MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 > mysql_config_editor.1 mysql_find_rows.1 \ > - mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \ > - mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 > +MMAN1= comp_err.1 lz4_decompress.1 mysql.1 mysql_config.1 > mysql_config_editor.1 \ > + mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 > mysqlman.1 \ > + mysqlpump.1 mysqlshow.1 mysqlslap.1 perror.1 zlib_decompress.1 > > CLIENT_ONLY= yes > + > +OPTIONS_GROUP+= PLUGINS > +PLUGINS_DESC= Default Client Plugins > +OPTIONS_GROUP_PLUGINS= SASLCLIENT > +SASLCLIENT_DESC= SASL client plugin module > +SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP > +SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 > +SASLCLIENT_USE= OPENLDAP=yes > +OPTIONS_DEFAULT+= SASLCLIENT > +OPTIONS_SUB= yes > > # issue 166367: adding symlinks for back-compatibility with ${lib}_r > post-install: > > Modified: branches/2020Q1/databases/mysql80-client/pkg-plist > ============================================================================== > --- branches/2020Q1/databases/mysql80-client/pkg-plist Thu Jan 9 > 06:40:26 2020 (r522469) > +++ branches/2020Q1/databases/mysql80-client/pkg-plist Thu Jan 9 > 06:41:44 2020 (r522470) > @@ -1,7 +1,7 @@ > +bin/my_print_defaults > bin/mysql > bin/mysql_config > bin/mysql_config_editor > -bin/mysql_ssl_rsa_setup > bin/mysqladmin > bin/mysqlbinlog > bin/mysqlcheck > @@ -10,6 +10,8 @@ bin/mysqlimport > bin/mysqlpump > bin/mysqlshow > bin/mysqlslap > +bin/perror > +bin/zlib_decompress > include/mysql/base64.h > include/mysql/big_endian.h > include/mysql/c_string_less.h > @@ -41,6 +43,7 @@ include/mysql/my_check_opt.h > include/mysql/my_command.h > include/mysql/my_compare.h > include/mysql/my_compiler.h > +include/mysql/my_compress.h > include/mysql/my_dbug.h > include/mysql/my_default.h > include/mysql/my_dir.h > @@ -181,8 +184,10 @@ lib/mysql/libmysqlclient.so.21 > lib/mysql/libmysqlclient_r.a > lib/mysql/libmysqlclient_r.so > lib/mysql/libmysqlclient_r.so.21 > +%%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so > libdata/pkgconfig/mysqlclient.pc > man/man1/comp_err.1.gz > +man/man1/lz4_decompress.1.gz > man/man1/mysql.1.gz > man/man1/mysql_config.1.gz > man/man1/mysql_config_editor.1.gz > @@ -191,6 +196,10 @@ man/man1/mysqlbinlog.1.gz > man/man1/mysqlcheck.1.gz > man/man1/mysqldump.1.gz > man/man1/mysqlimport.1.gz > +man/man1/mysqlman.1.gz > +man/man1/mysqlpump.1.gz > man/man1/mysqlshow.1.gz > man/man1/mysqlslap.1.gz > +man/man1/perror.1.gz > +man/man1/zlib_decompress.1.gz > share/aclocal/mysql.m4 > > Modified: branches/2020Q1/databases/mysql80-server/Makefile > ============================================================================== > --- branches/2020Q1/databases/mysql80-server/Makefile Thu Jan 9 > 06:40:26 2020 (r522469) > +++ branches/2020Q1/databases/mysql80-server/Makefile Thu Jan 9 > 06:41:44 2020 (r522470) > @@ -2,8 +2,8 @@ > # $FreeBSD$ > > PORTNAME?= mysql > -PORTVERSION= 8.0.17 > -PORTREVISION?= 2 > +PORTVERSION= 8.0.18 > +PORTREVISION?= 0 > CATEGORIES= databases > MASTER_SITES= MYSQL/MySQL-8.0 > PKGNAMESUFFIX?= 80-server > @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVER > > SLAVEDIRS= databases/mysql80-client > USES= bison:build cmake:noninja compiler:c++14-lang cpe \ > - libedit localbase perl5 pkgconfig shebangfix ssl > + libedit localbase ncurses perl5 pkgconfig shebangfix ssl > > USE_PERL5= run > > @@ -26,10 +26,11 @@ MY_DBDIR= /var/db/mysql > MY_SECDIR= /var/db/mysql_secure > MY_TMPDIR= /var/db/mysql_tmpdir > > -LIB_DEPENDS+= libevent.so:devel/libevent \ > +LIB_DEPENDS+= libcurl.so:ftp/curl \ > + libevent.so:devel/libevent \ > libicutu.so:devel/icu \ > liblz4.so:archivers/liblz4 \ > - libre2.so:devel/re2 \ > + libzstd.so:archivers/zstd \ > libprotobuf.so:devel/protobuf \ > libunwind.so:devel/libunwind > > @@ -51,7 +52,7 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ > -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \ > -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \ > -DINSTALL_MYSQLSHAREDIR="share/mysql" \ > - -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ > + -DINSTALL_MYSQLTESTDIR="" \ > -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ > -DINSTALL_SBINDIR="libexec" \ > -DINSTALL_SCRIPTDIR="bin" \ > @@ -65,11 +66,13 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ > -DWITH_LIBEVENT=system \ > -DWITH_LZ4=system \ > -DWITH_ICU=system \ > - -DWITH_RE2=system \ > + -DWITH_CURL=system \ > + -DWITH_ZLIB=system \ > + -DWITH_ZSTD=system \ > -DWITH_PROTOBUF=system \ > + -DWITH_SSL=${OPENSSLBASE} \ > -DBUILD_BUNDLED_ZLIB=0 \ > -DBUILD_BUNDLED_LZ4=0 \ > - -DINSTALL_MYSQLTESTDIR=0 > > SHEBANG_FILES= scripts/*.pl* scripts/*.sh > > @@ -105,14 +108,14 @@ GROUPS= mysql > > USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin > > -MMAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 > myisampack.1 \ > - mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \ > - mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 > mysql_setpermission.1 \ > - mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \ > - mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 > mysqlman.1 \ > - mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 > +MMAN1= ibd2sdi.1 innochecksum.1 my_print_defaults.1 myisam_ftdump.1 > myisamchk.1 \ > + myisamlog.1 myisampack.1 mysql_secure_installation.1 > mysql_ssl_rsa_setup.1 \ > + mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql.server.1 mysqldumpslow.1 > mysqld_multi.1 \ > + mysqld_safe.1 mysqlrouter_passwd.1 mysqlrouter_plugin_info.1 > mysqlrouter.1 > +MMAN8= mysqld.8 > > CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" > +CMAKE_ARGS+= -DWITHOUT_CLIENTLIBS="ON" > > OPTIONS_GROUP= STORAGE > OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE > PARTITION PERFSCHEMA > @@ -156,17 +159,8 @@ SUB_LIST+= LEGACY_LIMITS="" > MODERN_LIMITS="@comment " > > .include > > -.if ${SSL_DEFAULT} == base > -CMAKE_ARGS+= -DWITH_SSL=system > -.else > -CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} > -.endif > - > post-extract: > @${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h > - > -post-patch: > - @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt > > .if !defined(CLIENT_ONLY) > post-install: > > Modified: branches/2020Q1/databases/mysql80-server/distinfo > ============================================================================== > --- branches/2020Q1/databases/mysql80-server/distinfo Thu Jan 9 > 06:40:26 2020 (r522469) > +++ branches/2020Q1/databases/mysql80-server/distinfo Thu Jan 9 > 06:41:44 2020 (r522470) > @@ -1,3 +1,3 @@ > -TIMESTAMP = 1565048626 > -SHA256 (mysql-boost-8.0.17.tar.gz) = > d44231316ce30a1d1189125ceed86d3388409778e17d0e3b9a060f532463e29a > -SIZE (mysql-boost-8.0.17.tar.gz) = 189322239 > +TIMESTAMP = 1578004259 > +SHA256 (mysql-boost-8.0.18.tar.gz) = > 0eccd9d79c04ba0ca661136bb29085e3833d9c48ed022d0b9aba12236994186b > +SIZE (mysql-boost-8.0.18.tar.gz) = 194953221 > > Modified: > branches/2020Q1/databases/mysql80-server/files/patch-CMakeLists.txt > ============================================================================== > --- > branches/2020Q1/databases/mysql80-server/files/patch-CMakeLists.txt Thu > Jan 9 06:40:26 2020 (r522469) > +++ > branches/2020Q1/databases/mysql80-server/files/patch-CMakeLists.txt Thu > Jan 9 06:41:44 2020 (r522470) > @@ -1,35 +1,76 @@ > ---- CMakeLists.txt.orig 2019-01-21 19:00:53 UTC > +--- CMakeLists.txt.orig 2019-09-20 08:30:51 UTC > +++ CMakeLists.txt > -@@ -1045,7 +1045,6 @@ IF(UNIX) > +@@ -1181,10 +1181,10 @@ ENDIF() > + MYSQL_CHECK_SSL() > + MYSQL_CHECK_SSL_DLLS() > + > +-# Add system/bundled editline. > +-MYSQL_CHECK_EDITLINE() > + # Add libevent > +-MYSQL_CHECK_LIBEVENT() > ++IF(NOT WITHOUT_SERVER) > ++ MYSQL_CHECK_LIBEVENT() > ++ENDIF() > + # Add lz4 library > + MYSQL_CHECK_LZ4() > + # Add icu library > +@@ -1273,7 +1273,9 @@ IF(WITH_UNIT_TESTS) > + INCLUDE(googletest) > ENDIF() > > +-ADD_SUBDIRECTORY(include) > ++IF(NOT WITHOUT_CLIENTLIBS) > ++ ADD_SUBDIRECTORY(include) > ++ENDIF(NOT WITHOUT_CLIENTLIBS) > + ADD_SUBDIRECTORY(strings) > + ADD_SUBDIRECTORY(vio) > + ADD_SUBDIRECTORY(mysys) > +@@ -1314,24 +1316,29 @@ IF(WITH_UNIT_TESTS) > + ADD_SUBDIRECTORY(unittest/mytap/t) > + ENDIF() > + > +-ADD_SUBDIRECTORY(client) > ++IF(NOT WITHOUT_TOOLS) > ++ # Add system/bundled editline > ++ MYSQL_CHECK_EDITLINE() > ++ ADD_SUBDIRECTORY(client) > ++ENDIF(NOT WITHOUT_TOOLS) > ++ > + ADD_SUBDIRECTORY(utilities) > +-ADD_SUBDIRECTORY(share) > + ADD_SUBDIRECTORY(libservices) > + > IF(NOT WITHOUT_SERVER) > -- ADD_SUBDIRECTORY(testclients) > + ADD_SUBDIRECTORY(testclients) > ++ ADD_SUBDIRECTORY(share) > ADD_SUBDIRECTORY(sql) > ENDIF() > > -@@ -1054,8 +1053,6 @@ 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) > ++ADD_SUBDIRECTORY(support-files) > > IF(NOT WITHOUT_SERVER) > -- ADD_SUBDIRECTORY(mysql-test) > -- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) > - ADD_SUBDIRECTORY(support-files) > + ADD_SUBDIRECTORY(mysql-test) > + ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) > +- ADD_SUBDIRECTORY(support-files) > IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) > ADD_SUBDIRECTORY(internal) > -@@ -1152,6 +1149,7 @@ ENDIF() > - # > - # RPM installs documentation directly from the source tree > - # > + ENDIF() > +@@ -1440,6 +1447,7 @@ IF(PACK_SEPARATE_COMPONENTS) > + SET(CPACK_COMPONENTS_GROUPING IGNORE) > + ENDIF() > + > +IF(FALSE) > - IF(NOT INSTALL_LAYOUT MATCHES "RPM") > - INSTALL(FILES README LICENSE DESTINATION ${INSTALL_DOCREADMEDIR} > COMPONENT Readme) > - INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC > ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR}) > -@@ -1170,6 +1168,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") > + IF(UNIX) > + INSTALL(FILES > + Docs/mysql.info > +@@ -1474,6 +1482,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") > + PATTERN "sp-imp-spec.txt" EXCLUDE > PATTERN "README.build" EXCLUDE > ) > - ENDIF() > +ENDIF() > + ENDIF() > > # Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests, > - # we can safely enable ASan on Clang/Win32 if needed. > > Modified: > branches/2020Q1/databases/mysql80-server/files/patch-client_CMakeLists.txt > ============================================================================== > --- > branches/2020Q1/databases/mysql80-server/files/patch-client_CMakeLists.txt Thu Jan 9 06:40:26 2020 (r522469) > +++ > branches/2020Q1/databases/mysql80-server/files/patch-client_CMakeLists.txt Thu Jan 9 06:41:44 2020 (r522470) > @@ -1,52 +1,75 @@ > ---- client/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC > +--- client/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC > +++ client/CMakeLists.txt > -@@ -26,14 +26,14 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil > - > +@@ -23,8 +23,11 @@ > ## Subdirectory with common client code. > ADD_SUBDIRECTORY(base) > --## Subdirectory for mysqlpump code. > --ADD_SUBDIRECTORY(dump) > + ## Subdirectory for mysqlpump code. > ++IF(WITHOUT_SERVER) > + ADD_SUBDIRECTORY(dump) > ++ENDIF() > > -+IF(FALSE) > - MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc > ../sql-common/sql_string.cc pattern_matcher.cc > ${CMAKE_SOURCE_DIR}/sql/net_ns.cc) > - TARGET_LINK_LIBRARIES(mysql mysqlclient) > - IF(UNIX) > - TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) > - ENDIF(UNIX) > ++IF(NOT WITHOUT_CLIENTLIBS) > + MYSQL_ADD_EXECUTABLE(mysql > + ${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc > + completion_hash.cc > +@@ -33,6 +36,7 @@ MYSQL_ADD_EXECUTABLE(mysql > + readline.cc > + LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY} > + ) > +ENDIF() > > IF(NOT WITHOUT_SERVER) > - MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc) > -@@ -56,6 +56,7 @@ ADD_DEPENDENCIES(mysqltest GenError GenC > - ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) > - TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) > + MYSQL_ADD_EXECUTABLE(mysql_upgrade > +@@ -48,6 +52,7 @@ IF(SOLARIS_SPARC AND CMAKE_BUILD_TYPE_UPPER STREQUAL " > + ) > + ENDIF() > > -+IF(FALSE) > - MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc) > - TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core) > - > -@@ -68,7 +69,9 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc > - > - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.cc) > - TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) > ++IF(NOT WITHOUT_SERVER) > + MYSQL_ADD_EXECUTABLE(mysqltest > + mysqltest.cc > + mysqltest/error_names.cc > +@@ -63,6 +68,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest > + ENABLE_EXPORTS > + LINK_LIBRARIES mysqlclient > + ) > +ENDIF() > ++ > ++IF(WITHOUT_SERVER) > + MYSQL_ADD_EXECUTABLE(mysqlcheck > + check/mysqlcheck.cc > + check/mysqlcheck_core.cc > +@@ -80,6 +88,7 @@ MYSQL_ADD_EXECUTABLE(mysqlshow > + mysqlshow.cc > + LINK_LIBRARIES mysqlclient > + ) > ++ > + MYSQL_ADD_EXECUTABLE(mysqlbinlog > + mysqlbinlog.cc > + ${CMAKE_SOURCE_DIR}/sql/json_binary.cc > +@@ -104,7 +113,9 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog > > -+IF(FALSE) > - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) > - SET(MYSQLBINLOG_LIB_SOURCES > - ${CMAKE_SOURCE_DIR}/strings/decimal.cc > -@@ -107,12 +110,15 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli > - > - MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) > - TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) > + TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX) > + TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql) > +ENDIF() > > - MYSQL_ADD_EXECUTABLE(mysql_secure_installation > mysql_secure_installation.cc) > - TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) > - > -+IF(FALSE) > - MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc > path.cc logger.cc) > - TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys) > ++IF(WITHOUT_SERVER) > + MYSQL_ADD_EXECUTABLE(mysqladmin > + mysqladmin.cc > + LINK_LIBRARIES mysqlclient > +@@ -117,6 +128,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor > + mysql_config_editor.cc > + LINK_LIBRARIES mysqlclient > + ) > ++ENDIF() > ++ > ++IF(NOT WITHOUT_SERVER) > + MYSQL_ADD_EXECUTABLE(mysql_secure_installation > + mysql_secure_installation.cc > + LINK_LIBRARIES mysqlclient > +@@ -127,6 +141,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup > + path.cc > + LINK_LIBRARIES mysys > + ) > +ENDIF() > > # "WIN32" also covers 64 bit. "echo" is used in some files below > "mysql-test/". > > Copied: > branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_DragonFly.cmake (from r522436, head/databases/mysql80-server/files/patch-cmake_os_DragonFly.cmake) > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ > branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_DragonFly.cmake Thu Jan 9 06:41:44 2020 (r522470, copy of r522436, head/databases/mysql80-server/files/patch-cmake_os_DragonFly.cmake) > @@ -0,0 +1,27 @@ > +--- cmake/os/DragonFly.cmake.orig 2016-04-14 10:16:17 UTC > ++++ cmake/os/DragonFly.cmake > +@@ -0,0 +1,24 @@ > ++INCLUDE(CheckCSourceRuns) > ++ > ++# We require at least GCC 4.4 or Clang 3.3. > ++IF(NOT FORCE_UNSUPPORTED_COMPILER) > ++ IF(CMAKE_COMPILER_IS_GNUCC) > ++ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion > ++ OUTPUT_VARIABLE GCC_VERSION) > ++ IF(GCC_VERSION VERSION_LESS 4.4) > ++ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") > ++ ENDIF() > ++ ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang") > ++ CHECK_C_SOURCE_RUNS(" > ++ int main() > ++ { > ++ return (__clang_major__ < 3) || > ++ (__clang_major__ == 3 && __clang_minor__ < 3); > ++ }" HAVE_SUPPORTED_CLANG_VERSION) > ++ IF(NOT HAVE_SUPPORTED_CLANG_VERSION) > ++ MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!") > ++ ENDIF() > ++ ELSE() > ++ MESSAGE(FATAL_ERROR "Unsupported compiler!") > ++ ENDIF() > ++ENDIF() > > Copied: > branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake (from r522436, head/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake) > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ > branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake Thu Jan 9 06:41:44 2020 (r522470, copy of r522436, head/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake) > @@ -0,0 +1,25 @@ > +--- cmake/os/FreeBSD.cmake.orig 2019-09-20 08:30:51 UTC > ++++ cmake/os/FreeBSD.cmake > +@@ -45,8 +45,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) > + MESSAGE(FATAL_ERROR > + "GCC 5.3 or newer is required (-dumpversion says > ${GCC_VERSION})") > + ENDIF() > +- ELSE() > +- MESSAGE(FATAL_ERROR "Unsupported compiler!") > ++ CHECK_C_SOURCE_RUNS(" > ++ int main() > ++ { > ++ return (__clang_major__ >= 4); > ++ }" I386_ATOMIC_BUILTINS) > ++ IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT > I386_ATOMIC_BUILTINS)) > ++ SET(HAVE_GCC_ATOMIC_BUILTINS CACHE INTERNAL "") > ++ ENDIF() > ++ ELSEIF(CMAKE_COMPILER_IS_GNUCC) > ++ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion > ++ OUTPUT_VARIABLE GCC_VERSION) > ++ IF(GCC_VERSION VERSION_LESS 4.4) > ++ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") > ++ ENDIF() > + ENDIF() > + ENDIF() > + > > Modified: > branches/2020Q1/databases/mysql80-server/files/patch-cmake_plugin.cmake > ============================================================================== > --- > branches/2020Q1/databases/mysql80-server/files/patch-cmake_plugin.cmake Thu Jan 9 06:40:26 2020 (r522469) > +++ > branches/2020Q1/databases/mysql80-server/files/patch-cmake_plugin.cmake Thu Jan 9 06:41:44 2020 (r522470) > @@ -1,12 +1,12 @@ > ---- cmake/plugin.cmake.orig 2017-06-27 11:44:29 UTC > +--- cmake/plugin.cmake.orig 2019-09-20 08:30:51 UTC > +++ cmake/plugin.cmake > -@@ -207,9 +207,6 @@ MACRO(MYSQL_ADD_PLUGIN) > +@@ -226,9 +226,6 @@ MACRO(MYSQL_ADD_PLUGIN) > MYSQL_INSTALL_TARGETS(${target} > DESTINATION ${INSTALL_PLUGINDIR} > COMPONENT ${INSTALL_COMPONENT}) > - INSTALL_DEBUG_TARGET(${target} > - DESTINATION ${INSTALL_PLUGINDIR}/debug > - COMPONENT ${INSTALL_COMPONENT}) > - # For internal testing in PB2, append collections files > - IF(DEFINED ENV{PB2WORKDIR}) > - PLUGIN_APPEND_COLLECTIONS(${plugin}) > + ENDIF() > + ELSE() > + IF(WITHOUT_${plugin}) > > Modified: > branches/2020Q1/databases/mysql80-server/files/patch-cmake_ssl.cmake > ============================================================================== > --- > branches/2020Q1/databases/mysql80-server/files/patch-cmake_ssl.cmake Thu Jan 9 06:40:26 2020 (r522469) > +++ > branches/2020Q1/databases/mysql80-server/files/patch-cmake_ssl.cmake Thu Jan 9 06:41:44 2020 (r522470) > @@ -1,14 +1,28 @@ > ---- cmake/ssl.cmake.orig 2018-04-29 16:21:47 UTC > +--- cmake/ssl.cmake.orig 2019-09-20 08:30:51 UTC > +++ cmake/ssl.cmake > -@@ -265,10 +265,10 @@ MACRO (MYSQL_CHECK_SSL) > - OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" > +@@ -199,7 +199,7 @@ MACRO (MYSQL_CHECK_SSL) > + # Encoded as MNNFFPPS: major minor fix patch status > + FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" > + OPENSSL_VERSION_NUMBER > +- REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t > ]+0x[0-9].*" > ++ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t > ]+0x[0-9].*" > ) > + STRING(REGEX REPLACE > + "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" > +@@ -214,13 +214,14 @@ MACRO (MYSQL_CHECK_SSL) > + OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}" > + ) > ENDIF() > +- > IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0") > ++ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" > HAVE_TLS1_3_VERSION) > ++ IF(HAVE_TLS1_3_VERSION) > + ADD_DEFINITIONS(-DHAVE_TLSv13) > + ENDIF() > IF(OPENSSL_INCLUDE_DIR AND > OPENSSL_LIBRARY AND > CRYPTO_LIBRARY AND > - OPENSSL_MAJOR_VERSION STREQUAL "1" > -+ (OPENSSL_MAJOR_VERSION STREQUAL "1" OR OPENSSL_MAJOR_VERSION > STREQUAL "2") > ++ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1" > ) > SET(OPENSSL_FOUND TRUE) > FIND_PROGRAM(OPENSSL_EXECUTABLE openssl > > Copied: > branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_chartype.h (from r522436, head/databases/mysql80-server/files/patch-extra_libedit_chartype.h) > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ > branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_chartype.h Thu Jan 9 06:41:44 2020 (r522470, copy of r522436, head/databases/mysql80-server/files/patch-extra_libedit_chartype.h) > @@ -0,0 +1,11 @@ > +--- extra/libedit/chartype.h.orig 2019-09-20 08:30:51 UTC > ++++ extra/libedit/chartype.h > +@@ -49,7 +49,7 @@ > + TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */ > + #if !defined(__NetBSD__) && !defined(__sun) \ > + && !(defined(__APPLE__) && defined(__MACH__)) \ > +- && !defined(__FreeBSD__) && !defined(_AIX) > ++ && !defined(__FreeBSD__) && !defined(_AIX) && > !defined(__DragonFly__) > + #ifndef __STDC_ISO_10646__ > + /* In many places it is assumed that the first 127 code points are > ASCII > + * compatible, so ensure wchar_t indeed does ISO 10646 and not some > other > > Copied: > branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_vi.c > (from r522436, > head/databases/mysql80-server/files/patch-extra_libedit_vi.c) > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ > branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_vi.c Thu Jan 9 06:41:44 2020 (r522470, copy of r522436, head/databases/mysql80-server/files/patch-extra_libedit_vi.c) > @@ -0,0 +1,20 @@ > +--- extra/libedit/vi.c.orig 2019-09-20 08:30:51 UTC > ++++ extra/libedit/vi.c > +@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c > __attribute__((__un > + * NB: posix implies that we should enter insert mode, however > + * this is against historical precedent... > + */ > +-#if defined(__weak_reference) && !defined(__FreeBSD__) > ++#if defined(__weak_reference) && !defined(__FreeBSD__) && > !defined(__DragonFly__) > + __weakref_visible char *my_get_alias_text(const char *) > + __weak_reference(get_alias_text); > + #endif > +@@ -928,7 +928,7 @@ protected el_action_t > + vi_alias(EditLine *el __attribute__((__unused__)), > + Int c __attribute__((__unused__))) > + { > +-#if defined(__weak_reference) && !defined(__FreeBSD__) > ++#if defined(__weak_reference) && !defined(__FreeBSD__) && > !defined(__DragonFly__) > + char alias_name[3]; > + char *alias_text; > + > > Copied: > branches/2020Q1/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h (from r522436, head/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h) > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ > branches/2020Q1/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h Thu Jan 9 06:41:44 2020 (r522470, copy of r522436, head/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h) > @@ -0,0 +1,19 @@ > +--- extra/libevent/openssl-compat.h.orig 2019-09-20 08:30:51 UTC > ++++ extra/libevent/openssl-compat.h > +@@ -24,12 +24,15 @@ static inline BIO_METHOD *BIO_meth_new(int type, > const > + #define BIO_set_init(b, val) (b)->init = (val) > + #define BIO_set_data(b, val) (b)->ptr = (val) > + #define BIO_set_shutdown(b, val) (b)->shutdown = (val) > +-#define BIO_get_init(b) (b)->init > + #define BIO_get_data(b) (b)->ptr > + #define BIO_get_shutdown(b) (b)->shutdown > + > + #define TLS_method SSLv23_method > + > + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ > ++ > ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || > defined(LIBRESSL_VERSION_NUMBER) > ++#define BIO_get_init(b) (b)->init > ++#endif > + > + #endif /* OPENSSL_COMPAT_H */ > > Modified: > branches/2020Q1/databases/mysql80-server/files/patch-include_CMakeLists.txt > ============================================================================== > --- > branches/2020Q1/databases/mysql80-server/files/patch-include_CMakeLists.txt Thu Jan 9 06:40:26 2020 (r522469) > +++ > branches/2020Q1/databases/mysql80-server/files/patch-include_CMakeLists.txt Thu Jan 9 06:41:44 2020 (r522470) > @@ -1,10 +1,174 @@ > ---- include/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC > +--- include/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC > +++ include/CMakeLists.txt > -@@ -37,5 +37,7 @@ SET(HEADERS_MYSQL_DIR > +@@ -37,10 +37,171 @@ SET(HEADERS > + ${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h > + ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h > + field_types.h > ++ base64.h > ++ big_endian.h > ++ c_string_less.h > ++ crypt_genhash_impl.h > ++ decimal.h > ++ depth_first_search.h > ++ dur_prop.h > ++ errmsg.h > ++ ft_global.h > ++ heap.h > ++ keycache.h > ++ lex_string.h > ++ lf.h > ++ little_endian.h > ++ m_ctype.h > ++ m_string.h > ++ map_helpers.h > ++ mf_wcomp.h > ++ mutex_lock.h > ++ my_aes.h > ++ my_alloc.h > ++ my_atomic.h > ++ my_base.h > ++ my_bit.h > ++ my_bitmap.h > ++ my_byteorder.h > ++ my_check_opt.h > ++ my_command.h > ++ my_compare.h > ++ my_compiler.h > ++ my_dbug.h > ++ my_default.h > ++ my_dir.h > ++ my_double2ulonglong.h > ++ my_getopt.h > ++ my_hash_combine.h > ++ my_icp.h > ++ my_inttypes.h > ++ my_io.h > ++ my_list.h > ++ my_loglevel.h > ++ my_macros.h > ++ my_md5.h > ++ my_md5_size.h > ++ my_murmur3.h > ++ my_pointer_arithmetic.h > ++ my_psi_config.h > ++ my_rapidjson_size_t.h > ++ my_rdtsc.h > ++ my_rnd.h > ++ my_sharedlib.h > ++ my_shm_defaults.h > ++ my_sqlcommand.h > ++ my_stacktrace.h > ++ my_sys.h > ++ my_systime.h > ++ my_table_map.h > ++ my_thread.h > ++ my_thread_local.h > ++ my_thread_os_id.h > ++ my_time.h > ++ my_timer.h > ++ my_tree.h > ++ my_uctype.h > ++ my_user.h > ++ my_xml.h > ++ myisam.h > ++ myisammrg.h > ++ myisampack.h > ++ mysql.h > ++ mysql.h.pp > ++ mysql_com.h > ++ mysql_com_server.h > ++ mysql_time.h > ++ mysql_version.h.in > ++ mysys_err.h > ++ nullable.h > ++ password.h > ++ pfs_cond_provider.h > ++ pfs_error_provider.h > ++ pfs_file_provider.h > ++ pfs_idle_provider.h > ++ pfs_memory_provider.h > ++ pfs_metadata_provider.h > ++ pfs_mutex_provider.h > ++ pfs_rwlock_provider.h > ++ pfs_socket_provider.h > ++ pfs_stage_provider.h > ++ pfs_statement_provider.h > ++ pfs_table_provider.h > ++ pfs_thread_provider.h > ++ pfs_transaction_provider.h > ++ prealloced_array.h > ++ print_version.h > ++ priority_queue.h > ++ rwlock_scoped_lock.h > ++ scope_guard.h > ++ service_versions.h > ++ sha1.h > ++ sha2.h > ++ sql_chars.h > ++ sql_common.h > ++ sql_string.h > ++ sslopt-case.h > ++ sslopt-longopts.h > ++ sslopt-vars.h > ++ template_utils.h > ++ thr_cond.h > ++ thr_lock.h > ++ thr_mutex.h > ++ thr_rwlock.h > ++ typelib.h > ++ varlen_sort.h > ++ violite.h > ++ welcome_copyright_notice.h > + ) > + SET(HEADERS_MYSQL_DIR > + mysql/client_plugin.h > + mysql/plugin_auth_common.h > ++ mysql/udf_registration_types.h > ++ mysql/client_authentication.h > ++ mysql/client_plugin.h.pp > ++ mysql/com_data.h > ++ mysql/get_password.h > ++ mysql/group_replication_priv.h > ++ mysql/innodb_priv.h > ++ mysql/mysql_lex_string.h > ++ mysql/plugin.h > ++ mysql/plugin_audit.h > ++ mysql/plugin_audit.h.pp > ++ mysql/plugin_auth.h > ++ mysql/plugin_auth.h.pp > ++ mysql/plugin_auth_common.h > ++ mysql/plugin_ftparser.h > ++ mysql/plugin_ftparser.h.pp > ++ mysql/plugin_group_replication.h > ++ mysql/plugin_keyring.h > ++ mysql/plugin_keyring.h.pp > ++ mysql/plugin_query_rewrite.h > ++ mysql/plugin_trace.h > ++ mysql/plugin_validate_password.h > ++ mysql/service_command.h > ++ mysql/service_locking.h > ++ mysql/service_my_plugin_log.h > ++ mysql/service_mysql_alloc.h > ++ mysql/service_mysql_keyring.h > ++ mysql/service_mysql_password_policy.h > ++ mysql/service_mysql_string.h > ++ mysql/service_parser.h > ++ mysql/service_plugin_registry.h > ++ mysql/service_rpl_transaction_ctx.h > ++ mysql/service_rpl_transaction_write_set.h > ++ mysql/service_rules_table.h > ++ mysql/service_security_context.h > ++ mysql/service_srv_session.h > ++ mysql/service_srv_session_info.h > ++ mysql/service_ssl_wrapper.h > ++ mysql/service_thd_alloc.h > ++ mysql/service_thd_engine_lock.h > ++ mysql/service_thd_wait.h > ++ mysql/service_thread_scheduler.h > ++ mysql/services.h > ++ mysql/services.h.pp > ++ mysql/thread_pool_priv.h > ++ mysql/thread_type.h > mysql/udf_registration_types.h > ) > > -+IF(FALSE) > - INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT > Development) > - INSTALL(FILES ${HEADERS_MYSQL_DIR} DESTINATION > ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development) > -+ENDIF() > > Modified: > branches/2020Q1/databases/mysql80-server/files/patch-include_my__compare.h > ============================================================================== > --- > branches/2020Q1/databases/mysql80-server/files/patch-include_my__compare.h Thu Jan 9 06:40:26 2020 (r522469) > +++ > branches/2020Q1/databases/mysql80-server/files/patch-include_my__compare.h Thu Jan 9 06:41:44 2020 (r522470) > @@ -1,4 +1,4 @@ > ---- include/my_compare.h.orig 2018-04-08 06:44:49 UTC > +--- include/my_compare.h.orig 2019-09-20 08:30:51 UTC > +++ include/my_compare.h > @@ -49,7 +49,7 @@ > But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and > HA_MAX_KEY_LENGTH. > > Modified: > branches/2020Q1/databases/mysql80-server/files/patch-include_my__thread__os__id.h > ============================================================================== > --- > branches/2020Q1/databases/mysql80-server/files/patch-include_my__thread__os__id.h Thu Jan 9 06:40:26 2020 (r522469) > +++ > branches/2020Q1/databases/mysql80-server/files/patch-include_my__thread__os__id.h Thu Jan 9 06:41:44 2020 (r522470) > @@ -1,6 +1,6 @@ > ---- include/my_thread_os_id.h.orig 2016-03-28 18:06:12 UTC > +--- include/my_thread_os_id.h.orig 2019-09-20 08:30:51 UTC > +++ include/my_thread_os_id.h > -@@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa > +@@ -84,8 +84,12 @@ static inline my_thread_os_id_t my_thread_os_id() { > return pthread_getthreadid_np(); > #else > #ifdef HAVE_INTEGER_PTHREAD_SELF > > Modified: > branches/2020Q1/databases/mysql80-server/files/patch-include_myisam.h > ============================================================================== > --- > branches/2020Q1/databases/mysql80-server/files/patch-include_myisam.h Thu Jan 9 06:40:26 2020 (r522469) > +++ > branches/2020Q1/databases/mysql80-server/files/patch-include_myisam.h Thu Jan 9 06:41:44 2020 (r522470) > @@ -1,4 +1,4 @@ > ---- include/myisam.h.orig 2018-04-08 06:44:49 UTC > +--- include/myisam.h.orig 2019-09-20 08:30:51 UTC > +++ include/myisam.h > @@ -59,7 +59,7 @@ > The following defines can be increased if necessary. > > Copied: > branches/2020Q1/databases/mysql80-server/files/patch-include_violite.h > (from r522436, > head/databases/mysql80-server/files/patch-include_violite.h) > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ > branches/2020Q1/databases/mysql80-server/files/patch-include_violite.h Thu Jan 9 06:41:44 2020 (r522470, copy of r522436, head/databases/mysql80-server/files/patch-include_violite.h) > @@ -0,0 +1,14 @@ > +--- include/violite.h.orig 2019-09-20 08:30:51 UTC > ++++ include/violite.h > +@@ -269,9 +269,11 @@ struct st_VioSSLFd *new_VioSSLConnectorFd( > + > + long process_tls_version(const char *tls_version); > + > ++#ifndef LIBRESSL_VERSION_NUMBER > + int set_fips_mode(const uint fips_mode, char *err_string); > + > + uint get_fips_mode(); > ++#endif > + > + struct st_VioSSLFd *new_VioSSLAcceptorFd( > + const char *key_file, const char *cert_file, const char *ca_file, > > Modified: > branches/2020Q1/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt > ============================================================================== > --- > branches/2020Q1/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt Thu Jan 9 06:40:26 2020 (r522469) > +++ > branches/2020Q1/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt Thu Jan 9 06:41:44 2020 (r522470) > @@ -1,31 +1,70 @@ > ---- libmysql/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC > +--- libmysql/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC > +++ libmysql/CMakeLists.txt > -@@ -239,7 +239,7 @@ MESSAGE(STATUS "Creating LDAP authentica > - ADD_SUBDIRECTORY(authentication_ldap) > - > - # Merge several convenience libraries into one big mysqlclient > +@@ -192,6 +192,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C) > + ) > + ENDIF() > + > ++INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) > ++IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") > ++ ADD_COMPILE_FLAGS(${CLIENT_SOURCES} COMPILE_FLAGS "-fPIC") > ++ENDIF() > ++ > + # > + # Include protocol tracing infrastructure and the test > + # trace plugin if enabled by build options. > +@@ -240,12 +245,17 @@ 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) > -+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT > Development SKIP_INSTALL) > ++IF(WITHOUT_CLIENTLIBS) > ++ # Merge several convenience libraries into one big mysqlclient > ++ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT > Development SKIP_INSTALL) > ++ELSE(WITHOUT_CLIENTLIBS) > ++ # 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) > ++ENDIF(WITHOUT_CLIENTLIBS) > TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK}) > > # Visual Studio users need debug static library for debug projects > -@@ -280,9 +280,10 @@ IF(NOT DISABLE_SHARED) > - # and link them together into shared library. > - MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} > - EXPORTS ${CLIENT_API_FUNCTIONS} > ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} ${CLIENT_API_NONBLOCKING_FUNCTIONS} > -- COMPONENT SharedLibraries) > -+ COMPONENT SharedLibraries SKIP_INSTALL) > - TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK}) > +@@ -281,12 +291,22 @@ ENDIF() > > -+IF(FALSE) > - IF(WIN32) > - # So that libmysql_api_test below can find the .dll > - ADD_CUSTOM_COMMAND(TARGET libmysql POST_BUILD > -@@ -338,6 +339,7 @@ ENDIF() > - # to initialize api_calls[] array in api_test.c > - # > - SET(CLIENT_API_FUNCTION_LIST "") > -+ ENDIF() > - FOREACH(api ${CLIENT_API_FUNCTIONS}) > - SET(CLIENT_API_FUNCTION_LIST "${CLIENT_API_FUNCTION_LIST} ${api},") > - ENDFOREACH() > + # Merge several convenience libraries into one big mysqlclient > + # and link them together into shared library. > ++IF(WITHOUT_CLIENTLIBS) > + MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} > + EXPORTS > + ${CLIENT_API_FUNCTIONS} > + ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} > + ${CLIENT_API_NONBLOCKING_FUNCTIONS} > ++ COMPONENT SharedLibraries > ++ SKIP_INSTALL ) > ++ELSE(WITHOUT_CLIENTLIBS) > ++MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} > ++ EXPORTS > ++ ${CLIENT_API_FUNCTIONS} > ++ ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} > ++ ${CLIENT_API_NONBLOCKING_FUNCTIONS} > + COMPONENT SharedLibraries) > ++ENDIF(WITHOUT_CLIENTLIBS) > + TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK}) > + > + IF(WIN32) > +@@ -300,7 +320,7 @@ ENDIF() > + > + IF(UNIX) > + # libtool compatability > +- IF(FREEBSD OR APPLE) > ++ IF(FREEBSD OR APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly") > + SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") > + ELSE() > + SET(OS_SHARED_LIB_VERSION > > Modified: > branches/2020Q1/databases/mysql80-server/files/patch-libservices_CMakeLists.txt > ============================================================================== > --- > branches/2020Q1/databases/mysql80-server/files/patch-libservices_CMakeLists.txt Thu Jan 9 06:40:26 2020 (r522469) > +++ > branches/2020Q1/databases/mysql80-server/files/patch-libservices_CMakeLists.txt Thu Jan 9 06:41:44 2020 (r522470) > @@ -1,4 +1,4 @@ > ---- libservices/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC > +--- libservices/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC > +++ libservices/CMakeLists.txt > @@ -45,7 +45,9 @@ SET(MYSQLSERVICES_SOURCES > plugin_registry_service.c) > @@ -10,4 +10,3 @@ > DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) > +ENDIF() > ENDIF() > - > > Modified: > branches/2020Q1/databases/mysql80-server/files/patch-man_CMakeLists.txt > ============================================================================== > --- > branches/2020Q1/databases/mysql80-server/files/patch-man_CMakeLists.txt Thu Jan 9 06:40:26 2020 (r522469) > +++ > branches/2020Q1/databases/mysql80-server/files/patch-man_CMakeLists.txt Thu Jan 9 06:41:44 2020 (r522470) > @@ -1,14 +1,74 @@ > ---- man/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC > +--- man/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC > +++ man/CMakeLists.txt > -@@ -21,9 +21,8 @@ > - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > 02110-1301 USA > - > +@@ -23,29 +23,14 @@ > # Copy man pages > --FILE(GLOB MAN1 *.1) > --FILE(GLOB MAN1_NDB ndb*.1) > --FILE(GLOB MAN1_ROUTER mysqlrouter*.1) > -+FILE(GLOB MAN1 *.1) > -+FILE(GLOB MAN1_ROUTER mysqlroutermy_print_defaults.1 myisam_ftdump.1 > myisamchk.1 myisamlog.1 myisampack.1 mysql.server.1 > mysql_convert_table_format.1 mysql_fix_extensions.1 mysql_install_db.1 > mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 > mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 > mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 > mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1) > - FILE(GLOB MAN8 *.8) > - FILE(GLOB MAN8_NDB ndb*.8) > - IF(MAN1_NDB AND NOT WITH_NDBCLUSTER) > + SET(MAN1 > + comp_err.1 > +- ibd2sdi.1 > +- innochecksum.1 > + lz4_decompress.1 > +- my_print_defaults.1 > +- myisam_ftdump.1 > +- myisamchk.1 > +- myisamlog.1 > +- myisampack.1 > + mysql.1 > +- mysql.server.1 > + mysql_config.1 > + mysql_config_editor.1 > +- mysql_secure_installation.1 > +- mysql_ssl_rsa_setup.1 > +- mysql_tzinfo_to_sql.1 > +- mysql_upgrade.1 > + mysqladmin.1 > + mysqlbinlog.1 > + mysqlcheck.1 > +- mysqld_multi.1 > +- mysqld_safe.1 > + mysqldump.1 > +- mysqldumpslow.1 > + mysqlimport.1 > + mysqlman.1 > + mysqlpump.1 > +@@ -54,6 +39,23 @@ SET(MAN1 > + perror.1 > + zlib_decompress.1 > + ) > ++SET(MAN1_TOOLS > ++ ibd2sdi.1 > ++ innochecksum.1 > ++ my_print_defaults.1 > ++ myisam_ftdump.1 > ++ myisamchk.1 > ++ myisamlog.1 > ++ myisampack.1 > ++ mysql.server.1 > ++ mysql_secure_installation.1 > ++ mysql_ssl_rsa_setup.1 > ++ mysql_tzinfo_to_sql.1 > ++ mysql_upgrade.1 > ++ mysqldumpslow.1 > ++ mysqld_multi.1 > ++ mysqld_safe.1 > ++ ) > + SET(MAN1_NDB > + ndb-common-options.1 > + ndb_blob_tool.1 > +@@ -99,8 +101,15 @@ SET(MAN8_NDB > + ndbmtd.8 > + ) > + > > *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** > From owner-svn-ports-branches@freebsd.org Sat Jan 11 08:00: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 CECE2221AB4; Sat, 11 Jan 2020 08:00:17 +0000 (UTC) (envelope-from linimon@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 47vshx5D4Jz3D0M; Sat, 11 Jan 2020 08:00:17 +0000 (UTC) (envelope-from linimon@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 AE8132784F; Sat, 11 Jan 2020 08:00:17 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00B80HlF042779; Sat, 11 Jan 2020 08:00:17 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00B80Hg4042778; Sat, 11 Jan 2020 08:00:17 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <202001110800.00B80Hg4042778@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Sat, 11 Jan 2020 08:00:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522632 - in branches/2020Q1/net-p2p/c-lightning: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: in branches/2020Q1/net-p2p/c-lightning: . files X-SVN-Commit-Revision: 522632 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jan 2020 08:00:17 -0000 Author: linimon Date: Sat Jan 11 08:00:17 2020 New Revision: 522632 URL: https://svnweb.freebsd.org/changeset/ports/522632 Log: MFH: r522323 net-p2p/c-lightning: fix bitcoin-cli exec setup lightningd does execute bitcoin-cli internally during runtime. Fix two problems with that: * The bitcoin-cli executable is usually located in /usr/local/bin/bitcoin-cli but service(8) would remove /usr/local/bin from PATH before executing our rc script /usr/local/etc/rc.d/lightningd and so the lightningd daemon would inherit a PATH that does not contain bitcoin-cli. To fix this give the full path to bitcoin-cli to lightningd. * bitcoin-cli(1) tries to create its datadir when it starts if it does not exist. By default that is ${HOME}/.bitcoin. service(8) would set HOME=/ and if / is mounted read-only, then this creation would fail. Because we don't want this directory created (it is not necessary and remains empty) tell lightningd to execute bitcoin-cli --datadir=/some/directory/that/already/exists. Also, append ${lightningd_extra_args} to the lightingd arguments. This was forgotten in the initial commit and setting lightningd_extra_args would have had no effect. Reported by: https://github.com/bitcoin-software Approved by: portmgr ("fix broken ports") Modified: branches/2020Q1/net-p2p/c-lightning/Makefile branches/2020Q1/net-p2p/c-lightning/files/lightningd.in Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/net-p2p/c-lightning/Makefile ============================================================================== --- branches/2020Q1/net-p2p/c-lightning/Makefile Sat Jan 11 07:33:38 2020 (r522631) +++ branches/2020Q1/net-p2p/c-lightning/Makefile Sat Jan 11 08:00:17 2020 (r522632) @@ -4,6 +4,7 @@ PORTNAME= c-lightning # To build from an arbitrary git commit comment PORTVERSION and PORTREVISION (if present) PORTVERSION= 0.8.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v # and uncomment the following two lines (use for example -git-HEAD or -git-f8d8348c) #PORTVERSION= 0 Modified: branches/2020Q1/net-p2p/c-lightning/files/lightningd.in ============================================================================== --- branches/2020Q1/net-p2p/c-lightning/files/lightningd.in Sat Jan 11 07:33:38 2020 (r522631) +++ branches/2020Q1/net-p2p/c-lightning/files/lightningd.in Sat Jan 11 08:00:17 2020 (r522632) @@ -36,9 +36,18 @@ command_args="" command_args="${command_args} --lightning-dir=${lightningd_base_dir}" command_args="${command_args} --network=${lightningd_network}" command_args="${command_args} --daemon" +# service(8) would execute us with LOCALBASE stripped out from PATH, +# thus specify the full path to bitcoin-cli. +command_args="${command_args} --bitcoin-cli=%%LOCALBASE%%/bin/bitcoin-cli" +# bitcoin-cli(1) tries to create its "datadir" (by default ${HOME}/.bitcoin) +# if it does not exist. Provide something that already exists to avoid the +# creation of unnecessary empty directories. +command_args="${command_args} --bitcoin-datadir=${lightningd_base_dir}" if [ -e "${lightningd_conf}" ] ; then command_args="${command_args} --conf=${lightningd_conf}" fi + +command_args="${command_args} ${lightningd_extra_args}" run_rc_command "$1" From owner-svn-ports-branches@freebsd.org Sat Jan 11 09:32: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 CC04522382B; Sat, 11 Jan 2020 09:32:58 +0000 (UTC) (envelope-from tobik@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 47vvlt54qJz3JBV; Sat, 11 Jan 2020 09:32:58 +0000 (UTC) (envelope-from tobik@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 A9412B6C; Sat, 11 Jan 2020 09:32:58 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00B9WwHD002965; Sat, 11 Jan 2020 09:32:58 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00B9WwsT002964; Sat, 11 Jan 2020 09:32:58 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202001110932.00B9WwsT002964@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 11 Jan 2020 09:32:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522641 - in branches/2020Q1/lang/rust: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in branches/2020Q1/lang/rust: . files X-SVN-Commit-Revision: 522641 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jan 2020 09:32:58 -0000 Author: tobik Date: Sat Jan 11 09:32:58 2020 New Revision: 522641 URL: https://svnweb.freebsd.org/changeset/ports/522641 Log: MFH: r522316 r522638 r522639 lang/rust: Simplify do-configure and garbage collect files/config.toml lang/rust: fix powerpc64 elfv2 bootstrap Apparently there were some issues with the previous one. PR: 243253 Submitted by: mikael.urankar@gmail.com Reported by: jhibbits, pkubaj Tested by: pkubaj lang/rust: increase build verbosity and produce better build logs Approved by: ports-secteam blanket Deleted: branches/2020Q1/lang/rust/files/config.toml Modified: branches/2020Q1/lang/rust/Makefile branches/2020Q1/lang/rust/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/lang/rust/Makefile ============================================================================== --- branches/2020Q1/lang/rust/Makefile Sat Jan 11 09:30:16 2020 (r522640) +++ branches/2020Q1/lang/rust/Makefile Sat Jan 11 09:32:58 2020 (r522641) @@ -141,32 +141,38 @@ post-patch-SOURCES-off: @${REINPLACE_CMD} -e 's/config.tools.*"src".*/false;/' \ ${WRKSRC}/src/bootstrap/install.rs +do-configure: + @${ECHO_CMD} '[build]' > ${WRKSRC}/config.toml + @${ECHO_CMD} 'vendor=true' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'extended=true' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'python="${PYTHON_CMD}"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'docs=${_RUST_BUILD_DOCS}' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'verbose=2' >> ${WRKSRC}/config.toml + @${ECHO_CMD} '[install]' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'prefix="${PREFIX}"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'sysconfdir="${PREFIX}/etc"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'mandir="${MANPREFIX}/man"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} '[rust]' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'channel="${PKGNAMESUFFIX:Ustable:S/^-//}"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'default-linker="${CC}"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'verbose-tests=true' >> ${WRKSRC}/config.toml + @${ECHO_CMD} '[llvm]' >> ${WRKSRC}/config.toml .if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE) -CCACHE_VALUE= "${CCACHE_BIN}" + @${ECHO_CMD} 'ccache="${CCACHE_BIN}"' >> ${WRKSRC}/config.toml .else -CCACHE_VALUE= false + @${ECHO_CMD} 'ccache=false' >> ${WRKSRC}/config.toml .endif - -do-configure: - ${SED} -E \ - -e 's,%PREFIX%,${PREFIX},' \ - -e 's,%SYSCONFDIR%,${PREFIX}/etc,' \ - -e 's,%MANDIR%,${MANPREFIX}/man,' \ - -e 's,%PYTHON_CMD%,${PYTHON_CMD},' \ - -e 's,%CHANNEL%,${PKGNAMESUFFIX:Ustable:S/^-//},' \ - -e 's,%TARGET%,${_RUST_TARGET},' \ - -e 's,%CCACHE%,${CCACHE_VALUE},' \ - -e 's,%CC%,${CC},' \ - -e 's,%CXX%,${CXX},' \ - -e 's,%DOCS%,${_RUST_BUILD_DOCS},' \ - < ${FILESDIR}/config.toml \ - > ${WRKSRC}/config.toml # no need to build a crosscompiler for these targets .if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc64 - @${REINPLACE_CMD} -e 's,^#targets =.*,targets = "${_LLVM_TARGET}",' \ - -e 's,^#experimental-targets =.*,experimental-targets = "",' \ - ${WRKSRC}/config.toml + @${ECHO_CMD} 'targets="${_LLVM_TARGET}"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'experimental-targets=""' >> ${WRKSRC}/config.toml .endif + @${ECHO_CMD} '[target.${_RUST_TARGET}]' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'cc="${CC}"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'cxx="${CXX}"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'linker="${CC}"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} '[dist]' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'src-tarball=false' >> ${WRKSRC}/config.toml @${REINPLACE_CMD} -e 's,%CC%,${CC},g' \ ${WRKSRC}/src/librustc_llvm/build.rs \ ${WRKSRC}/src/bootstrap/native.rs @@ -175,7 +181,6 @@ do-build: cd ${WRKSRC} && \ ${SETENV} ${X_PY_ENV} \ ${X_PY_CMD} build \ - --verbose \ --config ./config.toml \ --jobs ${MAKE_JOBS_NUMBER} @@ -184,7 +189,6 @@ do-install: ${SETENV} ${X_PY_ENV} \ DESTDIR=${STAGEDIR} \ ${X_PY_CMD} 'install' \ - --verbose \ --config ./config.toml \ --jobs ${MAKE_JOBS_NUMBER} @@ -239,7 +243,6 @@ do-test: ${SETENV} ${X_PY_ENV} \ ALLOW_NONZERO_RLIMIT_CORE=1 \ ${X_PY_CMD} test \ - --verbose \ --config ./config.toml \ --jobs ${MAKE_JOBS_NUMBER} Modified: branches/2020Q1/lang/rust/distinfo ============================================================================== --- branches/2020Q1/lang/rust/distinfo Sat Jan 11 09:30:16 2020 (r522640) +++ branches/2020Q1/lang/rust/distinfo Sat Jan 11 09:32:58 2020 (r522641) @@ -1,4 +1,4 @@ -TIMESTAMP = 1576623023 +TIMESTAMP = 1578730697 SHA256 (rust/rustc-1.40.0-src.tar.xz) = 6e2aa3a91697f4b225c6b394cbae6b97666f061dba491f666a5281698fe2aace SIZE (rust/rustc-1.40.0-src.tar.xz) = 92306352 SHA256 (rust/2019-11-07/rustc-1.39.0-aarch64-unknown-freebsd.tar.xz) = 44098962a570e05d691d3b7c3337b873b1e1f22ac49fd19c0d5d3362c0008eb5 @@ -39,9 +39,9 @@ SHA256 (rust/2019-11-07/rust-std-1.39.0-powerpc64-unkn SIZE (rust/2019-11-07/rust-std-1.39.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 164834720 SHA256 (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 707eef9bac71a44db8e1d64c70a771fbac1f81f7ca58a2e3025ec1cc4d263b18 SIZE (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 3423776 -SHA256 (rust/2019-11-07/rustc-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = e615095f1fb2017938147da213d04444b785ae34128c4aa9099996f0de610a52 -SIZE (rust/2019-11-07/rustc-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 24519864 -SHA256 (rust/2019-11-07/rust-std-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = fb83397a7b6abfcf292ed50f8c277617c2e77686778ca853ca2228f7aa5d7a84 -SIZE (rust/2019-11-07/rust-std-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 163807368 -SHA256 (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = aeebed336e09121f4d8803b5b6c2814a0901773a65bce9bd091a06d6082ac978 -SIZE (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 2753592 +SHA256 (rust/2019-11-07/rustc-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 65a7eed0737ae94e54d60a0cf5cc67634fb8ddd978bdfb0ce4e5f46d309daa0a +SIZE (rust/2019-11-07/rustc-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 24483956 +SHA256 (rust/2019-11-07/rust-std-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 60782554de07997c25bf2aa279b44baa8009158b25cc3c5364b1496a2d40f2a4 +SIZE (rust/2019-11-07/rust-std-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 163926244 +SHA256 (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 75ecd88d83e8f394ce33f0213b622a045cbcfc55973f4b5140403de298f73968 +SIZE (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 3268696 From owner-svn-ports-branches@freebsd.org Sat Jan 11 09:57:32 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 AE926223F50; Sat, 11 Jan 2020 09:57:32 +0000 (UTC) (envelope-from tobik@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 47vwJD4C5Zz3KCw; Sat, 11 Jan 2020 09:57:32 +0000 (UTC) (envelope-from tobik@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 89F50F23; Sat, 11 Jan 2020 09:57:32 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00B9vWAS015256; Sat, 11 Jan 2020 09:57:32 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00B9vWOZ015254; Sat, 11 Jan 2020 09:57:32 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202001110957.00B9vWOZ015254@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 11 Jan 2020 09:57:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522643 - branches/2020Q1/devel/shfmt X-SVN-Group: ports-branches X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: branches/2020Q1/devel/shfmt X-SVN-Commit-Revision: 522643 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jan 2020 09:57:32 -0000 Author: tobik Date: Sat Jan 11 09:57:31 2020 New Revision: 522643 URL: https://svnweb.freebsd.org/changeset/ports/522643 Log: MFH: r522642 devel/shfmt: Update to v3.0.1 Changes: https://github.com/mvdan/sh/releases/tag/v3.0.1 Approved by: ports-secteam crash fix blanket Modified: branches/2020Q1/devel/shfmt/Makefile branches/2020Q1/devel/shfmt/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/devel/shfmt/Makefile ============================================================================== --- branches/2020Q1/devel/shfmt/Makefile Sat Jan 11 09:56:50 2020 (r522642) +++ branches/2020Q1/devel/shfmt/Makefile Sat Jan 11 09:57:31 2020 (r522643) @@ -2,7 +2,7 @@ PORTNAME= shfmt DISTVERSIONPREFIX= v -DISTVERSION= 3.0.0 +DISTVERSION= 3.0.1 CATEGORIES= devel MAINTAINER= tobik@FreeBSD.org Modified: branches/2020Q1/devel/shfmt/distinfo ============================================================================== --- branches/2020Q1/devel/shfmt/distinfo Sat Jan 11 09:56:50 2020 (r522642) +++ branches/2020Q1/devel/shfmt/distinfo Sat Jan 11 09:57:31 2020 (r522643) @@ -1,6 +1,6 @@ -TIMESTAMP = 1576505630 -SHA256 (mvdan-sh-v3.0.0_GH0.tar.gz) = 8bfd0d4b4d532d0b6ecd77f94c91d1f6da47b26a4453ed5c7567826113424116 -SIZE (mvdan-sh-v3.0.0_GH0.tar.gz) = 182624 +TIMESTAMP = 1578735484 +SHA256 (mvdan-sh-v3.0.1_GH0.tar.gz) = 4cca3d8a40e5132a4764a3bf7bcf335288ebff8a4a74e130f9359605e6f07544 +SIZE (mvdan-sh-v3.0.1_GH0.tar.gz) = 182967 SHA256 (go-errgo-errgo-v2.1.0_GH0.tar.gz) = f6b10d77db65cb5a6c425be0f695e43b98e3e10ec83340209ac5bf4bf5c1b837 SIZE (go-errgo-errgo-v2.1.0_GH0.tar.gz) = 9927 SHA256 (golang-crypto-34f69633bfdc_GH0.tar.gz) = c3fa0760971622af64c3b7a3319291d997f2f0d53a5c90c17d25eaeba7f0371a From owner-svn-ports-branches@freebsd.org Sat Jan 11 11:57:19 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 B10992270B8; Sat, 11 Jan 2020 11:57:19 +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 47vyyR4HjNz3ylB; Sat, 11 Jan 2020 11:57:19 +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 8EA03258E; Sat, 11 Jan 2020 11:57:19 +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 00BBvJwS090604; Sat, 11 Jan 2020 11:57:19 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00BBvJL6090602; Sat, 11 Jan 2020 11:57:19 GMT (envelope-from rene@FreeBSD.org) Message-Id: <202001111157.00BBvJL6090602@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sat, 11 Jan 2020 11:57:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522678 - in branches/2020Q1/devel/erlang-cuttlefish: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: rene X-SVN-Commit-Paths: in branches/2020Q1/devel/erlang-cuttlefish: . files X-SVN-Commit-Revision: 522678 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jan 2020 11:57:19 -0000 Author: rene Date: Sat Jan 11 11:57:18 2020 New Revision: 522678 URL: https://svnweb.freebsd.org/changeset/ports/522678 Log: MFH: r522674 erlang/cuttlefish: fix build PR: 238279 [1] PR: 238676 [2] Submitted by: fbsdports@westryn.net [1] Submitted by: dewayne@heuristicsystems.com.au [2] Approved by: ports-secteam (joneum) Modified: branches/2020Q1/devel/erlang-cuttlefish/Makefile branches/2020Q1/devel/erlang-cuttlefish/files/patch-rebar.config Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/devel/erlang-cuttlefish/Makefile ============================================================================== --- branches/2020Q1/devel/erlang-cuttlefish/Makefile Sat Jan 11 11:29:03 2020 (r522677) +++ branches/2020Q1/devel/erlang-cuttlefish/Makefile Sat Jan 11 11:57:18 2020 (r522678) @@ -11,10 +11,6 @@ COMMENT= Configuration library for Erlang LICENSE= APACHE20 -BROKEN= fails to build -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-01-10 - USES= erlang:rebar USE_GITHUB= yes GH_ACCOUNT= basho Modified: branches/2020Q1/devel/erlang-cuttlefish/files/patch-rebar.config ============================================================================== --- branches/2020Q1/devel/erlang-cuttlefish/files/patch-rebar.config Sat Jan 11 11:29:03 2020 (r522677) +++ branches/2020Q1/devel/erlang-cuttlefish/files/patch-rebar.config Sat Jan 11 11:57:18 2020 (r522678) @@ -2,7 +2,7 @@ +++ rebar.config @@ -1,6 +1,6 @@ -{require_otp_vsn, "R16|17|18"}. -+{require_otp_vsn, "R16|17|18|19|20"}. ++{require_otp_vsn, "R16|17|18|19|20|21|22"}. -{erl_opts, [warnings_as_errors, {parse_transform, lager_transform}, debug_info, warn_untyped_record]}. +{erl_opts, [{parse_transform, lager_transform}, debug_info, warn_untyped_record]}. From owner-svn-ports-branches@freebsd.org Sat Jan 11 12:16: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 7391D1E8425; Sat, 11 Jan 2020 12:16:34 +0000 (UTC) (envelope-from fluffy@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 47vzNf2T78z41Ps; Sat, 11 Jan 2020 12:16:34 +0000 (UTC) (envelope-from fluffy@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 500C6293B; Sat, 11 Jan 2020 12:16:34 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00BCGYQ9002835; Sat, 11 Jan 2020 12:16:34 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00BCGXDh002833; Sat, 11 Jan 2020 12:16:33 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202001111216.00BCGXDh002833@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Sat, 11 Jan 2020 12:16:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522680 - branches/2020Q1/security/botan2 X-SVN-Group: ports-branches X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: branches/2020Q1/security/botan2 X-SVN-Commit-Revision: 522680 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jan 2020 12:16:34 -0000 Author: fluffy Date: Sat Jan 11 12:16:33 2020 New Revision: 522680 URL: https://svnweb.freebsd.org/changeset/ports/522680 Log: MFH: r522563 security/botan2: update to 2.13.0 release * Fix a bug introduced in 2.12.0 where TLS::Channel::is_active and TLS::Channel::is_closed could simultaneously return true. (GH #2174 #2171) * Use std::shared_ptr instead of boost::shared_ptr in some examples. (GH #2155) * Add Roughtime client (GH #2143 #1842) * Add support for XMSS X.509 certificates (GH #2172) * Add support for X.509 CRLs in FFI layer and Python wrapper (GH #2213) https://botan.randombit.net/news.html PR: 243239 Submitted by: maintainer Approved by: maintainer Approved by: ports-secteam (joneum) Modified: branches/2020Q1/security/botan2/Makefile branches/2020Q1/security/botan2/distinfo branches/2020Q1/security/botan2/pkg-plist Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/security/botan2/Makefile ============================================================================== --- branches/2020Q1/security/botan2/Makefile Sat Jan 11 12:08:34 2020 (r522679) +++ branches/2020Q1/security/botan2/Makefile Sat Jan 11 12:16:33 2020 (r522680) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= botan -DISTVERSION= 2.12.1 -PORTREVISION= 1 +DISTVERSION= 2.13.0 CATEGORIES= security MASTER_SITES= http://botan.randombit.net/releases/ PKGNAMESUFFIX= 2 @@ -37,7 +36,8 @@ LDFLAGS+= -pthread DOCSDIR= ${LOCALBASE}/share/doc/${PORTNAME}-${PORTVERSION} _SHLIBVER= ${DISTVERSION:S/./ /g:[2]} -PLIST_SUB= SHLIBVER=${_SHLIBVER} +_SHLIBVERPATCH= ${DISTVERSION:S/./ /g:[3]} +PLIST_SUB= SHLIBVER=${_SHLIBVER} SHLIBVERPATCH=${_SHLIBVERPATCH} PORTDOCS= * OPTIONS_DEFINE= DOCS PYTHON SQLITE3 SSL @@ -78,6 +78,6 @@ post-patch: ${WRKSRC}/src/build-data/cc/clang.txt post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/botan ${STAGEDIR}${PREFIX}/lib/libbotan-2.so.${_SHLIBVER}.${_SHLIBVER}.1 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/botan ${STAGEDIR}${PREFIX}/lib/libbotan-2.so.${_SHLIBVER}.${_SHLIBVER}.${_SHLIBVERPATCH} .include Modified: branches/2020Q1/security/botan2/distinfo ============================================================================== --- branches/2020Q1/security/botan2/distinfo Sat Jan 11 12:08:34 2020 (r522679) +++ branches/2020Q1/security/botan2/distinfo Sat Jan 11 12:16:33 2020 (r522680) @@ -1,3 +1,3 @@ -TIMESTAMP = 1574608870 -SHA256 (Botan-2.12.1.tar.xz) = 7e035f142a51fca1359705792627a282456d49749bf62a37a8e48375d41baaa9 -SIZE (Botan-2.12.1.tar.xz) = 5844528 +TIMESTAMP = 1578385259 +SHA256 (Botan-2.13.0.tar.xz) = f57ae42a41e1091bca58f44f41addebd9a390b651603952c881ec89d50187e90 +SIZE (Botan-2.13.0.tar.xz) = 5911360 Modified: branches/2020Q1/security/botan2/pkg-plist ============================================================================== --- branches/2020Q1/security/botan2/pkg-plist Sat Jan 11 12:08:34 2020 (r522679) +++ branches/2020Q1/security/botan2/pkg-plist Sat Jan 11 12:16:33 2020 (r522680) @@ -19,6 +19,7 @@ include/botan-2/botan/asn1_time.h include/botan-2/botan/assert.h include/botan-2/botan/atomic.h include/botan-2/botan/auto_rng.h +include/botan-2/botan/b64_filt.h include/botan-2/botan/base32.h include/botan-2/botan/base58.h include/botan-2/botan/base64.h @@ -123,6 +124,7 @@ include/botan-2/botan/gost_3411.h include/botan-2/botan/hash.h include/botan-2/botan/hash_id.h include/botan-2/botan/hex.h +include/botan-2/botan/hex_filt.h include/botan-2/botan/hkdf.h include/botan-2/botan/hmac.h include/botan-2/botan/hmac_drbg.h @@ -220,6 +222,7 @@ include/botan-2/botan/rfc6979.h include/botan-2/botan/rmd160.h include/botan-2/botan/rng.h include/botan-2/botan/rotate.h +include/botan-2/botan/roughtime.h include/botan-2/botan/rsa.h include/botan-2/botan/salsa20.h include/botan-2/botan/scan_name.h @@ -316,6 +319,6 @@ include/botan-2/botan/zlib.h lib/libbotan-2.a lib/libbotan-2.so lib/libbotan-2.so.%%SHLIBVER%% -lib/libbotan-2.so.%%SHLIBVER%%.%%SHLIBVER%%.1 +lib/libbotan-2.so.%%SHLIBVER%%.%%SHLIBVER%%.%%SHLIBVERPATCH%% %%PYTHON%%%%PYTHON_SITELIBDIR%%/botan2.py libdata/pkgconfig/botan-2.pc From owner-svn-ports-branches@freebsd.org Sat Jan 11 12:18:09 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 179E81E84B0; Sat, 11 Jan 2020 12:18:09 +0000 (UTC) (envelope-from fluffy@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 47vzQS6vqfz41VV; Sat, 11 Jan 2020 12:18:08 +0000 (UTC) (envelope-from fluffy@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 E7C8F2942; Sat, 11 Jan 2020 12:18:08 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00BCI8WR003105; Sat, 11 Jan 2020 12:18:08 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00BCI8ig003102; Sat, 11 Jan 2020 12:18:08 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202001111218.00BCI8ig003102@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Sat, 11 Jan 2020 12:18:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522681 - in branches/2020Q1/net-mgmt/observium: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: in branches/2020Q1/net-mgmt/observium: . files X-SVN-Commit-Revision: 522681 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jan 2020 12:18:09 -0000 Author: fluffy Date: Sat Jan 11 12:18:08 2020 New Revision: 522681 URL: https://svnweb.freebsd.org/changeset/ports/522681 Log: MFH: r522628 net-mgmt/observium: unbreak and update to 19.8 community release Community edition release 19.8 from 2019-08-22 PR: 243031 Submitted by: fluffy Approved by: maintainer timeout (>1w) Approved by: ports-secteam (joneum) Modified: branches/2020Q1/net-mgmt/observium/Makefile branches/2020Q1/net-mgmt/observium/distinfo branches/2020Q1/net-mgmt/observium/files/patch-includes_defaults.inc.php Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/net-mgmt/observium/Makefile ============================================================================== --- branches/2020Q1/net-mgmt/observium/Makefile Sat Jan 11 12:16:33 2020 (r522680) +++ branches/2020Q1/net-mgmt/observium/Makefile Sat Jan 11 12:18:08 2020 (r522681) @@ -3,8 +3,8 @@ # Observium version can be found by looking at ${WRKSRC}/includes/definitions/version.inc.php PORTNAME= observium -PORTVERSION= 0.18.9.1 -PORTREVISION= 1 +PORTVERSION= 0.19.8 +PORTREVISION= 0 CATEGORIES= net-mgmt MASTER_SITES= http://www.observium.org/ DISTNAME= ${PORTNAME}-community-latest @@ -12,8 +12,6 @@ DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} MAINTAINER= feld@FreeBSD.org COMMENT= Autodiscovering PHP/MySQL/SNMP based network monitoring - -BROKEN= unfetchable LICENSE= EULA LICENSE_NAME= "Observium License Version 1.0" Modified: branches/2020Q1/net-mgmt/observium/distinfo ============================================================================== --- branches/2020Q1/net-mgmt/observium/distinfo Sat Jan 11 12:16:33 2020 (r522680) +++ branches/2020Q1/net-mgmt/observium/distinfo Sat Jan 11 12:18:08 2020 (r522681) @@ -1,3 +1,3 @@ -TIMESTAMP = 1556045788 -SHA256 (observium-0.18.9.1/observium-community-latest.tar.gz) = b182abb41483389b2e18e8d336560733680f38d66b1dc2f291cbf113a7e1f4d7 -SIZE (observium-0.18.9.1/observium-community-latest.tar.gz) = 76524711 +TIMESTAMP = 1577933625 +SHA256 (observium-0.19.8/observium-community-latest.tar.gz) = 0603cc81c1fede6b87b187fde64843e11d6ed44f32705c68c41ddccf05d90d5b +SIZE (observium-0.19.8/observium-community-latest.tar.gz) = 85994042 Modified: branches/2020Q1/net-mgmt/observium/files/patch-includes_defaults.inc.php ============================================================================== --- branches/2020Q1/net-mgmt/observium/files/patch-includes_defaults.inc.php Sat Jan 11 12:16:33 2020 (r522680) +++ branches/2020Q1/net-mgmt/observium/files/patch-includes_defaults.inc.php Sat Jan 11 12:18:08 2020 (r522681) @@ -1,6 +1,6 @@ ---- includes/defaults.inc.php.orig 2017-09-07 22:26:04 UTC +--- includes/defaults.inc.php.orig 2019-08-23 07:09:46 UTC +++ includes/defaults.inc.php -@@ -36,7 +36,7 @@ $config['db']['debug'] = TRUE; +@@ -57,7 +57,7 @@ $config['db']['debug'] = TRUE; // If TRUE // Default directories @@ -9,7 +9,7 @@ #$config['html_dir'] = $config['install_dir'] . "/html"; #$config['rrd_dir'] = $config['install_dir'] . "/rrd"; #$config['template_dir'] = $config['install_dir'] . "/templates"; -@@ -50,29 +50,29 @@ $config['db']['debug'] = TRUE; +@@ -71,30 +71,30 @@ $config['db']['debug'] = TRUE; // If TRUE // Location of executables @@ -18,6 +18,7 @@ -$config['fping6'] = "/usr/bin/fping6"; -$config['snmpwalk'] = "/usr/bin/snmpwalk"; -$config['snmpget'] = "/usr/bin/snmpget"; +-$config['snmpgetnext'] = "/usr/bin/snmpgetnext"; -$config['snmpbulkget'] = "/usr/bin/snmpbulkget"; -$config['snmpbulkwalk'] = "/usr/bin/snmpbulkwalk"; -$config['snmptranslate'] = "/usr/bin/snmptranslate"; @@ -26,6 +27,7 @@ +$config['fping6'] = "/usr/local/sbin/fping6"; +$config['snmpwalk'] = "/usr/local/bin/snmpwalk"; +$config['snmpget'] = "/usr/local/bin/snmpget"; ++$config['snmpgetnext'] = "/usr/local/bin/snmpgetnext"; +$config['snmpbulkget'] = "/usr/local/bin/snmpbulkget"; +$config['snmpbulkwalk'] = "/usr/local/bin/snmpbulkwalk"; +$config['snmptranslate'] = "/usr/local/bin/snmptranslate"; From owner-svn-ports-branches@freebsd.org Sat Jan 11 12:48:15 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 6102A1E9160; Sat, 11 Jan 2020 12:48:15 +0000 (UTC) (envelope-from sunpoet@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 47w05C1yj2z42ng; Sat, 11 Jan 2020 12:48:15 +0000 (UTC) (envelope-from sunpoet@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 3EB522EBF; Sat, 11 Jan 2020 12:48:15 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00BCmFqD021276; Sat, 11 Jan 2020 12:48:15 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00BCmFIH021275; Sat, 11 Jan 2020 12:48:15 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202001111248.00BCmFIH021275@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 11 Jan 2020 12:48:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522683 - in branches/2020Q1/devel/py-greenlet: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in branches/2020Q1/devel/py-greenlet: . files X-SVN-Commit-Revision: 522683 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jan 2020 12:48:15 -0000 Author: sunpoet Date: Sat Jan 11 12:48:14 2020 New Revision: 522683 URL: https://svnweb.freebsd.org/changeset/ports/522683 Log: MFH: r522608 Fix build on powerpc64 PR: 243241 Submitted by: pkubaj Approved by: ports-secteam (blanket) Added: branches/2020Q1/devel/py-greenlet/files/ - copied from r522608, head/devel/py-greenlet/files/ Modified: branches/2020Q1/devel/py-greenlet/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/devel/py-greenlet/Makefile ============================================================================== --- branches/2020Q1/devel/py-greenlet/Makefile Sat Jan 11 12:30:17 2020 (r522682) +++ branches/2020Q1/devel/py-greenlet/Makefile Sat Jan 11 12:48:14 2020 (r522683) @@ -13,7 +13,7 @@ COMMENT= Light-weight microthreads for Python LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -NOT_FOR_ARCHS= mips mips64 powerpc64 +NOT_FOR_ARCHS= mips mips64 NOT_FOR_ARCHS_REASON= greenlet needs to be ported to this platform USES= python