From owner-dev-commits-ports-branches@freebsd.org Mon Apr 19 03:35:43 2021 Return-Path: Delivered-To: dev-commits-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 922E25E0255; Mon, 19 Apr 2021 03:35:43 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FNssW30zCz4rLX; Mon, 19 Apr 2021 03:35:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5A80818384; Mon, 19 Apr 2021 03:35:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13J3ZhD1047145; Mon, 19 Apr 2021 03:35:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13J3Zhp8047144; Mon, 19 Apr 2021 03:35:43 GMT (envelope-from git) Date: Mon, 19 Apr 2021 03:35:43 GMT Message-Id: <202104190335.13J3Zhp8047144@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: ee6e3de19154 - 2021Q2 - multimedia/musikcube: Update 0.96.5 -> 0.96.6 with unbreak at run-time MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: ee6e3de191547bbe04854c115999ccc250fb6a1d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2021 03:35:43 -0000 The branch 2021Q2 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee6e3de191547bbe04854c115999ccc250fb6a1d commit ee6e3de191547bbe04854c115999ccc250fb6a1d Author: Yuri Victorovich AuthorDate: 2021-04-19 03:31:59 +0000 Commit: Yuri Victorovich CommitDate: 2021-04-19 03:35:40 +0000 multimedia/musikcube: Update 0.96.5 -> 0.96.6 with unbreak at run-time It was broken on 12 and 11 due to ncurses port vs. base library confusion. (cherry picked from commit 68457b801edd40093c0b8b624c7423868b5db95a) --- multimedia/musikcube/Makefile | 7 +++---- multimedia/musikcube/distinfo | 6 +++--- multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt | 11 ----------- multimedia/musikcube/pkg-plist | 1 + 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/multimedia/musikcube/Makefile b/multimedia/musikcube/Makefile index 61de2bf8592c..a2cba8a2b404 100644 --- a/multimedia/musikcube/Makefile +++ b/multimedia/musikcube/Makefile @@ -1,7 +1,6 @@ PORTNAME= musikcube -DISTVERSION= 0.96.5 -PORTREVISION= 1 +DISTVERSION= 0.96.6 CATEGORIES= multimedia audio MAINTAINER= yuri@FreeBSD.org @@ -24,20 +23,20 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libvorbis.so:audio/libvorbis USES= cmake:noninja compiler:c++14-lang pkgconfig ssl - USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= clangen -LDFLAGS+= -lncursesw -lpanelw -ltinfow .include .if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1300079 USES+= ncurses +CMAKE_ARGS= -DNCURSES_DISABLE_LIB_SUFFIXES=false .else USES+= ncurses:port CFLAGS+= -I${LOCALBASE}/include/ncurses +CMAKE_ARGS= -DNCURSES_DISABLE_LIB_SUFFIXES=true .endif .include diff --git a/multimedia/musikcube/distinfo b/multimedia/musikcube/distinfo index 5b5b37f2ba1d..1e865de42de0 100644 --- a/multimedia/musikcube/distinfo +++ b/multimedia/musikcube/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1611944934 -SHA256 (clangen-musikcube-0.96.5_GH0.tar.gz) = ee00667ea172a557c00de485fbbaa3fde3eb5ec1867c94b5f1705c1b72807490 -SIZE (clangen-musikcube-0.96.5_GH0.tar.gz) = 9474635 +TIMESTAMP = 1618798011 +SHA256 (clangen-musikcube-0.96.6_GH0.tar.gz) = 3d3512ae03ff5a233de8d6787417b32731e50d813035fd49188b2fca66c6d21e +SIZE (clangen-musikcube-0.96.6_GH0.tar.gz) = 9506235 diff --git a/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt b/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt deleted file mode 100644 index 55f73c00b19a..000000000000 --- a/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- src/musikcube/CMakeLists.txt.orig 2021-01-24 21:53:38 UTC -+++ src/musikcube/CMakeLists.txt -@@ -83,7 +83,7 @@ set_target_properties(musikcube PROPERTIES LINK_FLAGS - - if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD") - find_package(PkgConfig) -- pkg_check_modules(NCURSES REQUIRED ncursesw panelw) -+ pkg_check_modules(NCURSES ncurses panel) - target_link_libraries(musikcube ${musikcube_LINK_LIBS} ${NCURSES_LIBRARIES} musikcore) - elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin") - if (${LINK_STATICALLY} MATCHES "true") diff --git a/multimedia/musikcube/pkg-plist b/multimedia/musikcube/pkg-plist index 7bdf8fa55c94..1b2d9287fc6c 100644 --- a/multimedia/musikcube/pkg-plist +++ b/multimedia/musikcube/pkg-plist @@ -46,6 +46,7 @@ include/musikcube/musikcore/sdk/ReplayGain.h include/musikcube/musikcore/sdk/String.h include/musikcube/musikcore/sdk/constants.h %%DATADIR%%/libmusikcore.so +%%DATADIR%%/locales/de_DE.json %%DATADIR%%/locales/en_US.json %%DATADIR%%/locales/fr_FR.json %%DATADIR%%/locales/it_IT.json From owner-dev-commits-ports-branches@freebsd.org Mon Apr 19 07:57:19 2021 Return-Path: Delivered-To: dev-commits-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 53C555E61DD; Mon, 19 Apr 2021 07:57:19 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FNzgM1vLbz3LHq; Mon, 19 Apr 2021 07:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 301021B6DB; Mon, 19 Apr 2021 07:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13J7vJL1090908; Mon, 19 Apr 2021 07:57:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13J7vJ8a090907; Mon, 19 Apr 2021 07:57:19 GMT (envelope-from git) Date: Mon, 19 Apr 2021 07:57:19 GMT Message-Id: <202104190757.13J7vJ8a090907@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 16ad4d81058a - 2021Q2 - www/firefox: update to 88.0 (rc2) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 16ad4d81058a4dcae8b0a719bf25930f834f3c5e Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2021 07:57:19 -0000 The branch 2021Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=16ad4d81058a4dcae8b0a719bf25930f834f3c5e commit 16ad4d81058a4dcae8b0a719bf25930f834f3c5e Author: Christoph Moench-Tegeder AuthorDate: 2021-04-17 23:29:40 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2021-04-19 07:56:07 +0000 www/firefox: update to 88.0 (rc2) Release Notes (soon): https://www.mozilla.org/en-US/firefox/88.0/releasenotes/ (cherry picked from commit 05c4836c02c8c456a88d84ed0410506e1224595c) --- www/firefox/Makefile | 5 ++--- www/firefox/distinfo | 6 +++--- www/firefox/files/patch-bug1559213 | 16 ++++++++-------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index f80771e286ea..0214820bf4a0 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,12 +1,11 @@ # Created by: Alan Eldridge PORTNAME= firefox -DISTVERSION= 87.0 -PORTREVISION= 2 +DISTVERSION= 88.0 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 35782e402fed..270b1c38f36d 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1616281703 -SHA256 (firefox-87.0.source.tar.xz) = ce98be0522f971b6950f22c738c4b2caf19cf7f48ab2ae2e6d46694af7fd58ab -SIZE (firefox-87.0.source.tar.xz) = 377285124 +TIMESTAMP = 1618698329 +SHA256 (firefox-88.0.source.tar.xz) = 6b50dbfb393f843e4401e23965a1d8f7fd44b5a7628d95138294094094eee297 +SIZE (firefox-88.0.source.tar.xz) = 373744508 diff --git a/www/firefox/files/patch-bug1559213 b/www/firefox/files/patch-bug1559213 index f16af4cd83ba..16928f792f89 100644 --- a/www/firefox/files/patch-bug1559213 +++ b/www/firefox/files/patch-bug1559213 @@ -63,13 +63,13 @@ index 092cee0c9b66..38e45de5b5f0 100644 EXPORTS += [ diff --git toolkit/moz.configure toolkit/moz.configure index 82b5a59acf42..e2329560b42b 100644 ---- toolkit/moz.configure -+++ toolkit/moz.configure -@@ -553,7 +553,23 @@ def av1(value): +--- toolkit/moz.configure.orig 2021-04-13 16:12:34.770032000 +0200 ++++ toolkit/moz.configure 2021-04-18 00:03:41.432698000 +0200 +@@ -538,7 +538,23 @@ return True --@depends(target, nasm_version, when=av1 & compile_environment) +-@depends(target, when=av1 & compile_environment) +option("--with-system-av1", + help="Use system av1 (located with pkgconfig)") + @@ -86,11 +86,11 @@ index 82b5a59acf42..e2329560b42b 100644 + has_av1_libs = True + return has_av1_libs + -+@depends(target, nasm_version, when=av1 & depends(system_av1)(lambda v: not v) & compile_environment) - def dav1d_asm(target, nasm_version): - if target.cpu == "aarch64": ++@depends(target, when=av1 & depends(system_av1)(lambda v: not v) & compile_environment) + def dav1d_asm(target): + if target.cpu in ("aarch64", "x86", "x86_64"): return True -@@ -570,6 +586,7 @@ set_config("MOZ_DAV1D_ASM", dav1d_asm) +@@ -554,6 +570,7 @@ set_define("MOZ_DAV1D_ASM", dav1d_asm) set_config("MOZ_AV1", av1) set_define("MOZ_AV1", av1) From owner-dev-commits-ports-branches@freebsd.org Mon Apr 19 07:57:20 2021 Return-Path: Delivered-To: dev-commits-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 72D015E650A; Mon, 19 Apr 2021 07:57:20 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FNzgN2Xmzz3LHr; Mon, 19 Apr 2021 07:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4A80E1B652; Mon, 19 Apr 2021 07:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13J7vK5C090929; Mon, 19 Apr 2021 07:57:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13J7vKLX090928; Mon, 19 Apr 2021 07:57:20 GMT (envelope-from git) Date: Mon, 19 Apr 2021 07:57:20 GMT Message-Id: <202104190757.13J7vKLX090928@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: bf868a2c5087 - 2021Q2 - www/firefox: fix build on powerpc64* MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: bf868a2c50870a03f6807ab8a8537bbed9e862a7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2021 07:57:20 -0000 The branch 2021Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf868a2c50870a03f6807ab8a8537bbed9e862a7 commit bf868a2c50870a03f6807ab8a8537bbed9e862a7 Author: Piotr Kubaj AuthorDate: 2021-04-18 13:44:07 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2021-04-19 07:56:21 +0000 www/firefox: fix build on powerpc64* SupportsMimeType() now uses one argument. (cherry picked from commit 1dddbd517339425d59febc4cde1b037958e92920) --- www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp b/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp index e3f60e8ecf64..954b78f5bf37 100644 --- a/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp +++ b/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp @@ -1,8 +1,6 @@ Enable FLAC on platforms without ffvpx like powerpc* -diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp -index 53fc3c9937f7..b23771ab80fa 100644 ---- dom/media/flac/FlacDecoder.cpp +--- dom/media/flac/FlacDecoder.cpp.orig 2021-04-15 19:44:28 UTC +++ dom/media/flac/FlacDecoder.cpp @@ -7,6 +7,7 @@ #include "FlacDecoder.h" @@ -12,15 +10,14 @@ index 53fc3c9937f7..b23771ab80fa 100644 namespace mozilla { -@@ -14,6 +15,11 @@ namespace mozilla { +@@ -14,6 +15,10 @@ namespace mozilla { bool FlacDecoder::IsEnabled() { #ifdef MOZ_FFVPX return StaticPrefs::media_flac_enabled(); +#elif defined(MOZ_FFMPEG) + RefPtr platform = new PDMFactory(); + return StaticPrefs::media_flac_enabled() && -+ platform->SupportsMimeType("audio/flac"_ns, -+ /* DecoderDoctorDiagnostics* */ nullptr); ++ platform->SupportsMimeType("audio/flac"_ns); #else - // Until bug 1295886 is fixed. return false; + #endif From owner-dev-commits-ports-branches@freebsd.org Mon Apr 19 08:19:27 2021 Return-Path: Delivered-To: dev-commits-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 C317B5E7676; Mon, 19 Apr 2021 08:19:27 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FP08v5BPtz3MLF; Mon, 19 Apr 2021 08:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A53C71BE81; Mon, 19 Apr 2021 08:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13J8JRjm018973; Mon, 19 Apr 2021 08:19:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13J8JRrm018972; Mon, 19 Apr 2021 08:19:27 GMT (envelope-from git) Date: Mon, 19 Apr 2021 08:19:27 GMT Message-Id: <202104190819.13J8JRrm018972@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: cdbfe8c1c983 - 2021Q2 - graphics/drm-fbsd13-kmod: Update to 5.4.92.g20210419 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: cdbfe8c1c9831078e142376de877ab7bab1a3a00 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2021 08:19:27 -0000 The branch 2021Q2 has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=cdbfe8c1c9831078e142376de877ab7bab1a3a00 commit cdbfe8c1c9831078e142376de877ab7bab1a3a00 Author: Emmanuel Vadot AuthorDate: 2021-04-19 08:07:30 +0000 Commit: Emmanuel Vadot CommitDate: 2021-04-19 08:19:13 +0000 graphics/drm-fbsd13-kmod: Update to 5.4.92.g20210419 - Fix kernel panic with sysctl -a when a NAVI10 gpu is present. (cherry picked from commit 2a988f4b237f914a13a61f3d15879c4cb9fab9b6) --- graphics/drm-fbsd13-kmod/Makefile | 4 ++-- graphics/drm-fbsd13-kmod/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/graphics/drm-fbsd13-kmod/Makefile b/graphics/drm-fbsd13-kmod/Makefile index 6aa02a1411ae..d4fea2ca16cc 100644 --- a/graphics/drm-fbsd13-kmod/Makefile +++ b/graphics/drm-fbsd13-kmod/Makefile @@ -1,7 +1,7 @@ # Created by: Johannes Dieterich PORTNAME= drm-fbsd13-kmod -PORTVERSION= 5.4.92.g20210202 +PORTVERSION= 5.4.92.g20210419 CATEGORIES= graphics kld MAINTAINER= x11@FreeBSD.org @@ -26,7 +26,7 @@ USES= kmod uidfix compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= freebsd GH_PROJECT= drm-kmod -GH_TAGNAME= drm_v5.4.92_2 +GH_TAGNAME= drm_v5.4.92_3 .include diff --git a/graphics/drm-fbsd13-kmod/distinfo b/graphics/drm-fbsd13-kmod/distinfo index af48084620e9..9b9227f00680 100644 --- a/graphics/drm-fbsd13-kmod/distinfo +++ b/graphics/drm-fbsd13-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1612267699 -SHA256 (freebsd-drm-kmod-5.4.92.g20210202-drm_v5.4.92_2_GH0.tar.gz) = 6ef7a6e317deda91a1022e649efd72a5c173dff9d7d82567c0b7cb7a5ad6d20e -SIZE (freebsd-drm-kmod-5.4.92.g20210202-drm_v5.4.92_2_GH0.tar.gz) = 18825321 +TIMESTAMP = 1618819634 +SHA256 (freebsd-drm-kmod-5.4.92.g20210419-drm_v5.4.92_3_GH0.tar.gz) = fb6177a38b6052900d37fb3c36f402cb2a3fbd3f15361f7b9e4ed50c248f40b6 +SIZE (freebsd-drm-kmod-5.4.92.g20210419-drm_v5.4.92_3_GH0.tar.gz) = 18826688 From owner-dev-commits-ports-branches@freebsd.org Mon Apr 19 11:16:24 2021 Return-Path: Delivered-To: dev-commits-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 0853C5EDC1D; Mon, 19 Apr 2021 11:16:24 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FP4536r73z3nFG; Mon, 19 Apr 2021 11:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DDD181E38E; Mon, 19 Apr 2021 11:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13JBGNps058881; Mon, 19 Apr 2021 11:16:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13JBGNUb058880; Mon, 19 Apr 2021 11:16:23 GMT (envelope-from git) Date: Mon, 19 Apr 2021 11:16:23 GMT Message-Id: <202104191116.13JBGNUb058880@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 3404d5602a70 - 2021Q2 - graphics/libplacebo: update to 3.120.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 3404d5602a708e361cee98e0c967fbf2100bac3d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2021 11:16:24 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=3404d5602a708e361cee98e0c967fbf2100bac3d commit 3404d5602a708e361cee98e0c967fbf2100bac3d Author: Jan Beich AuthorDate: 2021-04-19 08:14:26 +0000 Commit: Jan Beich CommitDate: 2021-04-19 11:16:17 +0000 graphics/libplacebo: update to 3.120.2 Changes: https://code.videolan.org/videolan/libplacebo/-/tags/v3.120.2 Reported by: Repology (cherry picked from commit f1926853a2c0f48133180d33b925890e304aecb6) --- graphics/libplacebo/Makefile | 2 +- graphics/libplacebo/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/graphics/libplacebo/Makefile b/graphics/libplacebo/Makefile index ac32ee7537a6..cacf49c78c4d 100644 --- a/graphics/libplacebo/Makefile +++ b/graphics/libplacebo/Makefile @@ -1,7 +1,7 @@ PORTNAME= libplacebo DISTVERSIONPREFIX= v -DISTVERSION= 3.120.1 +DISTVERSION= 3.120.2 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/libplacebo/distinfo b/graphics/libplacebo/distinfo index f7579900ed7e..0ee5744b640e 100644 --- a/graphics/libplacebo/distinfo +++ b/graphics/libplacebo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617691664 -SHA256 (haasn-libplacebo-v3.120.1_GH0.tar.gz) = 83c785a46037e32daa8606cd147d7c9eb13ae27067abeca7673fa68741adf93c -SIZE (haasn-libplacebo-v3.120.1_GH0.tar.gz) = 522779 +TIMESTAMP = 1618820066 +SHA256 (haasn-libplacebo-v3.120.2_GH0.tar.gz) = 2105d431c2d1c8dbe3b51895364836086cc5edbcc3c195e8944c4b362484244d +SIZE (haasn-libplacebo-v3.120.2_GH0.tar.gz) = 523646 From owner-dev-commits-ports-branches@freebsd.org Mon Apr 19 16:56:56 2021 Return-Path: Delivered-To: dev-commits-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 F37945F8A7A; Mon, 19 Apr 2021 16:56:56 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPCf06fX4z4d3X; Mon, 19 Apr 2021 16:56:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D78AC2284B; Mon, 19 Apr 2021 16:56:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13JGuucW012428; Mon, 19 Apr 2021 16:56:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13JGuuGH012427; Mon, 19 Apr 2021 16:56:56 GMT (envelope-from git) Date: Mon, 19 Apr 2021 16:56:56 GMT Message-Id: <202104191656.13JGuuGH012427@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rodrigo Osorio Subject: git: 05109f51920e - 2021Q2 - Fix pkgconfig files. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 05109f51920eb6951b5204708c8f3f0f1bad29d8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2021 16:56:57 -0000 The branch 2021Q2 has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=05109f51920eb6951b5204708c8f3f0f1bad29d8 commit 05109f51920eb6951b5204708c8f3f0f1bad29d8 Author: Tilman Keskinoz AuthorDate: 2021-04-12 07:51:30 +0000 Commit: Rodrigo Osorio CommitDate: 2021-04-19 18:56:13 +0000 Fix pkgconfig files. PR: 254315 Reported by: Olga Smirnova Submitted by: rodrigo (cherry picked from commit efaa198b606e6f38c34d5b3f2acd12686f6ad455) --- textproc/luceneplusplus/Makefile | 1 + .../patch-src_config_contrib_liblucene++-contrib.pc.in | 18 ++++++++++++++++++ .../files/patch-src_config_core_liblucene++.pc.in | 17 +++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/textproc/luceneplusplus/Makefile b/textproc/luceneplusplus/Makefile index 0fada9ff9aa0..107a01e0ddf7 100644 --- a/textproc/luceneplusplus/Makefile +++ b/textproc/luceneplusplus/Makefile @@ -1,6 +1,7 @@ PORTNAME= lucene++ PORTVERSION= 3.0.8 +PORTREVISION= 1 DISTVERSIONPREFIX= rel_ CATEGORIES= textproc diff --git a/textproc/luceneplusplus/files/patch-src_config_contrib_liblucene++-contrib.pc.in b/textproc/luceneplusplus/files/patch-src_config_contrib_liblucene++-contrib.pc.in new file mode 100644 index 000000000000..8d1620d8c5d6 --- /dev/null +++ b/textproc/luceneplusplus/files/patch-src_config_contrib_liblucene++-contrib.pc.in @@ -0,0 +1,18 @@ +--- src/config/contrib/liblucene++-contrib.pc.in.orig ++++ src/config/contrib/liblucene++-contrib.pc.in +@@ -1,13 +1,12 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix}/bin +-libdir=@LIB_DESTINATION@ ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/include/lucene++ + lib=lucene++-contrib + + Name: liblucene++-contrib + Description: Contributions for Lucene++ - a C++ search engine, ported from the popular Apache Lucene + Version: @lucene++_VERSION@ +-Libs: -L@LIB_DESTINATION@ -l${lib} ++Libs: -L${libdir} -l${lib} + Cflags: -I${includedir} + Requires: liblucene++ = @lucene++_VERSION@ +- diff --git a/textproc/luceneplusplus/files/patch-src_config_core_liblucene++.pc.in b/textproc/luceneplusplus/files/patch-src_config_core_liblucene++.pc.in new file mode 100644 index 000000000000..2bfc591d47c3 --- /dev/null +++ b/textproc/luceneplusplus/files/patch-src_config_core_liblucene++.pc.in @@ -0,0 +1,17 @@ +--- src/config/core/liblucene++.pc.in.orig ++++ src/config/core/liblucene++.pc.in +@@ -1,12 +1,11 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix}/bin +-libdir=@LIB_DESTINATION@ ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/include/lucene++ + lib=lucene++ + + Name: liblucene++ + Description: Lucene++ - a C++ search engine, ported from the popular Apache Lucene + Version: @lucene++_VERSION@ +-Libs: -L@LIB_DESTINATION@ -l${lib} ++Libs: -L${libdir} -l${lib} + Cflags: -I${includedir} +- From owner-dev-commits-ports-branches@freebsd.org Mon Apr 19 21:02:06 2021 Return-Path: Delivered-To: dev-commits-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 3F91D5FF51B; Mon, 19 Apr 2021 21:02:06 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPK4t1NP0z4rP5; Mon, 19 Apr 2021 21:02:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 226A926062; Mon, 19 Apr 2021 21:02:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13JL2677047090; Mon, 19 Apr 2021 21:02:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13JL26jh047089; Mon, 19 Apr 2021 21:02:06 GMT (envelope-from git) Date: Mon, 19 Apr 2021 21:02:06 GMT Message-Id: <202104192102.13JL26jh047089@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kevin Bowling Subject: git: 5675152f8fb5 - 2021Q2 - devel/maven: update to 3.8.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 5675152f8fb588ed22092352a5a0294a67ba8442 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2021 21:02:06 -0000 The branch 2021Q2 has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=5675152f8fb588ed22092352a5a0294a67ba8442 commit 5675152f8fb588ed22092352a5a0294a67ba8442 Author: Kevin Bowling AuthorDate: 2021-04-19 18:00:15 +0000 Commit: Kevin Bowling CommitDate: 2021-04-19 18:00:15 +0000 devel/maven: update to 3.8.1 This is not just a bugfix as it contains three features that cause a change of default behavior (external HTTP insecure URLs are now blocked by default): your builds may fail when using this new Maven release, if you use now blocked repositories. Please check and eventually fix before upgrading. Changes http://maven.apache.org/docs/3.8.1/release-notes.html PR: 255161 Approved by: Jonathan Chen (maintainer) Security: CVE-2021-26291 CVE-2020-13956 (cherry picked from commit 887cfadcdf5e7ce9a33ef83ee6ee7b63ff855830) --- devel/maven/Makefile | 2 +- devel/maven/distinfo | 6 +++--- devel/maven/pkg-plist | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/devel/maven/Makefile b/devel/maven/Makefile index 42cac2993d5e..d2d77f4a1028 100644 --- a/devel/maven/Makefile +++ b/devel/maven/Makefile @@ -1,7 +1,7 @@ # Created by: JonathanChen PORTNAME= maven -DISTVERSION= 3.6.3 +DISTVERSION= 3.8.1 CATEGORIES= devel java MASTER_SITES= APACHE/maven/maven-3/${DISTVERSION}/binaries DISTNAME= apache-maven-${DISTVERSION}-bin diff --git a/devel/maven/distinfo b/devel/maven/distinfo index 4912d96568fe..57ad8a2cf1ef 100644 --- a/devel/maven/distinfo +++ b/devel/maven/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1575665365 -SHA256 (apache-maven-3.6.3-bin.tar.gz) = 26ad91d751b3a9a53087aefa743f4e16a17741d3915b219cf74112bf87a438c5 -SIZE (apache-maven-3.6.3-bin.tar.gz) = 9506321 +TIMESTAMP = 1618695108 +SHA256 (apache-maven-3.8.1-bin.tar.gz) = b98a1905eb554d07427b2e5509ff09bd53e2f1dd7a0afa38384968b113abef02 +SIZE (apache-maven-3.8.1-bin.tar.gz) = 9536838 diff --git a/devel/maven/pkg-plist b/devel/maven/pkg-plist index 4f40a59ef93a..3988d3cd5e82 100644 --- a/devel/maven/pkg-plist +++ b/devel/maven/pkg-plist @@ -45,13 +45,13 @@ %%DATADIR%%/lib/maven-model-builder-%%PORTVERSION%%.jar %%DATADIR%%/lib/maven-plugin-api-%%PORTVERSION%%.jar %%DATADIR%%/lib/maven-repository-metadata-%%PORTVERSION%%.jar -%%DATADIR%%/lib/maven-resolver-api-1.4.1.jar -%%DATADIR%%/lib/maven-resolver-connector-basic-1.4.1.jar -%%DATADIR%%/lib/maven-resolver-impl-1.4.1.jar +%%DATADIR%%/lib/maven-resolver-api-1.6.2.jar +%%DATADIR%%/lib/maven-resolver-connector-basic-1.6.2.jar +%%DATADIR%%/lib/maven-resolver-impl-1.6.2.jar %%DATADIR%%/lib/maven-resolver-provider-%%PORTVERSION%%.jar -%%DATADIR%%/lib/maven-resolver-spi-1.4.1.jar -%%DATADIR%%/lib/maven-resolver-transport-wagon-1.4.1.jar -%%DATADIR%%/lib/maven-resolver-util-1.4.1.jar +%%DATADIR%%/lib/maven-resolver-spi-1.6.2.jar +%%DATADIR%%/lib/maven-resolver-transport-wagon-1.6.2.jar +%%DATADIR%%/lib/maven-resolver-util-1.6.2.jar %%DATADIR%%/lib/maven-settings-%%PORTVERSION%%.jar %%DATADIR%%/lib/maven-settings-builder-%%PORTVERSION%%.jar %%DATADIR%%/lib/maven-shared-utils-3.2.1.jar @@ -72,7 +72,7 @@ %%DATADIR%%/lib/plexus-utils.license %%DATADIR%%/lib/slf4j-api-1.7.29.jar %%DATADIR%%/lib/slf4j-api.license -%%DATADIR%%/lib/wagon-file-3.3.4.jar -%%DATADIR%%/lib/wagon-http-3.3.4-shaded.jar -%%DATADIR%%/lib/wagon-provider-api-3.3.4.jar +%%DATADIR%%/lib/wagon-file-3.4.3.jar +%%DATADIR%%/lib/wagon-http-3.4.3-shaded.jar +%%DATADIR%%/lib/wagon-provider-api-3.4.3.jar %%DATADIR%%/maven-%%PORTVERSION%% From owner-dev-commits-ports-branches@freebsd.org Mon Apr 19 21:05:07 2021 Return-Path: Delivered-To: dev-commits-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 29AB75FF273; Mon, 19 Apr 2021 21:05:07 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPK8M0gfyz4rvQ; Mon, 19 Apr 2021 21:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0981026228; Mon, 19 Apr 2021 21:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13JL561E047526; Mon, 19 Apr 2021 21:05:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13JL56GG047525; Mon, 19 Apr 2021 21:05:06 GMT (envelope-from git) Date: Mon, 19 Apr 2021 21:05:06 GMT Message-Id: <202104192105.13JL56GG047525@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Adriaan de Groot Subject: git: dc11fcf27d86 - 2021Q2 - x11-fm/krusader2: fix crash-on-exit MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: dc11fcf27d86281522b097f47c0503b8c1070cb2 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2021 21:05:07 -0000 The branch 2021Q2 has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=dc11fcf27d86281522b097f47c0503b8c1070cb2 commit dc11fcf27d86281522b097f47c0503b8c1070cb2 Author: Adriaan de Groot AuthorDate: 2021-04-19 20:59:26 +0000 Commit: Adriaan de Groot CommitDate: 2021-04-19 21:05:05 +0000 x11-fm/krusader2: fix crash-on-exit Details are in the patch which has been added; committed upstream. --- x11-fm/krusader2/Makefile | 1 + x11-fm/krusader2/files/patch-git-415d519e.diff | 52 ++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile index b39b6d1dbac4..a0e693906333 100644 --- a/x11-fm/krusader2/Makefile +++ b/x11-fm/krusader2/Makefile @@ -2,6 +2,7 @@ PORTNAME= krusader DISTVERSION= 2.7.2 +PORTREVISION= 1 CATEGORIES= x11-fm kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/ diff --git a/x11-fm/krusader2/files/patch-git-415d519e.diff b/x11-fm/krusader2/files/patch-git-415d519e.diff new file mode 100644 index 000000000000..f5166551dcb3 --- /dev/null +++ b/x11-fm/krusader2/files/patch-git-415d519e.diff @@ -0,0 +1,52 @@ +commit 415d519e825a6b8b64d2ef5f9a8e9bf7a458d1d0 (HEAD -> master, origin/master, origin/HEAD) +Author: Adriaan de Groot +Date: Mon Apr 19 22:39:44 2021 +0200 + + Fix crash-on-exit on FreeBSD + + Scenario: + - start krusader + - close the application (alt-f4, or click the window-close button) + - SEGV, with this (edited) backtrace: + #0 KUrlNavigator::editor (this=0x80a562400) + #1 0x000000000031e20e in ListPanel::eventFilter (this=0x80c2309c0, watched=0x80a6980d0, e=0x7fffffffc278) + #6 0x00000008018c3c0c in QWidget::~QWidget() () from /usr/local/lib/qt5/libQt5Widgets.so.5 + #7 0x0000000800a26c4e in KUrlComboBox::~KUrlComboBox (this=0x80a6980d0) + #11 0x00000008005de60b in KUrlNavigator::~KUrlNavigator (this=0x80a562400) + #13 0x000000000031d5a5 in ListPanel::~ListPanel (this=0x80c2309c0) + + Analysis: + - During the destructor, events are triggered, which hit the + event-filter function in the object that is undergoing destruction. + Since some of the objects referred to via pointer in the event-filter + are dead or being-destroyed, this is UB (so be glad it crashes!). + - This is very similar to the problem and backtrace in KIO commit + a8a2c08014484145a4bd2a541a1cbeb8be856bf1. + + Fix: + - Uninstall the event-filter before carrying on with destruction. + - While here, add an extra nullptr check for the combobox in + the event-filter. + +diff --git krusader/Panel/listpanel.cpp krusader/Panel/listpanel.cpp +index 6f57c321..6a0914c6 100644 +--- krusader/Panel/listpanel.cpp ++++ krusader/Panel/listpanel.cpp +@@ -380,6 +380,8 @@ ListPanel::ListPanel(QWidget *parent, AbstractPanelManager *manager, const KConf + + ListPanel::~ListPanel() + { ++ view->widget()->removeEventFilter(this); ++ urlNavigator->editor()->removeEventFilter(this); + cancelProgress(); + delete view; + view = nullptr; +@@ -527,7 +529,7 @@ bool ListPanel::eventFilter(QObject * watched, QEvent * e) + } + } + // handle URL navigator key events +- else if(watched == urlNavigator->editor()) { ++ else if(urlNavigator && watched == urlNavigator->editor()) { + // override default shortcut for panel focus + if(e->type() == QEvent::ShortcutOverride) { + auto *ke = dynamic_cast(e); From owner-dev-commits-ports-branches@freebsd.org Tue Apr 20 00:49:24 2021 Return-Path: Delivered-To: dev-commits-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 88D415DCFC8; Tue, 20 Apr 2021 00:49:24 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPQ783LX6z3JY6; Tue, 20 Apr 2021 00:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 642CB10D9; Tue, 20 Apr 2021 00:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13K0nOlK037267; Tue, 20 Apr 2021 00:49:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13K0nOxo037266; Tue, 20 Apr 2021 00:49:24 GMT (envelope-from git) Date: Tue, 20 Apr 2021 00:49:24 GMT Message-Id: <202104200049.13K0nOxo037266@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: bca16f5881d6 - main - x11/wdisplays: unbreak fetch via fork MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bca16f5881d679b33913bdff6a00f0116369f497 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 00:49:24 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=bca16f5881d679b33913bdff6a00f0116369f497 commit bca16f5881d679b33913bdff6a00f0116369f497 Author: Jan Beich AuthorDate: 2021-04-20 00:01:50 +0000 Commit: Jan Beich CommitDate: 2021-04-20 00:46:56 +0000 x11/wdisplays: unbreak fetch via fork fetch: https://codeload.github.com/cyclopsian/wdisplays/tar.gz/1.0?dummy=/cyclopsian-wdisplays-1.0_GH0.tar.gz: Not Found Suggested by: /r/swaywm, AUR --- x11/wdisplays/Makefile | 2 +- x11/wdisplays/distinfo | 4 ++-- x11/wdisplays/pkg-descr | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x11/wdisplays/Makefile b/x11/wdisplays/Makefile index 4cb973943c24..70fe0b150c25 100644 --- a/x11/wdisplays/Makefile +++ b/x11/wdisplays/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ USES= compiler:c11 gnome meson pkgconfig USE_GITHUB= yes USE_GNOME= cairo gtk30 -GH_ACCOUNT= cyclopsian +GH_ACCOUNT= artizirk PLIST_FILES= bin/${PORTNAME} \ share/applications/network.cycles.${PORTNAME}.desktop \ share/icons/hicolor/scalable/apps/${PORTNAME}.svg diff --git a/x11/wdisplays/distinfo b/x11/wdisplays/distinfo index 7dc6a7fbcd72..f7b11e6c2507 100644 --- a/x11/wdisplays/distinfo +++ b/x11/wdisplays/distinfo @@ -1,5 +1,5 @@ TIMESTAMP = 1589011062 -SHA256 (cyclopsian-wdisplays-1.0_GH0.tar.gz) = fa34d5bdfd87d833e18a89b2acacc27833d7297374719773a705f2d3e89cdddf -SIZE (cyclopsian-wdisplays-1.0_GH0.tar.gz) = 106819 +SHA256 (artizirk-wdisplays-1.0_GH0.tar.gz) = fa34d5bdfd87d833e18a89b2acacc27833d7297374719773a705f2d3e89cdddf +SIZE (artizirk-wdisplays-1.0_GH0.tar.gz) = 106819 SHA256 (657e2966e556.patch) = e7cc9418945f12632fd17b408fdd8f1c0287f31e4bc3d2afab7683a84e8f2fd2 SIZE (657e2966e556.patch) = 2259 diff --git a/x11/wdisplays/pkg-descr b/x11/wdisplays/pkg-descr index 70d22ba3d599..e6e4e30fa2d4 100644 --- a/x11/wdisplays/pkg-descr +++ b/x11/wdisplays/pkg-descr @@ -5,4 +5,4 @@ protocol, including sway. The goal of this project is to allow precise adjustment of display settings in kiosks, digital signage, and other elaborate multi-monitor setups. -WWW: https://github.com/cyclopsian/wdisplays +WWW: https://github.com/artizirk/wdisplays From owner-dev-commits-ports-branches@freebsd.org Tue Apr 20 00:49:23 2021 Return-Path: Delivered-To: dev-commits-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 8A52E5DD05F; Tue, 20 Apr 2021 00:49:23 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPQ7726T7z3JjR; Tue, 20 Apr 2021 00:49:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3B3ADF58; Tue, 20 Apr 2021 00:49:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13K0nNod037229; Tue, 20 Apr 2021 00:49:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13K0nNFI037228; Tue, 20 Apr 2021 00:49:23 GMT (envelope-from git) Date: Tue, 20 Apr 2021 00:49:23 GMT Message-Id: <202104200049.13K0nNFI037228@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: d149560bb859 - 2021Q2 - x11/wdisplays: unbreak fetch via fork MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: d149560bb859d2ae49b964fe2c5b290d403dd87b Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 00:49:23 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d149560bb859d2ae49b964fe2c5b290d403dd87b commit d149560bb859d2ae49b964fe2c5b290d403dd87b Author: Jan Beich AuthorDate: 2021-04-20 00:01:50 +0000 Commit: Jan Beich CommitDate: 2021-04-20 00:48:56 +0000 x11/wdisplays: unbreak fetch via fork fetch: https://codeload.github.com/cyclopsian/wdisplays/tar.gz/1.0?dummy=/cyclopsian-wdisplays-1.0_GH0.tar.gz: Not Found Suggested by: /r/swaywm, AUR (cherry picked from commit bca16f5881d679b33913bdff6a00f0116369f497) --- x11/wdisplays/Makefile | 2 +- x11/wdisplays/distinfo | 4 ++-- x11/wdisplays/pkg-descr | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x11/wdisplays/Makefile b/x11/wdisplays/Makefile index 2aed09149f53..f0f80fd3b217 100644 --- a/x11/wdisplays/Makefile +++ b/x11/wdisplays/Makefile @@ -24,7 +24,7 @@ LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ USES= compiler:c11 gnome meson pkgconfig USE_GITHUB= yes USE_GNOME= cairo gtk30 -GH_ACCOUNT= cyclopsian +GH_ACCOUNT= artizirk PLIST_FILES= bin/${PORTNAME} \ share/applications/network.cycles.${PORTNAME}.desktop \ share/icons/hicolor/scalable/apps/${PORTNAME}.svg diff --git a/x11/wdisplays/distinfo b/x11/wdisplays/distinfo index 7dc6a7fbcd72..f7b11e6c2507 100644 --- a/x11/wdisplays/distinfo +++ b/x11/wdisplays/distinfo @@ -1,5 +1,5 @@ TIMESTAMP = 1589011062 -SHA256 (cyclopsian-wdisplays-1.0_GH0.tar.gz) = fa34d5bdfd87d833e18a89b2acacc27833d7297374719773a705f2d3e89cdddf -SIZE (cyclopsian-wdisplays-1.0_GH0.tar.gz) = 106819 +SHA256 (artizirk-wdisplays-1.0_GH0.tar.gz) = fa34d5bdfd87d833e18a89b2acacc27833d7297374719773a705f2d3e89cdddf +SIZE (artizirk-wdisplays-1.0_GH0.tar.gz) = 106819 SHA256 (657e2966e556.patch) = e7cc9418945f12632fd17b408fdd8f1c0287f31e4bc3d2afab7683a84e8f2fd2 SIZE (657e2966e556.patch) = 2259 diff --git a/x11/wdisplays/pkg-descr b/x11/wdisplays/pkg-descr index 70d22ba3d599..e6e4e30fa2d4 100644 --- a/x11/wdisplays/pkg-descr +++ b/x11/wdisplays/pkg-descr @@ -5,4 +5,4 @@ protocol, including sway. The goal of this project is to allow precise adjustment of display settings in kiosks, digital signage, and other elaborate multi-monitor setups. -WWW: https://github.com/cyclopsian/wdisplays +WWW: https://github.com/artizirk/wdisplays From owner-dev-commits-ports-branches@freebsd.org Tue Apr 20 00:49:26 2021 Return-Path: Delivered-To: dev-commits-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 354145DD149; Tue, 20 Apr 2021 00:49:26 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPQ7B08G5z3Jb0; Tue, 20 Apr 2021 00:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A1BDFF59; Tue, 20 Apr 2021 00:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13K0nPWP037288; Tue, 20 Apr 2021 00:49:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13K0nPVn037287; Tue, 20 Apr 2021 00:49:25 GMT (envelope-from git) Date: Tue, 20 Apr 2021 00:49:25 GMT Message-Id: <202104200049.13K0nPVn037287@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: cc887f718252 - main - x11/wdisplays: update to 1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc887f718252474550a7fe7d0090604af9b365e3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 00:49:26 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=cc887f718252474550a7fe7d0090604af9b365e3 commit cc887f718252474550a7fe7d0090604af9b365e3 Author: Jan Beich AuthorDate: 2020-05-09 08:07:33 +0000 Commit: Jan Beich CommitDate: 2021-04-20 00:46:56 +0000 x11/wdisplays: update to 1.1 Changes: https://github.com/artizirk/wdisplays/releases/tag/1.1 Reported by: Repology --- x11/wdisplays/Makefile | 6 +----- x11/wdisplays/distinfo | 8 +++----- x11/wdisplays/pkg-descr | 8 ++++---- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/x11/wdisplays/Makefile b/x11/wdisplays/Makefile index 70fe0b150c25..302c1988ad0f 100644 --- a/x11/wdisplays/Makefile +++ b/x11/wdisplays/Makefile @@ -1,11 +1,7 @@ PORTNAME= wdisplays -DISTVERSION= 1.0 -PORTREVISION= 1 +DISTVERSION= 1.1 CATEGORIES= x11 -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 657e2966e556.patch:-p1 # https://github.com/cyclopsian/wdisplays/pull/20 - MAINTAINER= jbeich@FreeBSD.org COMMENT= GUI display configurator for wlroots compositors diff --git a/x11/wdisplays/distinfo b/x11/wdisplays/distinfo index f7b11e6c2507..933252cb655c 100644 --- a/x11/wdisplays/distinfo +++ b/x11/wdisplays/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1589011062 -SHA256 (artizirk-wdisplays-1.0_GH0.tar.gz) = fa34d5bdfd87d833e18a89b2acacc27833d7297374719773a705f2d3e89cdddf -SIZE (artizirk-wdisplays-1.0_GH0.tar.gz) = 106819 -SHA256 (657e2966e556.patch) = e7cc9418945f12632fd17b408fdd8f1c0287f31e4bc3d2afab7683a84e8f2fd2 -SIZE (657e2966e556.patch) = 2259 +TIMESTAMP = 1617006823 +SHA256 (artizirk-wdisplays-1.1_GH0.tar.gz) = 5aa739dece0d928fe7ca2f28d7f6b4b6750559ec6a0cd0a7520a4b47cebb6f80 +SIZE (artizirk-wdisplays-1.1_GH0.tar.gz) = 108410 diff --git a/x11/wdisplays/pkg-descr b/x11/wdisplays/pkg-descr index e6e4e30fa2d4..ccefdbc6ad23 100644 --- a/x11/wdisplays/pkg-descr +++ b/x11/wdisplays/pkg-descr @@ -1,8 +1,8 @@ wdisplays is a graphical application for configuring displays in Wayland compositors. It borrows some code from kanshi. It should work -in any compositor that implements the wlr-output-management-unstable-v1 -protocol, including sway. The goal of this project is to allow precise -adjustment of display settings in kiosks, digital signage, and other -elaborate multi-monitor setups. +in any compositor that implements wlr-output-management-unstable-v1. +Compositors known to support the protocol are Sway and Wayfire. +wdisplays' goal is to allow precise adjustment of display settings in +kiosks, digital signage, and other elaborate multi-monitor setups. WWW: https://github.com/artizirk/wdisplays From owner-dev-commits-ports-branches@freebsd.org Tue Apr 20 00:49:28 2021 Return-Path: Delivered-To: dev-commits-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 3FCE95DD19B; Tue, 20 Apr 2021 00:49:28 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPQ7C6xQkz3JS6; Tue, 20 Apr 2021 00:49:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CFAB01396; Tue, 20 Apr 2021 00:49:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13K0nR0F037330; Tue, 20 Apr 2021 00:49:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13K0nR1x037329; Tue, 20 Apr 2021 00:49:27 GMT (envelope-from git) Date: Tue, 20 Apr 2021 00:49:27 GMT Message-Id: <202104200049.13K0nR1x037329@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: f855bd67f546 - main - emulators/yuzu: update to s20210419 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f855bd67f5462f331f4812697a2a90dd68d0484d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 00:49:28 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f855bd67f5462f331f4812697a2a90dd68d0484d commit f855bd67f5462f331f4812697a2a90dd68d0484d Author: Jan Beich AuthorDate: 2021-04-19 21:30:36 +0000 Commit: Jan Beich CommitDate: 2021-04-20 00:46:57 +0000 emulators/yuzu: update to s20210419 Changes: https://github.com/yuzu-emu/yuzu/compare/ce921e0f2...0da84c4de --- emulators/yuzu/Makefile | 4 ++-- emulators/yuzu/distinfo | 6 +++--- emulators/yuzu/files/patch-CMakeLists.txt | 31 ++++++++++++++++--------------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 50dac7190527..33f28badea7b 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,5 +1,5 @@ PORTNAME= yuzu -PORTVERSION= s20210417 +PORTVERSION= s20210419 PORTREVISION?= 0 CATEGORIES= emulators @@ -42,7 +42,7 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \ USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= ce921e0f2 +GH_TAGNAME= 0da84c4de GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-52-geac2416b8:mbedtls/externals/mbedtls \ KhronosGroup:SPIRV-Headers:2c51218:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \ KhronosGroup:Vulkan-Headers:v1.2.145:Vulkan_Headers/externals/Vulkan-Headers \ diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo index 972a48ce0b2a..72c094a2f412 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1618684637 -SHA256 (yuzu-emu-yuzu-s20210417-ce921e0f2_GH0.tar.gz) = 19c957c8299a005ef6e72a2b17572d43aff4fba418809776d4927632e5cb5eb2 -SIZE (yuzu-emu-yuzu-s20210417-ce921e0f2_GH0.tar.gz) = 3795308 +TIMESTAMP = 1618867836 +SHA256 (yuzu-emu-yuzu-s20210419-0da84c4de_GH0.tar.gz) = 87031df2ab1eade83bca2f151893273566ce710705ac0517f3fd57a46d570c3b +SIZE (yuzu-emu-yuzu-s20210419-0da84c4de_GH0.tar.gz) = 3795217 SHA256 (yuzu-emu-mbedtls-v2.16.9-52-geac2416b8_GH0.tar.gz) = 8d3b480b4121feaa30f12fdec06de741775465454610202363edaf7564d4f3bb SIZE (yuzu-emu-mbedtls-v2.16.9-52-geac2416b8_GH0.tar.gz) = 2676404 SHA256 (KhronosGroup-SPIRV-Headers-2c51218_GH0.tar.gz) = 08f70947b69e17c7e322156adcd471cf02b4b3f63e7baf8ee0f02d32603ac5ff diff --git a/emulators/yuzu/files/patch-CMakeLists.txt b/emulators/yuzu/files/patch-CMakeLists.txt index 02af027bd196..ec3911fb99a5 100644 --- a/emulators/yuzu/files/patch-CMakeLists.txt +++ b/emulators/yuzu/files/patch-CMakeLists.txt @@ -1,25 +1,26 @@ yuzu (Qt) currently needs SDL for input ---- CMakeLists.txt.orig 2021-04-16 17:36:48 UTC +--- CMakeLists.txt.orig 2021-04-19 21:30:36 UTC +++ CMakeLists.txt -@@ -274,8 +274,12 @@ if (ENABLE_SDL2) +@@ -273,9 +273,10 @@ if (ENABLE_SDL2) + add_library(SDL2 INTERFACE) target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}") target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}") - else() -- find_package(SDL2 REQUIRED) -+ find_package(SDL2) +- else() +- find_package(SDL2 2.0.12) +- + endif() +endif() - -+if(SDL2_FOUND) -+ if(NOT YUZU_USE_BUNDLED_SDL2) - # Some installations don't set SDL2_LIBRARIES - if("${SDL2_LIBRARIES}" STREQUAL "") - message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2") -@@ -286,8 +290,6 @@ if (ENABLE_SDL2) - add_library(SDL2 INTERFACE) - target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}") - endif() ++if (NOT YUZU_USE_BUNDLED_SDL2) ++ find_package(SDL2 2.0.12) + if(SDL2_FOUND) + # Some installations don't set SDL2_LIBRARIES + if("${SDL2_LIBRARIES}" STREQUAL "") +@@ -287,9 +288,6 @@ if (ENABLE_SDL2) + add_library(SDL2 INTERFACE) + target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}") + endif() +- endif() -else() - set(SDL2_FOUND NO) endif() From owner-dev-commits-ports-branches@freebsd.org Tue Apr 20 00:49:27 2021 Return-Path: Delivered-To: dev-commits-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 9336C5DCE66; Tue, 20 Apr 2021 00:49:27 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPQ7C1H7kz3Jb4; Tue, 20 Apr 2021 00:49:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B87E71144; Tue, 20 Apr 2021 00:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13K0nQeh037309; Tue, 20 Apr 2021 00:49:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13K0nQd2037308; Tue, 20 Apr 2021 00:49:26 GMT (envelope-from git) Date: Tue, 20 Apr 2021 00:49:26 GMT Message-Id: <202104200049.13K0nQd2037308@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 8d8d11985b1f - main - emulators/rpcs3: update to 0.0.15.12130 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d8d11985b1fa748e5ff53d5537cd8f24879d620 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 00:49:27 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=8d8d11985b1fa748e5ff53d5537cd8f24879d620 commit 8d8d11985b1fa748e5ff53d5537cd8f24879d620 Author: Jan Beich AuthorDate: 2021-04-18 11:49:29 +0000 Commit: Jan Beich CommitDate: 2021-04-20 00:46:57 +0000 emulators/rpcs3: update to 0.0.15.12130 Changes: https://github.com/RPCS3/rpcs3/compare/fb26da1cb...3e33f064b --- emulators/rpcs3/Makefile | 4 ++-- emulators/rpcs3/distinfo | 6 +++--- emulators/rpcs3/files/patch-userptr | 15 --------------- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 674ea0e73486..86651b5f2546 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -1,7 +1,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.15-12113 # git rev-list --count HEAD -DISTVERSIONSUFFIX= -gfb26da1cb +DISTVERSION= 0.0.15-12130 # git rev-list --count HEAD +DISTVERSIONSUFFIX= -g3e33f064b CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index 70b92d9ebe23..de58ec079778 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1618676599 -SHA256 (RPCS3-rpcs3-v0.0.15-12113-gfb26da1cb_GH0.tar.gz) = 00e6bffff44e09e49ce4732a37831dd782a40ee08ab8358378eb11f01c440970 -SIZE (RPCS3-rpcs3-v0.0.15-12113-gfb26da1cb_GH0.tar.gz) = 8019077 +TIMESTAMP = 1618872131 +SHA256 (RPCS3-rpcs3-v0.0.15-12130-g3e33f064b_GH0.tar.gz) = b2b8f46da51a3de22f80381dbc94e41611aa510dbe9c1b87512c1e6246e3910c +SIZE (RPCS3-rpcs3-v0.0.15-12130-g3e33f064b_GH0.tar.gz) = 8019315 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-28-g8961cf8_GH0.tar.gz) = 0f0f3b3af2fff7004f479a1adbbb81658b62a2e07b5978acc65833273e8124d7 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-28-g8961cf8_GH0.tar.gz) = 105391 SHA256 (RPCS3-llvm-mirror-5d8643e8eb3_GH0.tar.gz) = 9484c30b65d64ce4a70d058988995490a807556871b0af4e0616566826ac72fd diff --git a/emulators/rpcs3/files/patch-userptr b/emulators/rpcs3/files/patch-userptr deleted file mode 100644 index e090db6880d2..000000000000 --- a/emulators/rpcs3/files/patch-userptr +++ /dev/null @@ -1,15 +0,0 @@ -VK_EXT_external_memory_host depends on userptr, so disable on Intel until -https://github.com/FreeBSDDesktop/kms-drm/issues/197 - ---- rpcs3/Emu/RSX/VK/VKDMA.cpp.orig 2021-02-28 23:32:23 UTC -+++ rpcs3/Emu/RSX/VK/VKDMA.cpp -@@ -264,7 +264,8 @@ namespace vk - true; - #else - // Anything running on AMDGPU kernel driver will not work due to the check for fd-backed memory allocations -- const bool allow_host_buffers = (vendor != driver_vendor::AMD && vendor != driver_vendor::RADV); -+ // Intel userptr on non-Linux may not work or require root -+ const bool allow_host_buffers = (vendor != driver_vendor::AMD && vendor != driver_vendor::RADV && vendor != driver_vendor::INTEL); - #endif - if (allow_host_buffers && g_render_device->get_external_memory_host_support()) - { From owner-dev-commits-ports-branches@freebsd.org Tue Apr 20 00:49:29 2021 Return-Path: Delivered-To: dev-commits-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 8124C5DD219; Tue, 20 Apr 2021 00:49:29 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPQ7F1pm3z3JdG; Tue, 20 Apr 2021 00:49:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 089AF1145; Tue, 20 Apr 2021 00:49:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13K0nS63037351; Tue, 20 Apr 2021 00:49:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13K0nSsZ037350; Tue, 20 Apr 2021 00:49:28 GMT (envelope-from git) Date: Tue, 20 Apr 2021 00:49:28 GMT Message-Id: <202104200049.13K0nSsZ037350@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 338d8ba0f777 - main - graphics/mesa-devel: update to 21.1.b.238 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 338d8ba0f777b4af46c0de567fdb35931ae79aa2 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 00:49:29 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=338d8ba0f777b4af46c0de567fdb35931ae79aa2 commit 338d8ba0f777b4af46c0de567fdb35931ae79aa2 Author: Jan Beich AuthorDate: 2021-04-19 23:10:35 +0000 Commit: Jan Beich CommitDate: 2021-04-20 00:47:09 +0000 graphics/mesa-devel: update to 21.1.b.238 Changes: https://gitlab.freedesktop.org/mesa/mesa/-/compare/c74d93cf018...750ddf32395 --- graphics/mesa-devel/Makefile | 4 ++-- graphics/mesa-devel/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 57e11c54f5f8..018d4b782769 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= mesa -DISTVERSION= 21.1-branchpoint-176 -DISTVERSIONSUFFIX= -gc74d93cf018 +DISTVERSION= 21.1-branchpoint-238 +DISTVERSIONSUFFIX= -g750ddf32395 CATEGORIES= graphics PKGNAMESUFFIX= -devel diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index b10ab3f0fbbe..834fb2d0517e 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1618673936 -SHA256 (mesa3d-mesa-21.1-branchpoint-176-gc74d93cf018_GH0.tar.gz) = 519de8ad331b33c1be6e6e0743796bfb537a84698cc05c3df499a4784c8dc86e -SIZE (mesa3d-mesa-21.1-branchpoint-176-gc74d93cf018_GH0.tar.gz) = 23370385 +TIMESTAMP = 1618877471 +SHA256 (mesa3d-mesa-21.1-branchpoint-238-g750ddf32395_GH0.tar.gz) = 2e722953c197017d3471e737bafb0855a8b41e14a8a6b40bb6fdb351a280580e +SIZE (mesa3d-mesa-21.1-branchpoint-238-g750ddf32395_GH0.tar.gz) = 23375382 SHA256 (55822330540d.patch) = fc776fee1d59f743a060ad1f78e1d9eba8826beb1fe7abef1734a407734b6109 SIZE (55822330540d.patch) = 1278 SHA256 (f6c7569ad9ea.patch) = 481784ca37e35549bf265e21eee1b9a29d2b0b8d3294de1d5b6b83a84f3d7a9b From owner-dev-commits-ports-branches@freebsd.org Tue Apr 20 11:08:20 2021 Return-Path: Delivered-To: dev-commits-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 6CFDE5F0DA5; Tue, 20 Apr 2021 11:08:20 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPgsJ2dgGz4b8V; Tue, 20 Apr 2021 11:08:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4CC4E11C8E; Tue, 20 Apr 2021 11:08:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13KB8KhB060630; Tue, 20 Apr 2021 11:08:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13KB8KQJ060629; Tue, 20 Apr 2021 11:08:20 GMT (envelope-from git) Date: Tue, 20 Apr 2021 11:08:20 GMT Message-Id: <202104201108.13KB8KQJ060629@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: f4cd6b757f0c - 2021Q2 - mail/thunderbird: update to 78.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: f4cd6b757f0c29805175415f80a50a3a8f8d07e0 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 11:08:20 -0000 The branch 2021Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4cd6b757f0c29805175415f80a50a3a8f8d07e0 commit f4cd6b757f0c29805175415f80a50a3a8f8d07e0 Author: Christoph Moench-Tegeder AuthorDate: 2021-04-20 11:05:13 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2021-04-20 11:08:05 +0000 mail/thunderbird: update to 78.10.0 Release Notes: https://www.thunderbird.net/en-US/thunderbird/78.10.0/releasenotes/ (cherry picked from commit 9eb245eefcfa36e6cdc0e653857430ef14c4a79a) --- mail/thunderbird/Makefile | 2 +- mail/thunderbird/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 25d1f13598b0..871f5d2168ba 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -1,7 +1,7 @@ # Created by: Joe Marcus Clarke PORTNAME= thunderbird -DISTVERSION= 78.9.1 +DISTVERSION= 78.10.0 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index 3d537ff63f9b..78d8882fc94d 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617804436 -SHA256 (thunderbird-78.9.1.source.tar.xz) = 6be0daf439ea5aeef0fd1619511cb1af4f1ba056823910475adc17e60069317d -SIZE (thunderbird-78.9.1.source.tar.xz) = 358277740 +TIMESTAMP = 1618913956 +SHA256 (thunderbird-78.10.0.source.tar.xz) = 65d79a557027a3b52cc672ab9aea8da7131e6373f94657d03f6d6b9c7b36fb45 +SIZE (thunderbird-78.10.0.source.tar.xz) = 351422752 From owner-dev-commits-ports-branches@freebsd.org Tue Apr 20 11:32:14 2021 Return-Path: Delivered-To: dev-commits-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 F38845F1C52; Tue, 20 Apr 2021 11:32:14 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPhNt6dMhz4cWS; Tue, 20 Apr 2021 11:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D63BC11EFC; Tue, 20 Apr 2021 11:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13KBWEiR099609; Tue, 20 Apr 2021 11:32:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13KBWEp8099608; Tue, 20 Apr 2021 11:32:14 GMT (envelope-from git) Date: Tue, 20 Apr 2021 11:32:14 GMT Message-Id: <202104201132.13KBWEp8099608@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: f7329c715332 - 2021Q2 - www/firefox-esr: update to 78.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: f7329c715332a9c10836cde1859498d5a5bb400d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 11:32:15 -0000 The branch 2021Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=f7329c715332a9c10836cde1859498d5a5bb400d commit f7329c715332a9c10836cde1859498d5a5bb400d Author: Christoph Moench-Tegeder AuthorDate: 2021-04-20 11:30:19 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2021-04-20 11:31:50 +0000 www/firefox-esr: update to 78.10.0 Release Notes: https://www.mozilla.org/en-US/firefox/78.10.0/releasenotes/ (cherry picked from commit 1ce7d02f9f72782cc8283a44898f1db9962ad7c3) --- www/firefox-esr/Makefile | 3 +-- www/firefox-esr/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index a5419b744867..67b63e15bedc 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -1,8 +1,7 @@ # Created by: Alan Eldridge PORTNAME= firefox -DISTVERSION= 78.9.0 -PORTREVISION= 2 +DISTVERSION= 78.10.0 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo index e9ba572232f1..16f6e4ee0cd6 100644 --- a/www/firefox-esr/distinfo +++ b/www/firefox-esr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1615839895 -SHA256 (firefox-78.9.0esr.source.tar.xz) = 8e03ac1dfc5ac804c8b13a529414a9387e0425e545bb2f4462d74c3175e64864 -SIZE (firefox-78.9.0esr.source.tar.xz) = 332717100 +TIMESTAMP = 1618914469 +SHA256 (firefox-78.10.0esr.source.tar.xz) = 979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40 +SIZE (firefox-78.10.0esr.source.tar.xz) = 334642452 From owner-dev-commits-ports-branches@freebsd.org Tue Apr 20 11:51:14 2021 Return-Path: Delivered-To: dev-commits-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 321685F289B; Tue, 20 Apr 2021 11:51:14 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPhpp0vKcz4dmT; Tue, 20 Apr 2021 11:51:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 121E812581; Tue, 20 Apr 2021 11:51:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13KBpDi8022417; Tue, 20 Apr 2021 11:51:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13KBpDlw022416; Tue, 20 Apr 2021 11:51:13 GMT (envelope-from git) Date: Tue, 20 Apr 2021 11:51:13 GMT Message-Id: <202104201151.13KBpDlw022416@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mathieu Arnold Subject: git: 043e196d694c - 2021Q2 - Add the prepare-commit-msg hook to the repository. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mat X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 043e196d694c84978db30432358dd10ad90b3246 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 11:51:14 -0000 The branch 2021Q2 has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=043e196d694c84978db30432358dd10ad90b3246 commit 043e196d694c84978db30432358dd10ad90b3246 Author: Mathieu Arnold AuthorDate: 2021-04-20 09:50:42 +0000 Commit: Mathieu Arnold CommitDate: 2021-04-20 11:50:57 +0000 Add the prepare-commit-msg hook to the repository. To make use of it, the easiest way is to run: git config --add core.hooksPath .hooks Discussed with: bapt (cherry picked from commit bbc2474ef7a65eb8561c8ecf7af80c2bfed1f248) --- .hooks/prepare-commit-msg | 69 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/.hooks/prepare-commit-msg b/.hooks/prepare-commit-msg new file mode 100755 index 000000000000..d2d1536cfcca --- /dev/null +++ b/.hooks/prepare-commit-msg @@ -0,0 +1,69 @@ +#!/bin/sh + +# prepare-commit-msg: Prepare a commit message upon `git commit` for the +# user to edit. A script (rather than a static template) is used, so +# that we can insert our template text other than at the top of the +# message. +# +# Install by either setting the configuration of the repository to: +# git config --add core.hooksPath .hooks +# or copy it to the hooks directory, but it will not get automatically updated: +# cp .hooks/prepare-commit-msg .git/hooks/ + +case "$2" in +commit|message) + # It appears git invokes this script for interactive rebase but does + # not remove commented lines, so just exit if we're not called with the + # default (comment-containing) template. + grep -E -q '^#' "$1" || exit 0 + ;; +template) + exit 0 + ;; +merge) + exit 0 + ;; +esac + +outfile=$(mktemp /tmp/freebsd-git-commit.XXXXXXXX) + +# Create a commit message template from three parts: +# +# 1. The beginning of the git-provided template (up to the first comment-only +# line) which explains commented lines and such. +# +# 2. Our template. +# +# 3. The remainder of the git-provided template (from the first comment-only +# line to the end of the file) which lists files staged for commit, files +# not staged, and untracked files. + +cat >"$outfile" < +# 72 columns --| +# +# Uncomment and complete these metadata fields, as appropriate: +# +# PR: +# Reported by: +# Reviewed by: +# Tested by: +# Approved by: +# Obtained from: +# Fixes: +# MFH: +# Relnotes: +# Security: +# Sponsored by: +# Pull Request: /pull/###> +# Differential Revision: +# +# "Pull Request" and "Differential Revision" require the *full* GitHub or +# Phabricator URL. The commit author should be set appropriately, using +# \`git commit --author\` if someone besides the committer sent in the change. +$(awk '/^#$/,EOF' "$1") +EOF + +mv "$outfile" "$1" From owner-dev-commits-ports-branches@freebsd.org Tue Apr 20 13:20:48 2021 Return-Path: Delivered-To: dev-commits-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 B59265F5F0A; Tue, 20 Apr 2021 13:20:48 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPkp84Pnbz4jqx; Tue, 20 Apr 2021 13:20:48 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1618924848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=MK5v+s0zj0FUywnmmA3h56l0b2ZKWTnEE4lkj5K4l90=; b=lLSmPzYpx6zTpk2CDXdX+xBWUcoppCC78sSa3r2I0tM0xgoiR6IWltvDe62xdY4gHL5UwP FVH9PasWJfOkX+yhftiFe4mV5fg/msk4C+fDY/BjNK9eZpvSpR6/OZnH52iOLseNwJMYFS ULh1YiUciUtskIKbFQoUGUlUH7ue2qF9V98K/Ci/+2z9BtAqiZ86IPG23Bg4WgUhf7oJbn YDIprQHCiLxw+xq4o6QJJaz04nEBemSoJmFy0lST1SUphmU/ywd42r1orFehE+n8tB47lz jhTg3+JvZuoy3yGc09SWoxYdHW/7God1zPJbK3x9Ua/ARtJ/tF9cRfk+qu7Fpw== Received: by freefall.freebsd.org (Postfix, from userid 1354) id 8BAC81D773; Tue, 20 Apr 2021 13:20:48 +0000 (UTC) From: Jan Beich To: Mathieu Arnold Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: Re: git: 043e196d694c - 2021Q2 - Add the prepare-commit-msg hook to the repository. References: <202104201151.13KBpDlw022416__12188.0763372005$1618919484$gmane$org@gitrepo.freebsd.org> Date: Tue, 20 Apr 2021 15:20:39 +0200 In-Reply-To: <202104201151.13KBpDlw022416__12188.0763372005$1618919484$gmane$org@gitrepo.freebsd.org> (Mathieu Arnold's message of "Tue, 20 Apr 2021 11:51:13 GMT") Message-ID: MIME-Version: 1.0 Content-Type: text/plain ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1618924848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=MK5v+s0zj0FUywnmmA3h56l0b2ZKWTnEE4lkj5K4l90=; b=rvgsSpFdL97dHXDduJoWvkRTBHce72ohWUwb4PhhVzBgz2lZJo0NyILYAyENojI+ADw5M0 JwXdTM/morrqFy96raDQBisPHxPKmHA/mSQCZbEQBRS8ysh3401hwPVEbACV+QNkVHyHfP +RVPv8s2cSgJa6zsw/CuBo+bK/wo/4nApkOIOf75//gmVSpkvCsK3iKpntZfjim3TGkkgU TTJCAfRlDQdydRZj28X/YGupEtVU1YjhzhcSgj2vjkLuLI8yEzQh2Urb5ZDbSRYGbJ/i/+ GVbyg3zv7OZTMH64agkQtPG9erGjZlQJjsCqJYCf/d+JR7V3sFRHztHovwRqag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1618924848; a=rsa-sha256; cv=none; b=D87U+n94O+HDqxvvXvU+m7bQCdCqUi0CwHL2fLGmj1Zrl5zMzUDABvQUMaCqc8f5pUAwzq /hgucFXwLMYnByKSaJxE+nLKM4nTkmxtCWidyjZJCdxjOqrutSzUfeLGgHWL/jJb9edqlD PglSxJCDaaFRqiVEAfPxrwUwupi1wL8kAw34dyEECyn6Bg4RLcqbCsQcxmtX29MkcQEMp0 VL/o/J/dJQSJAwYpeLxr0ASiX4sDgqCF0zhvXbyjjdDIy8/PEHB2TZA4IuNgEOdadCTie/ sS/E3lJWqv1DbL04dvhyrnrz2y6A4fkz8NRoM45R+T7n9LVYoPMBcLklBpspgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 13:20:48 -0000 Mathieu Arnold writes: > +# MFH: Why bother after https://svnweb.freebsd.org/changeset/ports/556626 ? > +# Relnotes: "yes" doesn't apply to ports/. Also, some ports/ committers already use "Relnotes:" to link to upstream changelog. > +# Pull Request: /pull/###> Looks too GitHub-specific and doesn't allow auto-close by commit. From owner-dev-commits-ports-branches@freebsd.org Tue Apr 20 13:54:54 2021 Return-Path: Delivered-To: dev-commits-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 33C415F72A5; Tue, 20 Apr 2021 13:54:54 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPlYV0zGyz4m2H; Tue, 20 Apr 2021 13:54:54 +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 "R3" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id ED723C34B; Tue, 20 Apr 2021 13:54:53 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from aching.in.mat.cc (unknown [IPv6:2a01:678:ab:0:3356:ef6b:256f:d0c6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) 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 EDF87942D80; Tue, 20 Apr 2021 13:54:51 +0000 (UTC) Date: Tue, 20 Apr 2021 15:54:50 +0200 From: Mathieu Arnold To: Jan Beich Cc: Mathieu Arnold , ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-branches@freebsd.org Subject: Re: git: 043e196d694c - 2021Q2 - Add the prepare-commit-msg hook to the repository. Message-ID: <20210420135450.ahbofrjlolqf5ivy@aching.in.mat.cc> References: <202104201151.13KBpDlw022416__12188.0763372005$1618919484$gmane$org@gitrepo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="5zydvrs3eyercxdo" Content-Disposition: inline In-Reply-To: X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 13:54:54 -0000 --5zydvrs3eyercxdo Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Apr 20, 2021 at 03:20:39PM +0200, Jan Beich wrote: > Mathieu Arnold writes: >=20 > > +# MFH: >=20 > Why bother after https://svnweb.freebsd.org/changeset/ports/556626 ? The MFH field always was there to note intent, not to get approval. > > +# Relnotes: >=20 > "yes" doesn't apply to ports/. Also, some ports/ committers already use > "Relnotes:" to link to upstream changelog. >=20 > > +# Pull Request: /pull/###> >=20 > Looks too GitHub-specific and doesn't allow auto-close by commit. The script comes from the src tree: https://cgit.freebsd.org/src/tree/tools/tools/git/hooks/prepare-commit-msg I only removed the `MFC after` that we do not use in the ports tree. I don't see why Relnotes or Pull Request cannot be used here too. --=20 Mathieu Arnold --5zydvrs3eyercxdo Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEVhwchfRfuV0unqO5KesJApEdfgIFAmB+3SZfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU2 MUMxQzg1RjQ1RkI5NUQyRTlFQTNCOTI5RUIwOTAyOTExRDdFMDIACgkQKesJApEd fgKx4xAAiG7gZAP6P6ZqA3AkiXAFebL74112H3OllJjjgx+SqEhyeRupjnzGsgrb 6jEtLnRKOPbMQ8PAUWJ0js2GAHKZ5Wl48wzctLq8k0YMe6ZqB3A4EZ8kI5myyKNE 7neeRKDV+H08jHEwoEAp+X0OaqyeXZL6RwfyI17r/VNgCoH8+Jl8JGd13BupUhfa cMFwju1h7l19utRI6sFTjj93AvDDe/5id1JgWe0S/xBwp29zanQe/6O+rF3chX1S pERClw4ryzv9Fa8GSegCJeefEqv/H5qUOg0XFTgnhmBR8N9431NXVQan/cRRyBHb VpderZqMo4Y2eTuZggH79DQMloykfNFvZV3Ev0FYheZbORpRCRAHX+TGh/LKg8OK vuk2Jv8OTpf+9NISm5sqf67lAeAVKUj26J06i9xQA1W4yppb5H0z3S04aLGQQaEN aJ1lPzYFvzenq9LZnkvNuXwZIAtq+w45wub4lp6mlS/f7I7AW8ZHCWZFjnI30Xv2 3bTUPtPCpy/bW8VOzZCYMQdPpeVdzQC8eUTOviS8Q/iCUQL+OoW9xUTNAHdwfIuy xCCAG9aVo4ycLCx4lLTCzFy2VcvQfeVKGaAhegVLl+WO/mo3lqhV6dlzKCv8zW5N sySTcMVNPIqHbUJRWoyjXxEtbSmgEc+5RFoZGv475SZuu7FmWow= =fBcx -----END PGP SIGNATURE----- --5zydvrs3eyercxdo-- From owner-dev-commits-ports-branches@freebsd.org Tue Apr 20 14:15:54 2021 Return-Path: Delivered-To: dev-commits-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 CDB7C5F7DEC; Tue, 20 Apr 2021 14:15:54 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPm1k5V3Dz4mng; Tue, 20 Apr 2021 14:15:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AF59614365; Tue, 20 Apr 2021 14:15:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13KEFsgb012373; Tue, 20 Apr 2021 14:15:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13KEFsSc012372; Tue, 20 Apr 2021 14:15:54 GMT (envelope-from git) Date: Tue, 20 Apr 2021 14:15:54 GMT Message-Id: <202104201415.13KEFsSc012372@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: =?utf-8?B?RmVybmFuZG8gQXBlc3RlZ3XDrWE=?= Subject: git: 37865a2ee904 - 2021Q2 - devel/gearmand: Mark BROKEN on FreeBSD 12+ MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 37865a2ee904fb84ecb68a337bf3a644e830965d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 14:15:54 -0000 The branch 2021Q2 has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=37865a2ee904fb84ecb68a337bf3a644e830965d commit 37865a2ee904fb84ecb68a337bf3a644e830965d Author: Fernando Apesteguía AuthorDate: 2021-04-20 06:59:02 +0000 Commit: Fernando Apesteguía CommitDate: 2021-04-20 14:12:15 +0000 devel/gearmand: Mark BROKEN on FreeBSD 12+ Outdated and doesn't build on 12+ References: https://portsfallout.com/fallout?port=devel%2Fgearmand$ PR: 255212 Reported by: daniel.engberg.lists@pyret.net MFH: 2021Q2 (cherry picked from commit 143627392d41563295e20a41a23473f671b6135b) --- devel/gearmand/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/devel/gearmand/Makefile b/devel/gearmand/Makefile index 7434e66d167a..22072fa6834d 100644 --- a/devel/gearmand/Makefile +++ b/devel/gearmand/Makefile @@ -9,6 +9,9 @@ MASTER_SITES= http://launchpad.net/gearmand/1.0/${PORTVERSION}/+download/ MAINTAINER= ports@FreeBSD.org COMMENT= Gearman C Server and Library +BROKEN_FreeBSD_12= error: use of undeclared identifier 'abi' +BROKEN_FreeBSD_13= error: use of undeclared identifier 'abi' + BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} LIB_DEPENDS= libboost_program_options.so:devel/boost-libs \ libevent.so:devel/libevent \ From owner-dev-commits-ports-branches@freebsd.org Tue Apr 20 15:39:20 2021 Return-Path: Delivered-To: dev-commits-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 21D6E5DB8C9; Tue, 20 Apr 2021 15:39:20 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPnt00T0Qz4sNM; Tue, 20 Apr 2021 15:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 02BEA15884; Tue, 20 Apr 2021 15:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13KFdJro018916; Tue, 20 Apr 2021 15:39:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13KFdJvC018915; Tue, 20 Apr 2021 15:39:19 GMT (envelope-from git) Date: Tue, 20 Apr 2021 15:39:19 GMT Message-Id: <202104201539.13KFdJvC018915@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bryan Drewery Subject: git: b93b57f8a2e1 - 2021Q2 - Fix openssh version in entry for CVE-2021-28041 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: b93b57f8a2e100791adc5d2c8b79b0fa25a9db96 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 15:39:20 -0000 The branch 2021Q2 has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=b93b57f8a2e100791adc5d2c8b79b0fa25a9db96 commit b93b57f8a2e100791adc5d2c8b79b0fa25a9db96 Author: Bryan Drewery AuthorDate: 2021-04-20 15:37:19 +0000 Commit: Bryan Drewery CommitDate: 2021-04-20 15:39:06 +0000 Fix openssh version in entry for CVE-2021-28041 Reported by: leres (cherry picked from commit da89336b8dd885b50dd9994c56f731362270ce64) --- security/vuxml/vuln.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml index 72a8be1a9d8d..4ce7453444ef 100644 --- a/security/vuxml/vuln.xml +++ b/security/vuxml/vuln.xml @@ -426,7 +426,7 @@ Notes: openssh-portable openssh-portable-hpn openssh-portable-gssapi - 8.2p1,18.4p1,1_4 + 8.2p1,18.4p1_4,1 @@ -462,6 +462,7 @@ Notes: 2021-03-03 2021-03-13 + 2021-04-20 From owner-dev-commits-ports-branches@freebsd.org Tue Apr 20 19:27:53 2021 Return-Path: Delivered-To: dev-commits-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 AB6B15E55A9; Tue, 20 Apr 2021 19:27:53 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPtxj4TXgz3P1Z; Tue, 20 Apr 2021 19:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8C86318561; Tue, 20 Apr 2021 19:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13KJRrka024983; Tue, 20 Apr 2021 19:27:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13KJRrEW024982; Tue, 20 Apr 2021 19:27:53 GMT (envelope-from git) Date: Tue, 20 Apr 2021 19:27:53 GMT Message-Id: <202104201927.13KJRrEW024982@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: ece846ce0a63 - 2021Q2 - devel/jenkins-lts: Update to 2.277.3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: ece846ce0a63bb63acec64f1bbe64a15de347802 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 19:27:53 -0000 The branch 2021Q2 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=ece846ce0a63bb63acec64f1bbe64a15de347802 commit ece846ce0a63bb63acec64f1bbe64a15de347802 Author: Li-Wen Hsu AuthorDate: 2021-04-20 19:25:48 +0000 Commit: Li-Wen Hsu CommitDate: 2021-04-20 19:27:43 +0000 devel/jenkins-lts: Update to 2.277.3 MFH: 2021Q2 Security: e358b470-b37d-4e47-bc8a-2cd9adbeb63c Sponsored by: The FreeBSD Foundation (cherry picked from commit f1101c72bf9e3cbb2d90ac76198bb5656f0623d9) --- devel/jenkins-lts/Makefile | 2 +- devel/jenkins-lts/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/jenkins-lts/Makefile b/devel/jenkins-lts/Makefile index afbb394861ee..7cf73cf11888 100644 --- a/devel/jenkins-lts/Makefile +++ b/devel/jenkins-lts/Makefile @@ -1,6 +1,6 @@ PORTNAME= jenkins -PORTVERSION= 2.277.2 +PORTVERSION= 2.277.3 CATEGORIES= devel java MASTER_SITES= http://mirrors.jenkins-ci.org/war-stable/${PORTVERSION}/ PKGNAMESUFFIX= -lts diff --git a/devel/jenkins-lts/distinfo b/devel/jenkins-lts/distinfo index 7ca98a06363e..0787627e23f9 100644 --- a/devel/jenkins-lts/distinfo +++ b/devel/jenkins-lts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617842737 -SHA256 (jenkins/2.277.2/jenkins.war) = 423d506cbfccf677a8f8112e170e611d65a49244b0ca87d2b134dd3ecb2e9b22 -SIZE (jenkins/2.277.2/jenkins.war) = 70887351 +TIMESTAMP = 1618946551 +SHA256 (jenkins/2.277.3/jenkins.war) = 3e22c7e8cd7c8ee1e92cbaa8d0d303a7b53e07bc2a152ddc66f8ce55caea91ab +SIZE (jenkins/2.277.3/jenkins.war) = 70887043 From owner-dev-commits-ports-branches@freebsd.org Tue Apr 20 19:28:21 2021 Return-Path: Delivered-To: dev-commits-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 78BDE5E5691; Tue, 20 Apr 2021 19:28:21 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPtyF301Hz3Nsq; Tue, 20 Apr 2021 19:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4656B18898; Tue, 20 Apr 2021 19:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13KJSLdi025224; Tue, 20 Apr 2021 19:28:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13KJSLQA025223; Tue, 20 Apr 2021 19:28:21 GMT (envelope-from git) Date: Tue, 20 Apr 2021 19:28:21 GMT Message-Id: <202104201928.13KJSLQA025223@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bryan Drewery Subject: git: 50b224190720 - 2021Q2 - Another openssh version fix for CVE-2021-28041. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 50b224190720b071fda3b85345705e686c024957 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 19:28:21 -0000 The branch 2021Q2 has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=50b224190720b071fda3b85345705e686c024957 commit 50b224190720b071fda3b85345705e686c024957 Author: Bryan Drewery AuthorDate: 2021-04-20 19:27:56 +0000 Commit: Bryan Drewery CommitDate: 2021-04-20 19:28:20 +0000 Another openssh version fix for CVE-2021-28041. Reported by: leres (cherry picked from commit d51bb525343c53e0a111b86a7c15c59bcfa6b15f) --- security/vuxml/vuln.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml index 4ce7453444ef..55c21b0801bf 100644 --- a/security/vuxml/vuln.xml +++ b/security/vuxml/vuln.xml @@ -426,7 +426,7 @@ Notes: openssh-portable openssh-portable-hpn openssh-portable-gssapi - 8.2p1,18.4p1_4,1 + 8.2.p1,18.4.p1_4,1 From owner-dev-commits-ports-branches@freebsd.org Tue Apr 20 22:49:55 2021 Return-Path: Delivered-To: dev-commits-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 CAA985EBFF1; Tue, 20 Apr 2021 22:49:55 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPzQq5Mjlz3qXS; Tue, 20 Apr 2021 22:49:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AA17A1B2AC; Tue, 20 Apr 2021 22:49:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13KMntfH090979; Tue, 20 Apr 2021 22:49:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13KMnt6I090978; Tue, 20 Apr 2021 22:49:55 GMT (envelope-from git) Date: Tue, 20 Apr 2021 22:49:55 GMT Message-Id: <202104202249.13KMnt6I090978@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Adriaan de Groot Subject: git: d7bd94998c03 - 2021Q2 - graphics/spectacle: avoid crash with export-plugins MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: d7bd94998c03f8c14d58b4f462ea8d58a00f5ee6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 22:49:55 -0000 The branch 2021Q2 has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=d7bd94998c03f8c14d58b4f462ea8d58a00f5ee6 commit d7bd94998c03f8c14d58b4f462ea8d58a00f5ee6 Author: Adriaan de Groot AuthorDate: 2021-04-20 14:23:01 +0000 Commit: Adriaan de Groot CommitDate: 2021-04-20 22:49:35 +0000 graphics/spectacle: avoid crash with export-plugins This is upstream MR https://invent.kde.org/graphics/spectacle/-/merge_requests/61 and avoids crashes when clicking almost any entry in the *export* menu. PR: 252313 --- graphics/spectacle/Makefile | 1 + ...t-f123cf6b1b67519a1a4e82e69764da9e89716489.diff | 52 ++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/graphics/spectacle/Makefile b/graphics/spectacle/Makefile index 5d091220bf64..d1fb10e3cfa4 100644 --- a/graphics/spectacle/Makefile +++ b/graphics/spectacle/Makefile @@ -1,6 +1,7 @@ PORTNAME= spectacle DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/graphics/spectacle/files/patch-git-f123cf6b1b67519a1a4e82e69764da9e89716489.diff b/graphics/spectacle/files/patch-git-f123cf6b1b67519a1a4e82e69764da9e89716489.diff new file mode 100644 index 000000000000..379a3e90b1ed --- /dev/null +++ b/graphics/spectacle/files/patch-git-f123cf6b1b67519a1a4e82e69764da9e89716489.diff @@ -0,0 +1,52 @@ +commit f123cf6b1b67519a1a4e82e69764da9e89716489 +Author: Adriaan de Groot +Date: Tue Apr 20 14:28:33 2021 +0200 + + Fix crash in all(?) KIPI export plugins + + Scenario: + - start spectacle, take a screenshot, click *export* drop-down + and pick *imageshack* or *remote storage* (or most of the + others) + - spectacle crashes + + Valgrind: + ==60783== Invalid read of size 8 + ==60783== at 0x48A149A: KIPI::PluginLoader::interface() const (invent/libkipi/src/pluginloader.cpp:385) + ==60783== by 0x14DB111A: KIPIRemoteStoragePlugin::Plugin_RemoteStorage::slotActivateExport() (invent/kipi-plugins/remotestorage/plugin_remotestorage.cpp:122) + ==60783== Address 0xc6d28b0 is 16 bytes inside a block of size 24 free'd + ==60783== at 0x484CBAC: operator delete(void*) (in /usr/local/lib/valgrind/vgpreload_memcheck-amd64-freebsd.so) + ==60783== by 0x247CAB: ExportMenu::getKipiItems() (invent/spectacle/src/Gui/ExportMenu.cpp:164) +diff --git src/Gui/ExportMenu.cpp src/Gui/ExportMenu.cpp +index 66490dc..92eafa0 100644 +--- src/Gui/ExportMenu.cpp ++++ src/Gui/ExportMenu.cpp +@@ -120,7 +120,19 @@ void ExportMenu::getKipiItems() + mKipiMenu->clear(); + + mKipiInterface = new KSGKipiInterface(this); +- KIPI::PluginLoader *loader = new KIPI::PluginLoader; ++ ++ KIPI::PluginLoader *loader = KIPI::PluginLoader::instance(); ++ if (!loader) ++ { ++ // The loader needs to live at least as long as the plugins ++ // loaded through it, since the plugins use the loader's ++ // interface() call to get the KIPI interface they conform to. ++ // ++ // ASAN may complain about a leak here, because this loader ++ // pointer goes out of scope, but it is kept around in ++ // the PluginLoader's static instance() ++ loader = new KIPI::PluginLoader; ++ } + + loader->setInterface(mKipiInterface); + loader->init(); +@@ -161,7 +173,6 @@ void ExportMenu::getKipiItems() + if (mKipiMenu->isEmpty()) { + mKipiMenu->addAction(i18n("No KIPI plugins available"))->setEnabled(false); + } +- delete loader; + } + #endif + From owner-dev-commits-ports-branches@freebsd.org Wed Apr 21 07:09:57 2021 Return-Path: Delivered-To: dev-commits-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 0506D5F99E8; Wed, 21 Apr 2021 07:09:57 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQBWm6mTxz4jkh; Wed, 21 Apr 2021 07:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB06621B46; Wed, 21 Apr 2021 07:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13L79u8R053067; Wed, 21 Apr 2021 07:09:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13L79u0f053066; Wed, 21 Apr 2021 07:09:56 GMT (envelope-from git) Date: Wed, 21 Apr 2021 07:09:56 GMT Message-Id: <202104210709.13L79u0f053066@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 18679678e156 - 2021Q2 - textproc/rubygem-rexml: Update to 3.2.5 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 18679678e15642ceb499732b3a49628d5b235d70 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 07:09:57 -0000 The branch 2021Q2 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=18679678e15642ceb499732b3a49628d5b235d70 commit 18679678e15642ceb499732b3a49628d5b235d70 Author: Po-Chuan Hsieh AuthorDate: 2021-04-18 05:16:22 +0000 Commit: Matthias Fechner CommitDate: 2021-04-21 06:08:16 +0000 textproc/rubygem-rexml: Update to 3.2.5 Changes: https://github.com/ruby/rexml/blob/master/NEWS.md (cherry picked from commit 3d1a0c161c086ef084e127bbe1ce52b43f51329c) --- textproc/rubygem-rexml/Makefile | 2 +- textproc/rubygem-rexml/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/textproc/rubygem-rexml/Makefile b/textproc/rubygem-rexml/Makefile index 1098c660a19f..9af5bd6c25ac 100644 --- a/textproc/rubygem-rexml/Makefile +++ b/textproc/rubygem-rexml/Makefile @@ -1,7 +1,7 @@ # Created by: Po-Chuan Hsieh PORTNAME= rexml -PORTVERSION= 3.2.4 +PORTVERSION= 3.2.5 CATEGORIES= textproc rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-rexml/distinfo b/textproc/rubygem-rexml/distinfo index 7f2f9a933028..f7cf893ff9a2 100644 --- a/textproc/rubygem-rexml/distinfo +++ b/textproc/rubygem-rexml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1587445348 -SHA256 (rubygem/rexml-3.2.4.gem) = 036b31f3c052be42b7a2e6914f3322daaecce46b172806f38fea4297389b7bd6 -SIZE (rubygem/rexml-3.2.4.gem) = 77824 +TIMESTAMP = 1618321034 +SHA256 (rubygem/rexml-3.2.5.gem) = a33c3bf95fda7983ec7f05054f3a985af41dbc25a0339843bd2479e93cabb123 +SIZE (rubygem/rexml-3.2.5.gem) = 93184 From owner-dev-commits-ports-branches@freebsd.org Wed Apr 21 07:09:58 2021 Return-Path: Delivered-To: dev-commits-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 5E08B5F9A61; Wed, 21 Apr 2021 07:09:58 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQBWp1QL9z4jp1; Wed, 21 Apr 2021 07:09:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0831621DAC; Wed, 21 Apr 2021 07:09:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13L79vwo053090; Wed, 21 Apr 2021 07:09:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13L79vZS053089; Wed, 21 Apr 2021 07:09:57 GMT (envelope-from git) Date: Wed, 21 Apr 2021 07:09:57 GMT Message-Id: <202104210709.13L79vZS053089@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 66945d1ea90e - 2021Q2 - security/rubygem-ruby-saml: Update to 1.12.2. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 66945d1ea90ee148228b20a919d31e21656b6b76 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 07:09:58 -0000 The branch 2021Q2 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=66945d1ea90ee148228b20a919d31e21656b6b76 commit 66945d1ea90ee148228b20a919d31e21656b6b76 Author: Matthias Fechner AuthorDate: 2021-04-15 14:56:11 +0000 Commit: Matthias Fechner CommitDate: 2021-04-21 06:08:30 +0000 security/rubygem-ruby-saml: Update to 1.12.2. This upgrade is required for gitlab-ce 13.10.3 security update. Changes: https://github.com/onelogin/ruby-saml/blob/master/changelog.md MFH: 2021Q2 (cherry picked from commit e7761c8640b19f7cf8105c6dfbc9f4de9bb536cc) --- security/rubygem-ruby-saml/Makefile | 5 +++-- security/rubygem-ruby-saml/distinfo | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/security/rubygem-ruby-saml/Makefile b/security/rubygem-ruby-saml/Makefile index 60c4d30ba6cf..8de754d9cb2b 100644 --- a/security/rubygem-ruby-saml/Makefile +++ b/security/rubygem-ruby-saml/Makefile @@ -1,7 +1,7 @@ # Created by: Torsten Zuhlsdorff PORTNAME= ruby-saml -PORTVERSION= 1.9.0 +PORTVERSION= 1.12.2 CATEGORIES= security rubygems MASTER_SITES= RG @@ -11,7 +11,8 @@ COMMENT= SAML toolkit for Ruby on Rails LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-nokogiri>=1.5.10:textproc/rubygem-nokogiri +RUN_DEPENDS= rubygem-nokogiri>=1.10.5:textproc/rubygem-nokogiri \ + rubygem-rexml>=0:textproc/rubygem-rexml USES= gem USE_RUBY= yes diff --git a/security/rubygem-ruby-saml/distinfo b/security/rubygem-ruby-saml/distinfo index c6efbd8d52f6..665b6158b5ac 100644 --- a/security/rubygem-ruby-saml/distinfo +++ b/security/rubygem-ruby-saml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1536079784 -SHA256 (rubygem/ruby-saml-1.9.0.gem) = 648a5f67dec543214717d7052880cce75a0efaefe9dc32ca71c813dd7cadc389 -SIZE (rubygem/ruby-saml-1.9.0.gem) = 286208 +TIMESTAMP = 1618498508 +SHA256 (rubygem/ruby-saml-1.12.2.gem) = 31f606ead3e991223f7c8e708f9f6c5130de6fd0a33639784a7f6305d783416c +SIZE (rubygem/ruby-saml-1.12.2.gem) = 70144 From owner-dev-commits-ports-branches@freebsd.org Wed Apr 21 07:09:59 2021 Return-Path: Delivered-To: dev-commits-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 801B75F9D03; Wed, 21 Apr 2021 07:09:59 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQBWq1vqNz4jvW; Wed, 21 Apr 2021 07:09:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2166821AB8; Wed, 21 Apr 2021 07:09:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13L79xcT053112; Wed, 21 Apr 2021 07:09:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13L79xNQ053110; Wed, 21 Apr 2021 07:09:59 GMT (envelope-from git) Date: Wed, 21 Apr 2021 07:09:59 GMT Message-Id: <202104210709.13L79xNQ053110@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: a0aac5772461 - 2021Q2 - www/gitlab-ce: Security update to 13.10.3. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: a0aac5772461f983f0e8190049658d880943161c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 07:09:59 -0000 The branch 2021Q2 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0aac5772461f983f0e8190049658d880943161c commit a0aac5772461f983f0e8190049658d880943161c Author: Matthias Fechner AuthorDate: 2021-04-17 06:18:09 +0000 Commit: Matthias Fechner CommitDate: 2021-04-21 06:08:43 +0000 www/gitlab-ce: Security update to 13.10.3. Changelog: https://about.gitlab.com/releases/2021/04/14/security-release-gitlab-13-10-3-released/ (cherry picked from commit 77d6936ce6b750acc1503f712be7e507b90b5f47) --- devel/gitaly/Makefile | 4 ++-- devel/gitaly/distinfo | 6 +++--- www/gitlab-ce/Makefile | 6 ++++-- www/gitlab-ce/distinfo | 6 +++--- www/gitlab-workhorse/Makefile | 4 ++-- www/gitlab-workhorse/distinfo | 6 +++--- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 500358918d31..ece6da743146 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitaly -DISTVERSION= 13.10.2 +DISTVERSION= 13.10.3 PORTREVISION= 0 CATEGORIES= devel @@ -44,7 +44,7 @@ MAKE_ENV+= ${GO_ENV} USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= 566d0ed013b36ca369e72fd5d1a9a9cc7606132a +GL_COMMIT= 80796c538e2c8f45d311914c3d7a6b22866a0758 # for go dependencies USE_GITHUB= nodefault diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index d605a53c49c1..df0ae8e3774c 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1617994165 +TIMESTAMP = 1618497419 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84 SIZE (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = 3321111 SHA256 (alexbrainman-sspi-909beea2cc74_GH0.tar.gz) = 50b452d12987d884f45c85bd2de8ea7076cd54f6f2c8b612a1d4c1704e52b5df @@ -161,8 +161,8 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137 SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460 SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3 SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655 -SHA256 (gitlab-org-gitaly-566d0ed013b36ca369e72fd5d1a9a9cc7606132a_GL0.tar.gz) = 32e20b1de98c530a51f2bff821c070474311a53d14006513702ec7c25dd62658 -SIZE (gitlab-org-gitaly-566d0ed013b36ca369e72fd5d1a9a9cc7606132a_GL0.tar.gz) = 3396774 +SHA256 (gitlab-org-gitaly-80796c538e2c8f45d311914c3d7a6b22866a0758_GL0.tar.gz) = 6caa7d7f8ee04b9b455ba84fdd2a04ff16f6b79cd780ae02ac3b4c09c2a3541d +SIZE (gitlab-org-gitaly-80796c538e2c8f45d311914c3d7a6b22866a0758_GL0.tar.gz) = 3396835 SHA256 (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 7f5b214e4bd2b72231462c3a153d9b416caab331a1a25a3ca5cd44b02ab9eb15 SIZE (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 89693 SHA256 (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 0ac619ab0bfcbda29f80f0955e86c7ffa1adaa20c96ed546f53fb837633f5d90 diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 52ac13c4d351..669057aaf65a 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,7 +1,7 @@ # Created by: Torsten Zuehlsdorff PORTNAME= gitlab-ce -PORTVERSION= 13.10.2 +PORTVERSION= 13.10.3 PORTREVISION= 0 CATEGORIES= www devel @@ -38,6 +38,8 @@ MY_DEPENDS= git>=2.29:devel/git \ rubygem-bcrypt>=3.1.14<3.2:security/rubygem-bcrypt \ rubygem-doorkeeper>=5.5.0.rc2<5.6:security/rubygem-doorkeeper \ rubygem-doorkeeper-openid_connect>=1.7.5<1.8:security/rubygem-doorkeeper-openid_connect \ + rubygem-rexml>=3.2.5<3.3:textproc/rubygem-rexml \ + rubygem-ruby-saml>=1.12.1<1.13:security/rubygem-ruby-saml \ rubygem-omniauth>=1.8<2.0:security/rubygem-omniauth \ rubygem-omniauth-auth0>=2.0.0<2.1.0:net/rubygem-omniauth-auth0 \ rubygem-omniauth-azure-activedirectory-v2>=0.1<1:net/rubygem-omniauth-azure-activedirectory-v2 \ @@ -269,7 +271,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?= 7efd19e3716ab6f9146052da76d1bd59ec815f2d +GL_COMMIT?= b1774ad36a965ba5077db6db11e13f2837284158 USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 46dc6048f022..98a639c04dba 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617994217 -SHA256 (gitlab-org-gitlab-foss-7efd19e3716ab6f9146052da76d1bd59ec815f2d_GL0.tar.gz) = 9f1173a52eea1f6c27895ba05883a6b23d4e0968a3e6de47424a587018eda0b4 -SIZE (gitlab-org-gitlab-foss-7efd19e3716ab6f9146052da76d1bd59ec815f2d_GL0.tar.gz) = 100381606 +TIMESTAMP = 1618464119 +SHA256 (gitlab-org-gitlab-foss-b1774ad36a965ba5077db6db11e13f2837284158_GL0.tar.gz) = 0a27e1203218d9fc50193632dfbf3cf1bab128edbcd3c875085f4a6c74e9192d +SIZE (gitlab-org-gitlab-foss-b1774ad36a965ba5077db6db11e13f2837284158_GL0.tar.gz) = 100475905 diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index 99a61b7c6efc..2b72de95cc7d 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,7 +1,7 @@ # Created by: Torsten Zuehlsdorff PORTNAME?= gitlab-workhorse -PORTVERSION?= 13.10.2 +PORTVERSION?= 13.10.3 PORTREVISION?= 0 CATEGORIES= www @@ -22,7 +22,7 @@ USE_GITLAB= yes GL_ACCOUNT?= gitlab-org GL_PROJECT= gitlab-foss # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT?= 7efd19e3716ab6f9146052da76d1bd59ec815f2d +GL_COMMIT?= b1774ad36a965ba5077db6db11e13f2837284158 # for go dependencies USE_GITHUB= nodefault diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 9b7a82dbd45c..8a69eee1c6d9 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1617994305 +TIMESTAMP = 1618479411 SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102 SHA256 (Azure-azure-storage-blob-go-6df5d9af221d_GH0.tar.gz) = 31047920e4c507f913b9922ad920a2e9f6d48e6056bdc6869b6c257e3ab095a7 @@ -179,8 +179,8 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137 SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460 SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3 SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655 -SHA256 (gitlab-org-gitlab-foss-7efd19e3716ab6f9146052da76d1bd59ec815f2d_GL0.tar.gz) = 9f1173a52eea1f6c27895ba05883a6b23d4e0968a3e6de47424a587018eda0b4 -SIZE (gitlab-org-gitlab-foss-7efd19e3716ab6f9146052da76d1bd59ec815f2d_GL0.tar.gz) = 100381606 +SHA256 (gitlab-org-gitlab-foss-b1774ad36a965ba5077db6db11e13f2837284158_GL0.tar.gz) = 0a27e1203218d9fc50193632dfbf3cf1bab128edbcd3c875085f4a6c74e9192d +SIZE (gitlab-org-gitlab-foss-b1774ad36a965ba5077db6db11e13f2837284158_GL0.tar.gz) = 100475905 SHA256 (gitlab-org-gitaly-3f5e218def93024f3aafe590c22cd1b29f744105_GL0.tar.gz) = 000027af9d1bca6db30bb4e0b27fcb4b6315ae7c0787639c044eaa449fc3d8d0 SIZE (gitlab-org-gitaly-3f5e218def93024f3aafe590c22cd1b29f744105_GL0.tar.gz) = 3145584 SHA256 (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 0ac619ab0bfcbda29f80f0955e86c7ffa1adaa20c96ed546f53fb837633f5d90 From owner-dev-commits-ports-branches@freebsd.org Wed Apr 21 07:11:35 2021 Return-Path: Delivered-To: dev-commits-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 2B3445F9D26; Wed, 21 Apr 2021 07:11:35 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQBYg0N5sz4jhW; Wed, 21 Apr 2021 07:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F3C8C21F20; Wed, 21 Apr 2021 07:11:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13L7BYWr062349; Wed, 21 Apr 2021 07:11:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13L7BY3Q062348; Wed, 21 Apr 2021 07:11:34 GMT (envelope-from git) Date: Wed, 21 Apr 2021 07:11:34 GMT Message-Id: <202104210711.13L7BY3Q062348@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: ef6815792434 - 2021Q2 - multimedia/musikcube: Fix build on 13+ by properly linking to base OpenSSL MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: ef68157924340c73d1f20a369ae8d89a3196dda6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 07:11:35 -0000 The branch 2021Q2 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=ef68157924340c73d1f20a369ae8d89a3196dda6 commit ef68157924340c73d1f20a369ae8d89a3196dda6 Author: Yuri Victorovich AuthorDate: 2021-04-21 06:20:27 +0000 Commit: Yuri Victorovich CommitDate: 2021-04-21 07:11:33 +0000 multimedia/musikcube: Fix build on 13+ by properly linking to base OpenSSL Reported by: fallout (cherry picked from commit 089d935ab16b1ed209b2820c1652f38e023e1d6e) --- multimedia/musikcube/Makefile | 2 ++ .../files/patch-src_musikcube_CMakeLists.txt | 23 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/multimedia/musikcube/Makefile b/multimedia/musikcube/Makefile index a2cba8a2b404..972802b10e6e 100644 --- a/multimedia/musikcube/Makefile +++ b/multimedia/musikcube/Makefile @@ -33,10 +33,12 @@ GH_ACCOUNT= clangen .if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1300079 USES+= ncurses CMAKE_ARGS= -DNCURSES_DISABLE_LIB_SUFFIXES=false +CMAKE_ON= FREEBSD_USE_BASE_NCURSES .else USES+= ncurses:port CFLAGS+= -I${LOCALBASE}/include/ncurses CMAKE_ARGS= -DNCURSES_DISABLE_LIB_SUFFIXES=true +CMAKE_OFF= FREEBSD_USE_BASE_NCURSES .endif .include diff --git a/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt b/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt new file mode 100644 index 000000000000..db22da097189 --- /dev/null +++ b/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt @@ -0,0 +1,23 @@ +--- src/musikcube/CMakeLists.txt.orig 2021-04-21 04:51:30 UTC ++++ src/musikcube/CMakeLists.txt +@@ -103,10 +103,18 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin") + else() + find_package(PkgConfig) + if (${NCURSES_DISABLE_LIB_SUFFIXES} MATCHES "true") +- pkg_check_modules(NCURSES REQUIRED ncurses panel) ++ if (FREEBSD_USE_BASE_NCURSES) ++ set(NCURSES_LIBRARIES ncurses panel) ++ else() ++ pkg_check_modules(NCURSES REQUIRED ncurses panel) ++ endif() + message(STATUS "[ncurses] using library names without 'w' prefix") + else() +- pkg_check_modules(NCURSES REQUIRED ncursesw panelw) ++ if (FREEBSD_USE_BASE_NCURSES) ++ set(NCURSES_LIBRARIES ncursesw panelw) ++ else() ++ pkg_check_modules(NCURSES REQUIRED ncursesw panelw) ++ endif() + message(STATUS "[ncurses] using library names with 'w' prefix") + endif() + target_link_libraries(musikcube ${musikcube_LINK_LIBS} ${NCURSES_LIBRARIES} musikcore) From owner-dev-commits-ports-branches@freebsd.org Wed Apr 21 08:07:25 2021 Return-Path: Delivered-To: dev-commits-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 1D80C5FBF2E; Wed, 21 Apr 2021 08:07:25 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQCp50PStz4msV; Wed, 21 Apr 2021 08:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 00B38229CD; Wed, 21 Apr 2021 08:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13L87Ofh033235; Wed, 21 Apr 2021 08:07:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13L87Ow4033234; Wed, 21 Apr 2021 08:07:24 GMT (envelope-from git) Date: Wed, 21 Apr 2021 08:07:24 GMT Message-Id: <202104210807.13L87Ow4033234@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kai Knoblich Subject: git: 8e7d4134d37f - 2021Q2 - devel/pycharm-pro: Fix staging with non-default Python versions MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 8e7d4134d37fbdb3b1ad004b30139da27e74c8a7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 08:07:25 -0000 The branch 2021Q2 has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=8e7d4134d37fbdb3b1ad004b30139da27e74c8a7 commit 8e7d4134d37fbdb3b1ad004b30139da27e74c8a7 Author: Kai Knoblich AuthorDate: 2021-04-19 14:36:07 +0000 Commit: Kai Knoblich CommitDate: 2021-04-21 08:02:18 +0000 devel/pycharm-pro: Fix staging with non-default Python versions * Replace two occurrences in pkg-plist where PYTHON_VER shouldn't be used as a substitution because "3.7" is really hardcoded in the paths. PR: 253815 Approved by: portmgr (build fix) MFH: 2021Q2 (cherry picked from commit 980acd02507f9efef60f5aaf9aff71bb952571ff) --- devel/pycharm-pro/pkg-plist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/pycharm-pro/pkg-plist b/devel/pycharm-pro/pkg-plist index 6918195584c5..93874a472a16 100644 --- a/devel/pycharm-pro/pkg-plist +++ b/devel/pycharm-pro/pkg-plist @@ -2355,8 +2355,8 @@ share/applications/pycharm-pro.desktop %%DATADIR%%/plugins/python/helpers/typeshed/stdlib/2and3/zipfile.pyi %%DATADIR%%/plugins/python/helpers/typeshed/stdlib/2and3/zipimport.pyi %%DATADIR%%/plugins/python/helpers/typeshed/stdlib/2and3/zlib.pyi -%%DATADIR%%/plugins/python/helpers/typeshed/stdlib/%%PYTHON_VER%%/_py_abc.pyi -%%DATADIR%%/plugins/python/helpers/typeshed/stdlib/%%PYTHON_VER%%/contextvars.pyi +%%DATADIR%%/plugins/python/helpers/typeshed/stdlib/3.7/_py_abc.pyi +%%DATADIR%%/plugins/python/helpers/typeshed/stdlib/3.7/contextvars.pyi %%DATADIR%%/plugins/python/helpers/typeshed/stdlib/3.9/graphlib.pyi %%DATADIR%%/plugins/python/helpers/typeshed/stdlib/3.9/zoneinfo/__init__.pyi %%DATADIR%%/plugins/python/helpers/typeshed/stdlib/3/_bootlocale.pyi From owner-dev-commits-ports-branches@freebsd.org Wed Apr 21 11:37:16 2021 Return-Path: Delivered-To: dev-commits-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 7EF335E1887; Wed, 21 Apr 2021 11:37:16 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQJSD3335z3DxS; Wed, 21 Apr 2021 11:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5BEA5255E1; Wed, 21 Apr 2021 11:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13LBbGDU012847; Wed, 21 Apr 2021 11:37:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13LBbGFZ012846; Wed, 21 Apr 2021 11:37:16 GMT (envelope-from git) Date: Wed, 21 Apr 2021 11:37:16 GMT Message-Id: <202104211137.13LBbGFZ012846@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Koichiro Iwao Subject: git: 3590f90e1c6a - 2021Q2 - devel/ruby-build: Update to 20210420 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: meta X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 3590f90e1c6a7e193f1ecde5c1c720aeb0ecc3c3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 11:37:16 -0000 The branch 2021Q2 has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=3590f90e1c6a7e193f1ecde5c1c720aeb0ecc3c3 commit 3590f90e1c6a7e193f1ecde5c1c720aeb0ecc3c3 Author: Koichiro Iwao AuthorDate: 2021-04-21 11:07:50 +0000 Commit: Koichiro Iwao CommitDate: 2021-04-21 11:28:32 +0000 devel/ruby-build: Update to 20210420 * Warn EoL for Ruby 2.5 * Add mruby-3.0.0 * Add TruffleRuby 21.1.0 Relnotes: https://github.com/rbenv/ruby-build/releases/tag/v20210420 (cherry picked from commit 361ed522612d0f05eaaabfa825ae1effdc6fa7e7) --- devel/ruby-build/Makefile | 2 +- devel/ruby-build/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/ruby-build/Makefile b/devel/ruby-build/Makefile index 99825e5a6e02..a5f7e565f5a9 100644 --- a/devel/ruby-build/Makefile +++ b/devel/ruby-build/Makefile @@ -1,6 +1,6 @@ PORTNAME= ruby-build -PORTVERSION= 20210405 +PORTVERSION= 20210420 DISTVERSIONPREFIX= v CATEGORIES= devel ruby DIST_SUBDIR= rbenv diff --git a/devel/ruby-build/distinfo b/devel/ruby-build/distinfo index fac9dc902d1b..69cd9ea2a726 100644 --- a/devel/ruby-build/distinfo +++ b/devel/ruby-build/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617705242 -SHA256 (rbenv/rbenv-ruby-build-v20210405_GH0.tar.gz) = fedeac99dc84b3493da9ad2918687d3098d65f8455b861cb770d5c4133c466c2 -SIZE (rbenv/rbenv-ruby-build-v20210405_GH0.tar.gz) = 70738 +TIMESTAMP = 1619002834 +SHA256 (rbenv/rbenv-ruby-build-v20210420_GH0.tar.gz) = 4223676bf37854bada3f51165d3cdb87e28a2afdddaef8e5b2603c70fca47f81 +SIZE (rbenv/rbenv-ruby-build-v20210420_GH0.tar.gz) = 71005 From owner-dev-commits-ports-branches@freebsd.org Wed Apr 21 17:44:03 2021 Return-Path: Delivered-To: dev-commits-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 8AABB5ECF58; Wed, 21 Apr 2021 17:44:03 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQSbR3Tn0z3qKp; Wed, 21 Apr 2021 17:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 67DD9259B; Wed, 21 Apr 2021 17:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13LHi3rZ002791; Wed, 21 Apr 2021 17:44:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13LHi3Bp002790; Wed, 21 Apr 2021 17:44:03 GMT (envelope-from git) Date: Wed, 21 Apr 2021 17:44:03 GMT Message-Id: <202104211744.13LHi3Bp002790@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 0328b140894b - 2021Q2 - multimedia/vapoursynth: update to R53 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 0328b140894b6fe5b08d5b4a793e6da6cdcf9b65 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 17:44:03 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0328b140894b6fe5b08d5b4a793e6da6cdcf9b65 commit 0328b140894b6fe5b08d5b4a793e6da6cdcf9b65 Author: Jan Beich AuthorDate: 2021-04-10 13:45:19 +0000 Commit: Jan Beich CommitDate: 2021-04-21 17:43:52 +0000 multimedia/vapoursynth: update to R53 Changes: http://www.vapoursynth.com/2021/04/r53-once-more-there-are-bug-fixes/ Changes: https://github.com/vapoursynth/vapoursynth/compare/R52...R53 Reported by: GitHub (watch releases) (cherry picked from commit 8b7214f15623cfef66fd30d8d7a7539e44de24e5) --- multimedia/vapoursynth/Makefile | 2 +- multimedia/vapoursynth/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/multimedia/vapoursynth/Makefile b/multimedia/vapoursynth/Makefile index c15c03a24fa0..9dba80c5ae93 100644 --- a/multimedia/vapoursynth/Makefile +++ b/multimedia/vapoursynth/Makefile @@ -1,6 +1,6 @@ PORTNAME= vapoursynth -DISTVERSION= R52 +DISTVERSION= R53 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/vapoursynth/distinfo b/multimedia/vapoursynth/distinfo index f34ba7970805..c0debd3b7147 100644 --- a/multimedia/vapoursynth/distinfo +++ b/multimedia/vapoursynth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1597945702 -SHA256 (vapoursynth-vapoursynth-R52_GH0.tar.gz) = 4d5dc7950f4357da695d29708bc98013bc3e0bd72fc5d697f8c91ce3c4a4b2ac -SIZE (vapoursynth-vapoursynth-R52_GH0.tar.gz) = 618942 +TIMESTAMP = 1618062319 +SHA256 (vapoursynth-vapoursynth-R53_GH0.tar.gz) = 78e2c5311b2572349ff7fec2e16311e9e4f6acdda78673872206ab660eadf7c8 +SIZE (vapoursynth-vapoursynth-R53_GH0.tar.gz) = 620154 From owner-dev-commits-ports-branches@freebsd.org Wed Apr 21 17:44:06 2021 Return-Path: Delivered-To: dev-commits-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 1CD2D5ECBC2; Wed, 21 Apr 2021 17:44:06 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQSbT71jWz3qMs; Wed, 21 Apr 2021 17:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BE8702634; Wed, 21 Apr 2021 17:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13LHi54M002852; Wed, 21 Apr 2021 17:44:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13LHi5FK002851; Wed, 21 Apr 2021 17:44:05 GMT (envelope-from git) Date: Wed, 21 Apr 2021 17:44:05 GMT Message-Id: <202104211744.13LHi5FK002851@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: bba925e1282a - main - graphics/vulkan-loader: update to 1.2.176 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bba925e1282aefdda91a9171877c279b52d3bde8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 17:44:06 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=bba925e1282aefdda91a9171877c279b52d3bde8 commit bba925e1282aefdda91a9171877c279b52d3bde8 Author: Jan Beich AuthorDate: 2021-04-20 16:45:05 +0000 Commit: Jan Beich CommitDate: 2021-04-21 17:42:47 +0000 graphics/vulkan-loader: update to 1.2.176 Changes: https://github.com/KhronosGroup/Vulkan-Loader/compare/v1.2.174...v1.2.176 Reported by: portscout --- graphics/vulkan-loader/Makefile | 3 +- graphics/vulkan-loader/distinfo | 6 ++-- .../files/patch-cmake_FindVulkanHeaders.cmake | 39 ---------------------- graphics/vulkan-loader/files/patch-loader_loader.c | 6 ++-- .../files/patch-loader_vk__loader__platform.h | 6 ++-- 5 files changed, 10 insertions(+), 50 deletions(-) diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index d057c160c6d6..c6c9c4e35851 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,7 +1,6 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v -DISTVERSION= 1.2.174 -PORTREVISION= 1 +DISTVERSION= 1.2.176 CATEGORIES= graphics devel MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/vulkan-loader/distinfo b/graphics/vulkan-loader/distinfo index 017b7c497182..329a96075fbf 100644 --- a/graphics/vulkan-loader/distinfo +++ b/graphics/vulkan-loader/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617048347 -SHA256 (KhronosGroup-Vulkan-Loader-v1.2.174_GH0.tar.gz) = c39a660da13450cb5e2d1dc571749d0e9a4f831998b20a7ad9fc7f2c99e1bb0b -SIZE (KhronosGroup-Vulkan-Loader-v1.2.174_GH0.tar.gz) = 1423922 +TIMESTAMP = 1618937105 +SHA256 (KhronosGroup-Vulkan-Loader-v1.2.176_GH0.tar.gz) = 9a7cf743bea8bfc7bd8c0527079eea122a95cd2baaf61d1c8589168670e4a152 +SIZE (KhronosGroup-Vulkan-Loader-v1.2.176_GH0.tar.gz) = 1430058 diff --git a/graphics/vulkan-loader/files/patch-cmake_FindVulkanHeaders.cmake b/graphics/vulkan-loader/files/patch-cmake_FindVulkanHeaders.cmake deleted file mode 100644 index ad836da3157d..000000000000 --- a/graphics/vulkan-loader/files/patch-cmake_FindVulkanHeaders.cmake +++ /dev/null @@ -1,39 +0,0 @@ -Part of https://github.com/KhronosGroup/Vulkan-Loader/commit/eb6d6f95dff8 - -$ make check-plist -====> Checking for pkg-plist issues (check-plist) -===> Parsing plist -===> Checking for items in STAGEDIR missing from pkg-plist -Error: Orphaned: lib/libvulkan.so.0.0.176 -===> Checking for items in pkg-plist which are not in STAGEDIR -Error: Missing: lib/libvulkan.so.1.2.176 -===> Error: Plist issues found. -*** Error code 1 - ---- cmake/FindVulkanHeaders.cmake.orig 2021-03-29 20:05:47 UTC -+++ cmake/FindVulkanHeaders.cmake -@@ -114,19 +114,19 @@ endif() - file(STRINGS - ${VulkanHeaders_main_header} - VulkanHeaders_lines -- REGEX "^#define (VK_API_VERSION.*VK_MAKE_VERSION|VK_HEADER_VERSION)") -+ REGEX "^#define VK_HEADER_VERSION(_COMPLETE)? ") - - foreach(VulkanHeaders_line ${VulkanHeaders_lines}) - - # First, handle the case where we have a major/minor version - # Format is: -- # #define VK_API_VERSION_X_Y VK_MAKE_VERSION(X, Y, 0) -+ # #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, X, Y, VK_HEADER_VERSION) - # We grab the major version (X) and minor version (Y) out of the parentheses -- string(REGEX MATCH "VK_MAKE_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line}) -+ string(REGEX MATCH "VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line}) - string(REGEX MATCHALL "[0-9]+" VulkanHeaders_MAJOR_MINOR "${VulkanHeaders_out}") - if (VulkanHeaders_MAJOR_MINOR) -- list (GET VulkanHeaders_MAJOR_MINOR 0 VulkanHeaders_cur_major) -- list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_minor) -+ list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_major) -+ list (GET VulkanHeaders_MAJOR_MINOR 2 VulkanHeaders_cur_minor) - if (${VulkanHeaders_cur_major} GREATER ${VulkanHeaders_VERSION_MAJOR}) - set(VulkanHeaders_VERSION_MAJOR ${VulkanHeaders_cur_major}) - set(VulkanHeaders_VERSION_MINOR ${VulkanHeaders_cur_minor}) diff --git a/graphics/vulkan-loader/files/patch-loader_loader.c b/graphics/vulkan-loader/files/patch-loader_loader.c index 36450777becf..30b588023daa 100644 --- a/graphics/vulkan-loader/files/patch-loader_loader.c +++ b/graphics/vulkan-loader/files/patch-loader_loader.c @@ -1,11 +1,11 @@ ---- loader/loader.c.orig 2020-11-23 16:19:03 UTC +--- loader/loader.c.orig 2021-04-20 16:45:05 UTC +++ loader/loader.c @@ -253,7 +253,7 @@ void *loader_device_heap_realloc(const struct loader_d } // Environment variables --#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) -+#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) +-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) ++#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) static inline bool IsHighIntegrity() { return geteuid() != getuid() || getegid() != getgid(); diff --git a/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h b/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h index 31c41bac9716..888712684920 100644 --- a/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h +++ b/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h @@ -1,11 +1,11 @@ ---- loader/vk_loader_platform.h.orig 2020-11-23 16:19:03 UTC +--- loader/vk_loader_platform.h.orig 2021-04-20 16:45:05 UTC +++ loader/vk_loader_platform.h @@ -35,7 +35,7 @@ #include "vulkan/vk_platform.h" #include "vulkan/vk_sdk_platform.h" --#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) -+#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) +-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) ++#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) /* Linux-specific common code: */ // Headers: From owner-dev-commits-ports-branches@freebsd.org Wed Apr 21 17:44:07 2021 Return-Path: Delivered-To: dev-commits-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 0FF7B5ECBC4; Wed, 21 Apr 2021 17:44:07 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQSbV6kYQz3qQ4; Wed, 21 Apr 2021 17:44:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D1FFF26F0; Wed, 21 Apr 2021 17:44:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13LHi6FH002873; Wed, 21 Apr 2021 17:44:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13LHi6is002872; Wed, 21 Apr 2021 17:44:06 GMT (envelope-from git) Date: Wed, 21 Apr 2021 17:44:06 GMT Message-Id: <202104211744.13LHi6is002872@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 03c0fa19d95a - main - graphics/vulkan-tools: update to 1.2.176 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03c0fa19d95a823c68288ac462c2ed045e0682b0 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 17:44:07 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=03c0fa19d95a823c68288ac462c2ed045e0682b0 commit 03c0fa19d95a823c68288ac462c2ed045e0682b0 Author: Jan Beich AuthorDate: 2021-04-20 19:57:14 +0000 Commit: Jan Beich CommitDate: 2021-04-21 17:42:47 +0000 graphics/vulkan-tools: update to 1.2.176 Changes: https://github.com/KhronosGroup/Vulkan-Tools/compare/v1.2.174...v1.2.176 Reported by: portscout --- graphics/vulkan-tools/Makefile | 2 +- graphics/vulkan-tools/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile index 1003b84abf6c..c5ebe8a775b4 100644 --- a/graphics/vulkan-tools/Makefile +++ b/graphics/vulkan-tools/Makefile @@ -1,6 +1,6 @@ PORTNAME= vulkan-tools DISTVERSIONPREFIX= v -DISTVERSION= 1.2.174 +DISTVERSION= 1.2.176 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo index b210bbdb69f0..32be6f92d0bd 100644 --- a/graphics/vulkan-tools/distinfo +++ b/graphics/vulkan-tools/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1617052323 -SHA256 (KhronosGroup-Vulkan-Tools-v1.2.174_GH0.tar.gz) = c8b537d3a8f18550b8720a8a3c0006949e2575d547d88fa94858ab7413cee7de -SIZE (KhronosGroup-Vulkan-Tools-v1.2.174_GH0.tar.gz) = 837918 +TIMESTAMP = 1618948634 +SHA256 (KhronosGroup-Vulkan-Tools-v1.2.176_GH0.tar.gz) = 75fa54c7d6d73c359be4941010d8ed2e156a101389c9da0200da1ef005641f6c +SIZE (KhronosGroup-Vulkan-Tools-v1.2.176_GH0.tar.gz) = 841270 SHA256 (ea2e75bea224.patch) = 1a2550804a1bd7e66f5d19043dc540ffadc55a1bfe6b8734c353c0bd3a1090d1 SIZE (ea2e75bea224.patch) = 22460 From owner-dev-commits-ports-branches@freebsd.org Wed Apr 21 17:44:09 2021 Return-Path: Delivered-To: dev-commits-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 488715ED20D; Wed, 21 Apr 2021 17:44:09 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQSbY1Skwz3q2y; Wed, 21 Apr 2021 17:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 210612526; Wed, 21 Apr 2021 17:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13LHi91B002915; Wed, 21 Apr 2021 17:44:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13LHi92c002914; Wed, 21 Apr 2021 17:44:09 GMT (envelope-from git) Date: Wed, 21 Apr 2021 17:44:09 GMT Message-Id: <202104211744.13LHi92c002914@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 8b7214f15623 - main - multimedia/vapoursynth: update to R53 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b7214f15623cfef66fd30d8d7a7539e44de24e5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 17:44:09 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=8b7214f15623cfef66fd30d8d7a7539e44de24e5 commit 8b7214f15623cfef66fd30d8d7a7539e44de24e5 Author: Jan Beich AuthorDate: 2021-04-10 13:45:19 +0000 Commit: Jan Beich CommitDate: 2021-04-21 17:42:47 +0000 multimedia/vapoursynth: update to R53 Changes: http://www.vapoursynth.com/2021/04/r53-once-more-there-are-bug-fixes/ Changes: https://github.com/vapoursynth/vapoursynth/compare/R52...R53 Reported by: GitHub (watch releases) --- multimedia/vapoursynth/Makefile | 2 +- multimedia/vapoursynth/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/multimedia/vapoursynth/Makefile b/multimedia/vapoursynth/Makefile index e57c483e516f..2bb0c1f98c85 100644 --- a/multimedia/vapoursynth/Makefile +++ b/multimedia/vapoursynth/Makefile @@ -1,5 +1,5 @@ PORTNAME= vapoursynth -DISTVERSION= R52 +DISTVERSION= R53 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/vapoursynth/distinfo b/multimedia/vapoursynth/distinfo index f34ba7970805..c0debd3b7147 100644 --- a/multimedia/vapoursynth/distinfo +++ b/multimedia/vapoursynth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1597945702 -SHA256 (vapoursynth-vapoursynth-R52_GH0.tar.gz) = 4d5dc7950f4357da695d29708bc98013bc3e0bd72fc5d697f8c91ce3c4a4b2ac -SIZE (vapoursynth-vapoursynth-R52_GH0.tar.gz) = 618942 +TIMESTAMP = 1618062319 +SHA256 (vapoursynth-vapoursynth-R53_GH0.tar.gz) = 78e2c5311b2572349ff7fec2e16311e9e4f6acdda78673872206ab660eadf7c8 +SIZE (vapoursynth-vapoursynth-R53_GH0.tar.gz) = 620154 From owner-dev-commits-ports-branches@freebsd.org Wed Apr 21 17:44:04 2021 Return-Path: Delivered-To: dev-commits-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 A5FE15ECBBF; Wed, 21 Apr 2021 17:44:04 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQSbS47pjz3qMm; Wed, 21 Apr 2021 17:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7F3182525; Wed, 21 Apr 2021 17:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13LHi4SO002831; Wed, 21 Apr 2021 17:44:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13LHi4q5002830; Wed, 21 Apr 2021 17:44:04 GMT (envelope-from git) Date: Wed, 21 Apr 2021 17:44:04 GMT Message-Id: <202104211744.13LHi4q5002830@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: a88b69a2727e - main - graphics/vulkan-headers: update to 1.2.176 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a88b69a2727e3a8cc572de7e2082832f0b7c317c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 17:44:04 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=a88b69a2727e3a8cc572de7e2082832f0b7c317c commit a88b69a2727e3a8cc572de7e2082832f0b7c317c Author: Jan Beich AuthorDate: 2021-04-19 06:31:54 +0000 Commit: Jan Beich CommitDate: 2021-04-21 17:42:46 +0000 graphics/vulkan-headers: update to 1.2.176 Changes: https://github.com/KhronosGroup/Vulkan-Headers/compare/v1.2.174...v1.2.176 Reported by: portscout, Repology --- graphics/vulkan-headers/Makefile | 2 +- graphics/vulkan-headers/distinfo | 6 ++-- .../files/patch-include_vulkan_vulkan.hpp | 42 +++++++++++----------- graphics/vulkan-headers/pkg-plist | 6 ++++ graphics/vulkan-loader/Makefile | 1 + .../files/patch-cmake_FindVulkanHeaders.cmake | 39 ++++++++++++++++++++ graphics/vulkan-loader/pkg-plist | 2 +- 7 files changed, 72 insertions(+), 26 deletions(-) diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index 3580c4160e6b..5b26d3d09229 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,6 +1,6 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX= v -DISTVERSION= 1.2.174 +DISTVERSION= 1.2.176 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo index 9f5681467220..de3e3a6200d9 100644 --- a/graphics/vulkan-headers/distinfo +++ b/graphics/vulkan-headers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617005981 -SHA256 (KhronosGroup-Vulkan-Headers-v1.2.174_GH0.tar.gz) = 32a0a842081412eac756bf07a6f7ded421c78b2dcba3d4a8f6c410b532d0c739 -SIZE (KhronosGroup-Vulkan-Headers-v1.2.174_GH0.tar.gz) = 909126 +TIMESTAMP = 1618813914 +SHA256 (KhronosGroup-Vulkan-Headers-v1.2.176_GH0.tar.gz) = d77b033e74448341b42d1b6f2b380570e870b0443875f26c9e8a636f01ee6fe7 +SIZE (KhronosGroup-Vulkan-Headers-v1.2.176_GH0.tar.gz) = 1030697 diff --git a/graphics/vulkan-headers/files/patch-include_vulkan_vulkan.hpp b/graphics/vulkan-headers/files/patch-include_vulkan_vulkan.hpp index 8de486bd88ba..9915735db886 100644 --- a/graphics/vulkan-headers/files/patch-include_vulkan_vulkan.hpp +++ b/graphics/vulkan-headers/files/patch-include_vulkan_vulkan.hpp @@ -1,56 +1,56 @@ ---- include/vulkan/vulkan.hpp.orig 2021-03-01 06:51:42 UTC +--- include/vulkan/vulkan.hpp.orig 2021-04-19 06:31:54 UTC +++ include/vulkan/vulkan.hpp @@ -67,7 +67,7 @@ #endif #if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1 --# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) +-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) ++# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) # include # elif defined( _WIN32 ) typedef struct HINSTANCE__ * HINSTANCE; -@@ -92518,7 +92518,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -121385,7 +121385,7 @@ namespace VULKAN_HPP_NAMESPACE { if ( !vulkanLibraryName.empty() ) { --# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) +-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) ++# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL ); # elif defined( _WIN32 ) m_library = ::LoadLibraryA( vulkanLibraryName.c_str() ); -@@ -92528,7 +92528,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -121395,7 +121395,7 @@ namespace VULKAN_HPP_NAMESPACE } else { --# if defined( __linux__ ) || defined( __QNXNTO__ ) -+# if defined( __unix__ ) || defined( __QNXNTO__ ) +-# if defined( __linux__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) ++# if defined( __unix__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL ); if ( m_library == nullptr ) { -@@ -92571,7 +92571,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -121439,7 +121439,7 @@ namespace VULKAN_HPP_NAMESPACE { if ( m_library ) { --# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) +-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) ++# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) dlclose( m_library ); # elif defined( _WIN32 ) ::FreeLibrary( m_library ); -@@ -92584,7 +92584,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -121452,7 +121452,7 @@ namespace VULKAN_HPP_NAMESPACE template - T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT + T getProcAddress( const char * function ) const VULKAN_HPP_NOEXCEPT { --# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) +-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) ++# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) return (T)dlsym( m_library, function ); # elif defined( _WIN32 ) - return (T)::GetProcAddress( m_library, function ); -@@ -92596,7 +92596,7 @@ namespace VULKAN_HPP_NAMESPACE - bool success() const VULKAN_HPP_NOEXCEPT { return m_library != nullptr; } + return ( T )::GetProcAddress( m_library, function ); +@@ -121467,7 +121467,7 @@ namespace VULKAN_HPP_NAMESPACE + } private: --# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) +-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) ++# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) void * m_library; # elif defined( _WIN32 ) ::HINSTANCE m_library; diff --git a/graphics/vulkan-headers/pkg-plist b/graphics/vulkan-headers/pkg-plist index 417d3d2fd3ed..aa1d2c9d910e 100644 --- a/graphics/vulkan-headers/pkg-plist +++ b/graphics/vulkan-headers/pkg-plist @@ -1,3 +1,9 @@ +include/vk_video/vulkan_video_codec_h264std.h +include/vk_video/vulkan_video_codec_h264std_decode.h +include/vk_video/vulkan_video_codec_h264std_encode.h +include/vk_video/vulkan_video_codec_h265std.h +include/vk_video/vulkan_video_codec_h265std_decode.h +include/vk_video/vulkan_video_codecs_common.h include/vulkan/vk_icd.h include/vulkan/vk_layer.h include/vulkan/vk_platform.h diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 9efef6fe82d9..d057c160c6d6 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,6 +1,7 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v DISTVERSION= 1.2.174 +PORTREVISION= 1 CATEGORIES= graphics devel MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/vulkan-loader/files/patch-cmake_FindVulkanHeaders.cmake b/graphics/vulkan-loader/files/patch-cmake_FindVulkanHeaders.cmake new file mode 100644 index 000000000000..ad836da3157d --- /dev/null +++ b/graphics/vulkan-loader/files/patch-cmake_FindVulkanHeaders.cmake @@ -0,0 +1,39 @@ +Part of https://github.com/KhronosGroup/Vulkan-Loader/commit/eb6d6f95dff8 + +$ make check-plist +====> Checking for pkg-plist issues (check-plist) +===> Parsing plist +===> Checking for items in STAGEDIR missing from pkg-plist +Error: Orphaned: lib/libvulkan.so.0.0.176 +===> Checking for items in pkg-plist which are not in STAGEDIR +Error: Missing: lib/libvulkan.so.1.2.176 +===> Error: Plist issues found. +*** Error code 1 + +--- cmake/FindVulkanHeaders.cmake.orig 2021-03-29 20:05:47 UTC ++++ cmake/FindVulkanHeaders.cmake +@@ -114,19 +114,19 @@ endif() + file(STRINGS + ${VulkanHeaders_main_header} + VulkanHeaders_lines +- REGEX "^#define (VK_API_VERSION.*VK_MAKE_VERSION|VK_HEADER_VERSION)") ++ REGEX "^#define VK_HEADER_VERSION(_COMPLETE)? ") + + foreach(VulkanHeaders_line ${VulkanHeaders_lines}) + + # First, handle the case where we have a major/minor version + # Format is: +- # #define VK_API_VERSION_X_Y VK_MAKE_VERSION(X, Y, 0) ++ # #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, X, Y, VK_HEADER_VERSION) + # We grab the major version (X) and minor version (Y) out of the parentheses +- string(REGEX MATCH "VK_MAKE_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line}) ++ string(REGEX MATCH "VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line}) + string(REGEX MATCHALL "[0-9]+" VulkanHeaders_MAJOR_MINOR "${VulkanHeaders_out}") + if (VulkanHeaders_MAJOR_MINOR) +- list (GET VulkanHeaders_MAJOR_MINOR 0 VulkanHeaders_cur_major) +- list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_minor) ++ list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_major) ++ list (GET VulkanHeaders_MAJOR_MINOR 2 VulkanHeaders_cur_minor) + if (${VulkanHeaders_cur_major} GREATER ${VulkanHeaders_VERSION_MAJOR}) + set(VulkanHeaders_VERSION_MAJOR ${VulkanHeaders_cur_major}) + set(VulkanHeaders_VERSION_MINOR ${VulkanHeaders_cur_minor}) diff --git a/graphics/vulkan-loader/pkg-plist b/graphics/vulkan-loader/pkg-plist index 10ff833e30b9..2995ab120214 100644 --- a/graphics/vulkan-loader/pkg-plist +++ b/graphics/vulkan-loader/pkg-plist @@ -1,4 +1,4 @@ lib/libvulkan.so lib/libvulkan.so.1 -lib/libvulkan.so.1.2.174 +lib/libvulkan.so.1.2.176 libdata/pkgconfig/vulkan.pc From owner-dev-commits-ports-branches@freebsd.org Wed Apr 21 17:44:08 2021 Return-Path: Delivered-To: dev-commits-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 48B8A5ECFB5; Wed, 21 Apr 2021 17:44:08 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQSbX0DMtz3qQ8; Wed, 21 Apr 2021 17:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EE606279D; Wed, 21 Apr 2021 17:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13LHi74u002894; Wed, 21 Apr 2021 17:44:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13LHi7eQ002893; Wed, 21 Apr 2021 17:44:07 GMT (envelope-from git) Date: Wed, 21 Apr 2021 17:44:07 GMT Message-Id: <202104211744.13LHi7eQ002893@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 817b7f7b389a - main - graphics/vulkan-validation-layers: update to 1.2.176 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 817b7f7b389a38ce0785f5f481eb48fdc412e5b1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 17:44:08 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=817b7f7b389a38ce0785f5f481eb48fdc412e5b1 commit 817b7f7b389a38ce0785f5f481eb48fdc412e5b1 Author: Jan Beich AuthorDate: 2021-04-19 18:27:39 +0000 Commit: Jan Beich CommitDate: 2021-04-21 17:42:47 +0000 graphics/vulkan-validation-layers: update to 1.2.176 Changes: https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/v1.2.174...v1.2.176 Reported by: portscout --- graphics/vulkan-validation-layers/Makefile | 2 +- graphics/vulkan-validation-layers/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index 026d5ccb685d..f090ed416b6f 100644 --- a/graphics/vulkan-validation-layers/Makefile +++ b/graphics/vulkan-validation-layers/Makefile @@ -1,6 +1,6 @@ PORTNAME= vulkan-validation-layers DISTVERSIONPREFIX= v -DISTVERSION= 1.2.174 +DISTVERSION= 1.2.176 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/vulkan-validation-layers/distinfo b/graphics/vulkan-validation-layers/distinfo index 22b23af0a2fc..582d3c762e2e 100644 --- a/graphics/vulkan-validation-layers/distinfo +++ b/graphics/vulkan-validation-layers/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1617056365 -SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.2.174_GH0.tar.gz) = 5696a502a11ca0fb954b1dbf6b887ce6371c6a80666420102d5b6250117e06f7 -SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.2.174_GH0.tar.gz) = 2634975 +TIMESTAMP = 1618856859 +SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.2.176_GH0.tar.gz) = 8fa71257d4a88532bbc107303d6e81ead72ae92c662b73c92d9836f47fe6d738 +SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.2.176_GH0.tar.gz) = 2707247 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-29-g75b30a6_GH0.tar.gz) = 03075fc9f52833849bb34210029d029669f96bfc9dcf937b910a8ba7f5f361db SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-29-g75b30a6_GH0.tar.gz) = 403781 SHA256 (martinus-robin-hood-hashing-3.10.0_GH0.tar.gz) = 15f031c3ab7c13addfb19bd495be6f12ac8843111b71b61873ef6fa981bfc4da From owner-dev-commits-ports-branches@freebsd.org Wed Apr 21 17:49:14 2021 Return-Path: Delivered-To: dev-commits-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 0B8B95ED35F; Wed, 21 Apr 2021 17:49:14 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQSjP71tbz3qrP; Wed, 21 Apr 2021 17:49:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E462423E9; Wed, 21 Apr 2021 17:49:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13LHnDZI003532; Wed, 21 Apr 2021 17:49:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13LHnDok003531; Wed, 21 Apr 2021 17:49:13 GMT (envelope-from git) Date: Wed, 21 Apr 2021 17:49:13 GMT Message-Id: <202104211749.13LHnDok003531@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Andree Subject: git: 08c22f24c94d - 2021Q2 - security/openvpn: security update to v2.5.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 08c22f24c94d9310d984e2ce0aa3c840bb5accd2 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 17:49:14 -0000 The branch 2021Q2 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=08c22f24c94d9310d984e2ce0aa3c840bb5accd2 commit 08c22f24c94d9310d984e2ce0aa3c840bb5accd2 Author: Matthias Andree AuthorDate: 2021-04-21 17:46:21 +0000 Commit: Matthias Andree CommitDate: 2021-04-21 17:48:38 +0000 security/openvpn: security update to v2.5.2 Changelog: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst#overview-of-changes-in-252 Security: CVE-2020-15078 Security: efb965be-a2c0-11eb-8956-1951a8617e30 MFH: 2021Q2 (cherry picked from commit 6271ca01ce9d0733b650b42cdf98813b27758370) --- security/openvpn/Makefile | 11 ++++++----- security/openvpn/distinfo | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile index 1e2a19dfc81a..93904f5908c9 100644 --- a/security/openvpn/Makefile +++ b/security/openvpn/Makefile @@ -1,7 +1,7 @@ # Created by: Matthias Andree PORTNAME= openvpn -DISTVERSION= 2.5.1 +DISTVERSION= 2.5.2 PORTREVISION?= 0 CATEGORIES= security net net-vpn MASTER_SITES= https://swupdate.openvpn.org/community/releases/ \ @@ -34,11 +34,8 @@ SUB_FILES= pkg-message openvpn-client PORTDOCS= * PORTEXAMPLES= * -# avoid picking up CMAKE, we don't have cmocka in the tarballs. -CONFIGURE_ENV+= ac_cv_prog_CMAKE= CMAKE= - OPTIONS_DEFINE= PKCS11 EASYRSA DOCS EXAMPLES X509ALTUSERNAME \ - TEST LZ4 LZO SMALL TUNNELBLICK ASYNC_PUSH + TEST LZ4 LZO SMALL TUNNELBLICK ASYNC_PUSH UNITTESTS OPTIONS_DEFAULT= EASYRSA OPENSSL TEST LZ4 LZO OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= OPENSSL MBEDTLS @@ -48,6 +45,7 @@ MBEDTLS_DESC= SSL/TLS via mbedTLS (lacks TLS v1.3) PKCS11_DESC= Use security/pkcs11-helper (OpenSSL only) SMALL_DESC= Build a smaller executable with fewer features TUNNELBLICK_DESC= Tunnelblick XOR scramble patch (READ HELP!) +UNITTESTS_DESC= Enable unit tests X509ALTUSERNAME_DESC= Enable --x509-username-field (OpenSSL only) ASYNC_PUSH_LIB_DEPENDS= libinotify.so:devel/libinotify @@ -79,6 +77,9 @@ TEST_TEST_TARGET_OFF= check TUNNELBLICK_EXTRA_PATCHES= ${FILESDIR}/extra-tunnelblick-openvpn_xorpatch:-p1 +UNITTESTS_BUILD_DEPENDS= cmocka>=0:sysutils/cmocka +UNITTESTS_CONFIGURE_ENABLE= unit-tests + X509ALTUSERNAME_PREVENTS= MBEDTLS X509ALTUSERNAME_PREVENTS_MSG= OpenVPN ${DISTVERSION} cannot use --x509-username-field with mbedTLS. Disable X509ALTUSERNAME, or use OpenSSL instead X509ALTUSERNAME_CONFIGURE_ENABLE= x509-alt-username diff --git a/security/openvpn/distinfo b/security/openvpn/distinfo index 2e53f51759f8..46c0867f3257 100644 --- a/security/openvpn/distinfo +++ b/security/openvpn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1614191992 -SHA256 (openvpn-2.5.1.tar.xz) = 40930489c837c05f6153f38e1ebaec244431ef1a034e4846ff732d71d59ff194 -SIZE (openvpn-2.5.1.tar.xz) = 1132708 +TIMESTAMP = 1619022841 +SHA256 (openvpn-2.5.2.tar.xz) = b12743836901f365efaf82ab2493967e1b21c21eb43ce9a8da1002a17c9c1dc8 +SIZE (openvpn-2.5.2.tar.xz) = 1134644 From owner-dev-commits-ports-branches@freebsd.org Wed Apr 21 17:53:48 2021 Return-Path: Delivered-To: dev-commits-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 95F035ED5F0; Wed, 21 Apr 2021 17:53:48 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQSph3vByz3rMt; Wed, 21 Apr 2021 17:53:48 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mandree.no-ip.org (p4fe5242b.dip0.t-ipconnect.de [79.229.36.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: mandree/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 5DC7029A09; Wed, 21 Apr 2021 17:53:48 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from ryzen.an3e.de (localhost [IPv6:::1]) by ryzen.an3e.de (Postfix) with ESMTP id 6E056120647; Wed, 21 Apr 2021 19:53:47 +0200 (CEST) Subject: Re: git: 08c22f24c94d - 2021Q2 - security/openvpn: security update to v2.5.2 From: Matthias Andree To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org References: <202104211749.13LHnDok003531@gitrepo.freebsd.org> Message-ID: <129910f9-cab1-c219-e8d5-52fd3776e429@FreeBSD.org> Date: Wed, 21 Apr 2021 19:53:47 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <202104211749.13LHnDok003531@gitrepo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 17:53:48 -0000 Am 21.04.21 um 19:49 schrieb Matthias Andree: > The branch 2021Q2 has been updated by mandree: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=08c22f24c94d9310d984e2ce0aa3c840bb5accd2 > > commit 08c22f24c94d9310d984e2ce0aa3c840bb5accd2 > Author: Matthias Andree > AuthorDate: 2021-04-21 17:46:21 +0000 > Commit: Matthias Andree > CommitDate: 2021-04-21 17:48:38 +0000 > ... > (cherry picked from commit 6271ca01ce9d0733b650b42cdf98813b27758370) Lesson learned: pull --rebase and push main first, then cherry-pick the MFH. From owner-dev-commits-ports-branches@freebsd.org Wed Apr 21 18:38:13 2021 Return-Path: Delivered-To: dev-commits-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 459295EE9D6; Wed, 21 Apr 2021 18:38:13 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQTnx1X6mz3tJ8; Wed, 21 Apr 2021 18:38:13 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1619030293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=f5LHDXPSamb4y+ok6+cd3sleHf6lWRqj3fBPk0CZG7Y=; b=WbzZytyuo7c8yGPUVsRD/rO0xQvbEbxJTczz+OkEP0ITjQef5JDAxxObi/zov6psC0ld86 G9NYWceOBmJ6YHIoaMJ83jh9/FzTGIfl5Bw4TRskVfMN68387VPj8VnK+biXT2cpcOjvu/ SD8l2CtVbt0VvAkZUceyjVPeisRGc6spKsdTzgcTjg5XiQViP7AcSuiVMq04ATgg3YB4D+ 9sXxIV0zYUviFDvA7p5ZjEHKIS5M3q6BAo9oVvCWG4nQo7IplkAX0n+QMIvcJql6ltXsMH bBTZWiuAIhuXGDKgbhHPuoQCqJtrPcc4+AX95Gq5M5frE64PsZz0+hXfeEB/wg== Received: by freefall.freebsd.org (Postfix, from userid 1354) id 1AEE2232B6; Wed, 21 Apr 2021 18:38:13 +0000 (UTC) From: Jan Beich To: Matthias Andree Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: Re: git: 08c22f24c94d - 2021Q2 - security/openvpn: security update to v2.5.2 References: <202104211749.13LHnDok003531@gitrepo.freebsd.org> <129910f9-cab1-c219-e8d5-52fd3776e429__24805.0403710053$1619027639$gmane$org@FreeBSD.org> Date: Wed, 21 Apr 2021 20:38:08 +0200 In-Reply-To: <129910f9-cab1-c219-e8d5-52fd3776e429__24805.0403710053$1619027639$gmane$org@FreeBSD.org> (Matthias Andree's message of "Wed, 21 Apr 2021 19:53:47 +0200") Message-ID: <7dkv-sctr-wny@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1619030293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=f5LHDXPSamb4y+ok6+cd3sleHf6lWRqj3fBPk0CZG7Y=; b=ST8LWhy2uWc2JvwZYJAV66I5AtWpazxk+ObB7/qhiO5rj5Gwlxbq/95GQG9IUM460sapkC ag9sO9qxRCG8ON8nAepWn5+p1tmsVyQQRqmepYzjuAoqKfx4a5ekSX4ffbgFqDLaXbtG2n 2wvTXRf7/GSU4tRApV/08FYY+PQap4iJ49flyYIyr+k8C5LJfSwC8yZ5414znc1zBGkB80 b0in6OPwOsRLJEtWrzQ2IO3M0ueccO88W2mme7xQQvBbMaGOhKkUPaP1NBBvbTJ44vjq0T jfYCpr7/SehSyxif39QbX5Vu3dxraNs6LuR9OBpGZxmB5kZ9Z285Z9w0B+RpGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1619030293; a=rsa-sha256; cv=none; b=beWf3ohznUsMMnVr4xtbF/IGq2VEp3TgZGjg4CCuKCTzBfoe7DTFd+otOUliQPbcSA19DZ jxnUfenPowJEk7PyBsKtS3PY2hObyfPcEP+Bi03fYkDe4dT5klT0ax4PEeZruFyoxJRNwY QTI2yjXfcc9Vf/s+LdQHBcQrzbCJLaCeKujAyNijahz28IHwhGqR28T2XpJzNKNfW+OgTX uth8bDTVelsYZLdv2YioWwjKceby887zoj8lOVXLXGpiYERHdmte0jnQAWIK6owI6dc65u C9cLRfgsxPX3hlk83DDyB/MvSlPwWaONIKgMEEDb8g7zOrdsD5pyonE8thydeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 18:38:13 -0000 Matthias Andree writes: > Am 21.04.21 um 19:49 schrieb Matthias Andree: > >> The branch 2021Q2 has been updated by mandree: >> >> URL: https://cgit.FreeBSD.org/ports/commit/?id=08c22f24c94d9310d984e2ce0aa3c840bb5accd2 >> >> commit 08c22f24c94d9310d984e2ce0aa3c840bb5accd2 >> Author: Matthias Andree >> AuthorDate: 2021-04-21 17:46:21 +0000 >> Commit: Matthias Andree >> CommitDate: 2021-04-21 17:48:38 +0000 >> > ... >> (cherry picked from commit 6271ca01ce9d0733b650b42cdf98813b27758370) > > Lesson learned: > pull --rebase and push main first, then cherry-pick the MFH. Or use "git push --atomic freebsd main 2021Q2". From manpage: --[no-]atomic Use an atomic transaction on the remote side if available. Either all refs are updated, or on error, no refs are updated. If the server does not support atomic pushes the push will fail. I did test this e.g., d149560bb859 (regular multi-branch push) and 0328b140894b (multi-branch with --atomic). From owner-dev-commits-ports-branches@freebsd.org Wed Apr 21 19:42:52 2021 Return-Path: Delivered-To: dev-commits-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 4FCDE5F004A; Wed, 21 Apr 2021 19:42:52 +0000 (UTC) (envelope-from mandree@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQWDX1mmLz4QvF; Wed, 21 Apr 2021 19:42:52 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mandree.no-ip.org (p200300d0273ba9003a4f9af3ce9e76c6.dip0.t-ipconnect.de [IPv6:2003:d0:273b:a900:3a4f:9af3:ce9e:76c6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: mandree/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 10C452A79B; Wed, 21 Apr 2021 19:42:52 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from ryzen.an3e.de (localhost [IPv6:::1]) by ryzen.an3e.de (Postfix) with ESMTP id 500CC120647; Wed, 21 Apr 2021 21:42:49 +0200 (CEST) Subject: Re: git: 08c22f24c94d - 2021Q2 - security/openvpn: security update to v2.5.2 To: Jan Beich Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org References: <202104211749.13LHnDok003531@gitrepo.freebsd.org> <129910f9-cab1-c219-e8d5-52fd3776e429__24805.0403710053$1619027639$gmane$org@FreeBSD.org> <7dkv-sctr-wny@FreeBSD.org> From: Matthias Andree Message-ID: <8a90f09f-d911-d6dd-fe2f-d61caa80cc87@FreeBSD.org> Date: Wed, 21 Apr 2021 21:42:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <7dkv-sctr-wny@FreeBSD.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 19:42:52 -0000 Am 21.04.21 um 20:38 schrieb Jan Beich: > Matthias Andree writes: > >> Am 21.04.21 um 19:49 schrieb Matthias Andree: >> >>> The branch 2021Q2 has been updated by mandree: >>> >>> URL: https://cgit.FreeBSD.org/ports/commit/?id=08c22f24c94d9310d984e2ce0aa3c840bb5accd2 >>> >>> commit 08c22f24c94d9310d984e2ce0aa3c840bb5accd2 >>> Author: Matthias Andree >>> AuthorDate: 2021-04-21 17:46:21 +0000 >>> Commit: Matthias Andree >>> CommitDate: 2021-04-21 17:48:38 +0000 >>> >> ... >>> (cherry picked from commit 6271ca01ce9d0733b650b42cdf98813b27758370) >> >> Lesson learned: >> pull --rebase and push main first, then cherry-pick the MFH. > > Or use "git push --atomic freebsd main 2021Q2". From manpage: > > --[no-]atomic > Use an atomic transaction on the remote side if available. Either > all refs are updated, or on error, no refs are updated. If the > server does not support atomic pushes the push will fail. > > I did test this e.g., d149560bb859 (regular multi-branch push) and > 0328b140894b (multi-branch with --atomic). > Thanks for the suggestion, but this would not have helped. Sequence was: * pull main * update vuxml and commit * update openvpn, test, test some more, poudriere builds, fixups, commit [in the meanwhile, people pushed to main] * checkout 2021Q2 and pull * MFH. i. e. cherry-pick one commit from main. * checkout main and pull so I can push => at this point, the rebase changed the commit hash of my two commits rendering the "cherry picked from commit ..." obsolete * I pushed The flaw in the sequencing is that the local reference on main that I cherry-pick from is unstable until I've pushed. TL;DR take-away message: Really only cherry-pick from references you've successfully pushed out into the public. From owner-dev-commits-ports-branches@freebsd.org Thu Apr 22 00:53:10 2021 Return-Path: Delivered-To: dev-commits-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 0880B5F6E7A; Thu, 22 Apr 2021 00:53:10 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQf6Y6rl5z4fgb; Thu, 22 Apr 2021 00:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DE0E27EFE; Thu, 22 Apr 2021 00:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13M0r9np073100; Thu, 22 Apr 2021 00:53:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13M0r9pR073099; Thu, 22 Apr 2021 00:53:09 GMT (envelope-from git) Date: Thu, 22 Apr 2021 00:53:09 GMT Message-Id: <202104220053.13M0r9pR073099@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: a5bd958ec79a - 2021Q2 - audio/rhvoice: Follow the GitHub account rename; Integrate with speech-dispatcher MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: a5bd958ec79a23cb9272f1e6386ea7d6c4aee288 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 00:53:10 -0000 The branch 2021Q2 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=a5bd958ec79a23cb9272f1e6386ea7d6c4aee288 commit a5bd958ec79a23cb9272f1e6386ea7d6c4aee288 Author: Yuri Victorovich AuthorDate: 2021-04-21 22:22:32 +0000 Commit: Yuri Victorovich CommitDate: 2021-04-22 00:53:07 +0000 audio/rhvoice: Follow the GitHub account rename; Integrate with speech-dispatcher (cherry picked from commit ecc0623c5d85bcee6284492fbfef811497d8280d) --- audio/rhvoice/Makefile | 7 ++++++- audio/rhvoice/distinfo | 6 +++--- audio/rhvoice/pkg-descr | 2 +- audio/rhvoice/pkg-plist | 1 + 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/audio/rhvoice/Makefile b/audio/rhvoice/Makefile index 29b700a437af..abfa13938400 100644 --- a/audio/rhvoice/Makefile +++ b/audio/rhvoice/Makefile @@ -1,6 +1,7 @@ PORTNAME= RHVoice DISTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= yuri@FreeBSD.org @@ -15,7 +16,6 @@ BROKEN_FreeBSD_12_powerpc64= fails to configure: The C++ compiler is not working USES= compiler:c++0x pkgconfig scons USE_GITHUB= yes -GH_ACCOUNT= Olga-Yakovleva USE_LDCONFIG= yes OPTIONS_RADIO= AUDIO @@ -36,7 +36,12 @@ post-patch-PORTAUDIO-off: @${REINPLACE_CMD} 's|conf.CheckPKG("portaudio-2.0")|False|' ${WRKSRC}/SConstruct post-install: + # create config file ${MV} ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample + # strip binaries cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} bin/RHVoice-test bin/sd_rhvoice lib/libRHVoice.so lib/libRHVoice_audio.so lib/libRHVoice_core.so + # install accessibility/speech-dispatcher module + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/speech-dispatcher-modules + ${RLN} ${STAGEDIR}${PREFIX}/bin/sd_rhvoice ${STAGEDIR}${PREFIX}/lib/speech-dispatcher-modules .include diff --git a/audio/rhvoice/distinfo b/audio/rhvoice/distinfo index 3ccfc32326fc..0225bb4267dc 100644 --- a/audio/rhvoice/distinfo +++ b/audio/rhvoice/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1599929129 -SHA256 (Olga-Yakovleva-RHVoice-1.2.3_GH0.tar.gz) = d104f20dc75fcd133d21751a6e894d34b423e12e4784350b4b9573c727fb71cd -SIZE (Olga-Yakovleva-RHVoice-1.2.3_GH0.tar.gz) = 170715227 +TIMESTAMP = 1619041364 +SHA256 (RHVoice-RHVoice-1.2.3_GH0.tar.gz) = d104f20dc75fcd133d21751a6e894d34b423e12e4784350b4b9573c727fb71cd +SIZE (RHVoice-RHVoice-1.2.3_GH0.tar.gz) = 170715227 diff --git a/audio/rhvoice/pkg-descr b/audio/rhvoice/pkg-descr index 2549bb1933de..27568d0af50d 100644 --- a/audio/rhvoice/pkg-descr +++ b/audio/rhvoice/pkg-descr @@ -6,4 +6,4 @@ It consists of the following components: * speech module for Windows (SAPI5) * Android App -WWW: https://github.com/Olga-Yakovleva/RHVoice +WWW: https://github.com/RHVoice/RHVoice diff --git a/audio/rhvoice/pkg-plist b/audio/rhvoice/pkg-plist index 478663ffe3e2..38a8292e54a3 100644 --- a/audio/rhvoice/pkg-plist +++ b/audio/rhvoice/pkg-plist @@ -12,6 +12,7 @@ lib/libRHVoice_audio.so.2.0.0 lib/libRHVoice_core.so lib/libRHVoice_core.so.4 lib/libRHVoice_core.so.4.0.0 +lib/speech-dispatcher-modules/sd_rhvoice %%DATADIR%%/languages/Brazilian-Portuguese/downcase.fst %%DATADIR%%/languages/Brazilian-Portuguese/dur-mod.dt %%DATADIR%%/languages/Brazilian-Portuguese/emoji.fst From owner-dev-commits-ports-branches@freebsd.org Thu Apr 22 08:20:59 2021 Return-Path: Delivered-To: dev-commits-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 AC1DE5E4743; Thu, 22 Apr 2021 08:20:59 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQr3H4Rnnz3JTl; Thu, 22 Apr 2021 08:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8B5E2164B6; Thu, 22 Apr 2021 08:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13M8Kxaj070761; Thu, 22 Apr 2021 08:20:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13M8KxXd070760; Thu, 22 Apr 2021 08:20:59 GMT (envelope-from git) Date: Thu, 22 Apr 2021 08:20:59 GMT Message-Id: <202104220820.13M8KxXd070760@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Guido Falsi Subject: git: fd679460e9c0 - 2021Q2 - emulators/virtualbox-ose-additions: Fix vboxvfs panic MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: fd679460e9c056f582bb858031ed723f6384e701 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 08:20:59 -0000 The branch 2021Q2 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd679460e9c056f582bb858031ed723f6384e701 commit fd679460e9c056f582bb858031ed723f6384e701 Author: Guido Falsi AuthorDate: 2021-04-22 08:15:53 +0000 Commit: Guido Falsi CommitDate: 2021-04-22 08:20:39 +0000 emulators/virtualbox-ose-additions: Fix vboxvfs panic Fix panic on mount when trying to use vbox VFS after base r355790 (or git commit hash 6fa079fc3f5e). PR: 255208 MFH: 2021Q2 (cherry picked from commit 8a311de0cb804d8b135413884b4fb336d287ad5a) --- emulators/virtualbox-ose-additions/Makefile | 1 + .../files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index e34b98c7a6c4..b335cda7154e 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -2,6 +2,7 @@ PORTNAME= virtualbox-ose PORTVERSION= 6.1.18 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX?= -additions diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c index 471b3ac76714..99893d2f750e 100644 --- a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c @@ -1,6 +1,6 @@ --- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c.orig 2021-01-07 15:34:22 UTC +++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c -@@ -14,228 +14,1347 @@ +@@ -14,228 +14,1350 @@ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ @@ -160,6 +160,9 @@ + .vop_write = vboxfs_write, + .vop_bmap = VOP_EOPNOTSUPP }; ++#if __FreeBSD_version > 1300068 ++VFS_VOP_VECTOR_REGISTER(vboxfs_vnodeops); ++#endif -static int vboxvfs_access(struct vop_access_args *ap) +static uint64_t From owner-dev-commits-ports-branches@freebsd.org Thu Apr 22 12:41:52 2021 Return-Path: Delivered-To: dev-commits-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 646E55F1932; Thu, 22 Apr 2021 12:41:52 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQxrJ2Tnsz3sLW; Thu, 22 Apr 2021 12:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3DE711A21A; Thu, 22 Apr 2021 12:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13MCfqaI020421; Thu, 22 Apr 2021 12:41:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13MCfqN3020420; Thu, 22 Apr 2021 12:41:52 GMT (envelope-from git) Date: Thu, 22 Apr 2021 12:41:52 GMT Message-Id: <202104221241.13MCfqN3020420@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rene Ladan Subject: git: 1cd7238bc54a - 2021Q2 - devel/include-what-you-use: update to 0.15 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 1cd7238bc54a86a1b9b29213ed011f8c40404838 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 12:41:52 -0000 The branch 2021Q2 has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=1cd7238bc54a86a1b9b29213ed011f8c40404838 commit 1cd7238bc54a86a1b9b29213ed011f8c40404838 Author: Rene Ladan AuthorDate: 2021-04-22 12:38:46 +0000 Commit: Rene Ladan CommitDate: 2021-04-22 12:41:24 +0000 devel/include-what-you-use: update to 0.15 PR: 255189 Approved by: koobs (maintainer) MFH: 2021Q2 (several bugfix releases) (cherry picked from commit 2c9f5d1cb54dc06c60f83ee79435c0bdf579e65d) --- devel/include-what-you-use/Makefile | 8 +++----- devel/include-what-you-use/distinfo | 6 +++--- devel/include-what-you-use/pkg-plist | 2 ++ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/devel/include-what-you-use/Makefile b/devel/include-what-you-use/Makefile index 44cce81b8a6d..41b1de142df9 100644 --- a/devel/include-what-you-use/Makefile +++ b/devel/include-what-you-use/Makefile @@ -1,8 +1,7 @@ # Created by: Kubilay Kocak PORTNAME= include-what-you-use -PORTVERSION= 0.12 -PORTREVISION= 1 +PORTVERSION= 0.15 CATEGORIES= devel MAINTAINER= koobs@FreeBSD.org @@ -11,18 +10,17 @@ COMMENT= Tool for use with clang to analyze \#includes in C and C++ source files LICENSE= NCSA LICENSE_FILE= ${WRKSRC}/LICENSE.TXT -LLVM_VER= 80 +LLVM_VER= 11 BUILD_DEPENDS= clang${LLVM_VER}:devel/llvm${LLVM_VER} RUN_DEPENDS= clang${LLVM_VER}:devel/llvm${LLVM_VER} USES= cmake compiler:c++11-lang ncurses python:run shebangfix USE_GITHUB= yes +GH_TAGNAME= clang_${LLVM_VER} SHEBANG_FILES= fix_includes.py \ iwyu_tool.py -GH_TAGNAME= clang_8.0 - CMAKE_ARGS+= -DLLVM_DIR=${LOCALBASE}/llvm${LLVM_VER}/lib/cmake/llvm \ -DClang_DIR=${LOCALBASE}/llvm${LLVM_VER}/lib/cmake/clang diff --git a/devel/include-what-you-use/distinfo b/devel/include-what-you-use/distinfo index 13d2527b6b93..c5d3fac3033e 100644 --- a/devel/include-what-you-use/distinfo +++ b/devel/include-what-you-use/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1556011804 -SHA256 (include-what-you-use-include-what-you-use-0.12-clang_8.0_GH0.tar.gz) = 2df080a3e657ebf40386c94a327d1aeeb9ff8d4569bfb860df398629b7f0fdb6 -SIZE (include-what-you-use-include-what-you-use-0.12-clang_8.0_GH0.tar.gz) = 545788 +TIMESTAMP = 1618750002 +SHA256 (include-what-you-use-include-what-you-use-0.15-clang_11_GH0.tar.gz) = 73a70a58d3e1a2e7beece7349580622db9d6b275b600d0e9bbc1c157dd7b9388 +SIZE (include-what-you-use-include-what-you-use-0.15-clang_11_GH0.tar.gz) = 603430 diff --git a/devel/include-what-you-use/pkg-plist b/devel/include-what-you-use/pkg-plist index 543823b36104..ce0464b651a8 100644 --- a/devel/include-what-you-use/pkg-plist +++ b/devel/include-what-you-use/pkg-plist @@ -1,6 +1,7 @@ bin/fix_includes.py bin/include-what-you-use bin/iwyu_tool.py +man/man1/include-what-you-use.1.gz %%DATADIR%%/boost-1.64-all-private.imp %%DATADIR%%/boost-1.64-all.imp %%DATADIR%%/boost-all-private.imp @@ -13,5 +14,6 @@ bin/iwyu_tool.py %%DATADIR%%/iwyu.gcc.imp %%DATADIR%%/libcxx.imp %%DATADIR%%/qt4.imp +%%DATADIR%%/qt5_11.imp %%DATADIR%%/qt5_4.imp %%DATADIR%%/stl.c.headers.imp From owner-dev-commits-ports-branches@freebsd.org Thu Apr 22 13:08:37 2021 Return-Path: Delivered-To: dev-commits-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 D81FA5F239A; Thu, 22 Apr 2021 13:08:37 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQyR95nzTz3tdv; Thu, 22 Apr 2021 13:08:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BA0CB1A6D3; Thu, 22 Apr 2021 13:08:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13MD8bR2049212; Thu, 22 Apr 2021 13:08:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13MD8bNx049211; Thu, 22 Apr 2021 13:08:37 GMT (envelope-from git) Date: Thu, 22 Apr 2021 13:08:37 GMT Message-Id: <202104221308.13MD8bNx049211@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Lewis Cook Subject: git: d1b07b5de8ad - 2021Q2 - www/lagrange: Make SSE4.1 support optional MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lcook X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: d1b07b5de8ad50283d2f748a674147c0cf36f3c2 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 13:08:37 -0000 The branch 2021Q2 has been updated by lcook: URL: https://cgit.FreeBSD.org/ports/commit/?id=d1b07b5de8ad50283d2f748a674147c0cf36f3c2 commit d1b07b5de8ad50283d2f748a674147c0cf36f3c2 Author: Lewis Cook AuthorDate: 2021-04-22 12:59:59 +0000 Commit: Lewis Cook CommitDate: 2021-04-22 13:07:56 +0000 www/lagrange: Make SSE4.1 support optional Older class AMD64 and i386 CPUs do not support SSE4.1, so make it opt-in instead. This is a problem since a build host may support the feature-set whilst a package consumer does not, causing an unexpected crash upon starting the application. (cherry picked from commit 6a9dfe8760c745ce1710c71c797f88c2f5416b1c) --- www/lagrange/Makefile | 6 ++++ .../files/patch-lib_the__Foundation_CheckSSE.cmake | 32 ++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/www/lagrange/Makefile b/www/lagrange/Makefile index e9df8c2e494e..84d13c6409c9 100644 --- a/www/lagrange/Makefile +++ b/www/lagrange/Makefile @@ -1,6 +1,7 @@ PORTNAME= lagrange DISTVERSION= 1.2.2 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://git.skyjake.fi/skyjake/${PORTNAME}/releases/download/v${DISTVERSION}/ @@ -20,6 +21,11 @@ LIB_DEPENDS= libmpg123.so:audio/mpg123 \ USES= cmake compiler:c11 desktop-file-utils pkgconfig sdl ssl USE_SDL= sdl2 +OPTIONS_DEFINE= SSE41 + +SSE41_DESC= Enable SSE4.1 support +SSE41_CMAKE_ON= -DTFDN_ENABLE_SSE41:BOOL=ON + OPENSSL_LDFLAGS= -lssl -lcrypto .include diff --git a/www/lagrange/files/patch-lib_the__Foundation_CheckSSE.cmake b/www/lagrange/files/patch-lib_the__Foundation_CheckSSE.cmake new file mode 100644 index 000000000000..20c25373b943 --- /dev/null +++ b/www/lagrange/files/patch-lib_the__Foundation_CheckSSE.cmake @@ -0,0 +1,32 @@ +Disable SSE4.1 by default and make it opt-in only. + +Older class AMD64 and i386 CPUs do not support the +feature-set, this becomes a problem when a build +hosts support it, whilst package consumers do not, +causing an instant crash upon startup. + +--- lib/the_Foundation/CheckSSE.cmake.orig 2021-04-22 10:39:48 UTC ++++ lib/the_Foundation/CheckSSE.cmake +@@ -1,22 +1 @@ + set (SSE41_FOUND NO) +-try_run ( +- sseRunCode +- sseCompiled +- ${CMAKE_CURRENT_BINARY_DIR} +- ${CMAKE_CURRENT_LIST_DIR}/ssecheck.c +- RUN_OUTPUT_VARIABLE sseOutput +-) +-string (STRIP "${sseOutput}" sseOutput) +-# message (STATUS "sseCompiled: ${sseCompiled}") +-# message (STATUS "sseRunCode: ${sseRunCode}") +-# message (STATUS "sseOutput: ${sseOutput}") +- +-if (sseCompiled AND sseOutput STREQUAL "1") +- set (SSE41_FOUND YES) +-endif () +- +-if (SSE41_FOUND) +- message (STATUS "CPU supports SSE 4.1") +-else () +- message (STATUS "CPU does not support SSE 4.1") +-endif () From owner-dev-commits-ports-branches@freebsd.org Thu Apr 22 13:28:30 2021 Return-Path: Delivered-To: dev-commits-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 54E5D5F2A5A; Thu, 22 Apr 2021 13:28:30 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQyt6208rz3vKx; Thu, 22 Apr 2021 13:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 36FFF1AC0F; Thu, 22 Apr 2021 13:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13MDSUsR075123; Thu, 22 Apr 2021 13:28:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13MDSUlO075122; Thu, 22 Apr 2021 13:28:30 GMT (envelope-from git) Date: Thu, 22 Apr 2021 13:28:30 GMT Message-Id: <202104221328.13MDSUlO075122@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kirill Ponomarev Subject: git: be8130a6d012 - 2021Q2 - devel/py-aiologger: Update to 0.6.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: krion X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: be8130a6d01208e23c3317c643a5e8820dcd6fa7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 13:28:30 -0000 The branch 2021Q2 has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=be8130a6d01208e23c3317c643a5e8820dcd6fa7 commit be8130a6d01208e23c3317c643a5e8820dcd6fa7 Author: Kirill Ponomarev AuthorDate: 2021-04-22 13:14:07 +0000 Commit: Kirill Ponomarev CommitDate: 2021-04-22 13:28:15 +0000 devel/py-aiologger: Update to 0.6.1 (cherry picked from commit e0fc25630cba8309f88dd0017c29b9d0c684d77d) --- devel/py-aiologger/Makefile | 2 +- devel/py-aiologger/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/py-aiologger/Makefile b/devel/py-aiologger/Makefile index 599beeaf9bb7..cdf9d6be035c 100644 --- a/devel/py-aiologger/Makefile +++ b/devel/py-aiologger/Makefile @@ -1,7 +1,7 @@ # Created by: Kirill Ponomarev PORTNAME= aiologger -PORTVERSION= 0.6.0 +PORTVERSION= 0.6.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-aiologger/distinfo b/devel/py-aiologger/distinfo index 52ed41998f51..89d55bf1e266 100644 --- a/devel/py-aiologger/distinfo +++ b/devel/py-aiologger/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1602276124 -SHA256 (aiologger-0.6.0.tar.gz) = 8dab61c4704ffac9cdf515695bcf95b866af0a4dc27c5f336fd4230631c5036c -SIZE (aiologger-0.6.0.tar.gz) = 30988 +TIMESTAMP = 1619096979 +SHA256 (aiologger-0.6.1.tar.gz) = 1b6b8f00d74a588339b657ff60ffa9f64c53873887a008934c66e1a673ea68cd +SIZE (aiologger-0.6.1.tar.gz) = 20527 From owner-dev-commits-ports-branches@freebsd.org Thu Apr 22 14:33:58 2021 Return-Path: Delivered-To: dev-commits-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 DCD025F4D99; Thu, 22 Apr 2021 14:33:58 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FR0Kf5cfQz4Sb7; Thu, 22 Apr 2021 14:33:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B3A081BA7D; Thu, 22 Apr 2021 14:33:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13MEXwT6067462; Thu, 22 Apr 2021 14:33:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13MEXwnb067461; Thu, 22 Apr 2021 14:33:58 GMT (envelope-from git) Date: Thu, 22 Apr 2021 14:33:58 GMT Message-Id: <202104221433.13MEXwnb067461@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 03184d2a165e - 2021Q2 - x11-toolkits/qt5-gui: unbreak on FreeBSD >= 13.0 armv[67] MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 03184d2a165ee682a32e2b4b3d1a0530d3ac9723 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 14:33:58 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=03184d2a165ee682a32e2b4b3d1a0530d3ac9723 commit 03184d2a165ee682a32e2b4b3d1a0530d3ac9723 Author: Jan Beich AuthorDate: 2021-04-22 14:22:24 +0000 Commit: Jan Beich CommitDate: 2021-04-22 14:33:07 +0000 x11-toolkits/qt5-gui: unbreak on FreeBSD >= 13.0 armv[67] /usr/bin/cc ... -fno-integrated-as ... ../3rdparty/pixman/pixman-arm-neon-asm.S -o .obj/pixman-arm-neon-asm.o cc: error: unable to execute command: Executable "as" doesn't exist! cc: error: assembler command failed with exit code 1 (use -v to see invocation) Reported by: pkg-fallout (cherry picked from commit 7ebdbb52f8d7050fcfd6bbad5eac0ade8a52597e) --- x11-toolkits/qt5-gui/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile index 9cbed53613e9..6afd64949b36 100644 --- a/x11-toolkits/qt5-gui/Makefile +++ b/x11-toolkits/qt5-gui/Makefile @@ -11,7 +11,10 @@ COMMENT= Qt graphical user interface module BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \ ${LOCALBASE}/include/xf86drm.h:graphics/libdrm \ - at-spi2-core>=0:accessibility/at-spi2-core + at-spi2-core>=0:accessibility/at-spi2-core \ + ${BUILD_DEPENDS_${ARCH}} +BUILD_DEPENDS_armv6= as:devel/binutils +BUILD_DEPENDS_armv7= as:devel/binutils LIB_DEPENDS= libdbus-1.so:devel/dbus \ libevdev.so:devel/libevdev \ libfontconfig.so:x11-fonts/fontconfig \ From owner-dev-commits-ports-branches@freebsd.org Thu Apr 22 14:34:00 2021 Return-Path: Delivered-To: dev-commits-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 16A785F4CAE; Thu, 22 Apr 2021 14:34:00 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FR0Kg6s1dz4SM3; Thu, 22 Apr 2021 14:33:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DC8381BAA5; Thu, 22 Apr 2021 14:33:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13MEXx3E067495; Thu, 22 Apr 2021 14:33:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13MEXxDw067494; Thu, 22 Apr 2021 14:33:59 GMT (envelope-from git) Date: Thu, 22 Apr 2021 14:33:59 GMT Message-Id: <202104221433.13MEXxDw067494@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: e9ae03ca8f9b - main - graphics/spirv-tools: update to 2021.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9ae03ca8f9bc36f3dda1ddc264bb476625f1331 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 14:34:00 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=e9ae03ca8f9bc36f3dda1ddc264bb476625f1331 commit e9ae03ca8f9bc36f3dda1ddc264bb476625f1331 Author: Jan Beich AuthorDate: 2021-04-21 14:13:07 +0000 Commit: Jan Beich CommitDate: 2021-04-22 14:32:54 +0000 graphics/spirv-tools: update to 2021.1 Changes: https://github.com/KhronosGroup/SPIRV-Tools/compare/v2020.7...v2021.1 Reported by: portscout --- graphics/spirv-tools/Makefile | 4 ++-- graphics/spirv-tools/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/graphics/spirv-tools/Makefile b/graphics/spirv-tools/Makefile index 103cc0b26a2a..f72b29b38632 100644 --- a/graphics/spirv-tools/Makefile +++ b/graphics/spirv-tools/Makefile @@ -1,6 +1,6 @@ PORTNAME= spirv-tools DISTVERSIONPREFIX= v -DISTVERSION= 2020.7 +DISTVERSION= 2021.1 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org @@ -15,7 +15,7 @@ SHEBANG_FILES= tools/lesspipe/spirv-lesspipe.sh USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= SPIRV-Tools -GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-29-g75b30a6:headers/external/spirv-headers +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-47-gdafead1:headers/external/spirv-headers CMAKE_ON= SPIRV_SKIP_TESTS CMAKE_OFF= SPIRV_WERROR diff --git a/graphics/spirv-tools/distinfo b/graphics/spirv-tools/distinfo index 36a99c1a8a06..014b7816c9c9 100644 --- a/graphics/spirv-tools/distinfo +++ b/graphics/spirv-tools/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1613662792 -SHA256 (KhronosGroup-SPIRV-Tools-v2020.7_GH0.tar.gz) = c06eed1c7a1018b232768481184b5ae4d91d614d7bd7358dc2fe306bd0a39c6e -SIZE (KhronosGroup-SPIRV-Tools-v2020.7_GH0.tar.gz) = 2585866 -SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-29-g75b30a6_GH0.tar.gz) = 03075fc9f52833849bb34210029d029669f96bfc9dcf937b910a8ba7f5f361db -SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-29-g75b30a6_GH0.tar.gz) = 403781 +TIMESTAMP = 1619014387 +SHA256 (KhronosGroup-SPIRV-Tools-v2021.1_GH0.tar.gz) = bd42f6d766ac50f1a1ab46ce96d59e24ab28fb9779a71fccfa8bad760842c274 +SIZE (KhronosGroup-SPIRV-Tools-v2021.1_GH0.tar.gz) = 2608588 +SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-47-gdafead1_GH0.tar.gz) = e38cdf41c089a0688b2024a873d20f84fa259af713ad52430b4d119b5f5380a6 +SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-47-gdafead1_GH0.tar.gz) = 405883 From owner-dev-commits-ports-branches@freebsd.org Thu Apr 22 14:34:01 2021 Return-Path: Delivered-To: dev-commits-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 81B755F4C7A; Thu, 22 Apr 2021 14:34:01 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FR0Kj2dxMz4SXq; Thu, 22 Apr 2021 14:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 13D971B75E; Thu, 22 Apr 2021 14:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13MEY05K067516; Thu, 22 Apr 2021 14:34:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13MEY0bi067515; Thu, 22 Apr 2021 14:34:00 GMT (envelope-from git) Date: Thu, 22 Apr 2021 14:34:00 GMT Message-Id: <202104221434.13MEY0bi067515@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 715aa9edeb75 - main - graphics/shaderc: update to 2021.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 715aa9edeb75cf72b0e5307490a32942876879b9 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 14:34:01 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=715aa9edeb75cf72b0e5307490a32942876879b9 commit 715aa9edeb75cf72b0e5307490a32942876879b9 Author: Jan Beich AuthorDate: 2021-04-21 21:13:25 +0000 Commit: Jan Beich CommitDate: 2021-04-22 14:32:54 +0000 graphics/shaderc: update to 2021.0 Changes: https://github.com/google/shaderc/compare/v2020.5...v2021.0 Reported by: portscout --- graphics/shaderc/Makefile | 4 ++-- graphics/shaderc/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/graphics/shaderc/Makefile b/graphics/shaderc/Makefile index 4afacf5ea02c..be743bb4a0fe 100644 --- a/graphics/shaderc/Makefile +++ b/graphics/shaderc/Makefile @@ -1,6 +1,6 @@ PORTNAME= shaderc DISTVERSIONPREFIX= v -DISTVERSION= 2020.5 +DISTVERSION= 2021.0 CATEGORIES= graphics devel MAINTAINER= jbeich@FreeBSD.org @@ -15,7 +15,7 @@ USES= cmake compiler:c++11-lib localbase:ldflags python:3.4+,build USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= google -GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-32-ga3fdfe8:headers/third_party/spirv-headers +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-47-gdafead1:headers/third_party/spirv-headers CMAKE_ARGS= -Dglslang_SOURCE_DIR:PATH="${LOCALBASE}/include/glslang" \ -DSPIRV-Headers_SOURCE_DIR:PATH="${WRKSRC}/third_party/spirv-headers" LDFLAGS+= -Wl,-z,defs # glslang diff --git a/graphics/shaderc/distinfo b/graphics/shaderc/distinfo index 424f44d93c01..d2bd5067a142 100644 --- a/graphics/shaderc/distinfo +++ b/graphics/shaderc/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1613768888 -SHA256 (google-shaderc-v2020.5_GH0.tar.gz) = e96d8cb208b796cecb9e6cce437c7d1116343158ef3ea26277eb13b62cf56834 -SIZE (google-shaderc-v2020.5_GH0.tar.gz) = 220159 -SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-32-ga3fdfe8_GH0.tar.gz) = bd629d6296dd374eb2aeff923c75895ba0f3ce6448dad89763930e65b954e0cb -SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-32-ga3fdfe8_GH0.tar.gz) = 403778 +TIMESTAMP = 1619039605 +SHA256 (google-shaderc-v2021.0_GH0.tar.gz) = 99762c51b0ceddea4be9b8de3240a7dbf1de9131179eed94b568ce52a5496a8f +SIZE (google-shaderc-v2021.0_GH0.tar.gz) = 220240 +SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-47-gdafead1_GH0.tar.gz) = e38cdf41c089a0688b2024a873d20f84fa259af713ad52430b4d119b5f5380a6 +SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-47-gdafead1_GH0.tar.gz) = 405883 From owner-dev-commits-ports-branches@freebsd.org Thu Apr 22 14:34:03 2021 Return-Path: Delivered-To: dev-commits-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 8547A5F4E80; Thu, 22 Apr 2021 14:34:03 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FR0Kl2Mw3z4SbG; Thu, 22 Apr 2021 14:34:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 442581BAA6; Thu, 22 Apr 2021 14:34:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13MEY3rW067560; Thu, 22 Apr 2021 14:34:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13MEY3Yi067559; Thu, 22 Apr 2021 14:34:03 GMT (envelope-from git) Date: Thu, 22 Apr 2021 14:34:03 GMT Message-Id: <202104221434.13MEY3Yi067559@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 7ebdbb52f8d7 - main - x11-toolkits/qt5-gui: unbreak on FreeBSD >= 13.0 armv[67] MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ebdbb52f8d7050fcfd6bbad5eac0ade8a52597e Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 14:34:04 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=7ebdbb52f8d7050fcfd6bbad5eac0ade8a52597e commit 7ebdbb52f8d7050fcfd6bbad5eac0ade8a52597e Author: Jan Beich AuthorDate: 2021-04-22 14:22:24 +0000 Commit: Jan Beich CommitDate: 2021-04-22 14:32:55 +0000 x11-toolkits/qt5-gui: unbreak on FreeBSD >= 13.0 armv[67] /usr/bin/cc ... -fno-integrated-as ... ../3rdparty/pixman/pixman-arm-neon-asm.S -o .obj/pixman-arm-neon-asm.o cc: error: unable to execute command: Executable "as" doesn't exist! cc: error: assembler command failed with exit code 1 (use -v to see invocation) Reported by: pkg-fallout --- x11-toolkits/qt5-gui/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile index 1539528e6ef4..8cc7362c6252 100644 --- a/x11-toolkits/qt5-gui/Makefile +++ b/x11-toolkits/qt5-gui/Makefile @@ -10,7 +10,10 @@ COMMENT= Qt graphical user interface module BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \ ${LOCALBASE}/include/xf86drm.h:graphics/libdrm \ - at-spi2-core>=0:accessibility/at-spi2-core + at-spi2-core>=0:accessibility/at-spi2-core \ + ${BUILD_DEPENDS_${ARCH}} +BUILD_DEPENDS_armv6= as:devel/binutils +BUILD_DEPENDS_armv7= as:devel/binutils LIB_DEPENDS= libdbus-1.so:devel/dbus \ libevdev.so:devel/libevdev \ libfontconfig.so:x11-fonts/fontconfig \ From owner-dev-commits-ports-branches@freebsd.org Thu Apr 22 14:34:02 2021 Return-Path: Delivered-To: dev-commits-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 941025F48E5; Thu, 22 Apr 2021 14:34:02 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FR0Kk2WKmz4SGT; Thu, 22 Apr 2021 14:34:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 254681BA7E; Thu, 22 Apr 2021 14:34:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13MEY20a067537; Thu, 22 Apr 2021 14:34:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13MEY2Xx067536; Thu, 22 Apr 2021 14:34:02 GMT (envelope-from git) Date: Thu, 22 Apr 2021 14:34:02 GMT Message-Id: <202104221434.13MEY2Xx067536@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 0d7168d58b0c - main - x11-wm/river: update to s20210422 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d7168d58b0c155de9ba1a297e9ba08e844f8e4c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 14:34:02 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0d7168d58b0c155de9ba1a297e9ba08e844f8e4c commit 0d7168d58b0c155de9ba1a297e9ba08e844f8e4c Author: Jan Beich AuthorDate: 2021-04-22 08:33:28 +0000 Commit: Jan Beich CommitDate: 2021-04-22 14:32:54 +0000 x11-wm/river: update to s20210422 Changes: https://github.com/ifreund/river/compare/891eb38...84f5283 --- x11-wm/river/Makefile | 6 +++--- x11-wm/river/distinfo | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile index 1080df96aa1b..2b69fa2c9b25 100644 --- a/x11-wm/river/Makefile +++ b/x11-wm/river/Makefile @@ -1,5 +1,5 @@ PORTNAME= river -PORTVERSION= s20210421 +PORTVERSION= s20210422 CATEGORIES= x11-wm MAINTAINER= jbeich@FreeBSD.org @@ -20,8 +20,8 @@ USES= pkgconfig xorg USE_GITHUB= yes USE_XORG= pixman GH_ACCOUNT= ifreund -GH_TAGNAME= 891eb38 -GH_TUPLE= ifreund:zig-pixman:f8e682a:zig_pixman/deps/zig-pixman \ +GH_TAGNAME= 84f5283 +GH_TUPLE= ifreund:zig-pixman:9acac69:zig_pixman/deps/zig-pixman \ ifreund:zig-wayland:f170fe0:zig_wayland/deps/zig-wayland \ ifreund:zig-xkbcommon:9e4d41f:zig_xkbcommon/deps/zig-xkbcommon \ swaywm:zig-wlroots:6c62568:zig_wlroots/deps/zig-wlroots diff --git a/x11-wm/river/distinfo b/x11-wm/river/distinfo index fd54ab68485c..d82aa3d8b398 100644 --- a/x11-wm/river/distinfo +++ b/x11-wm/river/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1619016713 -SHA256 (ifreund-river-s20210421-891eb38_GH0.tar.gz) = 8371f8cdd181225074401b2de1774a116d8a42fa7d044ed43ea2bd805d8452b4 -SIZE (ifreund-river-s20210421-891eb38_GH0.tar.gz) = 114435 -SHA256 (ifreund-zig-pixman-f8e682a_GH0.tar.gz) = 1e040e7652861d7064e2997f5f6397483dca87261621318c9a06d7701bae67aa -SIZE (ifreund-zig-pixman-f8e682a_GH0.tar.gz) = 7052 +TIMESTAMP = 1619080408 +SHA256 (ifreund-river-s20210422-84f5283_GH0.tar.gz) = 9b54a338edf25dc747b47244bea725f9f836d421ccef8d5a1e3f61060dee4b55 +SIZE (ifreund-river-s20210422-84f5283_GH0.tar.gz) = 114424 +SHA256 (ifreund-zig-pixman-9acac69_GH0.tar.gz) = 748ab9bad42e2e67fd0976eeed215182a0d72df17ac82183d53f810c22137da0 +SIZE (ifreund-zig-pixman-9acac69_GH0.tar.gz) = 7153 SHA256 (ifreund-zig-wayland-f170fe0_GH0.tar.gz) = 5ab51c15c56921a1e1269da469bbbd2ac5d8b9bb01e09b9db9409d06a76d5014 SIZE (ifreund-zig-wayland-f170fe0_GH0.tar.gz) = 52945 SHA256 (ifreund-zig-xkbcommon-9e4d41f_GH0.tar.gz) = 3af5c9a448cf311d9cc819c8fd1dba114fbd7a4407f4174f95e4c82bb37f447b From owner-dev-commits-ports-branches@freebsd.org Thu Apr 22 15:03:54 2021 Return-Path: Delivered-To: dev-commits-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 E89065F5BC2; Thu, 22 Apr 2021 15:03:54 +0000 (UTC) (envelope-from adridg@freebsd.org) Received: from lb3-smtp-cloud8.xs4all.net (lb3-smtp-cloud8.xs4all.net [194.109.24.29]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.xs4all.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FR10B2mqhz4ThZ; Thu, 22 Apr 2021 15:03:54 +0000 (UTC) (envelope-from adridg@freebsd.org) Received: from cust-d4a83f22 ([IPv6:fc0c:c11d:cecc:f58a:eaa1:c0:9d8f:c143]) by smtp-cloud8.xs4all.net with ESMTPA id ZarvlGtdaXsivZarwly8Jq; Thu, 22 Apr 2021 17:03:52 +0200 From: Adriaan de Groot To: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-branches@freebsd.org, dev-commits-ports-main@freebsd.org, Jan Beich Subject: Re: git: 7ebdbb52f8d7 - main - x11-toolkits/qt5-gui: unbreak on FreeBSD >= 13.0 armv[67] Date: Thu, 22 Apr 2021 17:03:51 +0200 Message-ID: <1828798.FhnM7FagqO@beastie.bionicmutton.org> Organization: FreeBSD In-Reply-To: <202104221434.13MEY3Yi067559@gitrepo.freebsd.org> References: <202104221434.13MEY3Yi067559@gitrepo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2137490.tuzrAb6zvp"; micalg="pgp-sha256"; protocol="application/pgp-signature" X-CMAE-Envelope: MS4xfCvyyYpmVHyCVwbwf1Y5zRuxvLO6OavS7/dR0T7jyzUzm4xiNMm4aD+2qDw8opm8C72YINm8qkv1NLVcMTfiFyqYyXrMH9UI6/Fc2GuPWbKfYTJhFK3o +5ZM9pdCYS52k/vM1zs8dN72ibeB7Rrntbq5OCPz2DsXxWzlitrNNGNSHRNSwpmLIO8O6pg4TT3Drc/+bjL1mpn3b54i9eSpEQDubcSvkhjdhZHDs6jl+qen lEjyoUWZeJOQi1NN5dDs90vubbMKBv8NMMyzrybY4RceyeXFlgxlZzYW83rL93zhItUjWYJH6XhPAZrkvSqEECEWjzkdT13dwkw9qh/bqLqLLnYVImMPZagl Pc9eQFdl8QvVeM0SXZ9ZE1k8gt+iIsJN4VVCA+LElBFYNW8oH8dY022tVAnGXiU73ReID2sypPtSXncpIXLbeM2y6LTRNB6vGQ1NQaSwwgFu33uePDY= X-Rspamd-Queue-Id: 4FR10B2mqhz4ThZ X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 15:03:55 -0000 --nextPart2137490.tuzrAb6zvp Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Adriaan de Groot To: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-branches@freebsd.org, dev-commits-ports-main@freebsd.org, Jan Beich Subject: Re: git: 7ebdbb52f8d7 - main - x11-toolkits/qt5-gui: unbreak on FreeBSD >= 13.0 armv[67] Date: Thu, 22 Apr 2021 17:03:51 +0200 Message-ID: <1828798.FhnM7FagqO@beastie.bionicmutton.org> Organization: FreeBSD In-Reply-To: <202104221434.13MEY3Yi067559@gitrepo.freebsd.org> References: <202104221434.13MEY3Yi067559@gitrepo.freebsd.org> On Thursday, 22 April 2021 16:34:03 CEST Jan Beich wrote: > x11-toolkits/qt5-gui: unbreak on FreeBSD >= 13.0 armv[67] Thanks. Nothing has changed in those ports recently, so it's presumably been failing for some time now. I intend to bump qt5-gui soon-ish to wrestle with mesa-dri as a dependency, so we'll see more triggered builds in the near future. [ade] --nextPart2137490.tuzrAb6zvp Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQGzBAABCAAdFiEEhrjttu2OP5apuuy1z93JbxKxkVwFAmCBkFcACgkQz93JbxKx kVwTvQv+NK0sbKgRyJj40FIXtoPhgmjbDu0xCSIDOlrsQI0LqQdVvRiY0aVwaLMp 2bRfjs9evmD6AEVdj+9ztrhI4zCu6x7NAdXPuxKY3FizA4TFzmbNjquh5fXsbWuU WQBbH1YmwwpTfHzCi3UmjGk6X/keauPADZyz/PVIGMmwk44xyIRh/euz+bzVIcD+ ypz6T3f9plDtcdpw6vnHYZ2Va+i1i9Dvq1hPVpIRscVkhtKhXjDidzqIdFQUtssL LLBfN/gKvoMJPaYPh23EbYmZUn6CNrCXJVcnaLaYVIpt+F5gNgDe2kVILgfdwMSy 2ue6tDTZ0YBjXc1DkEyvjks52Ry3HIc9KAnnY+fd+FK8NdQP/L0SPqrGcO/7Pp8c FurCkBYVvR93OrBdWEmclZj6heoB8ica+NS32s4YQ79u3xaoChz8HYBrChM2BXT5 6vollyN/dx0kgNU3+3eMej3Fnv7f8NP0gQ55nERkfHKH+WmPBGHRTLTDshysA5E8 E4/pkoVt =Fo++ -----END PGP SIGNATURE----- --nextPart2137490.tuzrAb6zvp-- From owner-dev-commits-ports-branches@freebsd.org Thu Apr 22 16:55:27 2021 Return-Path: Delivered-To: dev-commits-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 580655F88EA; Thu, 22 Apr 2021 16:55:27 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FR3Sv231Lz4b6y; Thu, 22 Apr 2021 16:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 34F9B1DA35; Thu, 22 Apr 2021 16:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13MGtRS3052641; Thu, 22 Apr 2021 16:55:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13MGtRAa052640; Thu, 22 Apr 2021 16:55:27 GMT (envelope-from git) Date: Thu, 22 Apr 2021 16:55:27 GMT Message-Id: <202104221655.13MGtRAa052640@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Thierry Thomas Subject: git: f46e4ccd8445 - 2021Q2 - math/sage: work-around to chase the upgrade of py-docutils to 0.17 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: f46e4ccd8445b0dc50ebb06a20e3e5b4c9f0a28a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 16:55:27 -0000 The branch 2021Q2 has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=f46e4ccd8445b0dc50ebb06a20e3e5b4c9f0a28a commit f46e4ccd8445b0dc50ebb06a20e3e5b4c9f0a28a Author: Thierry Thomas AuthorDate: 2021-04-19 09:12:08 +0000 Commit: Thierry Thomas CommitDate: 2021-04-22 16:54:56 +0000 math/sage: work-around to chase the upgrade of py-docutils to 0.17 There is no subdir hu for Hungarian under $PYTHON_SITELIBDIR/docutils/languages and since the upgrade to textproc/py-docutils to 0.17 this causes a failure in dochtml when building Sage. Neither the upgrade to 0.17.1 proposed in PR 255197 solves the problem: as a work-around this modification only removes the build of a_tour_of_sage for hu. (cherry picked from commit 4a9bb724e8f62bdf6f9e2a73e86fd2187b532f41) --- math/sage/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/math/sage/Makefile b/math/sage/Makefile index 4e6ca525b9c7..40e88de1e63d 100644 --- a/math/sage/Makefile +++ b/math/sage/Makefile @@ -2,7 +2,7 @@ PORTNAME= sage PORTVERSION= 9.2 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= math MASTER_SITES= https://mirrors.xmission.com/sage/src/ \ http://mirrors.xmission.com/sage/src/ \ @@ -500,6 +500,8 @@ pre-configure: ${REINPLACE_CMD} -e 's|/var/lib/sage|/share/libdata/${PORTNAME}|' \ ${WRKSRC}/${f} .endfor + # Bug with py-docutils > 0.16 + ${RM} -r ${WRKSRC}/src/doc/hu (cd ${WRKSRC} && ./bootstrap) ${MKDIR} ${BLDDIR}${PREFIX}/lib/pkgconfig # Removed thereafter From owner-dev-commits-ports-branches@freebsd.org Thu Apr 22 17:16:10 2021 Return-Path: Delivered-To: dev-commits-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 65DBF5F9591; Thu, 22 Apr 2021 17:16:10 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FR3wp2Tfhz4bdH; Thu, 22 Apr 2021 17:16:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 43E511DB69; Thu, 22 Apr 2021 17:16:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13MHGALa079997; Thu, 22 Apr 2021 17:16:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13MHGAfh079996; Thu, 22 Apr 2021 17:16:10 GMT (envelope-from git) Date: Thu, 22 Apr 2021 17:16:10 GMT Message-Id: <202104221716.13MHGAfh079996@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dmitry Marakasov Subject: git: fee070d6b431 - 2021Q2 - games/supertuxkart: mark BROKEN on i386 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: fee070d6b431928ea814159edfc9412045d6e778 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 17:16:10 -0000 The branch 2021Q2 has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=fee070d6b431928ea814159edfc9412045d6e778 commit fee070d6b431928ea814159edfc9412045d6e778 Author: Dmitry Marakasov AuthorDate: 2021-04-08 21:36:03 +0000 Commit: Dmitry Marakasov CommitDate: 2021-04-22 17:14:53 +0000 games/supertuxkart: mark BROKEN on i386 --- games/supertuxkart/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile index e4c967fda964..e3ad0b825b0b 100644 --- a/games/supertuxkart/Makefile +++ b/games/supertuxkart/Makefile @@ -16,6 +16,7 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \ libcurl.so:ftp/curl BROKEN_FreeBSD_12_i386= does not build (error: this directive must appear between .cfi_startproc and .cfi_endproc directives) +BROKEN_i386= ld: error: cannot preempt symbol: alcOpenDevice USES= alias cmake compiler:c++11-lib pkgconfig tar:xz CMAKE_OFF= USE_WIIUSE \ From owner-dev-commits-ports-branches@freebsd.org Thu Apr 22 17:21:42 2021 Return-Path: Delivered-To: dev-commits-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 80E005F9729; Thu, 22 Apr 2021 17:21:42 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FR43B38ymz4cC7; Thu, 22 Apr 2021 17:21:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5F4DF1DDA5; Thu, 22 Apr 2021 17:21:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13MHLgfr091245; Thu, 22 Apr 2021 17:21:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13MHLgJD091244; Thu, 22 Apr 2021 17:21:42 GMT (envelope-from git) Date: Thu, 22 Apr 2021 17:21:42 GMT Message-Id: <202104221721.13MHLgJD091244@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dmitry Marakasov Subject: git: ef47add9a366 - 2021Q2 - games/hedgewars: mark BROKEN on i386 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: ef47add9a366ab2a45207c71fa860d777b8d03e0 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 17:21:42 -0000 The branch 2021Q2 has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=ef47add9a366ab2a45207c71fa860d777b8d03e0 commit ef47add9a366ab2a45207c71fa860d777b8d03e0 Author: Dmitry Marakasov AuthorDate: 2021-04-08 16:40:32 +0000 Commit: Dmitry Marakasov CommitDate: 2021-04-22 17:19:28 +0000 games/hedgewars: mark BROKEN on i386 Link fails with 'ld: error: duplicate symbol: LandDirty_dimension_info' on some code converted from pascal to C, so this would be non-trivial to fix. --- games/hedgewars/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile index a9aba3b8a186..cbf4b3df5694 100644 --- a/games/hedgewars/Makefile +++ b/games/hedgewars/Makefile @@ -14,6 +14,8 @@ COMMENT= Free Worms-like turn based strategy game LICENSE= GPLv2 GFDL LICENSE_COMB= multi +BROKEN_i386= ld: error: duplicate symbol: LandDirty_dimension_info + LIB_DEPENDS= libphysfs.so:devel/physfs \ libpng.so:graphics/png From owner-dev-commits-ports-branches@freebsd.org Thu Apr 22 17:21:43 2021 Return-Path: Delivered-To: dev-commits-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 AF85D5F972A; Thu, 22 Apr 2021 17:21:43 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FR43C4NvDz4btH; Thu, 22 Apr 2021 17:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 841201D7EF; Thu, 22 Apr 2021 17:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13MHLhPk091266; Thu, 22 Apr 2021 17:21:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13MHLhVp091265; Thu, 22 Apr 2021 17:21:43 GMT (envelope-from git) Date: Thu, 22 Apr 2021 17:21:43 GMT Message-Id: <202104221721.13MHLhVp091265@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dmitry Marakasov Subject: git: aeb34a5d6f1f - 2021Q2 - games/brumbrumrally: fix build on 11 by disabling LTO MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: aeb34a5d6f1f0955f3d1089cb06c2788672502b5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 17:21:43 -0000 The branch 2021Q2 has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=aeb34a5d6f1f0955f3d1089cb06c2788672502b5 commit aeb34a5d6f1f0955f3d1089cb06c2788672502b5 Author: Dmitry Marakasov AuthorDate: 2021-04-08 21:34:09 +0000 Commit: Dmitry Marakasov CommitDate: 2021-04-22 17:20:05 +0000 games/brumbrumrally: fix build on 11 by disabling LTO --- games/brumbrumrally/files/patch-Makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/games/brumbrumrally/files/patch-Makefile b/games/brumbrumrally/files/patch-Makefile index b63395c39e80..c2fabe14a988 100644 --- a/games/brumbrumrally/files/patch-Makefile +++ b/games/brumbrumrally/files/patch-Makefile @@ -1,6 +1,6 @@ --- Makefile.orig 2016-03-23 12:05:46 UTC +++ Makefile -@@ -1,19 +1,18 @@ +@@ -1,27 +1,18 @@ OBJS := $(patsubst %.cpp,%.o,$(wildcard src/*.cpp src/hqx/*.cpp)) -DESTDIR = @@ -22,7 +22,15 @@ +CXXFLAGS += -Wall -std=c++98 -pedantic `sdl-config --cflags` -LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_net +- +-# lto is supported in g++ version 4.5.0 or higher +-CXX_MAJOR := $(shell $(CXX) -dumpversion | cut -d'.' -f1) +-CXX_MINOR := $(shell $(CXX) -dumpversion | cut -d'.' -f2) +-CXX_LTO := $(shell [ $(CXX_MAJOR) -gt 4 -o \( $(CXX_MAJOR) -eq 4 -a $(CXX_MINOR) -ge 5 \) ] && echo true || echo false) +-ifeq ($(CXX_LTO),true) +-all : CXXFLAGS += -flto -fwhole-program +-endif +LDFLAGS += `sdl-config --libs` -lSDL_image -lSDL_net - # lto is supported in g++ version 4.5.0 or higher - CXX_MAJOR := $(shell $(CXX) -dumpversion | cut -d'.' -f1) + EXE = brumbrumrally + From owner-dev-commits-ports-branches@freebsd.org Thu Apr 22 22:17:48 2021 Return-Path: Delivered-To: dev-commits-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 391C76214DE; Thu, 22 Apr 2021 22:17:48 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRBcq75MQz4rjy; Thu, 22 Apr 2021 22:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E678121F07; Thu, 22 Apr 2021 22:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13MMHlZV078574; Thu, 22 Apr 2021 22:17:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13MMHl84078573; Thu, 22 Apr 2021 22:17:47 GMT (envelope-from git) Date: Thu, 22 Apr 2021 22:17:47 GMT Message-Id: <202104222217.13MMHl84078573@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 0b45aff97034 - 2021Q2 - science/mbdyn: Unbreak build by properly implementing get_nprocs() for FreeBSD. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 0b45aff9703499baec84b5c3adbee9e5e28d4e33 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 22:17:48 -0000 The branch 2021Q2 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b45aff9703499baec84b5c3adbee9e5e28d4e33 commit 0b45aff9703499baec84b5c3adbee9e5e28d4e33 Author: Yuri Victorovich AuthorDate: 2021-04-22 22:12:26 +0000 Commit: Yuri Victorovich CommitDate: 2021-04-22 22:17:44 +0000 science/mbdyn: Unbreak build by properly implementing get_nprocs() for FreeBSD. It looks like it was only built for one CPU before and didn't fail. Some change in the underlying libraries triggered the build to become multi-CPU and it began failing because get_nprocs() wasn't available for FreeBSD and also was't properly linked to the surrounding code. Reported by: fallout (cherry picked from commit c4254019d8e8aa636db96bcea5702e0a39880048) --- science/mbdyn/Makefile | 9 +++-- .../files/patch-libraries_libobjs_get__nprocs.c | 39 ++++++++++++++++++++++ science/mbdyn/files/patch-mbdyn_base_invsolver.cc | 11 ++++++ science/mbdyn/files/patch-mbdyn_base_readlinsol.cc | 11 ++++++ science/mbdyn/files/patch-mbdyn_base_rtsolver.cc | 11 ++++++ science/mbdyn/files/patch-mbdyn_base_solver.cc | 10 ++++++ science/mbdyn/pkg-descr | 2 +- 7 files changed, 89 insertions(+), 4 deletions(-) diff --git a/science/mbdyn/Makefile b/science/mbdyn/Makefile index 006b0d124aa3..cd6b63780a8c 100644 --- a/science/mbdyn/Makefile +++ b/science/mbdyn/Makefile @@ -1,8 +1,8 @@ # Created by: Kay Lehmann PORTNAME= mbdyn -PORTVERSION= 1.7.3 -PORTREVISION= 1 +DISTVERSION= 1.7.3 +PORTREVISION= 3 CATEGORIES= science MASTER_SITES= https://www.mbdyn.org/userfiles/downloads/ @@ -20,12 +20,15 @@ LIB_DEPENDS= libltdl.so:devel/libltdl \ libarpack.so:math/arpack-ng \ libumfpack.so:math/suitesparse -GNU_CONFIGURE= yes USES= compiler:c++11-lib fortran gmake libtool:build localbase USE_LDCONFIG= yes + CPPFLAGS+= -fpermissive -I${LOCALBASE}/include/suitesparse + +GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix='' --enable-multithread --with-mpi=no \ --with-ginac=no + INSTALL_TARGET= install-strip OPTIONS_DEFINE= METIS CHACO diff --git a/science/mbdyn/files/patch-libraries_libobjs_get__nprocs.c b/science/mbdyn/files/patch-libraries_libobjs_get__nprocs.c new file mode 100644 index 000000000000..9aaa6e62bd02 --- /dev/null +++ b/science/mbdyn/files/patch-libraries_libobjs_get__nprocs.c @@ -0,0 +1,39 @@ +--- libraries/libobjs/get_nprocs.c.orig 2021-04-22 19:18:04 UTC ++++ libraries/libobjs/get_nprocs.c +@@ -39,10 +39,28 @@ + + #ifndef HAVE_GET_NPROCS + ++#if defined(__FreeBSD__) ++#include ++#include ++#include ++#include ++#endif ++ + /* GNU libc */ + int + get_nprocs(void) + { ++#if defined(__FreeBSD__) ++ static int name[2] = {CTL_HW, HW_NCPU}; ++ int32_t ncpu; ++ size_t size = sizeof(ncpu); ++ if (sysctl(name, sizeof(name)/sizeof(*name), &ncpu, &size, NULL, 0)) { ++ perror("unable to determine number of CPUs"); ++ abort(); ++ } ++ return (int)ncpu; ++ ++#else + #warning "pippero!!!" + #if defined(_SC_NPROCESSORS_ONLN) + /* POSIX.1. */ +@@ -65,6 +83,7 @@ get_nprocs(void) + #endif + /* we assume that there is at least one :) */ + return 1; ++#endif + } + + #endif /* HAVE_GET_NPROCS */ diff --git a/science/mbdyn/files/patch-mbdyn_base_invsolver.cc b/science/mbdyn/files/patch-mbdyn_base_invsolver.cc new file mode 100644 index 000000000000..63e116306104 --- /dev/null +++ b/science/mbdyn/files/patch-mbdyn_base_invsolver.cc @@ -0,0 +1,11 @@ +--- mbdyn/base/invsolver.cc.orig 2017-09-09 09:20:12 UTC ++++ mbdyn/base/invsolver.cc +@@ -76,6 +76,8 @@ + + #include "solver_impl.h" + ++extern "C" {int get_nprocs(void);} ++ + InverseSolver::InverseSolver(MBDynParser& HPar, + const std::string& sInFName, + const std::string& sOutFName, diff --git a/science/mbdyn/files/patch-mbdyn_base_readlinsol.cc b/science/mbdyn/files/patch-mbdyn_base_readlinsol.cc new file mode 100644 index 000000000000..2154c6d46aaf --- /dev/null +++ b/science/mbdyn/files/patch-mbdyn_base_readlinsol.cc @@ -0,0 +1,11 @@ +--- mbdyn/base/readlinsol.cc.orig 2021-04-22 19:28:15 UTC ++++ mbdyn/base/readlinsol.cc +@@ -35,6 +35,8 @@ + #include "dataman.h" + #include "readlinsol.h" + ++extern "C" {int get_nprocs(void);} ++ + void + ReadLinSol(LinSol& cs, HighParser &HP, bool bAllowEmpty) + { diff --git a/science/mbdyn/files/patch-mbdyn_base_rtsolver.cc b/science/mbdyn/files/patch-mbdyn_base_rtsolver.cc new file mode 100644 index 000000000000..bc93ef8cfb6d --- /dev/null +++ b/science/mbdyn/files/patch-mbdyn_base_rtsolver.cc @@ -0,0 +1,11 @@ +--- mbdyn/base/rtsolver.cc.orig 2021-04-22 19:28:55 UTC ++++ mbdyn/base/rtsolver.cc +@@ -38,6 +38,8 @@ + #include "rtaisolver.h" + #include "rtposixsolver.h" + #include "ac/sys_sysinfo.h" ++ ++extern "C" {int get_nprocs(void);} + + /* RTSolverBase - begin */ + diff --git a/science/mbdyn/files/patch-mbdyn_base_solver.cc b/science/mbdyn/files/patch-mbdyn_base_solver.cc new file mode 100644 index 000000000000..92675d27ae77 --- /dev/null +++ b/science/mbdyn/files/patch-mbdyn_base_solver.cc @@ -0,0 +1,10 @@ +--- mbdyn/base/solver.cc.orig 2021-04-22 19:30:51 UTC ++++ mbdyn/base/solver.cc +@@ -85,6 +85,7 @@ + #include "ac/arpack.h" + #include "eigjdqz.h" + ++extern "C" {int get_nprocs(void);} + + #ifdef HAVE_SIGNAL + /* diff --git a/science/mbdyn/pkg-descr b/science/mbdyn/pkg-descr index 14cc6838c91c..68a8e27e7369 100644 --- a/science/mbdyn/pkg-descr +++ b/science/mbdyn/pkg-descr @@ -8,4 +8,4 @@ o a commercial tool o a completely supported software -WWW: http://www.mbdyn.org +WWW: https://www.mbdyn.org/ From owner-dev-commits-ports-branches@freebsd.org Fri Apr 23 09:22:52 2021 Return-Path: Delivered-To: dev-commits-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 026B35EB18B; Fri, 23 Apr 2021 09:22:52 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRTNC6fNFz3wTr; Fri, 23 Apr 2021 09:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D70FD275D; Fri, 23 Apr 2021 09:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13N9MpZY064558; Fri, 23 Apr 2021 09:22:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13N9Mpd8064557; Fri, 23 Apr 2021 09:22:51 GMT (envelope-from git) Date: Fri, 23 Apr 2021 09:22:51 GMT Message-Id: <202104230922.13N9Mpd8064557@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dmitry Marakasov Subject: git: 5287994291e5 - 2021Q2 - games/sgt-puzzles: update to 20210420 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 5287994291e5e9f1607d8eeac417af64d877ee6a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 09:22:52 -0000 The branch 2021Q2 has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=5287994291e5e9f1607d8eeac417af64d877ee6a commit 5287994291e5e9f1607d8eeac417af64d877ee6a Author: Dmitry Marakasov AuthorDate: 2021-04-22 17:45:42 +0000 Commit: Dmitry Marakasov CommitDate: 2021-04-23 09:20:46 +0000 games/sgt-puzzles: update to 20210420 This syncs the port with master branch to fix fetch, for upstream does not preserve older distfile versions. --- games/sgt-puzzles/Makefile | 67 +++++-------------------- games/sgt-puzzles/distinfo | 6 +-- games/sgt-puzzles/pkg-plist | 117 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+), 58 deletions(-) diff --git a/games/sgt-puzzles/Makefile b/games/sgt-puzzles/Makefile index 5b354bc4e649..58a3235e2c05 100644 --- a/games/sgt-puzzles/Makefile +++ b/games/sgt-puzzles/Makefile @@ -1,7 +1,5 @@ -# Created by: Dmitry Marakasov - PORTNAME= puzzles -PORTVERSION= 20201208 +PORTVERSION= 20210420 CATEGORIES= games MASTER_SITES= https://www.chiark.greenend.org.uk/~sgtatham/puzzles/ \ https://mirror.amdmi3.ru/distfiles/ @@ -14,63 +12,22 @@ COMMENT= Simon Tatham's Portable Puzzle Collection LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE -COMMITHASH= 84cb4c6 - -USES= autoreconf gmake gnome pkgconfig -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --program-prefix=sgt- -INSTALL_TARGET= install-strip +COMMITHASH= 3cf0a3b -PORTDOCS= * +BUILD_DEPENDS= convert:graphics/ImageMagick6-nox11 -PUZZLE_LIST= blackbox bridges cube dominosa fifteen filling flip \ - flood galaxies guess inertia keen lightup loopy magnets map \ - mines net netslide palisade pattern pearl pegs range rect \ - samegame signpost singles sixteen slant solo tents towers \ - tracks twiddle undead unequal unruly untangle +USES= cmake gnome perl5 pkgconfig +USE_PERL5= build +CMAKE_ARGS= -DNAME_PREFIX:STRING=sgt- -.for f in ${PUZZLE_LIST} -PLIST_FILES+= bin/sgt-${f} -DESKTOP_FILES_PLIST_FILES+=\ - share/pixmaps/sgt-${f}.png -DESKTOP_FILES_DESKTOP_ENTRIES+=\ - "${f}" \ - "${f} puzzle game" \ - "sgt-${f}" \ - "sgt-${f}" \ - "Game;LogicGame;" \ - "" -.endfor - -OPTIONS_DEFINE= DESKTOP_FILES DOCS -OPTIONS_DEFAULT=DESKTOP_FILES GTK2 OPTIONS_SINGLE= GTK OPTIONS_SINGLE_GTK= GTK2 GTK3 +OPTIONS_DEFAULT=GTK3 -DESKTOP_FILES_DESC= Install menu entries (lots of them) - -GTK_DESC= Gtk version -GTK2_CONFIGURE_ON= --with-gtk=2 -GTK2_USE= GNOME=gtk20 -GTK3_CONFIGURE_ON= --with-gtk=3 -GTK3_USE= GNOME=gtk30 - -post-patch: - @${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/configure.ac \ - ${WRKSRC}/configure - -post-install-DESKTOP_FILES-on: -.for f in ${PUZZLE_LIST} - ${INSTALL_DATA} ${WRKSRC}/icons/${f}-48d24.png ${STAGEDIR}${PREFIX}/share/pixmaps/sgt-${f}.png -.endfor - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/puzzles.txt ${WRKSRC}/HACKING ${STAGEDIR}${DOCSDIR}/ - -check-puzzle-list-completeness: extract - @${ECHO_CMD} ${PUZZLE_LIST} | ${FMT} -w 1 | ${SORT} > ${WRKDIR}/puzzle_list.port - @${LS} ${WRKSRC}/icons | ${GREP} 48d24.png | ${CUT} -f 1 -d- | ${SORT} > ${WRKDIR}/puzzle_list.upstream - @cmp ${WRKDIR}/puzzle_list.port ${WRKDIR}/puzzle_list.upstream +GTK_DESC= Gtk version +GTK2_CMAKE_ON= -DPUZZLES_GTK_VERSION=2 +GTK2_USE= GNOME=gtk20 +GTK3_CMAKE_ON= -DPUZZLES_GTK_VERSION=3 +GTK3_USE= GNOME=gtk30 .include diff --git a/games/sgt-puzzles/distinfo b/games/sgt-puzzles/distinfo index eb65f9758241..5814da55e0e3 100644 --- a/games/sgt-puzzles/distinfo +++ b/games/sgt-puzzles/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1607605072 -SHA256 (puzzles-20201208.84cb4c6.tar.gz) = fd49aabdd7c7e521c990991dab59700a40719cca172113ac8df693afe11d284d -SIZE (puzzles-20201208.84cb4c6.tar.gz) = 3261715 +TIMESTAMP = 1619110782 +SHA256 (puzzles-20210420.3cf0a3b.tar.gz) = 461ff64b1ed911f5a96c8db9cb36e568782eb715a3ef6ca7057fb31e0b96cbab +SIZE (puzzles-20210420.3cf0a3b.tar.gz) = 1670391 diff --git a/games/sgt-puzzles/pkg-plist b/games/sgt-puzzles/pkg-plist new file mode 100644 index 000000000000..48dcda831815 --- /dev/null +++ b/games/sgt-puzzles/pkg-plist @@ -0,0 +1,117 @@ +bin/sgt-blackbox +bin/sgt-bridges +bin/sgt-cube +bin/sgt-dominosa +bin/sgt-fifteen +bin/sgt-filling +bin/sgt-flip +bin/sgt-flood +bin/sgt-galaxies +bin/sgt-guess +bin/sgt-inertia +bin/sgt-keen +bin/sgt-lightup +bin/sgt-loopy +bin/sgt-magnets +bin/sgt-map +bin/sgt-mines +bin/sgt-net +bin/sgt-netslide +bin/sgt-palisade +bin/sgt-pattern +bin/sgt-pearl +bin/sgt-pegs +bin/sgt-range +bin/sgt-rect +bin/sgt-samegame +bin/sgt-signpost +bin/sgt-singles +bin/sgt-sixteen +bin/sgt-slant +bin/sgt-solo +bin/sgt-tents +bin/sgt-towers +bin/sgt-tracks +bin/sgt-twiddle +bin/sgt-undead +bin/sgt-unequal +bin/sgt-unruly +bin/sgt-untangle +share/applications/sgt-blackbox.desktop +share/applications/sgt-bridges.desktop +share/applications/sgt-cube.desktop +share/applications/sgt-dominosa.desktop +share/applications/sgt-fifteen.desktop +share/applications/sgt-filling.desktop +share/applications/sgt-flip.desktop +share/applications/sgt-flood.desktop +share/applications/sgt-galaxies.desktop +share/applications/sgt-guess.desktop +share/applications/sgt-inertia.desktop +share/applications/sgt-keen.desktop +share/applications/sgt-lightup.desktop +share/applications/sgt-loopy.desktop +share/applications/sgt-magnets.desktop +share/applications/sgt-map.desktop +share/applications/sgt-mines.desktop +share/applications/sgt-net.desktop +share/applications/sgt-netslide.desktop +share/applications/sgt-palisade.desktop +share/applications/sgt-pattern.desktop +share/applications/sgt-pearl.desktop +share/applications/sgt-pegs.desktop +share/applications/sgt-range.desktop +share/applications/sgt-rect.desktop +share/applications/sgt-samegame.desktop +share/applications/sgt-signpost.desktop +share/applications/sgt-singles.desktop +share/applications/sgt-sixteen.desktop +share/applications/sgt-slant.desktop +share/applications/sgt-solo.desktop +share/applications/sgt-tents.desktop +share/applications/sgt-towers.desktop +share/applications/sgt-tracks.desktop +share/applications/sgt-twiddle.desktop +share/applications/sgt-undead.desktop +share/applications/sgt-unequal.desktop +share/applications/sgt-unruly.desktop +share/applications/sgt-untangle.desktop +share/pixmaps/sgt-blackbox-48d24.png +share/pixmaps/sgt-bridges-48d24.png +share/pixmaps/sgt-cube-48d24.png +share/pixmaps/sgt-dominosa-48d24.png +share/pixmaps/sgt-fifteen-48d24.png +share/pixmaps/sgt-filling-48d24.png +share/pixmaps/sgt-flip-48d24.png +share/pixmaps/sgt-flood-48d24.png +share/pixmaps/sgt-galaxies-48d24.png +share/pixmaps/sgt-guess-48d24.png +share/pixmaps/sgt-inertia-48d24.png +share/pixmaps/sgt-keen-48d24.png +share/pixmaps/sgt-lightup-48d24.png +share/pixmaps/sgt-loopy-48d24.png +share/pixmaps/sgt-magnets-48d24.png +share/pixmaps/sgt-map-48d24.png +share/pixmaps/sgt-mines-48d24.png +share/pixmaps/sgt-net-48d24.png +share/pixmaps/sgt-netslide-48d24.png +share/pixmaps/sgt-palisade-48d24.png +share/pixmaps/sgt-pattern-48d24.png +share/pixmaps/sgt-pearl-48d24.png +share/pixmaps/sgt-pegs-48d24.png +share/pixmaps/sgt-range-48d24.png +share/pixmaps/sgt-rect-48d24.png +share/pixmaps/sgt-samegame-48d24.png +share/pixmaps/sgt-signpost-48d24.png +share/pixmaps/sgt-singles-48d24.png +share/pixmaps/sgt-sixteen-48d24.png +share/pixmaps/sgt-slant-48d24.png +share/pixmaps/sgt-solo-48d24.png +share/pixmaps/sgt-tents-48d24.png +share/pixmaps/sgt-towers-48d24.png +share/pixmaps/sgt-tracks-48d24.png +share/pixmaps/sgt-twiddle-48d24.png +share/pixmaps/sgt-undead-48d24.png +share/pixmaps/sgt-unequal-48d24.png +share/pixmaps/sgt-unruly-48d24.png +share/pixmaps/sgt-untangle-48d24.png From owner-dev-commits-ports-branches@freebsd.org Fri Apr 23 13:17:03 2021 Return-Path: Delivered-To: dev-commits-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 8631D5F30E3; Fri, 23 Apr 2021 13:17:03 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRZZR2PR1z4g9H; Fri, 23 Apr 2021 13:17:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4512B5960; Fri, 23 Apr 2021 13:17:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13NDH3sW073823; Fri, 23 Apr 2021 13:17:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13NDH3Sr073822; Fri, 23 Apr 2021 13:17:03 GMT (envelope-from git) Date: Fri, 23 Apr 2021 13:17:03 GMT Message-Id: <202104231317.13NDH3Sr073822@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Koichiro Iwao Subject: git: 1d1ebc8f3da3 - 2021Q2 - devel/ruby-build: Update to 20210423 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: meta X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 1d1ebc8f3da3cf44360e15e1a2e522c6e0e76043 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 13:17:03 -0000 The branch 2021Q2 has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d1ebc8f3da3cf44360e15e1a2e522c6e0e76043 commit 1d1ebc8f3da3cf44360e15e1a2e522c6e0e76043 Author: Koichiro Iwao AuthorDate: 2021-04-23 13:13:33 +0000 Commit: Koichiro Iwao CommitDate: 2021-04-23 13:16:31 +0000 devel/ruby-build: Update to 20210423 * Fix hashes for TruffleRuby GraalVM 21.1.0 Relnotes: https://github.com/rbenv/ruby-build/releases/tag/v20210423 (cherry picked from commit 0d028b527bbe6a886d57f3523719575bfbf45432) --- devel/ruby-build/Makefile | 2 +- devel/ruby-build/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/ruby-build/Makefile b/devel/ruby-build/Makefile index a5f7e565f5a9..51db6c4d5395 100644 --- a/devel/ruby-build/Makefile +++ b/devel/ruby-build/Makefile @@ -1,6 +1,6 @@ PORTNAME= ruby-build -PORTVERSION= 20210420 +PORTVERSION= 20210423 DISTVERSIONPREFIX= v CATEGORIES= devel ruby DIST_SUBDIR= rbenv diff --git a/devel/ruby-build/distinfo b/devel/ruby-build/distinfo index 69cd9ea2a726..2b150dbb8395 100644 --- a/devel/ruby-build/distinfo +++ b/devel/ruby-build/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619002834 -SHA256 (rbenv/rbenv-ruby-build-v20210420_GH0.tar.gz) = 4223676bf37854bada3f51165d3cdb87e28a2afdddaef8e5b2603c70fca47f81 -SIZE (rbenv/rbenv-ruby-build-v20210420_GH0.tar.gz) = 71005 +TIMESTAMP = 1619183128 +SHA256 (rbenv/rbenv-ruby-build-v20210423_GH0.tar.gz) = bffdf6f9572a9a2d3cf6d9cbc44a27470b5c9b77009abd3489876a2e452e44ac +SIZE (rbenv/rbenv-ruby-build-v20210423_GH0.tar.gz) = 71007 From owner-dev-commits-ports-branches@freebsd.org Fri Apr 23 15:09:41 2021 Return-Path: Delivered-To: dev-commits-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 B63EF5F5D56; Fri, 23 Apr 2021 15:09:41 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRd4P4rgRz4lWf; Fri, 23 Apr 2021 15:09:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 998437274; Fri, 23 Apr 2021 15:09:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13NF9fOs020598; Fri, 23 Apr 2021 15:09:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13NF9fsQ020597; Fri, 23 Apr 2021 15:09:41 GMT (envelope-from git) Date: Fri, 23 Apr 2021 15:09:41 GMT Message-Id: <202104231509.13NF9fsQ020597@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Lewis Cook Subject: git: 0854e2520786 - 2021Q2 - shells/fish: Update to 3.2.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lcook X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 0854e2520786948b8ed964f8711e1889d98d881a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 15:09:41 -0000 The branch 2021Q2 has been updated by lcook: URL: https://cgit.FreeBSD.org/ports/commit/?id=0854e2520786948b8ed964f8711e1889d98d881a commit 0854e2520786948b8ed964f8711e1889d98d881a Author: Lewis Cook AuthorDate: 2021-04-23 15:03:32 +0000 Commit: Lewis Cook CommitDate: 2021-04-23 15:08:52 +0000 shells/fish: Update to 3.2.2 Changes: https://github.com/fish-shell/fish-shell/releases/tag/3.2.2 (cherry picked from commit 93946d8aaafcff4fe8142ad4b0abb57af426144c) --- shells/fish/Makefile | 2 +- shells/fish/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shells/fish/Makefile b/shells/fish/Makefile index a9c52150d6a4..9d35e4150d6f 100644 --- a/shells/fish/Makefile +++ b/shells/fish/Makefile @@ -1,7 +1,7 @@ # Created by: Kai Wang PORTNAME= fish -DISTVERSION= 3.2.1 +DISTVERSION= 3.2.2 CATEGORIES= shells MASTER_SITES= https://github.com/fish-shell/fish-shell/releases/download/${PORTVERSION}/ diff --git a/shells/fish/distinfo b/shells/fish/distinfo index 6bdf8b97164a..07ffb71c95b0 100644 --- a/shells/fish/distinfo +++ b/shells/fish/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1616090214 -SHA256 (fish-3.2.1.tar.xz) = d8e49f4090d3778df17dd825e4a2a80192015682423cd9dd02b6675d65c3af5b -SIZE (fish-3.2.1.tar.xz) = 3409808 +TIMESTAMP = 1619185361 +SHA256 (fish-3.2.2.tar.xz) = 5944da1a8893d11b0828a4fd9136ee174549daffb3d0adfdd8917856fe6b4009 +SIZE (fish-3.2.2.tar.xz) = 3411748 From owner-dev-commits-ports-branches@freebsd.org Fri Apr 23 16:14:07 2021 Return-Path: Delivered-To: dev-commits-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 1708E5F7FE0; Fri, 23 Apr 2021 16:14:07 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRfVl0CXkz4pcR; Fri, 23 Apr 2021 16:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EE4C87FCB; Fri, 23 Apr 2021 16:14:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13NGE6Ac015936; Fri, 23 Apr 2021 16:14:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13NGE6h2015935; Fri, 23 Apr 2021 16:14:06 GMT (envelope-from git) Date: Fri, 23 Apr 2021 16:14:06 GMT Message-Id: <202104231614.13NGE6h2015935@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 5390741fcfd8 - 2021Q2 - llvm12: rework handling undefined options MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 5390741fcfd802145f2cd2cdff5bceb292594f1e Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 16:14:07 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=5390741fcfd802145f2cd2cdff5bceb292594f1e commit 5390741fcfd802145f2cd2cdff5bceb292594f1e Author: Brooks Davis AuthorDate: 2021-04-07 17:26:40 +0000 Commit: Jan Beich CommitDate: 2021-04-23 16:11:02 +0000 llvm12: rework handling undefined options Define a list of options and for any that aren't defined for the current architecture add a PLIST_SUB entry as through the option were defined and disabled. (cherry picked from commit c9a3a7442f64da0f932d4e6934218c1acd684d25) --- devel/llvm12/Makefile | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile index 67f4d5f2764e..7ef190aa2f48 100644 --- a/devel/llvm12/Makefile +++ b/devel/llvm12/Makefile @@ -90,6 +90,8 @@ OPTIONS_DEFAULT_powerpc64le= GOLD OPENMP OPTIONS_SINGLE= BACKENDS OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD OPTIONS_SUB= yes +# All non-backend options +_ALL_OPTIONS= CLANG COMPILER_RT DOCS EXTRAS GOLD LIT LLD LLDB PYCLANG OPENMP BE_AMDGPU_DESC= AMD GPU backend (required by mesa) BE_FREEBSD_DESC= Backends for FreeBSD architectures @@ -437,23 +439,12 @@ CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin .endif -.if ! ${OPTIONS_DEFINE:MCOMPILER_RT} -# Hack to disable COMPILER_RT in plist of unsupported architectures -PLIST_SUB+= COMPILER_RT="@comment " -.else -.endif - -.if ! ${OPTIONS_DEFINE:MGOLD} -# Hack to disable GOLD in plist of unsupported architectures -PLIST_SUB+= GOLD="@comment " -.else -.endif - -.if ! ${OPTIONS_DEFINE:MOPENMP} -# Hack to disable OPENMP in plist of unsupported architectures -PLIST_SUB+= OPENMP="@comment " -.else +# Comment out plist entries for unsupported options. +.for opt in ${_ALL_OPTIONS} +.if !${OPTIONS_DEFINE:M${opt}} +PLIST_SUB+= ${opt}="@comment " .endif +.endfor post-patch: ${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \ From owner-dev-commits-ports-branches@freebsd.org Fri Apr 23 16:14:08 2021 Return-Path: Delivered-To: dev-commits-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 394985F7D5D; Fri, 23 Apr 2021 16:14:08 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRfVm17ghz4pff; Fri, 23 Apr 2021 16:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1A5A81034A; Fri, 23 Apr 2021 16:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13NGE89Z015957; Fri, 23 Apr 2021 16:14:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13NGE8rP015956; Fri, 23 Apr 2021 16:14:08 GMT (envelope-from git) Date: Fri, 23 Apr 2021 16:14:08 GMT Message-Id: <202104231614.13NGE8rP015956@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 3ce785449ff3 - 2021Q2 - llvm12: Disable LLDB on non-x86 architectures MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 3ce785449ff3bd8d33020a697759cd2ecdc12478 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 16:14:08 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=3ce785449ff3bd8d33020a697759cd2ecdc12478 commit 3ce785449ff3bd8d33020a697759cd2ecdc12478 Author: Brooks Davis AuthorDate: 2021-04-07 17:26:40 +0000 Commit: Jan Beich CommitDate: 2021-04-23 16:11:03 +0000 llvm12: Disable LLDB on non-x86 architectures The 12.0.0 branch point hit point in the rework of FreeBSD debug targets were non-x86 architectures are broken. For now, simply disable LLDB builds on those platforms. PR: 254082 (cherry picked from commit cc0bbd86088c545607a8585256adb8e3cfb132ad) --- devel/llvm12/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile index 7ef190aa2f48..4a139265d63e 100644 --- a/devel/llvm12/Makefile +++ b/devel/llvm12/Makefile @@ -73,16 +73,16 @@ CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF CFLAGS+= -DNDEBUG CXXFLAGS+= -DNDEBUG -OPTIONS_DEFINE= BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLD_LINK LLDB PYCLANG +OPTIONS_DEFINE= BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLD_LINK PYCLANG OPTIONS_DEFINE_aarch64= OPENMP -OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP -OPTIONS_DEFINE_i386= COMPILER_RT OPENMP +OPTIONS_DEFINE_amd64= COMPILER_RT GOLD LLDB OPENMP +OPTIONS_DEFINE_i386= COMPILER_RT LLDB OPENMP OPTIONS_DEFINE_powerpc64= GOLD OPENMP OPTIONS_DEFINE_powerpc64le= GOLD OPENMP -OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLD_LINK LLDB PYCLANG +OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLD_LINK PYCLANG OPTIONS_DEFAULT_aarch64= OPENMP -OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP -OPTIONS_DEFAULT_i386= COMPILER_RT OPENMP +OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD LLDB OPENMP +OPTIONS_DEFAULT_i386= COMPILER_RT LLDB OPENMP OPTIONS_DEFAULT_powerpc64= ${OPTIONS_DEFAULT_powerpc64_${OSREL:R}} OPENMP OPTIONS_DEFAULT_powerpc64_13= GOLD OPTIONS_DEFAULT_powerpc64_14= GOLD From owner-dev-commits-ports-branches@freebsd.org Fri Apr 23 16:14:09 2021 Return-Path: Delivered-To: dev-commits-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 5F3C45F7FE6; Fri, 23 Apr 2021 16:14:09 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRfVn298Xz4pl6; Fri, 23 Apr 2021 16:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3A5DE107D1; Fri, 23 Apr 2021 16:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13NGE9Cj015983; Fri, 23 Apr 2021 16:14:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13NGE9dj015982; Fri, 23 Apr 2021 16:14:09 GMT (envelope-from git) Date: Fri, 23 Apr 2021 16:14:09 GMT Message-Id: <202104231614.13NGE9dj015982@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: f4f2dcaee5c6 - 2021Q2 - llvm12: Update to 12.0.0rc4 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: f4f2dcaee5c66c32811d90a7869e7a587de1cdc0 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 16:14:09 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4f2dcaee5c66c32811d90a7869e7a587de1cdc0 commit f4f2dcaee5c66c32811d90a7869e7a587de1cdc0 Author: Brooks Davis AuthorDate: 2021-04-07 17:26:40 +0000 Commit: Jan Beich CommitDate: 2021-04-23 16:11:03 +0000 llvm12: Update to 12.0.0rc4 (cherry picked from commit 847e7c304a27c34d8f53f9bd0a98f3fd116ce240) --- devel/llvm12/Makefile | 2 +- devel/llvm12/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile index 4a139265d63e..bc5a332cd9d4 100644 --- a/devel/llvm12/Makefile +++ b/devel/llvm12/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm -DISTVERSION= 12.0.0rc2 +DISTVERSION= 12.0.0rc4 PORTREVISION= 0 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ diff --git a/devel/llvm12/distinfo b/devel/llvm12/distinfo index 7161e880f6ac..e3ad0b7a5591 100644 --- a/devel/llvm12/distinfo +++ b/devel/llvm12/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1614877783 -SHA256 (llvm-project-12.0.0rc2.src.tar.xz) = 5cda94b2cf58ac516519c248625bee5fa145ab1dc527fcac7d6ab3316ffb0c3b -SIZE (llvm-project-12.0.0rc2.src.tar.xz) = 90882304 +TIMESTAMP = 1617731020 +SHA256 (llvm-project-12.0.0rc4.src.tar.xz) = 9c4e99554a85aa42f7a6deb4421e2e7e08646720ebe2f5feeaec5b593e66587e +SIZE (llvm-project-12.0.0rc4.src.tar.xz) = 90891308 From owner-dev-commits-ports-branches@freebsd.org Fri Apr 23 16:14:13 2021 Return-Path: Delivered-To: dev-commits-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 2E84B5F8014; Fri, 23 Apr 2021 16:14:13 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRfVr6Ykrz4psR; Fri, 23 Apr 2021 16:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AB55310629; Fri, 23 Apr 2021 16:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13NGECDn016060; Fri, 23 Apr 2021 16:14:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13NGECjl016059; Fri, 23 Apr 2021 16:14:12 GMT (envelope-from git) Date: Fri, 23 Apr 2021 16:14:12 GMT Message-Id: <202104231614.13NGECjl016059@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: b126b061ee68 - main - multimedia/gmmlib: update to 21.1.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b126b061ee688945ec52732586335d1361dc76cc Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 16:14:13 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b126b061ee688945ec52732586335d1361dc76cc commit b126b061ee688945ec52732586335d1361dc76cc Author: Jan Beich AuthorDate: 2021-04-21 14:36:34 +0000 Commit: Jan Beich CommitDate: 2021-04-23 16:13:15 +0000 multimedia/gmmlib: update to 21.1.2 Changes: https://github.com/intel/gmmlib/compare/intel-gmmlib-21.1.1...intel-gmmlib-21.1.2 Reported by: portscout --- multimedia/gmmlib/Makefile | 2 +- multimedia/gmmlib/distinfo | 6 +++--- multimedia/gmmlib/pkg-plist | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/multimedia/gmmlib/Makefile b/multimedia/gmmlib/Makefile index 6f02e48cf02d..ca0bc12fad47 100644 --- a/multimedia/gmmlib/Makefile +++ b/multimedia/gmmlib/Makefile @@ -1,6 +1,6 @@ PORTNAME= gmmlib DISTVERSIONPREFIX= intel-${PORTNAME}- -DISTVERSION= 21.1.1 +DISTVERSION= 21.1.2 CATEGORIES= multimedia PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/multimedia/gmmlib/distinfo b/multimedia/gmmlib/distinfo index 7a92d6d86c4f..7c7e077f9573 100644 --- a/multimedia/gmmlib/distinfo +++ b/multimedia/gmmlib/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1616673280 -SHA256 (intel-gmmlib-intel-gmmlib-21.1.1_GH0.tar.gz) = b996f09264e05ebca0dc275ea32791ba22769fe04147592371b4a61cdf508763 -SIZE (intel-gmmlib-intel-gmmlib-21.1.1_GH0.tar.gz) = 737024 +TIMESTAMP = 1619015794 +SHA256 (intel-gmmlib-intel-gmmlib-21.1.2_GH0.tar.gz) = ecd3b39ae7fd8414e0a45b4b23877c5c13eec692b0a21e0126f336e9c02eea5d +SIZE (intel-gmmlib-intel-gmmlib-21.1.2_GH0.tar.gz) = 745686 SHA256 (f17dd87c7f57.patch) = 0bdfd22e8f36a097c875796c7bbf7003a16cc7535fdf5d3caa3a7de9dc21c28e SIZE (f17dd87c7f57.patch) = 1485 SHA256 (7171f6d818fc.patch) = 8a3e8fb3aff618c41818df7e2a46af2b649a4a059b0ec37d053eeb5972dd846a diff --git a/multimedia/gmmlib/pkg-plist b/multimedia/gmmlib/pkg-plist index c90779e55076..0ce908593201 100644 --- a/multimedia/gmmlib/pkg-plist +++ b/multimedia/gmmlib/pkg-plist @@ -61,5 +61,5 @@ include/igdgmm/util/g_gfxDebug.h include/igdgmm/util/gfxDebug.h lib/libigdgmm.so lib/libigdgmm.so.11 -lib/libigdgmm.so.11.2.0 +lib/libigdgmm.so.11.3.0 libdata/pkgconfig/igdgmm.pc From owner-dev-commits-ports-branches@freebsd.org Fri Apr 23 16:14:14 2021 Return-Path: Delivered-To: dev-commits-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 05AA65F8017; Fri, 23 Apr 2021 16:14:14 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRfVs6PJSz4pTC; Fri, 23 Apr 2021 16:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CBD0E10458; Fri, 23 Apr 2021 16:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13NGED36016081; Fri, 23 Apr 2021 16:14:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13NGEDo3016080; Fri, 23 Apr 2021 16:14:13 GMT (envelope-from git) Date: Fri, 23 Apr 2021 16:14:13 GMT Message-Id: <202104231614.13NGEDo3016080@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 1589b9500bde - main - graphics/glslang: update to 11.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1589b9500bdee13ac291e8fe7b6b1636117d32e8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 16:14:14 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1589b9500bdee13ac291e8fe7b6b1636117d32e8 commit 1589b9500bdee13ac291e8fe7b6b1636117d32e8 Author: Jan Beich AuthorDate: 2021-04-22 04:58:39 +0000 Commit: Jan Beich CommitDate: 2021-04-23 16:13:15 +0000 graphics/glslang: update to 11.3.0 Changes: https://github.com/KhronosGroup/glslang/compare/11.2.0...11.3.0 Reported by: Repology --- graphics/glslang/Makefile | 2 +- graphics/glslang/distinfo | 6 +++--- graphics/glslang/pkg-plist | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/graphics/glslang/Makefile b/graphics/glslang/Makefile index 5d17cd4127b3..aa0d41a5529c 100644 --- a/graphics/glslang/Makefile +++ b/graphics/glslang/Makefile @@ -1,5 +1,5 @@ PORTNAME= glslang -DISTVERSION= 11.2.0 +DISTVERSION= 11.3.0 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/glslang/distinfo b/graphics/glslang/distinfo index d55e48c7a13d..e88149f5172e 100644 --- a/graphics/glslang/distinfo +++ b/graphics/glslang/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1614027240 -SHA256 (KhronosGroup-glslang-11.2.0_GH0.tar.gz) = 8ff2fcf9b054e4a4ef56fcd8a637322f827b2b176a592a618d63672ddb896e06 -SIZE (KhronosGroup-glslang-11.2.0_GH0.tar.gz) = 3295235 +TIMESTAMP = 1619067519 +SHA256 (KhronosGroup-glslang-11.3.0_GH0.tar.gz) = 2221ff544a301269f0762facd2d62f1399f57ff49f5b57683421891665546425 +SIZE (KhronosGroup-glslang-11.3.0_GH0.tar.gz) = 3342525 diff --git a/graphics/glslang/pkg-plist b/graphics/glslang/pkg-plist index d78a8df97e5f..2986ddb65387 100644 --- a/graphics/glslang/pkg-plist +++ b/graphics/glslang/pkg-plist @@ -68,6 +68,8 @@ lib/cmake/SPIRVTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/SPIRVTargets.cmake lib/cmake/SPVRemapperTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/SPVRemapperTargets.cmake +lib/cmake/glslang-default-resource-limitsTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/glslang-default-resource-limitsTargets.cmake lib/cmake/glslangTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/glslangTargets.cmake lib/cmake/glslangValidatorTargets-%%CMAKE_BUILD_TYPE%%.cmake @@ -81,4 +83,5 @@ lib/libOGLCompiler.a lib/libOSDependent.a lib/libSPIRV.a lib/libSPVRemapper.a +lib/libglslang-default-resource-limits.a lib/libglslang.a From owner-dev-commits-ports-branches@freebsd.org Fri Apr 23 16:14:10 2021 Return-Path: Delivered-To: dev-commits-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 C79485F7D6D; Fri, 23 Apr 2021 16:14:10 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRfVp3Fttz4pcc; Fri, 23 Apr 2021 16:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5DB4A107D2; Fri, 23 Apr 2021 16:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13NGEA7n016006; Fri, 23 Apr 2021 16:14:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13NGEAFw016005; Fri, 23 Apr 2021 16:14:10 GMT (envelope-from git) Date: Fri, 23 Apr 2021 16:14:10 GMT Message-Id: <202104231614.13NGEAFw016005@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: c994f091962f - 2021Q2 - devel/llvm12: Update to 12.0.0 release MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: c994f091962fc738f2801971380b45a169653558 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 16:14:11 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c994f091962fc738f2801971380b45a169653558 commit c994f091962fc738f2801971380b45a169653558 Author: Brooks Davis AuthorDate: 2021-04-21 22:03:07 +0000 Commit: Jan Beich CommitDate: 2021-04-23 16:11:03 +0000 devel/llvm12: Update to 12.0.0 release (cherry picked from commit 95d9554b594c65332756a661114e884c758148f5) --- devel/llvm12/Makefile | 2 +- devel/llvm12/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile index bc5a332cd9d4..ed05f4e16e14 100644 --- a/devel/llvm12/Makefile +++ b/devel/llvm12/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm -DISTVERSION= 12.0.0rc4 +DISTVERSION= 12.0.0 PORTREVISION= 0 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ diff --git a/devel/llvm12/distinfo b/devel/llvm12/distinfo index e3ad0b7a5591..ee71f9aac0f3 100644 --- a/devel/llvm12/distinfo +++ b/devel/llvm12/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617731020 -SHA256 (llvm-project-12.0.0rc4.src.tar.xz) = 9c4e99554a85aa42f7a6deb4421e2e7e08646720ebe2f5feeaec5b593e66587e -SIZE (llvm-project-12.0.0rc4.src.tar.xz) = 90891308 +TIMESTAMP = 1619034049 +SHA256 (llvm-project-12.0.0.src.tar.xz) = 9ed1688943a4402d7c904cc4515798cdb20080066efa010fe7e1f2551b423628 +SIZE (llvm-project-12.0.0.src.tar.xz) = 90884060 From owner-dev-commits-ports-branches@freebsd.org Fri Apr 23 16:14:11 2021 Return-Path: Delivered-To: dev-commits-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 9E09B5F7FF4; Fri, 23 Apr 2021 16:14:11 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRfVq3zf7z4pcg; Fri, 23 Apr 2021 16:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 799C47FCC; Fri, 23 Apr 2021 16:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13NGEB3i016027; Fri, 23 Apr 2021 16:14:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13NGEBII016026; Fri, 23 Apr 2021 16:14:11 GMT (envelope-from git) Date: Fri, 23 Apr 2021 16:14:11 GMT Message-Id: <202104231614.13NGEBII016026@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 894c1d0b9af8 - 2021Q2 - www/firefox: update gamepad patch MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 894c1d0b9af8ec137f5be9483aba7ac5879cbfed Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 16:14:11 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=894c1d0b9af8ec137f5be9483aba7ac5879cbfed commit 894c1d0b9af8ec137f5be9483aba7ac5879cbfed Author: Jan Beich AuthorDate: 2021-04-23 06:54:32 +0000 Commit: Jan Beich CommitDate: 2021-04-23 16:13:33 +0000 www/firefox: update gamepad patch (cherry picked from commit cdf1aef1ccda3584edab59654b173e55500eae6c) --- www/firefox/Makefile | 1 + www/firefox/files/patch-bug1680982 | 59 +++++++++++++++++++++++++------------- 2 files changed, 40 insertions(+), 20 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 0214820bf4a0..30556e7188b7 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,6 +2,7 @@ PORTNAME= firefox DISTVERSION= 88.0 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ diff --git a/www/firefox/files/patch-bug1680982 b/www/firefox/files/patch-bug1680982 index 17604ac3b6a2..c9fc2344bb44 100644 --- a/www/firefox/files/patch-bug1680982 +++ b/www/firefox/files/patch-bug1680982 @@ -1,28 +1,28 @@ -commit d947b92c7503 +commit 3204512f58a1 Author: Greg V Date: Sun Dec 6 22:07:00 2020 +0000 - Bug 1680982 - Use evdev for gamepads on Linux/FreeBSD + Bug 1680982 - Use evdev instead of the Linux legacy joystick API for gamepads - Switch from the legacy Linux joystick API to the generic evdev API. + Using evdev is a prerequisite for adding rumble (haptic feedback) and LED support. - BTN_GAMEPAD semantic buttons are interpreted directly, since all kernel drivers are supposed to use them correctly: https://www.kernel.org/doc/html/latest/input/gamepad.html - BTN_JOYSTICK legacy style numbered buttons use the model specific remappers - - using evdev is a prerequisite for adding rumble (haptic feedback) and other extras - - the Linux gamepad module is enabled on FreeBSD, because - FreeBSD provides evdev, and libudev-devd provides enough of libudev + - we support even strange devices that combine both styles in one device + - the Linux gamepad module is enabled on FreeBSD and DragonFly, because + these kernels provide evdev, and libudev-devd provides enough of libudev (evdev headers are provided by the devel/evdev-proto package) Differential Revision: https://phabricator.services.mozilla.com/D98868 --- - dom/gamepad/linux/LinuxGamepad.cpp | 243 +++++++++++++++++++++++++++++++------ + dom/gamepad/linux/LinuxGamepad.cpp | 262 ++++++++++++++++++++++++++++++++----- dom/gamepad/moz.build | 2 +- - 2 files changed, 210 insertions(+), 35 deletions(-) + 2 files changed, 229 insertions(+), 35 deletions(-) diff --git dom/gamepad/linux/LinuxGamepad.cpp dom/gamepad/linux/LinuxGamepad.cpp -index 512ac765020d..0e51183c2a2d 100644 +index deee47b9d267..31f0aad7ae4a 100644 --- dom/gamepad/linux/LinuxGamepad.cpp +++ dom/gamepad/linux/LinuxGamepad.cpp @@ -5,15 +5,16 @@ @@ -109,13 +109,15 @@ index 512ac765020d..0e51183c2a2d 100644 static gboolean OnGamepadData(GIOChannel* source, GIOCondition condition, gpointer data); -@@ -114,8 +129,12 @@ void LinuxGamepadService::AddDevice(struct udev_device* dev) { +@@ -114,8 +129,14 @@ void LinuxGamepadService::AddDevice(struct udev_device* dev) { g_io_channel_set_encoding(channel, nullptr, nullptr); g_io_channel_set_buffered(channel, FALSE); int fd = g_io_channel_unix_get_fd(channel); + -+ struct input_id id = {0}; -+ ioctl(fd, EVIOCGID, &id); ++ struct input_id id {}; ++ if (ioctl(fd, EVIOCGID, &id) == -1) { ++ return; ++ } + char name[128]; - if (ioctl(fd, JSIOCGNAME(sizeof(name)), &name) == -1) { @@ -123,7 +125,7 @@ index 512ac765020d..0e51183c2a2d 100644 strcpy(name, "unknown"); } const char* vendor_id = -@@ -131,20 +150,69 @@ void LinuxGamepadService::AddDevice(struct udev_device* dev) { +@@ -131,20 +152,86 @@ void LinuxGamepadService::AddDevice(struct udev_device* dev) { model_id = mUdev.udev_device_get_sysattr_value(parent, "id/product"); } } @@ -148,8 +150,11 @@ index 512ac765020d..0e51183c2a2d 100644 + unsigned long abs_bits[NLONGS(ABS_CNT)] = {0}; + ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(key_bits)), key_bits); + ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(abs_bits)), abs_bits); ++ ++ /* Here, we try to support even strange cases where proper semantic ++ * BTN_GAMEPAD button are combined with arbitrary extra buttons. */ + for (uint16_t i = BTN_JOYSTICK; i < KEY_MAX; i++) { -+ /* Skip proper gamepad events, they are handled directly */ ++ /* Do not map semantic buttons, they are handled directly */ + if (i == BTN_GAMEPAD) { + i = BTN_THUMBR + 1; + continue; @@ -167,6 +172,13 @@ index 512ac765020d..0e51183c2a2d 100644 + gamepad->key_map[i] = numButtons++; + } + } ++ for (uint16_t i = BTN_GAMEPAD; i <= BTN_THUMBR; i++) { ++ /* But if any semantic event exists, count them all */ ++ if (TestBit(key_bits, i)) { ++ numButtons += BUTTON_INDEX_COUNT; ++ break; ++ } ++ } + for (uint16_t i = 0; i < ABS_MAX; ++i) { + if (TestBit(abs_bits, i)) { + gamepad->abs_info.emplace(i, input_absinfo{}); @@ -181,6 +193,13 @@ index 512ac765020d..0e51183c2a2d 100644 + } + } + ++ if (numAxes == 0) { ++ NS_WARNING("Gamepad with zero axes detected?"); ++ } ++ if (numButtons == 0) { ++ NS_WARNING("Gamepad with zero buttons detected?"); ++ } ++ + bool defaultRemapper = false; + RefPtr remapper = + GetGamepadRemapper(id.vendor, id.product, defaultRemapper); @@ -200,7 +219,7 @@ index 512ac765020d..0e51183c2a2d 100644 // TODO: Bug 1523355, implement gamepad lighindicator and touch for Linux. gamepad->source_id = -@@ -257,7 +325,7 @@ bool LinuxGamepadService::is_gamepad(struct udev_device* dev) { +@@ -257,7 +344,7 @@ bool LinuxGamepadService::is_gamepad(struct udev_device* dev) { if (!devpath) { return false; } @@ -209,16 +228,16 @@ index 512ac765020d..0e51183c2a2d 100644 return false; } -@@ -292,7 +360,7 @@ gboolean LinuxGamepadService::OnGamepadData(GIOChannel* source, +@@ -292,7 +379,7 @@ gboolean LinuxGamepadService::OnGamepadData(GIOChannel* source, if (condition & G_IO_ERR || condition & G_IO_HUP) return FALSE; while (true) { - struct js_event event; -+ struct input_event event = {0}; ++ struct input_event event {}; gsize count; GError* err = nullptr; if (g_io_channel_read_chars(source, (gchar*)&event, sizeof(event), &count, -@@ -301,18 +369,125 @@ gboolean LinuxGamepadService::OnGamepadData(GIOChannel* source, +@@ -301,18 +388,125 @@ gboolean LinuxGamepadService::OnGamepadData(GIOChannel* source, break; } @@ -355,7 +374,7 @@ index 512ac765020d..0e51183c2a2d 100644 } } diff --git dom/gamepad/moz.build dom/gamepad/moz.build -index 5f55d5a95e96..b5d10e9d095a 100644 +index 5f55d5a95e96..544b7f927736 100644 --- dom/gamepad/moz.build +++ dom/gamepad/moz.build @@ -59,7 +59,7 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows": @@ -363,7 +382,7 @@ index 5f55d5a95e96..b5d10e9d095a 100644 elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "android": UNIFIED_SOURCES += ["android/AndroidGamepad.cpp"] -elif CONFIG["OS_ARCH"] == "Linux": -+elif CONFIG["OS_ARCH"] == "Linux" or CONFIG["OS_ARCH"] == "FreeBSD": ++elif CONFIG["OS_ARCH"] in ("Linux", "FreeBSD", "DragonFly"): UNIFIED_SOURCES += ["linux/LinuxGamepad.cpp"] else: UNIFIED_SOURCES += ["fallback/FallbackGamepad.cpp"] From owner-dev-commits-ports-branches@freebsd.org Fri Apr 23 16:14:15 2021 Return-Path: Delivered-To: dev-commits-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 2376D5F7DEE; Fri, 23 Apr 2021 16:14:15 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRfVv0QrHz4pfx; Fri, 23 Apr 2021 16:14:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EEFE1107D3; Fri, 23 Apr 2021 16:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13NGEEBX016102; Fri, 23 Apr 2021 16:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13NGEEoJ016101; Fri, 23 Apr 2021 16:14:14 GMT (envelope-from git) Date: Fri, 23 Apr 2021 16:14:14 GMT Message-Id: <202104231614.13NGEEoJ016101@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: cdf1aef1ccda - main - www/firefox: update gamepad patch MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cdf1aef1ccda3584edab59654b173e55500eae6c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 16:14:15 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=cdf1aef1ccda3584edab59654b173e55500eae6c commit cdf1aef1ccda3584edab59654b173e55500eae6c Author: Jan Beich AuthorDate: 2021-04-23 06:54:32 +0000 Commit: Jan Beich CommitDate: 2021-04-23 16:13:15 +0000 www/firefox: update gamepad patch --- www/firefox/Makefile | 1 + www/firefox/files/patch-bug1680982 | 59 +++++++++++++++++++++++++------------- 2 files changed, 40 insertions(+), 20 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 0214820bf4a0..30556e7188b7 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,6 +2,7 @@ PORTNAME= firefox DISTVERSION= 88.0 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ diff --git a/www/firefox/files/patch-bug1680982 b/www/firefox/files/patch-bug1680982 index 17604ac3b6a2..c9fc2344bb44 100644 --- a/www/firefox/files/patch-bug1680982 +++ b/www/firefox/files/patch-bug1680982 @@ -1,28 +1,28 @@ -commit d947b92c7503 +commit 3204512f58a1 Author: Greg V Date: Sun Dec 6 22:07:00 2020 +0000 - Bug 1680982 - Use evdev for gamepads on Linux/FreeBSD + Bug 1680982 - Use evdev instead of the Linux legacy joystick API for gamepads - Switch from the legacy Linux joystick API to the generic evdev API. + Using evdev is a prerequisite for adding rumble (haptic feedback) and LED support. - BTN_GAMEPAD semantic buttons are interpreted directly, since all kernel drivers are supposed to use them correctly: https://www.kernel.org/doc/html/latest/input/gamepad.html - BTN_JOYSTICK legacy style numbered buttons use the model specific remappers - - using evdev is a prerequisite for adding rumble (haptic feedback) and other extras - - the Linux gamepad module is enabled on FreeBSD, because - FreeBSD provides evdev, and libudev-devd provides enough of libudev + - we support even strange devices that combine both styles in one device + - the Linux gamepad module is enabled on FreeBSD and DragonFly, because + these kernels provide evdev, and libudev-devd provides enough of libudev (evdev headers are provided by the devel/evdev-proto package) Differential Revision: https://phabricator.services.mozilla.com/D98868 --- - dom/gamepad/linux/LinuxGamepad.cpp | 243 +++++++++++++++++++++++++++++++------ + dom/gamepad/linux/LinuxGamepad.cpp | 262 ++++++++++++++++++++++++++++++++----- dom/gamepad/moz.build | 2 +- - 2 files changed, 210 insertions(+), 35 deletions(-) + 2 files changed, 229 insertions(+), 35 deletions(-) diff --git dom/gamepad/linux/LinuxGamepad.cpp dom/gamepad/linux/LinuxGamepad.cpp -index 512ac765020d..0e51183c2a2d 100644 +index deee47b9d267..31f0aad7ae4a 100644 --- dom/gamepad/linux/LinuxGamepad.cpp +++ dom/gamepad/linux/LinuxGamepad.cpp @@ -5,15 +5,16 @@ @@ -109,13 +109,15 @@ index 512ac765020d..0e51183c2a2d 100644 static gboolean OnGamepadData(GIOChannel* source, GIOCondition condition, gpointer data); -@@ -114,8 +129,12 @@ void LinuxGamepadService::AddDevice(struct udev_device* dev) { +@@ -114,8 +129,14 @@ void LinuxGamepadService::AddDevice(struct udev_device* dev) { g_io_channel_set_encoding(channel, nullptr, nullptr); g_io_channel_set_buffered(channel, FALSE); int fd = g_io_channel_unix_get_fd(channel); + -+ struct input_id id = {0}; -+ ioctl(fd, EVIOCGID, &id); ++ struct input_id id {}; ++ if (ioctl(fd, EVIOCGID, &id) == -1) { ++ return; ++ } + char name[128]; - if (ioctl(fd, JSIOCGNAME(sizeof(name)), &name) == -1) { @@ -123,7 +125,7 @@ index 512ac765020d..0e51183c2a2d 100644 strcpy(name, "unknown"); } const char* vendor_id = -@@ -131,20 +150,69 @@ void LinuxGamepadService::AddDevice(struct udev_device* dev) { +@@ -131,20 +152,86 @@ void LinuxGamepadService::AddDevice(struct udev_device* dev) { model_id = mUdev.udev_device_get_sysattr_value(parent, "id/product"); } } @@ -148,8 +150,11 @@ index 512ac765020d..0e51183c2a2d 100644 + unsigned long abs_bits[NLONGS(ABS_CNT)] = {0}; + ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(key_bits)), key_bits); + ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(abs_bits)), abs_bits); ++ ++ /* Here, we try to support even strange cases where proper semantic ++ * BTN_GAMEPAD button are combined with arbitrary extra buttons. */ + for (uint16_t i = BTN_JOYSTICK; i < KEY_MAX; i++) { -+ /* Skip proper gamepad events, they are handled directly */ ++ /* Do not map semantic buttons, they are handled directly */ + if (i == BTN_GAMEPAD) { + i = BTN_THUMBR + 1; + continue; @@ -167,6 +172,13 @@ index 512ac765020d..0e51183c2a2d 100644 + gamepad->key_map[i] = numButtons++; + } + } ++ for (uint16_t i = BTN_GAMEPAD; i <= BTN_THUMBR; i++) { ++ /* But if any semantic event exists, count them all */ ++ if (TestBit(key_bits, i)) { ++ numButtons += BUTTON_INDEX_COUNT; ++ break; ++ } ++ } + for (uint16_t i = 0; i < ABS_MAX; ++i) { + if (TestBit(abs_bits, i)) { + gamepad->abs_info.emplace(i, input_absinfo{}); @@ -181,6 +193,13 @@ index 512ac765020d..0e51183c2a2d 100644 + } + } + ++ if (numAxes == 0) { ++ NS_WARNING("Gamepad with zero axes detected?"); ++ } ++ if (numButtons == 0) { ++ NS_WARNING("Gamepad with zero buttons detected?"); ++ } ++ + bool defaultRemapper = false; + RefPtr remapper = + GetGamepadRemapper(id.vendor, id.product, defaultRemapper); @@ -200,7 +219,7 @@ index 512ac765020d..0e51183c2a2d 100644 // TODO: Bug 1523355, implement gamepad lighindicator and touch for Linux. gamepad->source_id = -@@ -257,7 +325,7 @@ bool LinuxGamepadService::is_gamepad(struct udev_device* dev) { +@@ -257,7 +344,7 @@ bool LinuxGamepadService::is_gamepad(struct udev_device* dev) { if (!devpath) { return false; } @@ -209,16 +228,16 @@ index 512ac765020d..0e51183c2a2d 100644 return false; } -@@ -292,7 +360,7 @@ gboolean LinuxGamepadService::OnGamepadData(GIOChannel* source, +@@ -292,7 +379,7 @@ gboolean LinuxGamepadService::OnGamepadData(GIOChannel* source, if (condition & G_IO_ERR || condition & G_IO_HUP) return FALSE; while (true) { - struct js_event event; -+ struct input_event event = {0}; ++ struct input_event event {}; gsize count; GError* err = nullptr; if (g_io_channel_read_chars(source, (gchar*)&event, sizeof(event), &count, -@@ -301,18 +369,125 @@ gboolean LinuxGamepadService::OnGamepadData(GIOChannel* source, +@@ -301,18 +388,125 @@ gboolean LinuxGamepadService::OnGamepadData(GIOChannel* source, break; } @@ -355,7 +374,7 @@ index 512ac765020d..0e51183c2a2d 100644 } } diff --git dom/gamepad/moz.build dom/gamepad/moz.build -index 5f55d5a95e96..b5d10e9d095a 100644 +index 5f55d5a95e96..544b7f927736 100644 --- dom/gamepad/moz.build +++ dom/gamepad/moz.build @@ -59,7 +59,7 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows": @@ -363,7 +382,7 @@ index 5f55d5a95e96..b5d10e9d095a 100644 elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "android": UNIFIED_SOURCES += ["android/AndroidGamepad.cpp"] -elif CONFIG["OS_ARCH"] == "Linux": -+elif CONFIG["OS_ARCH"] == "Linux" or CONFIG["OS_ARCH"] == "FreeBSD": ++elif CONFIG["OS_ARCH"] in ("Linux", "FreeBSD", "DragonFly"): UNIFIED_SOURCES += ["linux/LinuxGamepad.cpp"] else: UNIFIED_SOURCES += ["fallback/FallbackGamepad.cpp"] From owner-dev-commits-ports-branches@freebsd.org Fri Apr 23 16:14:16 2021 Return-Path: Delivered-To: dev-commits-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 702585F7DF6; Fri, 23 Apr 2021 16:14:16 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRfVw1mwwz4psb; Fri, 23 Apr 2021 16:14:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 290BD7FCD; Fri, 23 Apr 2021 16:14:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13NGEGSS016129; Fri, 23 Apr 2021 16:14:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13NGEGK2016128; Fri, 23 Apr 2021 16:14:16 GMT (envelope-from git) Date: Fri, 23 Apr 2021 16:14:16 GMT Message-Id: <202104231614.13NGEGK2016128@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 0cad1d8425c3 - main - gecko: switch to llvm12 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0cad1d8425c36f4c99397d197d0f1871d9d5c292 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 16:14:16 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0cad1d8425c36f4c99397d197d0f1871d9d5c292 commit 0cad1d8425c36f4c99397d197d0f1871d9d5c292 Author: Jan Beich AuthorDate: 2021-04-23 07:03:34 +0000 Commit: Jan Beich CommitDate: 2021-04-23 16:13:16 +0000 gecko: switch to llvm12 May help with LTO and -march=native issues. --- Mk/bsd.gecko.mk | 2 +- mail/thunderbird/Makefile | 1 + www/firefox-esr/Makefile | 1 + www/firefox/Makefile | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 70471bd03281..b611e4421b3c 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -92,7 +92,7 @@ MOZ_EXPORT+= LLVM_OBJDUMP="${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}" .endif # Ignore Mk/bsd.default-versions.mk but respect make.conf(5) .if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} -LLVM_DEFAULT= 11 # bump if not latest release +LLVM_DEFAULT= 12 # bump if not latest release .endif # Require newer Clang than what's in base system unless user opted out . if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 871f5d2168ba..efa3ed52e127 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -2,6 +2,7 @@ PORTNAME= thunderbird DISTVERSION= 78.10.0 +PORTREVISION= 1 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 67b63e15bedc..2c823a5b160f 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -2,6 +2,7 @@ PORTNAME= firefox DISTVERSION= 78.10.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 30556e7188b7..1666c2000095 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,7 +2,7 @@ PORTNAME= firefox DISTVERSION= 88.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ From owner-dev-commits-ports-branches@freebsd.org Fri Apr 23 16:39:31 2021 Return-Path: Delivered-To: dev-commits-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 E0F2C5F89AF; Fri, 23 Apr 2021 16:39:31 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRg43620fz4qcG; Fri, 23 Apr 2021 16:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C1C5810AA8; Fri, 23 Apr 2021 16:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13NGdVC5043509; Fri, 23 Apr 2021 16:39:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13NGdVBu043508; Fri, 23 Apr 2021 16:39:31 GMT (envelope-from git) Date: Fri, 23 Apr 2021 16:39:31 GMT Message-Id: <202104231639.13NGdVBu043508@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Neel Chauhan Subject: git: 56268cfe681d - 2021Q2 - lang/mecrisp-stellaris: fix build problems MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 56268cfe681dca6bd3163229f9cf8fa3995752d7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 16:39:31 -0000 The branch 2021Q2 has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=56268cfe681dca6bd3163229f9cf8fa3995752d7 commit 56268cfe681dca6bd3163229f9cf8fa3995752d7 Author: Neel Chauhan AuthorDate: 2021-04-23 16:34:45 +0000 Commit: Neel Chauhan CommitDate: 2021-04-23 16:38:07 +0000 lang/mecrisp-stellaris: fix build problems PR: 254945 Submitted by: Robert Clausecker (maintainer) MFH: 2021Q2 (cherry picked from commit 4a19295b952c805bea86aea01125d6180eccb7a2) --- lang/mecrisp-stellaris/Makefile | 29 +++++++++++----------- ...-mecrisp-stellaris-source_freebsd-ra_terminal.s | 25 +++++++++++++++++++ lang/mecrisp-stellaris/pkg-message | 8 ++++++ 3 files changed, 48 insertions(+), 14 deletions(-) diff --git a/lang/mecrisp-stellaris/Makefile b/lang/mecrisp-stellaris/Makefile index dc8c019dc5d2..5af2312a35b1 100644 --- a/lang/mecrisp-stellaris/Makefile +++ b/lang/mecrisp-stellaris/Makefile @@ -1,6 +1,7 @@ PORTNAME= mecrisp-stellaris DISTVERSION= 2.5.8 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= SF/mecrisp @@ -10,10 +11,22 @@ COMMENT= Native code Forth system for ARM LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING +OPTIONS_DEFINE= EXTRAS +OPTIONS_DEFAULT= EXTRAS +EXTRAS_DESC= Add disassembler and math library to Forth core +EXTRAS_VARS= PROGRAM=mecrisp-stellaris-freebsd-with-disassembler-and-math +EXTRAS_VARS_OFF= PROGRAM=mecrisp-stellaris-freebsd + +.include + +.if ${OSVERSION} < 1300000 ONLY_FOR_ARCHS= armv6 armv7 +.else +ONLY_FOR_ARCHS= armv6 armv7 aarch64 +.endif ONLY_FOR_ARCHS_REASON= written in ARM assembly -BUILD_DEPENDS= binutils>2.33:devel/binutils +BUILD_DEPENDS= arm-none-eabi-binutils>2.25:devel/binutils@arm_none_eabi AFLAGS.armv6= -march=armv6 --defsym m0core=1 MAKE_ENV+= AFLAGS="${AFLAGS.${ARCH}}" @@ -21,18 +34,6 @@ MAKE_ENV+= AFLAGS="${AFLAGS.${ARCH}}" # stripping eats our hand-crafted ELF binaries, so don't do that # the binaries are free of symbols or stuff like that anyway STRIP= -# definitions assuming we build on ARM -BINARY_ALIAS= arm-none-eabi-as=${LOCALBASE}/bin/${AS} \ - arm-none-eabi-ld=${LOCALBASE}/bin/${LD} \ - arm-none-eabi-objcopy=${LOCALBASE}/bin/${OBJCOPY} - -OPTIONS_DEFINE= EXTRAS -OPTIONS_DEFAULT= EXTRAS -EXTRAS_DESC= Add disassembler and math library to Forth core -EXTRAS_VARS= PROGRAM=mecrisp-stellaris-freebsd-with-disassembler-and-math -EXTRAS_VARS_OFF= PROGRAM=mecrisp-stellaris-freebsd - -.include # Can't use the release script as it tries to build a bunch of stuff # that won't build correctly. This does the relevant parts manually. @@ -48,4 +49,4 @@ do-install: cd ${WRKSRC}/common; ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/freebsd-ra/${PROGRAM} ${STAGEDIR}${PREFIX}/bin/mecrisp-stellaris -.include +.include diff --git a/lang/mecrisp-stellaris/files/patch-mecrisp-stellaris-source_freebsd-ra_terminal.s b/lang/mecrisp-stellaris/files/patch-mecrisp-stellaris-source_freebsd-ra_terminal.s new file mode 100644 index 000000000000..9aecba07f8bb --- /dev/null +++ b/lang/mecrisp-stellaris/files/patch-mecrisp-stellaris-source_freebsd-ra_terminal.s @@ -0,0 +1,25 @@ +--- mecrisp-stellaris-source/freebsd-ra/terminal.s.orig 2021-04-10 12:49:15 UTC ++++ mecrisp-stellaris-source/freebsd-ra/terminal.s +@@ -167,7 +167,6 @@ serial_key: @ ( -- c ) Receive one character + cacheflush: + @ ----------------------------------------------------------------------------- + +-.ifdef m0core + @ ARMv6 hat keine Speicherbarrieren. Das muss über einen syscall realisiert werden + push {r4-r7, lr} + movs r0, #0 @ ARM_SYNC_ICACHE +@@ -180,14 +179,6 @@ cacheflush: + @ Datenstruktur arm_sync_icache_args für den sysarch-Aufruf + 0:.word incipit + .word totalsize +- +-.else +- @ auf ARMv7 und später nehmen wir einfach die Barrien-Befehle +- dmb +- dsb +- isb +- bx lr +-.endif + + @ ----------------------------------------------------------------------------- + Wortbirne Flag_foldable_0, "arguments" @ ( -- a-addr ) diff --git a/lang/mecrisp-stellaris/pkg-message b/lang/mecrisp-stellaris/pkg-message new file mode 100644 index 000000000000..bbf2f9f716c8 --- /dev/null +++ b/lang/mecrisp-stellaris/pkg-message @@ -0,0 +1,8 @@ +This port is written in ARM32 assembly. On ARM64 systems, it only runs +on those that support the AArch32 execution state in EL0. If the port +does not run, check dmesg for a line like + + Processor Features 0 = + +If the feature string "EL0 32" does not occur, your processor cannot +run ARM32 binaries and thus will not be able to run this port either. From owner-dev-commits-ports-branches@freebsd.org Fri Apr 23 16:43:33 2021 Return-Path: Delivered-To: dev-commits-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 6A90E5F88BB; Fri, 23 Apr 2021 16:43:33 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRg8j2ZVsz4rDL; Fri, 23 Apr 2021 16:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4B48A109D2; Fri, 23 Apr 2021 16:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13NGhX1G055984; Fri, 23 Apr 2021 16:43:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13NGhXmb055983; Fri, 23 Apr 2021 16:43:33 GMT (envelope-from git) Date: Fri, 23 Apr 2021 16:43:33 GMT Message-Id: <202104231643.13NGhXmb055983@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Neel Chauhan Subject: git: b73e50d70822 - 2021Q2 - security/suricata: update to 6.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: b73e50d7082255f0b32cab52f3f22621c4b08b07 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 16:43:33 -0000 The branch 2021Q2 has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=b73e50d7082255f0b32cab52f3f22621c4b08b07 commit b73e50d7082255f0b32cab52f3f22621c4b08b07 Author: Neel Chauhan AuthorDate: 2021-04-23 16:42:45 +0000 Commit: Neel Chauhan CommitDate: 2021-04-23 16:42:45 +0000 security/suricata: update to 6.0.2 Changes: https://redmine.openinfosecfoundation.org/versions/162 PR: 255342 Submitted by: Franco Fichtner (maintainer) --- security/suricata/Makefile | 4 +--- security/suricata/distinfo | 6 +++--- security/suricata/files/patch-configure.ac | 6 +++--- security/suricata/files/patch-src_suricata-common.h | 4 ++-- security/suricata/pkg-plist | 4 +--- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/security/suricata/Makefile b/security/suricata/Makefile index b86c12effc57..6307744e3fed 100644 --- a/security/suricata/Makefile +++ b/security/suricata/Makefile @@ -1,7 +1,5 @@ -# Created by: Patrick Tracanelli - PORTNAME= suricata -DISTVERSION= 5.0.6 +DISTVERSION= 6.0.2 CATEGORIES= security MASTER_SITES= https://www.openinfosecfoundation.org/download/ diff --git a/security/suricata/distinfo b/security/suricata/distinfo index cc976d6c1299..2e96b779479a 100644 --- a/security/suricata/distinfo +++ b/security/suricata/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1616749948 -SHA256 (suricata-5.0.6.tar.gz) = d2045c7fbdbd56d1bed15aa8d48a2b3a46e4052599ac7ab89bf2fc3d6a08b491 -SIZE (suricata-5.0.6.tar.gz) = 29136659 +TIMESTAMP = 1616753087 +SHA256 (suricata-6.0.2.tar.gz) = 5e4647a07cb31b5d6d0049972a45375c137de908a964a44e2d6d231fa3ad4b52 +SIZE (suricata-6.0.2.tar.gz) = 30514801 diff --git a/security/suricata/files/patch-configure.ac b/security/suricata/files/patch-configure.ac index 6469c5417da0..50f478ea39f3 100644 --- a/security/suricata/files/patch-configure.ac +++ b/security/suricata/files/patch-configure.ac @@ -1,7 +1,7 @@ ---- configure.ac.orig 2017-02-15 07:54:17 UTC +--- configure.ac.orig 2021-03-01 16:13:22 UTC +++ configure.ac -@@ -935,8 +935,10 @@ - AS_HELP_STRING([--enable-prelude], [Enable Prelude support for alerts]),,[enable_prelude=no]) +@@ -1186,8 +1186,10 @@ + AS_HELP_STRING([--enable-prelude], [Enable Prelude support for alerts]),[enable_prelude=$enableval],[enable_prelude=no]) # Prelude doesn't work with -Werror STORECFLAGS="${CFLAGS}" - CFLAGS="${CFLAGS} -Wno-error=unused-result" diff --git a/security/suricata/files/patch-src_suricata-common.h b/security/suricata/files/patch-src_suricata-common.h index c65fd8d928e1..e1c8eea63855 100644 --- a/security/suricata/files/patch-src_suricata-common.h +++ b/security/suricata/files/patch-src_suricata-common.h @@ -1,4 +1,4 @@ ---- src/suricata-common.h.orig 2020-12-04 07:11:05 UTC +--- src/suricata-common.h.orig 2021-03-01 16:13:22 UTC +++ src/suricata-common.h @@ -36,6 +36,8 @@ #define _GNU_SOURCE @@ -7,5 +7,5 @@ +#include "queue.h" + #if HAVE_CONFIG_H - #include + #include #endif diff --git a/security/suricata/pkg-plist b/security/suricata/pkg-plist index efc1173f5dcf..889a0baefc09 100644 --- a/security/suricata/pkg-plist +++ b/security/suricata/pkg-plist @@ -75,8 +75,6 @@ man/man1/suricata.1.gz %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/disablesource.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/enablesource.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/enablesource.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/listenabledsources.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/listenabledsources.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/listsources.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/listsources.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/removesource.py @@ -131,7 +129,7 @@ man/man1/suricata.1.gz %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/util.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/version.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/version.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata_update-1.1.3-py%%PYTHON_VER%%.egg-info +%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata_update-1.2.1-py%%PYTHON_VER%%.egg-info %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricatasc/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricatasc/__init__.pyc %%DATADIR%%/rules/app-layer-events.rules From owner-dev-commits-ports-branches@freebsd.org Sat Apr 24 11:45:43 2021 Return-Path: Delivered-To: dev-commits-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 554B75FCAD1; Sat, 24 Apr 2021 11:45:43 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FS8Vb1ysQz4qW6; Sat, 24 Apr 2021 11:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 367C420161; Sat, 24 Apr 2021 11:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13OBjho5067496; Sat, 24 Apr 2021 11:45:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13OBjh9l067495; Sat, 24 Apr 2021 11:45:43 GMT (envelope-from git) Date: Sat, 24 Apr 2021 11:45:43 GMT Message-Id: <202104241145.13OBjh9l067495@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: dd9d2b67767d - 2021Q2 - graphics/vulkan-caps-viewer: update to 3.01 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: dd9d2b67767d35afded972f938a15ff2f798c15f Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2021 11:45:43 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=dd9d2b67767d35afded972f938a15ff2f798c15f commit dd9d2b67767d35afded972f938a15ff2f798c15f Author: Jan Beich AuthorDate: 2021-04-24 08:28:43 +0000 Commit: Jan Beich CommitDate: 2021-04-24 11:45:13 +0000 graphics/vulkan-caps-viewer: update to 3.01 Changes: https://github.com/SaschaWillems/VulkanCapsViewer/releases/tag/3.01 Reported by: GitHub (watch releases) (cherry picked from commit 93f93fa7511e0819069a4f337b70909d82aea208) --- graphics/vulkan-caps-viewer/Makefile | 4 ++-- graphics/vulkan-caps-viewer/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/graphics/vulkan-caps-viewer/Makefile b/graphics/vulkan-caps-viewer/Makefile index 94519b3be9e7..694d3dd5763d 100644 --- a/graphics/vulkan-caps-viewer/Makefile +++ b/graphics/vulkan-caps-viewer/Makefile @@ -1,6 +1,6 @@ PORTNAME= vulkan-caps-viewer -DISTVERSION= 3.0 +DISTVERSION= 3.01 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org @@ -15,7 +15,7 @@ USE_GITHUB= yes USE_QT= qmake_build buildtools_build core gui network widgets GH_ACCOUNT= SaschaWillems GH_PROJECT= VulkanCapsViewer -GH_TUPLE= KhronosGroup:Vulkan-Headers:v1.2.165:vkheaders/Vulkan-Headers +GH_TUPLE= KhronosGroup:Vulkan-Headers:v1.2.175-2-gf5ac258:vkheaders/Vulkan-Headers LDFLAGS+= -Wl,--as-needed # avoid overlinking (GL, wayland) PLIST_FILES= bin/vulkanCapsViewer \ share/applications/vulkanCapsViewer.desktop \ diff --git a/graphics/vulkan-caps-viewer/distinfo b/graphics/vulkan-caps-viewer/distinfo index a3a45e137eaa..c1055007974e 100644 --- a/graphics/vulkan-caps-viewer/distinfo +++ b/graphics/vulkan-caps-viewer/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1610295994 -SHA256 (SaschaWillems-VulkanCapsViewer-3.0_GH0.tar.gz) = 0cbec45d347028c3d161b42615cfabe3861ea0e0606e3bbe46aa45a0a3efd7ce -SIZE (SaschaWillems-VulkanCapsViewer-3.0_GH0.tar.gz) = 897869 -SHA256 (KhronosGroup-Vulkan-Headers-v1.2.165_GH0.tar.gz) = 3f9435a93ba13d94d0c3265a47e0436579e46bb9ca085e9b16a753458e4d79d2 -SIZE (KhronosGroup-Vulkan-Headers-v1.2.165_GH0.tar.gz) = 861347 +TIMESTAMP = 1619252923 +SHA256 (SaschaWillems-VulkanCapsViewer-3.01_GH0.tar.gz) = ead2a35b48a2f8cfacd0bd0d4cecfdd7ed7e953258e9aaaf6046fb545e206911 +SIZE (SaschaWillems-VulkanCapsViewer-3.01_GH0.tar.gz) = 2274940 +SHA256 (KhronosGroup-Vulkan-Headers-v1.2.175-2-gf5ac258_GH0.tar.gz) = 0f85210642f9258611c7a8e4130bf407e134ffb5aa5daf590b1d1a8d47abcfcb +SIZE (KhronosGroup-Vulkan-Headers-v1.2.175-2-gf5ac258_GH0.tar.gz) = 1020405 From owner-dev-commits-ports-branches@freebsd.org Sat Apr 24 11:45:44 2021 Return-Path: Delivered-To: dev-commits-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 9631B5FC6DC; Sat, 24 Apr 2021 11:45:44 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FS8Vc3gsLz4r1Y; Sat, 24 Apr 2021 11:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5E9D72023B; Sat, 24 Apr 2021 11:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13OBjioR067529; Sat, 24 Apr 2021 11:45:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13OBjiw9067528; Sat, 24 Apr 2021 11:45:44 GMT (envelope-from git) Date: Sat, 24 Apr 2021 11:45:44 GMT Message-Id: <202104241145.13OBjiw9067528@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 93f93fa7511e - main - graphics/vulkan-caps-viewer: update to 3.01 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93f93fa7511e0819069a4f337b70909d82aea208 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2021 11:45:44 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=93f93fa7511e0819069a4f337b70909d82aea208 commit 93f93fa7511e0819069a4f337b70909d82aea208 Author: Jan Beich AuthorDate: 2021-04-24 08:28:43 +0000 Commit: Jan Beich CommitDate: 2021-04-24 11:40:57 +0000 graphics/vulkan-caps-viewer: update to 3.01 Changes: https://github.com/SaschaWillems/VulkanCapsViewer/releases/tag/3.01 Reported by: GitHub (watch releases) --- graphics/vulkan-caps-viewer/Makefile | 4 ++-- graphics/vulkan-caps-viewer/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/graphics/vulkan-caps-viewer/Makefile b/graphics/vulkan-caps-viewer/Makefile index 5b2a4fbf52c8..f1499dee6316 100644 --- a/graphics/vulkan-caps-viewer/Makefile +++ b/graphics/vulkan-caps-viewer/Makefile @@ -1,5 +1,5 @@ PORTNAME= vulkan-caps-viewer -DISTVERSION= 3.0 +DISTVERSION= 3.01 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org @@ -14,7 +14,7 @@ USE_GITHUB= yes USE_QT= qmake_build buildtools_build core gui network widgets GH_ACCOUNT= SaschaWillems GH_PROJECT= VulkanCapsViewer -GH_TUPLE= KhronosGroup:Vulkan-Headers:v1.2.165:vkheaders/Vulkan-Headers +GH_TUPLE= KhronosGroup:Vulkan-Headers:v1.2.175-2-gf5ac258:vkheaders/Vulkan-Headers LDFLAGS+= -Wl,--as-needed # avoid overlinking (GL, wayland) PLIST_FILES= bin/vulkanCapsViewer \ share/applications/vulkanCapsViewer.desktop \ diff --git a/graphics/vulkan-caps-viewer/distinfo b/graphics/vulkan-caps-viewer/distinfo index a3a45e137eaa..c1055007974e 100644 --- a/graphics/vulkan-caps-viewer/distinfo +++ b/graphics/vulkan-caps-viewer/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1610295994 -SHA256 (SaschaWillems-VulkanCapsViewer-3.0_GH0.tar.gz) = 0cbec45d347028c3d161b42615cfabe3861ea0e0606e3bbe46aa45a0a3efd7ce -SIZE (SaschaWillems-VulkanCapsViewer-3.0_GH0.tar.gz) = 897869 -SHA256 (KhronosGroup-Vulkan-Headers-v1.2.165_GH0.tar.gz) = 3f9435a93ba13d94d0c3265a47e0436579e46bb9ca085e9b16a753458e4d79d2 -SIZE (KhronosGroup-Vulkan-Headers-v1.2.165_GH0.tar.gz) = 861347 +TIMESTAMP = 1619252923 +SHA256 (SaschaWillems-VulkanCapsViewer-3.01_GH0.tar.gz) = ead2a35b48a2f8cfacd0bd0d4cecfdd7ed7e953258e9aaaf6046fb545e206911 +SIZE (SaschaWillems-VulkanCapsViewer-3.01_GH0.tar.gz) = 2274940 +SHA256 (KhronosGroup-Vulkan-Headers-v1.2.175-2-gf5ac258_GH0.tar.gz) = 0f85210642f9258611c7a8e4130bf407e134ffb5aa5daf590b1d1a8d47abcfcb +SIZE (KhronosGroup-Vulkan-Headers-v1.2.175-2-gf5ac258_GH0.tar.gz) = 1020405 From owner-dev-commits-ports-branches@freebsd.org Sat Apr 24 17:30:56 2021 Return-Path: Delivered-To: dev-commits-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 122C5625510; Sat, 24 Apr 2021 17:30:56 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSJ8w03Ssz3N2X; Sat, 24 Apr 2021 17:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E955F24844; Sat, 24 Apr 2021 17:30:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13OHUtsU024942; Sat, 24 Apr 2021 17:30:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13OHUtGD024941; Sat, 24 Apr 2021 17:30:55 GMT (envelope-from git) Date: Sat, 24 Apr 2021 17:30:55 GMT Message-Id: <202104241730.13OHUtGD024941@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rodrigo Osorio Subject: git: 46fb56020ce7 - 2021Q2 - archivers/rpm4: Upgrade to 9.1.3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 46fb56020ce71c7c638b5d9802a47a32ea317590 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2021 17:30:56 -0000 The branch 2021Q2 has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=46fb56020ce71c7c638b5d9802a47a32ea317590 commit 46fb56020ce71c7c638b5d9802a47a32ea317590 Author: Rodrigo Osorio AuthorDate: 2021-04-24 19:17:42 +0000 Commit: Rodrigo Osorio CommitDate: 2021-04-24 19:30:16 +0000 archivers/rpm4: Upgrade to 9.1.3 Major changes: Fix for CVE-2021-3421, CVE-2021-20271 and CVE-2021-20266 additional fixes for important bugs Full changelog: https://rpm.org/wiki/Releases/4.16.1.3 Security: CVE-2021-3421 Security: CVE-2021-20271 Security: CVE-2021-20266 MFH: 2021Q2 (cherry picked from commit 1cabbfe3cacd488ded9bad1b5217232fdcc02ab8) --- archivers/rpm4/Makefile | 2 +- archivers/rpm4/distinfo | 6 +++--- archivers/rpm4/pkg-plist | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile index 77c9de60e737..f4ef3ed5d34f 100644 --- a/archivers/rpm4/Makefile +++ b/archivers/rpm4/Makefile @@ -1,7 +1,7 @@ # Created by: Greg Lewis PORTNAME= rpm -PORTVERSION= 4.16.1.2 +PORTVERSION= 4.16.1.3 CATEGORIES= archivers MASTER_SITES= http://ftp.rpm.org/releases/rpm-4.16.x/ PKGNAMESUFFIX= 4 diff --git a/archivers/rpm4/distinfo b/archivers/rpm4/distinfo index 99dab729b8a1..116a89b63844 100644 --- a/archivers/rpm4/distinfo +++ b/archivers/rpm4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609172068 -SHA256 (rpm-4.16.1.2.tar.bz2) = 8357329ceefc92c41687988b22198b26f74a12a9a68ac00728f934a5c4b4cacc -SIZE (rpm-4.16.1.2.tar.bz2) = 4346745 +TIMESTAMP = 1619221631 +SHA256 (rpm-4.16.1.3.tar.bz2) = 513dc7f972b6e7ccfc9fc7f9c01d5310cc56ee853892e4314fa2cad71478e21d +SIZE (rpm-4.16.1.3.tar.bz2) = 4354652 diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist index 0f04588afbb7..67761b39552f 100644 --- a/archivers/rpm4/pkg-plist +++ b/archivers/rpm4/pkg-plist @@ -48,16 +48,16 @@ include/rpm/rpmutil.h include/rpm/rpmver.h lib/librpm.so lib/librpm.so.9 -lib/librpm.so.9.1.2 +lib/librpm.so.9.1.3 lib/librpmbuild.so lib/librpmbuild.so.9 -lib/librpmbuild.so.9.1.2 +lib/librpmbuild.so.9.1.3 lib/librpmio.so lib/librpmio.so.9 -lib/librpmio.so.9.1.2 +lib/librpmio.so.9.1.3 lib/librpmsign.so lib/librpmsign.so.9 -lib/librpmsign.so.9.1.2 +lib/librpmsign.so.9.1.3 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpm.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/transaction.py From owner-dev-commits-ports-branches@freebsd.org Sat Apr 24 18:18:45 2021 Return-Path: Delivered-To: dev-commits-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 BB364626293; Sat, 24 Apr 2021 18:18:45 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSKD54zkbz3PgZ; Sat, 24 Apr 2021 18:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 998E62529F; Sat, 24 Apr 2021 18:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13OIIj4b082395; Sat, 24 Apr 2021 18:18:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13OIIj3d082394; Sat, 24 Apr 2021 18:18:45 GMT (envelope-from git) Date: Sat, 24 Apr 2021 18:18:45 GMT Message-Id: <202104241818.13OIIj3d082394@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bernhard Froehlich Subject: git: 6b04cf205a6c - 2021Q2 - net/wireguard-go: Update to 0.0.20210424 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: decke X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 6b04cf205a6c9703cbe9716a63b51ea9e5f97743 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2021 18:18:45 -0000 The branch 2021Q2 has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=6b04cf205a6c9703cbe9716a63b51ea9e5f97743 commit 6b04cf205a6c9703cbe9716a63b51ea9e5f97743 Author: Bernhard Froehlich AuthorDate: 2021-04-24 18:11:07 +0000 Commit: Bernhard Froehlich CommitDate: 2021-04-24 18:17:16 +0000 net/wireguard-go: Update to 0.0.20210424 (cherry picked from commit fa23bcdfc51c9d073848f9cb536d0cfcee35ca36) --- net/wireguard-go/Makefile | 2 +- net/wireguard-go/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/wireguard-go/Makefile b/net/wireguard-go/Makefile index 6ccad42b22a0..d46caebf10ee 100644 --- a/net/wireguard-go/Makefile +++ b/net/wireguard-go/Makefile @@ -1,6 +1,6 @@ PORTNAME= wireguard-go -PORTVERSION= 0.0.20210323 +PORTVERSION= 0.0.20210424 PORTEPOCH= 1 CATEGORIES= net net-vpn MASTER_SITES= https://git.zx2c4.com/wireguard-go/snapshot/ diff --git a/net/wireguard-go/distinfo b/net/wireguard-go/distinfo index ca911834ba46..31418d2c8a9a 100644 --- a/net/wireguard-go/distinfo +++ b/net/wireguard-go/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1616528675 -SHA256 (wireguard-go-0.0.20210323.tar.xz) = 88e864b28bbf4502bbef71c7a8483921f7888fdb09cff1dbc90e9551e1ab5e24 -SIZE (wireguard-go-0.0.20210323.tar.xz) = 105056 +TIMESTAMP = 1619285318 +SHA256 (wireguard-go-0.0.20210424.tar.xz) = 0f9a7c0657e6119d317a0bab453aeb5140111b186ae10f62cfa081eecf2f03ba +SIZE (wireguard-go-0.0.20210424.tar.xz) = 105496 SHA256 (golang-crypto-5ea612d1eb83_GH0.tar.gz) = ab4d88d6121195632d006705a950adebaf4fa99dd15ea0c508297a17c5d3277e SIZE (golang-crypto-5ea612d1eb83_GH0.tar.gz) = 1726242 SHA256 (golang-net-e18ecbb05110_GH0.tar.gz) = c30374f6fd34c6b77d53224aa3ba7458e3773d7e6e4fa16d88fb05c7d05e0e89 From owner-dev-commits-ports-branches@freebsd.org Sun Apr 25 06:50:23 2021 Return-Path: Delivered-To: dev-commits-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 069B25F7886; Sun, 25 Apr 2021 06:50:23 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSdvL6kKXz4mfK; Sun, 25 Apr 2021 06:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D963B7174; Sun, 25 Apr 2021 06:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13P6oMCu083102; Sun, 25 Apr 2021 06:50:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13P6oMr5083101; Sun, 25 Apr 2021 06:50:22 GMT (envelope-from git) Date: Sun, 25 Apr 2021 06:50:22 GMT Message-Id: <202104250650.13P6oMr5083101@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kirill Ponomarev Subject: git: ebf2969e3a90 - 2021Q2 - databases/clickhouse: update to 21.3.6.55-lts PR: 255352 Reported by: maintainer MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: krion X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: ebf2969e3a90463ae6e9bd55594829717ad82a5c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 06:50:23 -0000 The branch 2021Q2 has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=ebf2969e3a90463ae6e9bd55594829717ad82a5c commit ebf2969e3a90463ae6e9bd55594829717ad82a5c Author: Kirill Ponomarev AuthorDate: 2021-04-25 06:47:43 +0000 Commit: Kirill Ponomarev CommitDate: 2021-04-25 06:50:17 +0000 databases/clickhouse: update to 21.3.6.55-lts PR: 255352 Reported by: maintainer (cherry picked from commit af7179f8cc81ef51e96a74971c3ab40d5f3a0a8e) --- databases/clickhouse/Makefile | 181 ++- databases/clickhouse/distinfo | 154 +- databases/clickhouse/files/clickhouse.in | 2 + .../files/patch-cmake_freebsd_default__libs.cmake | 2 +- .../files/patch-src_Common_MemoryStatisticsOS.cpp | 38 +- .../files/patch-src_Common_MemoryStatisticsOS.h | 2 +- .../patch-src_Interpreters_AsynchronousMetrics.cpp | 6 +- .../patch-src_Interpreters_AsynchronousMetrics.h | 4 +- databases/clickhouse/pkg-plist | 1619 +++++++++++++++++++- 9 files changed, 1777 insertions(+), 231 deletions(-) diff --git a/databases/clickhouse/Makefile b/databases/clickhouse/Makefile index a34b4350f623..0eff7beee3bf 100644 --- a/databases/clickhouse/Makefile +++ b/databases/clickhouse/Makefile @@ -1,10 +1,9 @@ # Created by: proler@gmail.com PORTNAME= clickhouse -PORTVERSION= 20.7.2.30 +PORTVERSION= 21.3.6.55 DISTVERSIONPREFIX= v -DISTVERSIONSUFFIX= -stable -PORTREVISION= 2 +DISTVERSIONSUFFIX= -lts CATEGORIES= databases MAINTAINER= olevole@olevole.ru @@ -16,67 +15,75 @@ ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= "Only supported on amd64" BUILD_DEPENDS= bash:shells/bash \ - clang++90:devel/llvm90 -LIB_DEPENDS= libprotobuf.so:devel/protobuf + clang++11:devel/llvm11 RUN_DEPENDS= bash:shells/bash -USES= cmake:insource python localbase shebangfix -CXX= clang++90 +USES= cmake:insource localbase python shebangfix USE_GITHUB= yes GH_ACCOUNT= yandex GH_PROJECT= ClickHouse -GH_TUPLE= \ - CopernicaMarketingSoftware:AMQP-CPP:1c08399:CopernicaMarketingSoftware_AMQP_CPP/contrib/AMQP-CPP \ - apache:arrow:3cbcb7b:apache_arrow/contrib/arrow \ +GH_TUPLE= ClickHouse-Extras:AMQP-CPP:03781aa:ClickHouse_Extras_AMQP_CPP/contrib/AMQP-CPP \ + ClickHouse-Extras:NuRaft:9a0d78d:ClickHouse_Extras_NuRaft/contrib/NuRaft \ + ClickHouse-Extras:abseil-cpp:4f3b686:ClickHouse_Extras_abseil_cpp/contrib/abseil-cpp \ + ClickHouse-Extras:antlr4-runtime:a2fa7b7:ClickHouse_Extras_antlr4_runtime/contrib/antlr4-runtime \ + ClickHouse-Extras:arrow:744bdfe:ClickHouse_Extras_arrow/contrib/arrow \ ClickHouse-Extras:avro:92caca2:ClickHouse_Extras_avro/contrib/avro \ - ClickHouse-Extras:aws-sdk-cpp:17e10c0:ClickHouse_Extras_aws_sdk_cpp/contrib/aws \ + ClickHouse-Extras:aws-sdk-cpp:7d48b2c:ClickHouse_Extras_aws_sdk_cpp/contrib/aws \ ClickHouse-Extras:aws-c-common:736a82d:ClickHouse_Extras_aws_c_common/contrib/aws-c-common \ ClickHouse-Extras:aws-c-event-stream:3bc3366:ClickHouse_Extras_aws_c_event_stream/contrib/aws-c-event-stream \ ClickHouse-Extras:aws-checksums:519d6d9:ClickHouse_Extras_aws_checksums/contrib/aws-checksums \ ClickHouse-Extras:Turbo-Base64:af9b331:ClickHouse_Extras_Turbo_Base64/contrib/base64 \ - ClickHouse-Extras:boost:a04e72c:ClickHouse_Extras_boost/contrib/boost \ - google:brotli:5805f99:google_brotli/contrib/brotli \ + ClickHouse-Extras:boost:ee24fa5:ClickHouse_Extras_boost/contrib/boost \ + ClickHouse-Extras:boringssl:8b2bf91:ClickHouse_Extras_boringssl/contrib/boringssl \ + google:brotli:63be8a9:google_brotli/contrib/brotli \ capnproto:capnproto:a00ccd9:capnproto_capnproto/contrib/capnproto \ - ClickHouse-Extras:cpp-driver:a49b4e0:ClickHouse_Extras_cpp_driver/contrib/cassandra \ - ClickHouse-Extras:cctz:7a2db4e:ClickHouse_Extras_cctz/contrib/cctz \ + ClickHouse-Extras:cpp-driver:b446d7e:ClickHouse_Extras_cpp_driver/contrib/cassandra \ + ClickHouse-Extras:cctz:c0f1bcb:ClickHouse_Extras_cctz/contrib/cctz \ mfontanini:cppkafka:b06e64e:mfontanini_cppkafka/contrib/cppkafka \ + RoaringBitmap:CRoaring:d840293:RoaringBitmap_CRoaring/contrib/croaring \ curl:curl:3b8bbbb:curl_curl/contrib/curl \ + ClickHouse-Extras:cyrus-sasl:9995bf9:ClickHouse_Extras_cyrus_sasl/contrib/cyrus-sasl \ google:double-conversion:cf2f0f3:google_double_conversion/contrib/double-conversion \ + ClickHouse-Extras:dragonbox:923705a:ClickHouse_Extras_dragonbox/contrib/dragonbox \ + fastfloat:fast_float:7eae925:fastfloat_fast_float/contrib/fast_float \ ClickHouse-Extras:fastops:88752a5:ClickHouse_Extras_fastops/contrib/fastops \ google:flatbuffers:6df40a2:google_flatbuffers/contrib/flatbuffers \ fmtlib:fmt:c108ee1:fmtlib_fmt/contrib/fmtlib \ kthohr:gcem:8d4f1b5:kthohr_gcem/contrib/gcem \ google:googletest:356f2d2:google_googletest/contrib/googletest \ - ClickHouse-Extras:grpc:8aea4e1:ClickHouse_Extras_grpc/contrib/grpc \ - uber:h3:6cfd649:uber_h3/contrib/h3 \ - ClickHouse-Extras:hyperscan:3907fd0:ClickHouse_Extras_hyperscan/contrib/hyperscan \ + ClickHouse-Extras:grpc:7436366:ClickHouse_Extras_grpc/contrib/grpc \ + ClickHouse-Extras:h3:e209086:ClickHouse_Extras_h3/contrib/h3 \ + ClickHouse-Extras:hyperscan:e9f08df:ClickHouse_Extras_hyperscan/contrib/hyperscan \ unicode-org:icu:faa2f9f:unicode_org_icu/contrib/icu \ ClickHouse-Extras:icudata:f020820:ClickHouse_Extras_icudata/contrib/icudata \ - jemalloc:jemalloc:ea6b3e9:jemalloc_jemalloc/contrib/jemalloc \ - ClickHouse-Extras:libc-headers:92c74f9:ClickHouse_Extras_libc_headers/contrib/libc-headers \ + ClickHouse-Extras:jemalloc:e6891d9:ClickHouse_Extras_jemalloc/contrib/jemalloc \ + ClickHouse-Extras:krb5:5149dea:ClickHouse_Extras_krb5/contrib/krb5 \ + ClickHouse-Extras:libc-headers:a720b71:ClickHouse_Extras_libc_headers/contrib/libc-headers \ ClickHouse-Extras:libcpuid:8db3b8d:ClickHouse_Extras_libcpuid/contrib/libcpuid \ - ClickHouse-Extras:libcxx:9f71e12:ClickHouse_Extras_libcxx/contrib/libcxx \ - ClickHouse-Extras:libcxxabi:1ebc83a:ClickHouse_Extras_libcxxabi/contrib/libcxxabi \ - ClickHouse-Extras:libgsasl:140fb58:ClickHouse_Extras_libgsasl/contrib/libgsasl \ - ClickHouse-Extras:libhdfs3:1b66657:ClickHouse_Extras_libhdfs3/contrib/libhdfs3 \ - ClickHouse-Extras:librdkafka:2090cbf:ClickHouse_Extras_librdkafka/contrib/librdkafka \ - ClickHouse-Extras:libunwind:27026ef:ClickHouse_Extras_libunwind/contrib/libunwind \ - ClickHouse-Extras:libuv:8443830:ClickHouse_Extras_libuv/contrib/libuv \ + ClickHouse-Extras:libcxx:8b80a15:ClickHouse_Extras_libcxx/contrib/libcxx \ + ClickHouse-Extras:libcxxabi:df8f1e7:ClickHouse_Extras_libcxxabi/contrib/libcxxabi \ + ClickHouse-Extras:libgsasl:383ee28:ClickHouse_Extras_libgsasl/contrib/libgsasl \ + ClickHouse-Extras:libhdfs3:095b9d4:ClickHouse_Extras_libhdfs3/contrib/libhdfs3 \ + ClickHouse-Extras:libpq:1f9c286:ClickHouse_Extras_libpq/contrib/libpq \ + jtv:libpqxx:58d2a02:jtv_libpqxx/contrib/libpqxx \ + ClickHouse-Extras:librdkafka:cf11d0a:ClickHouse_Extras_librdkafka/contrib/librdkafka \ + ClickHouse-Extras:libunwind:8fe25d7:ClickHouse_Extras_libunwind/contrib/libunwind \ + ClickHouse-Extras:libuv:e2e9b7e:ClickHouse_Extras_libuv/contrib/libuv \ GNOME:libxml2:18890f4:GNOME_libxml2/contrib/libxml2 \ - ClickHouse-Extras:llvm:3d6c7e9:ClickHouse_Extras_llvm/contrib/llvm \ + ClickHouse-Extras:llvm:8f24d50:ClickHouse_Extras_llvm/contrib/llvm \ lz4:lz4:f39b79f:lz4_lz4/contrib/lz4 \ - ClickHouse-Extras:mariadb-connector-c:3f512fe:ClickHouse_Extras_mariadb_connector_c/contrib/mariadb-connector-c \ + ClickHouse-Extras:mariadb-connector-c:21f451d:ClickHouse_Extras_mariadb_connector_c/contrib/mariadb-connector-c \ + danlark1:miniselect:be0af6b:danlark1_miniselect/contrib/miniselect \ msgpack:msgpack-c:4668426:msgpack_msgpack_c/contrib/msgpack-c \ - openldap:openldap:34b9ba9:openldap_openldap/contrib/openldap \ - ClickHouse-Extras:openssl:07e9623:ClickHouse_Extras_openssl/contrib/openssl \ + ClickHouse-Extras:openldap:0208811:ClickHouse_Extras_openldap/contrib/openldap \ apache:orc:5981208:apache_orc/contrib/orc \ - ClickHouse-Extras:poco:74c9344:ClickHouse_Extras_poco/contrib/poco \ - ClickHouse-Extras:protobuf:d6a10dd:ClickHouse_Extras_protobuf/contrib/protobuf \ + ClickHouse-Extras:poco:c55b91f:ClickHouse_Extras_poco/contrib/poco \ + ClickHouse-Extras:protobuf:73b1281:ClickHouse_Extras_protobuf/contrib/protobuf \ ClickHouse-Extras:rapidjson:c4ef90c:ClickHouse_Extras_rapidjson/contrib/rapidjson \ google:re2:7cf8b88:google_re2/contrib/re2 \ - ClickHouse-Extras:replxx:94b1f56:ClickHouse_Extras_replxx/contrib/replxx \ - ClickHouse-Extras:ryu:5b4a853:ClickHouse_Extras_ryu/contrib/ryu \ + ClickHouse-Extras:replxx:cdb6e3f:ClickHouse_Extras_replxx/contrib/replxx \ + ClickHouse-Extras:rocksdb:54a0dec:ClickHouse_Extras_rocksdb/contrib/rocksdb \ ClickHouse-Extras:sentry-native:94644e9:ClickHouse_Extras_sentry_native/contrib/sentry-native \ ClickHouse-Extras:simdjson:3190d66:ClickHouse_Extras_simdjson/contrib/simdjson \ google:snappy:3f194ac:google_snappy/contrib/snappy \ @@ -84,10 +91,11 @@ GH_TUPLE= \ kthohr:stats:b6dd459:kthohr_stats/contrib/stats \ apache:thrift:010ccf0:apache_thrift/contrib/thrift \ ClickHouse-Extras:UnixODBC:b0ad30f:ClickHouse_Extras_UnixODBC/contrib/unixodbc \ - ClickHouse-Extras:zlib-ng:bba56a7:ClickHouse_Extras_zlib_ng/contrib/zlib-ng \ + xz-mirror:xz:869b9d1:xz_mirror_xz/contrib/xz \ + ClickHouse-Extras:zlib-ng:6fd1846:ClickHouse_Extras_zlib_ng/contrib/zlib-ng \ facebook:zstd:10f0e69:facebook_zstd/contrib/zstd \ - apache:parquet-testing:46c9e97:apache_parquet_testing/contrib/arrow/cpp/submodules/parquet-testing \ - apache:arrow-testing:3772a1b:apache_arrow_testing/contrib/arrow/testing \ + apache:parquet-testing:d914f9d:apache_parquet_testing/contrib/arrow/cpp/submodules/parquet-testing \ + apache:arrow-testing:860376d:apache_arrow_testing/contrib/arrow/testing \ hillbig:esaxx:ca7cb33:hillbig_esaxx/contrib/brotli/research/esaxx \ y-256:libdivsufsort:5f60d6f:y_256_libdivsufsort/contrib/brotli/research/libdivsufsort \ catchorg:Catch2:d2d8455:catchorg_Catch2/contrib/cppkafka/third_party/Catch2 \ @@ -97,15 +105,14 @@ GH_TUPLE= \ google:googletest:ba96d0b:google_googletest/contrib/rapidjson/thirdparty/gtest \ jarro2783:cxxopts:794c975:jarro2783_cxxopts/contrib/simdjson/dependencies/cxxopts -SHEBANG_LANG= expect -expect_OLD_CMD= /usr/bin/expect -expect_CMD= ${LOCALBASE}/bin/expect - USE_RC_SUBR= ${PORTNAME} + SHEBANG_FILES= src/Storages/System/StorageSystemLicenses.sh \ - tests/clickhouse-test \ - tests/queries/0_stateless/00921_datetime64_compatibility.python \ + tests/clickhouse-test tests/config/install.sh \ tests/queries/0_stateless/00960_live_view_watch_events_live.py \ + tests/queries/0_stateless/00962_live_view_periodic_refresh.py \ + tests/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.py \ + tests/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.py \ tests/queries/0_stateless/00962_temporary_live_view_watch_live.py \ tests/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.py.disabled \ tests/queries/0_stateless/00964_live_view_watch_events_heartbeat.py \ @@ -115,35 +122,83 @@ SHEBANG_FILES= src/Storages/System/StorageSystemLicenses.sh \ tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py \ tests/queries/0_stateless/00971_live_view_watch_http_heartbeat.py \ tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py \ - tests/queries/0_stateless/00979_live_view_watch_live_moving_avg.py \ - tests/queries/0_stateless/00979_live_view_watch_live_with_subquery.py \ tests/queries/0_stateless/00979_live_view_watch_live.py \ - tests/queries/0_stateless/00990_hasToken.python \ + tests/queries/0_stateless/00979_live_view_watch_live_moving_avg.py.disabled \ + tests/queries/0_stateless/00979_live_view_watch_live_with_subquery.py \ tests/queries/0_stateless/00991_live_view_watch_http.python \ + tests/queries/0_stateless/01176_mysql_client_interactive.expect \ + tests/queries/0_stateless/01179_insert_values_semicolon.expect \ + tests/queries/0_stateless/01180_client_syntax_errors.expect \ tests/queries/0_stateless/01246_insert_into_watch_live_view.py \ - tests/queries/0_stateless/01293_client_interactive_vertical_multiline.sh \ - tests/queries/0_stateless/01293_client_interactive_vertical_singleline.sh \ - tests/queries/0_stateless/01300_client_save_history_when_terminated.sh \ - tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.sh \ - utils/build/build_debian_shared.sh \ - utils/build/build_debian_unbundled_split.sh \ + tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect \ + tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect \ + tests/queries/0_stateless/01300_client_save_history_when_terminated.expect \ + tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect \ + tests/queries/0_stateless/01520_client_print_query_id.expect \ + tests/queries/0_stateless/01526_client_start_and_exit.expect-not-a-test-case \ + tests/queries/0_stateless/01565_reconnect_after_client_error.expect \ + tests/queries/0_stateless/01599_multiline_input_and_singleline_comments.sh \ + tests/queries/0_stateless/01610_client_spawn_editor.sh \ + tests/queries/0_stateless/helpers/00900_parquet_create_table_columns.py \ + tests/queries/0_stateless/helpers/client.py \ + tests/queries/0_stateless/helpers/httpclient.py \ + tests/queries/0_stateless/helpers/httpechoserver.py \ + tests/queries/0_stateless/helpers/httpexpect.py \ + tests/queries/0_stateless/helpers/protobuf_length_delimited_encoder.py \ + tests/queries/0_stateless/helpers/pure_http_client.py \ + tests/queries/0_stateless/helpers/shell.py \ + tests/queries/0_stateless/helpers/uexpect.py \ + utils/build/build_debian.sh utils/build/build_debian_shared.sh \ utils/build/build_debian_unbundled.sh \ - utils/build/build_minimal.sh \ - utils/clickhouse-docker \ + utils/build/build_debian_unbundled_split.sh \ + utils/build/build_freebsd.sh utils/build/build_macos.sh \ + utils/build/build_minimal.sh utils/build/build_no_submodules.sh \ + utils/check-style/check-duplicate-includes.sh \ + utils/check-style/check-ungrouped-includes.sh \ + utils/check-style/format.sh utils/check-style/shellcheck-run.sh \ + utils/ci/build-clang-from-sources.sh \ + utils/ci/build-debian-packages.sh \ + utils/ci/build-gcc-from-sources.sh utils/ci/build-normal.sh \ + utils/ci/check-docker.sh utils/ci/check-syntax.sh \ + utils/ci/check-tzdata-updates.sh \ + utils/ci/create-sources-tarball.sh \ + utils/ci/docker-multiarch/update.sh utils/ci/get-sources.sh \ + utils/ci/install-compiler-from-packages.sh \ + utils/ci/install-compiler-from-sources.sh \ + utils/ci/install-libraries.sh utils/ci/install-os-packages.sh \ + utils/ci/jobs/quick-build/run.sh \ + utils/ci/prepare-docker-image-ubuntu.sh \ + utils/ci/prepare-toolchain.sh \ + utils/ci/prepare-vagrant-image-freebsd.sh \ + utils/ci/run-clickhouse-from-binaries.sh \ + utils/ci/run-with-docker.sh utils/ci/run-with-vagrant.sh \ + utils/clickhouse-docker utils/compressor/test.sh \ + utils/durability-test/durability-test.sh \ + utils/durability-test/install.sh \ utils/generate-ya-make/generate-ya-make.sh \ + utils/link-validate/link-validate.sh \ utils/list-licenses/list-licenses.sh \ utils/list-versions/list-versions.sh \ - utils/simple-backport/backport.sh \ + utils/release/release_lib.sh utils/simple-backport/backport.sh \ utils/simple-backport/changelog.sh +SHEBANG_LANG= expect -CMAKE_ARGS= -DNO_WERROR=1 \ - -DUSE_INTERNAL_PROTOBUF_LIBRARY=FALSE +expect_OLD_CMD= /usr/bin/expect +expect_CMD= ${LOCALBASE}/bin/expect + +CMAKE_ARGS= -DCMAKE_CXX_STANDARD=20 \ + -DENABLE_EMBEDDED_COMPILER=OFF \ + -DENABLE_PARQUET=OFF \ + -DENABLE_UTILS=ON \ + -DNO_WERROR=1 + +CC= clang11 +CXX= clang++11 USERS= clickhouse GROUPS= clickhouse # The version stamp of libclickhouse.so doesn't always match ${PORTVERSION} -SOVERSION= ${PORTVERSION} PLIST_SUB= SOVERSION=${SOVERSION} OPTIONS_DEFINE= TEST @@ -154,11 +209,15 @@ TEST_CMAKE_BOOL= ENABLE_TESTS .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" +SUB_LIST+= LEGACY_LIMITS="@comment " \ + MODERN_LIMITS="" .else -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " +SUB_LIST+= LEGACY_LIMITS="" \ + MODERN_LIMITS="@comment " .endif +SOVERSION= ${PORTVERSION} + .include post-patch: diff --git a/databases/clickhouse/distinfo b/databases/clickhouse/distinfo index 2166b61786c4..2c3e6fc4ac0d 100644 --- a/databases/clickhouse/distinfo +++ b/databases/clickhouse/distinfo @@ -1,14 +1,20 @@ -TIMESTAMP = 1598951496 -SHA256 (yandex-ClickHouse-v20.7.2.30-stable_GH0.tar.gz) = 1e773c6410cfaa425574ea1f42c1f69a0d9812c2fd772d33032c099bcc8d78de -SIZE (yandex-ClickHouse-v20.7.2.30-stable_GH0.tar.gz) = 13943956 -SHA256 (CopernicaMarketingSoftware-AMQP-CPP-1c08399_GH0.tar.gz) = bb5718390b5538c2b69409b68cd49457b6bffe68196ce8f9ad542afe1306d43a -SIZE (CopernicaMarketingSoftware-AMQP-CPP-1c08399_GH0.tar.gz) = 144702 -SHA256 (apache-arrow-3cbcb7b_GH0.tar.gz) = 4fb65de1d48647dfb6cac623b330ebea85b139e1f13325dd3e772b54316f3f7a -SIZE (apache-arrow-3cbcb7b_GH0.tar.gz) = 5830670 +TIMESTAMP = 1619124342 +SHA256 (yandex-ClickHouse-v21.3.6.55-lts_GH0.tar.gz) = 7111c3b29424286c96890dbc4e01b5cbd465ce48d4abc8e810b851a19429c5fe +SIZE (yandex-ClickHouse-v21.3.6.55-lts_GH0.tar.gz) = 46452595 +SHA256 (ClickHouse-Extras-AMQP-CPP-03781aa_GH0.tar.gz) = 18772fbd31740df6953ec6484c4f58455934bba61e77d491b88dc0fc6c9a2071 +SIZE (ClickHouse-Extras-AMQP-CPP-03781aa_GH0.tar.gz) = 147162 +SHA256 (ClickHouse-Extras-NuRaft-9a0d78d_GH0.tar.gz) = e0aed33577b6729c1851d60069fc7a6ee1971c428c656e833fced909fff93831 +SIZE (ClickHouse-Extras-NuRaft-9a0d78d_GH0.tar.gz) = 456734 +SHA256 (ClickHouse-Extras-abseil-cpp-4f3b686_GH0.tar.gz) = 73986b9bab3a1f4bd8f99039aec28a53244ca519f710a82c57067a8bfa7a18e7 +SIZE (ClickHouse-Extras-abseil-cpp-4f3b686_GH0.tar.gz) = 1680931 +SHA256 (ClickHouse-Extras-antlr4-runtime-a2fa7b7_GH0.tar.gz) = f4b8c3c8ca371e2107a1937b255cd82b9a7e5cb6556d78beb6e61c28dcc3b51b +SIZE (ClickHouse-Extras-antlr4-runtime-a2fa7b7_GH0.tar.gz) = 226057 +SHA256 (ClickHouse-Extras-arrow-744bdfe_GH0.tar.gz) = c9af0690532eac354cb25c570bbb554efbc449fb9cf27c5fb200f540d3f1390b +SIZE (ClickHouse-Extras-arrow-744bdfe_GH0.tar.gz) = 6847092 SHA256 (ClickHouse-Extras-avro-92caca2_GH0.tar.gz) = bfb801e5c5ea6814adf6a934a6c4654080215bd1dacf234d5b268e76e35358b7 SIZE (ClickHouse-Extras-avro-92caca2_GH0.tar.gz) = 1858326 -SHA256 (ClickHouse-Extras-aws-sdk-cpp-17e10c0_GH0.tar.gz) = 6023da474ce9f4767903b85d94c107e5c9700c478690fc292aa3b98665f5b539 -SIZE (ClickHouse-Extras-aws-sdk-cpp-17e10c0_GH0.tar.gz) = 27022883 +SHA256 (ClickHouse-Extras-aws-sdk-cpp-7d48b2c_GH0.tar.gz) = 9d0b0c4577e62bc0349579345e4002b3fe304352736fe4676db6b56eec69ad6d +SIZE (ClickHouse-Extras-aws-sdk-cpp-7d48b2c_GH0.tar.gz) = 32563928 SHA256 (ClickHouse-Extras-aws-c-common-736a82d_GH0.tar.gz) = d4e48a9bb96cc17a0107e3d95f3ef4eb67aaf9c2c39220188456b0c7eb89740b SIZE (ClickHouse-Extras-aws-c-common-736a82d_GH0.tar.gz) = 321426 SHA256 (ClickHouse-Extras-aws-c-event-stream-3bc3366_GH0.tar.gz) = e6e4d3c1a2d518c7292aaef8d023ae567cd000bcba94bdf544db07385148b194 @@ -17,22 +23,32 @@ SHA256 (ClickHouse-Extras-aws-checksums-519d6d9_GH0.tar.gz) = 6574d090c8f340fe6e SIZE (ClickHouse-Extras-aws-checksums-519d6d9_GH0.tar.gz) = 78316 SHA256 (ClickHouse-Extras-Turbo-Base64-af9b331_GH0.tar.gz) = b1d1f40c984d6328d64f7b9ab3b0fb603f10f539af38eac7c878722fac82ee62 SIZE (ClickHouse-Extras-Turbo-Base64-af9b331_GH0.tar.gz) = 49262 -SHA256 (ClickHouse-Extras-boost-a04e72c_GH0.tar.gz) = 1b09c38a94c3f912bd2b3020cebfa71f2a538faf925e354883fa1353dd9f7385 -SIZE (ClickHouse-Extras-boost-a04e72c_GH0.tar.gz) = 5830453 -SHA256 (google-brotli-5805f99_GH0.tar.gz) = d2650dc403a3be47ae54f1c2b165e3cc0daface87bb6a5309e2b8808291ce741 -SIZE (google-brotli-5805f99_GH0.tar.gz) = 23833395 +SHA256 (ClickHouse-Extras-boost-ee24fa5_GH0.tar.gz) = 9bc89a3a195e4e30d966755accaad80900358bfaa360caf60f9d2d61757acc58 +SIZE (ClickHouse-Extras-boost-ee24fa5_GH0.tar.gz) = 6553024 +SHA256 (ClickHouse-Extras-boringssl-8b2bf91_GH0.tar.gz) = 0b2a13b7be87d4e3d4c8aee2ca8ed6b31ad788ba4ae6fffd079f06273d2787f7 +SIZE (ClickHouse-Extras-boringssl-8b2bf91_GH0.tar.gz) = 27326515 +SHA256 (google-brotli-63be8a9_GH0.tar.gz) = ab6d0b8c0503a4e085c441bc323cce1746d31c0a52502e2841fee754de07e20f +SIZE (google-brotli-63be8a9_GH0.tar.gz) = 488535 SHA256 (capnproto-capnproto-a00ccd9_GH0.tar.gz) = afb081ce4df9e3e1602f796769441b49394215217295cad5bf3f8010c0e708a3 SIZE (capnproto-capnproto-a00ccd9_GH0.tar.gz) = 1991634 -SHA256 (ClickHouse-Extras-cpp-driver-a49b4e0_GH0.tar.gz) = dcbd289ebed8223fb239080af28d1fc3703632ab5dadb37448691d4472c94d1c -SIZE (ClickHouse-Extras-cpp-driver-a49b4e0_GH0.tar.gz) = 9392526 -SHA256 (ClickHouse-Extras-cctz-7a2db4e_GH0.tar.gz) = d1ce5c54d6944ac06d3d752badf0e910f0ce5b8631a953efe90fe15d57d2b43c -SIZE (ClickHouse-Extras-cctz-7a2db4e_GH0.tar.gz) = 301969 +SHA256 (ClickHouse-Extras-cpp-driver-b446d7e_GH0.tar.gz) = 6992fd1fb76fb3c3013e69de2ca7cb2c512ab68d723b68a208144fbc99241fa2 +SIZE (ClickHouse-Extras-cpp-driver-b446d7e_GH0.tar.gz) = 12281873 +SHA256 (ClickHouse-Extras-cctz-c0f1bcb_GH0.tar.gz) = cb834d27bf68bce146d5f3c7151c6cc20004986585ef2939fcac95f773c72716 +SIZE (ClickHouse-Extras-cctz-c0f1bcb_GH0.tar.gz) = 212987 SHA256 (mfontanini-cppkafka-b06e64e_GH0.tar.gz) = f742733bd1ad4e4f1cfa25922790e883474c089e4d25ac5d7024609841c30218 SIZE (mfontanini-cppkafka-b06e64e_GH0.tar.gz) = 106118 +SHA256 (RoaringBitmap-CRoaring-d840293_GH0.tar.gz) = e3c90ce26f4f82b3d6df46c18962d81a833e8c7d36aa79520c2123d6f5b6b3a5 +SIZE (RoaringBitmap-CRoaring-d840293_GH0.tar.gz) = 100575964 SHA256 (curl-curl-3b8bbbb_GH0.tar.gz) = 7405f6074709cc8872070b26073253b6188b487027d2b8cb743646da870b27f5 SIZE (curl-curl-3b8bbbb_GH0.tar.gz) = 2980455 +SHA256 (ClickHouse-Extras-cyrus-sasl-9995bf9_GH0.tar.gz) = d86b4b7be8d4dc572aa01f62a7782fb30fb29e85df0c58a2f5ac8713506a5870 +SIZE (ClickHouse-Extras-cyrus-sasl-9995bf9_GH0.tar.gz) = 2120246 SHA256 (google-double-conversion-cf2f0f3_GH0.tar.gz) = 2fa2aaa8afb7d8b32913da01f381a8cfa7dda7b0be7278f1f823935c94fa4baf SIZE (google-double-conversion-cf2f0f3_GH0.tar.gz) = 7019614 +SHA256 (ClickHouse-Extras-dragonbox-923705a_GH0.tar.gz) = b086f293f1c92d3674d03d2a7082a5a564b909d9d46d04c708cee76872ea356d +SIZE (ClickHouse-Extras-dragonbox-923705a_GH0.tar.gz) = 2985032 +SHA256 (fastfloat-fast_float-7eae925_GH0.tar.gz) = 506aecaa2f39420cedded455e21421b57e3c033d5bef11feb3564892793d1e6b +SIZE (fastfloat-fast_float-7eae925_GH0.tar.gz) = 105248 SHA256 (ClickHouse-Extras-fastops-88752a5_GH0.tar.gz) = 2df9d0f4bbbf587db4b1690e63063adbc4712c8c6ae7e4c9ed3821f9783f459a SIZE (ClickHouse-Extras-fastops-88752a5_GH0.tar.gz) = 266310 SHA256 (google-flatbuffers-6df40a2_GH0.tar.gz) = ac89dc4f033bf4de64d0d80d5919788a35bc5f6e0263962ecf97db4b4ed443cb @@ -43,64 +59,70 @@ SHA256 (kthohr-gcem-8d4f1b5_GH0.tar.gz) = 3aa0e4733a7d4990447d97038446a0411100f9 SIZE (kthohr-gcem-8d4f1b5_GH0.tar.gz) = 52091 SHA256 (google-googletest-ba96d0b_GH0.tar.gz) = 0ab78ed11f5ed1b3caea51ac4a08871ce078db4fe01e74d87d9678cec7413483 SIZE (google-googletest-ba96d0b_GH0.tar.gz) = 986108 -SHA256 (ClickHouse-Extras-grpc-8aea4e1_GH0.tar.gz) = 02aba88a320036a7af7d61e22c5c4eb452d0f6850cfe7af043c9e64c058ef78e -SIZE (ClickHouse-Extras-grpc-8aea4e1_GH0.tar.gz) = 16435790 -SHA256 (uber-h3-6cfd649_GH0.tar.gz) = 25452729edd0931cb65adf2ede8e0fb0593afa62913dc082049358588301bf0e -SIZE (uber-h3-6cfd649_GH0.tar.gz) = 17041860 -SHA256 (ClickHouse-Extras-hyperscan-3907fd0_GH0.tar.gz) = c722890d1e146b968451f87bd7c197875fae1274730681667bc361306937dcb0 -SIZE (ClickHouse-Extras-hyperscan-3907fd0_GH0.tar.gz) = 1844529 -SHA256 (unicode-org-icu-faa2f9f_GH0.tar.gz) = d44751f8e4f8f3a9c1763db0edd9c6bb40a6cdcf18bf3327805e6f5487e7c762 -SIZE (unicode-org-icu-faa2f9f_GH0.tar.gz) = 44792713 +SHA256 (ClickHouse-Extras-grpc-7436366_GH0.tar.gz) = 206a1a31bc13b881bfe9cfafce7e4f4bf4e6d10591cb933cbbede2d35fd33ade +SIZE (ClickHouse-Extras-grpc-7436366_GH0.tar.gz) = 7270271 +SHA256 (ClickHouse-Extras-h3-e209086_GH0.tar.gz) = df8ae0847625c9fb32ed0a3f81dbf15ad46f7e4a5a8f0f1a0770e9f31e9930e0 +SIZE (ClickHouse-Extras-h3-e209086_GH0.tar.gz) = 17316672 +SHA256 (ClickHouse-Extras-hyperscan-e9f08df_GH0.tar.gz) = ba3d33853271bbff533019fcc2be9df4900410e220ee00a5cbe7a55f1c5550dc +SIZE (ClickHouse-Extras-hyperscan-e9f08df_GH0.tar.gz) = 1844326 +SHA256 (unicode-org-icu-faa2f9f_GH0.tar.gz) = 462938228ad8adc209c01594eaeb3a6ca36f8c0bff0411e599b2c78a651d6fb0 +SIZE (unicode-org-icu-faa2f9f_GH0.tar.gz) = 59134304 SHA256 (ClickHouse-Extras-icudata-f020820_GH0.tar.gz) = 45ee70d1db43af034b560556a6218813f011ab5a5af48b40443bdc7121696300 SIZE (ClickHouse-Extras-icudata-f020820_GH0.tar.gz) = 16305443 -SHA256 (jemalloc-jemalloc-ea6b3e9_GH0.tar.gz) = abd4cf62f3e5fad72f93bfd654ef999f53a70ffcd91645394c7fd93c0dff8a38 -SIZE (jemalloc-jemalloc-ea6b3e9_GH0.tar.gz) = 580664 -SHA256 (ClickHouse-Extras-libc-headers-92c74f9_GH0.tar.gz) = 23caf49a040c2d29c1d3c5fe616e8b3b9fadf6524e29f4245e8c20810914d994 -SIZE (ClickHouse-Extras-libc-headers-92c74f9_GH0.tar.gz) = 378370 +SHA256 (ClickHouse-Extras-jemalloc-e6891d9_GH0.tar.gz) = 6a95a98c77d68c09bc226b11f3d6e21f5f60ea32f9eaac41a8a7362d0df571c2 +SIZE (ClickHouse-Extras-jemalloc-e6891d9_GH0.tar.gz) = 580995 +SHA256 (ClickHouse-Extras-krb5-5149dea_GH0.tar.gz) = eac6ff30ae30bd11757b57ee0c4d4e5cccbb9bac874de5f6305b1f009853bafc +SIZE (ClickHouse-Extras-krb5-5149dea_GH0.tar.gz) = 5155458 +SHA256 (ClickHouse-Extras-libc-headers-a720b71_GH0.tar.gz) = 71d9436748bf78f7b97e8c11a5f8fb295d729d9e8f8beb264a00316105ed4128 +SIZE (ClickHouse-Extras-libc-headers-a720b71_GH0.tar.gz) = 397157 SHA256 (ClickHouse-Extras-libcpuid-8db3b8d_GH0.tar.gz) = 1b1ed73158063d721555b8b6f95e59599cb28be636b8f08b4be281e6f36f965b SIZE (ClickHouse-Extras-libcpuid-8db3b8d_GH0.tar.gz) = 140826 -SHA256 (ClickHouse-Extras-libcxx-9f71e12_GH0.tar.gz) = 4ff4b4ac89fc05f9cdc52d43c55d3ed98e021541a13478317b65ee9cacce5e68 -SIZE (ClickHouse-Extras-libcxx-9f71e12_GH0.tar.gz) = 1001700 -SHA256 (ClickHouse-Extras-libcxxabi-1ebc83a_GH0.tar.gz) = b35f04f35011cc15f060310056dd1eed73d7cda8a687b444449b3f1fb27775b3 -SIZE (ClickHouse-Extras-libcxxabi-1ebc83a_GH0.tar.gz) = 110867 -SHA256 (ClickHouse-Extras-libgsasl-140fb58_GH0.tar.gz) = 4ce651f2e0fb2b7592c0b7377c1e0f7782e5167849dd37ade48f0f3316ce5af2 -SIZE (ClickHouse-Extras-libgsasl-140fb58_GH0.tar.gz) = 174043 -SHA256 (ClickHouse-Extras-libhdfs3-1b66657_GH0.tar.gz) = ae97e03b17fa146441ff57d92e8718373efbd8e3b649b69ab0e2064aa571697d -SIZE (ClickHouse-Extras-libhdfs3-1b66657_GH0.tar.gz) = 251783 -SHA256 (ClickHouse-Extras-librdkafka-2090cbf_GH0.tar.gz) = 824ffa0ef77bc24b6fc73ec84a447176722ab399d18b431c48c89fe2615f2752 -SIZE (ClickHouse-Extras-librdkafka-2090cbf_GH0.tar.gz) = 2757561 -SHA256 (ClickHouse-Extras-libunwind-27026ef_GH0.tar.gz) = 4898872ed329a2d4613c4fce54b07a28b92fc7da65df40ea65ca7788bdedcb29 -SIZE (ClickHouse-Extras-libunwind-27026ef_GH0.tar.gz) = 119493 -SHA256 (ClickHouse-Extras-libuv-8443830_GH0.tar.gz) = d8166e242b3412a5ccebcc5a1a6888f5a5faa785d898c651ec1cdcae738bb84d -SIZE (ClickHouse-Extras-libuv-8443830_GH0.tar.gz) = 1242588 +SHA256 (ClickHouse-Extras-libcxx-8b80a15_GH0.tar.gz) = 919add1fde7c78a11f9c6acd37114353794dc4dc0bc163c27213642ed55136a6 +SIZE (ClickHouse-Extras-libcxx-8b80a15_GH0.tar.gz) = 863065 +SHA256 (ClickHouse-Extras-libcxxabi-df8f1e7_GH0.tar.gz) = 5d21d45648e0454f8db4e5e946d05999d6e59e724d66ce7eeb5162c1de2ec01b +SIZE (ClickHouse-Extras-libcxxabi-df8f1e7_GH0.tar.gz) = 110708 +SHA256 (ClickHouse-Extras-libgsasl-383ee28_GH0.tar.gz) = 959a1f488db847e674d6935cb2a1c9921c01bb08eee8bdfb124032a3be54aece +SIZE (ClickHouse-Extras-libgsasl-383ee28_GH0.tar.gz) = 174201 +SHA256 (ClickHouse-Extras-libhdfs3-095b9d4_GH0.tar.gz) = 9b57e83e29ce8058e1de95e9750d0b9eebf99d7a8847fde171f82d3f61871af6 +SIZE (ClickHouse-Extras-libhdfs3-095b9d4_GH0.tar.gz) = 252150 +SHA256 (ClickHouse-Extras-libpq-1f9c286_GH0.tar.gz) = a3d8485c39ec0e9342b58178e4429d335e228105323b3b42d2c357d62295e3c5 +SIZE (ClickHouse-Extras-libpq-1f9c286_GH0.tar.gz) = 686547 +SHA256 (jtv-libpqxx-58d2a02_GH0.tar.gz) = 007e50227e61e7ec1921bea3f9b8b41e1f534730edaa851958f9fa496c021844 +SIZE (jtv-libpqxx-58d2a02_GH0.tar.gz) = 694052 +SHA256 (ClickHouse-Extras-librdkafka-cf11d0a_GH0.tar.gz) = 95d51945fc81f3b528f46e054bceb6ad19dc5332a22f59f4c57e6f77ac23c2c3 +SIZE (ClickHouse-Extras-librdkafka-cf11d0a_GH0.tar.gz) = 2904256 +SHA256 (ClickHouse-Extras-libunwind-8fe25d7_GH0.tar.gz) = 79b03ad3fc82306de3a10003d53b500ff721767b80a2e9834408c33d542334fe +SIZE (ClickHouse-Extras-libunwind-8fe25d7_GH0.tar.gz) = 120981 +SHA256 (ClickHouse-Extras-libuv-e2e9b7e_GH0.tar.gz) = e495a83bdfea09e04638f35b16a1c516dfadeee66cb60be6d36754e23b6bf81d +SIZE (ClickHouse-Extras-libuv-e2e9b7e_GH0.tar.gz) = 1242751 SHA256 (GNOME-libxml2-18890f4_GH0.tar.gz) = e1ca0f84996af7c394adfa6ca74a85aba031e34197d303b35d4a7b20935c5a84 SIZE (GNOME-libxml2-18890f4_GH0.tar.gz) = 5170146 -SHA256 (ClickHouse-Extras-llvm-3d6c7e9_GH0.tar.gz) = a7e726244f7844fd5632f7abcc1b0ccc33c7be650847908c6edad4d646ceef66 -SIZE (ClickHouse-Extras-llvm-3d6c7e9_GH0.tar.gz) = 14330676 +SHA256 (ClickHouse-Extras-llvm-8f24d50_GH0.tar.gz) = 61e1bbd49e86e15efe8d3752830f73ee7dc2f06aabfe131e40d392aeccfe85f0 +SIZE (ClickHouse-Extras-llvm-8f24d50_GH0.tar.gz) = 14330537 SHA256 (lz4-lz4-f39b79f_GH0.tar.gz) = cdc9ad4f5bdfb96934cb5c1b169e415f05e9405ef8d91a30fc387f9bed969d9a SIZE (lz4-lz4-f39b79f_GH0.tar.gz) = 310434 -SHA256 (ClickHouse-Extras-mariadb-connector-c-3f512fe_GH0.tar.gz) = bdfacd1c8c1e0b6048d97fc48a528d7a763f8f532e8fc7157a253b6615d20c50 -SIZE (ClickHouse-Extras-mariadb-connector-c-3f512fe_GH0.tar.gz) = 744993 +SHA256 (ClickHouse-Extras-mariadb-connector-c-21f451d_GH0.tar.gz) = bd3ab10d558443747b34af5ab7ce46850c2a4cbf4547fbd8f39d5ca407af81ba +SIZE (ClickHouse-Extras-mariadb-connector-c-21f451d_GH0.tar.gz) = 745023 +SHA256 (danlark1-miniselect-be0af6b_GH0.tar.gz) = 3e9f40847fa2774a8fdc8a219ad226de30784ae62d926328247534b102cb62ef +SIZE (danlark1-miniselect-be0af6b_GH0.tar.gz) = 404227 SHA256 (msgpack-msgpack-c-4668426_GH0.tar.gz) = 77fb0ecbfb46ed73dfe79b1b04d0be19a2441756964e81bd559eadc4f38cb943 SIZE (msgpack-msgpack-c-4668426_GH0.tar.gz) = 496549 -SHA256 (openldap-openldap-34b9ba9_GH0.tar.gz) = e3803c2b86002c392c93c4db4f19a62b05a19aade7d997a4d1f71e2a09c8fd7f -SIZE (openldap-openldap-34b9ba9_GH0.tar.gz) = 5706858 -SHA256 (ClickHouse-Extras-openssl-07e9623_GH0.tar.gz) = 2becda5dc2e1dad11dd8840fab275fac0e1bf46098b57d363a777c968db1db10 -SIZE (ClickHouse-Extras-openssl-07e9623_GH0.tar.gz) = 9305823 +SHA256 (ClickHouse-Extras-openldap-0208811_GH0.tar.gz) = e7ff9ba82fd7ed523ed26a518ddd14a0120fe2254b556668d0d3d3b052eaced8 +SIZE (ClickHouse-Extras-openldap-0208811_GH0.tar.gz) = 5706857 SHA256 (apache-orc-5981208_GH0.tar.gz) = 308c89397c403aebad7e89eb65f39b7ed9ab13fcba0a88fada7e5b2e6e0bbd25 SIZE (apache-orc-5981208_GH0.tar.gz) = 13390179 -SHA256 (ClickHouse-Extras-poco-74c9344_GH0.tar.gz) = a6323c5e1d6445ca2a20f9fa6cde57e1f26003da8a227e4a60c88a2491601a47 -SIZE (ClickHouse-Extras-poco-74c9344_GH0.tar.gz) = 10244149 -SHA256 (ClickHouse-Extras-protobuf-d6a10dd_GH0.tar.gz) = 6d0aca01808f8f5449bf8aa43c41dd689e35634d26d9e7322e45ca4e4f483608 -SIZE (ClickHouse-Extras-protobuf-d6a10dd_GH0.tar.gz) = 2303694 +SHA256 (ClickHouse-Extras-poco-c55b91f_GH0.tar.gz) = 771a8a0a07addfbeda6901e170b9383ee199bb4494e37d1904ec9232c3912376 +SIZE (ClickHouse-Extras-poco-c55b91f_GH0.tar.gz) = 10244552 +SHA256 (ClickHouse-Extras-protobuf-73b1281_GH0.tar.gz) = 5761c4b3b5da2f87952642830c5e728f95d4e9f2d0ac9bac2c2cb97b5c2b9266 +SIZE (ClickHouse-Extras-protobuf-73b1281_GH0.tar.gz) = 5277846 SHA256 (ClickHouse-Extras-rapidjson-c4ef90c_GH0.tar.gz) = 8c986a8e27c8091d3b4dea24b3910244993e7617cb1d573e96d1ce35a324c81c SIZE (ClickHouse-Extras-rapidjson-c4ef90c_GH0.tar.gz) = 1059337 SHA256 (google-re2-7cf8b88_GH0.tar.gz) = abf82619d512523137a320a3f6f60e735a934e6bc97976e8e90b5ec4f33738fd SIZE (google-re2-7cf8b88_GH0.tar.gz) = 388768 -SHA256 (ClickHouse-Extras-replxx-94b1f56_GH0.tar.gz) = 36421881799b9a992146459d6296d29ec7b05d2a36828180dbfaa36bd9deb147 -SIZE (ClickHouse-Extras-replxx-94b1f56_GH0.tar.gz) = 83541 -SHA256 (ClickHouse-Extras-ryu-5b4a853_GH0.tar.gz) = fa1263ee3d27d713eeb8ccec76167346d5e0b94e34fd9055409247f0a998ad44 -SIZE (ClickHouse-Extras-ryu-5b4a853_GH0.tar.gz) = 8290278 +SHA256 (ClickHouse-Extras-replxx-cdb6e3f_GH0.tar.gz) = 5e87efb101c2a322089fd7722f56f4b9e4af008a349a8d1e8a7810d122f462ea +SIZE (ClickHouse-Extras-replxx-cdb6e3f_GH0.tar.gz) = 84631 +SHA256 (ClickHouse-Extras-rocksdb-54a0dec_GH0.tar.gz) = 2a48f04732a7f2880407e9d737c0e9d33aa2bdeb185863cd081c4408cb36085c +SIZE (ClickHouse-Extras-rocksdb-54a0dec_GH0.tar.gz) = 6506930 SHA256 (ClickHouse-Extras-sentry-native-94644e9_GH0.tar.gz) = b1445b3dec3d42e8ae7e93aff37c96d19b44f1e60b3c83df981b9c19618c169d SIZE (ClickHouse-Extras-sentry-native-94644e9_GH0.tar.gz) = 236202 SHA256 (ClickHouse-Extras-simdjson-3190d66_GH0.tar.gz) = 99c8215cd3335839778289f14845c64a8b4f5d6b5d132f43d0a3d8fa59364c7d @@ -115,14 +137,16 @@ SHA256 (apache-thrift-010ccf0_GH0.tar.gz) = 839804231ec99111cfb0035641316161f299 SIZE (apache-thrift-010ccf0_GH0.tar.gz) = 2923002 SHA256 (ClickHouse-Extras-UnixODBC-b0ad30f_GH0.tar.gz) = 32d8df90d925324d694e7592d2f04701dc29c93e4e591154e9a77c06f96ccb83 SIZE (ClickHouse-Extras-UnixODBC-b0ad30f_GH0.tar.gz) = 1595038 -SHA256 (ClickHouse-Extras-zlib-ng-bba56a7_GH0.tar.gz) = 45412b0fa05c0f67ad5a44eaaaff700097bd6a24eeff57b6971a1fc4b6384bc5 -SIZE (ClickHouse-Extras-zlib-ng-bba56a7_GH0.tar.gz) = 322006 +SHA256 (xz-mirror-xz-869b9d1_GH0.tar.gz) = 7a512bd28783385545dee1d263220afe61c633d84c45ffe459ea814e8ea7f057 +SIZE (xz-mirror-xz-869b9d1_GH0.tar.gz) = 719977 +SHA256 (ClickHouse-Extras-zlib-ng-6fd1846_GH0.tar.gz) = 8cc1f364c1284bc309d62de545c0426fcb61357b88332d2c883bdab8caaeb2ae +SIZE (ClickHouse-Extras-zlib-ng-6fd1846_GH0.tar.gz) = 322016 SHA256 (facebook-zstd-10f0e69_GH0.tar.gz) = a56b179bf19dc347dea0c5d24f78001d97510fd47757da644e9ce200b80489e3 SIZE (facebook-zstd-10f0e69_GH0.tar.gz) = 1962695 -SHA256 (apache-parquet-testing-46c9e97_GH0.tar.gz) = 3278e4f278f260a74d743de976035fcc017e0f32d576e964c39ac90ad533ca4b -SIZE (apache-parquet-testing-46c9e97_GH0.tar.gz) = 31276 -SHA256 (apache-arrow-testing-3772a1b_GH0.tar.gz) = 64f4bb05209ceab2e0069070c62c2f6e449f9d1780b942f6f36acdbc5032dec1 -SIZE (apache-arrow-testing-3772a1b_GH0.tar.gz) = 522484 +SHA256 (apache-parquet-testing-d914f9d_GH0.tar.gz) = 2dcb94a9351b04227c469d3c37592b54b3b550a8448b261357fb53d8cf6a050c +SIZE (apache-parquet-testing-d914f9d_GH0.tar.gz) = 33470 +SHA256 (apache-arrow-testing-860376d_GH0.tar.gz) = bb562c4d58437188dbc11f5ea42bddaf71a3d38839b914d0156449db36edae08 +SIZE (apache-arrow-testing-860376d_GH0.tar.gz) = 53097472 SHA256 (hillbig-esaxx-ca7cb33_GH0.tar.gz) = 8d049f87c9cf08ee4ea91ac3839ddb9a078e1118ea432ffd9de5e56cbb5ff8ff SIZE (hillbig-esaxx-ca7cb33_GH0.tar.gz) = 96441 SHA256 (y-256-libdivsufsort-5f60d6f_GH0.tar.gz) = d6495c9bbd5837892b344826140a5feba524c132c4d533429b90cb40e7c7d813 diff --git a/databases/clickhouse/files/clickhouse.in b/databases/clickhouse/files/clickhouse.in index a3ff2098e49b..a81b35ed1835 100644 --- a/databases/clickhouse/files/clickhouse.in +++ b/databases/clickhouse/files/clickhouse.in @@ -1,5 +1,7 @@ #!/bin/sh +# $FreeBSD: head/databases/clickhouse/files/clickhouse.in 475667 2018-07-29 17:49:12Z pi $ +# # PROVIDE: clickhouse # REQUIRE: LOGIN # KEYWORD: shutdown diff --git a/databases/clickhouse/files/patch-cmake_freebsd_default__libs.cmake b/databases/clickhouse/files/patch-cmake_freebsd_default__libs.cmake index 92eb1ef0be45..70c32f8227bf 100644 --- a/databases/clickhouse/files/patch-cmake_freebsd_default__libs.cmake +++ b/databases/clickhouse/files/patch-cmake_freebsd_default__libs.cmake @@ -1,4 +1,4 @@ ---- cmake/freebsd/default_libs.cmake.orig 2020-08-31 16:22:57 UTC +--- cmake/freebsd/default_libs.cmake.orig 2021-04-12 12:15:33 UTC +++ cmake/freebsd/default_libs.cmake @@ -4,13 +4,13 @@ if (NOT COMPILER_CLANG) message (FATAL_ERROR "FreeBSD build is supported only for Clang") diff --git a/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.cpp b/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.cpp index a4e9ad63dbcc..de0458181f69 100644 --- a/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.cpp +++ b/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.cpp @@ -1,6 +1,6 @@ ---- src/Common/MemoryStatisticsOS.cpp.orig 2020-08-31 16:22:57 UTC +--- src/Common/MemoryStatisticsOS.cpp.orig 2021-03-19 11:39:14 UTC +++ src/Common/MemoryStatisticsOS.cpp -@@ -1,7 +1,13 @@ +@@ -1,14 +1,20 @@ -#if defined(OS_LINUX) - #include @@ -16,19 +16,15 @@ #include #include #include -@@ -11,9 +17,10 @@ - #include - #include - #include --#include + #include "MemoryStatisticsOS.h" -+ -+ - namespace DB - { - -@@ -23,21 +30,40 @@ namespace ErrorCodes +-#include ++//#include + #include + #include + #include +@@ -24,20 +30,40 @@ namespace ErrorCodes extern const int CANNOT_OPEN_FILE; extern const int CANNOT_READ_FROM_FILE_DESCRIPTOR; extern const int CANNOT_CLOSE_FILE; @@ -37,9 +33,10 @@ +#endif } +-static constexpr auto filename = "/proc/self/statm"; +#ifndef OS_FREEBSD - static constexpr auto filename = "/proc/self/statm"; - static constexpr size_t PAGE_SIZE = 4096; ++ static constexpr auto filename = "/proc/self/statm"; ++ static constexpr size_t PAGE_SIZE = 4096; +#endif MemoryStatisticsOS::MemoryStatisticsOS() @@ -69,7 +66,7 @@ if (0 != ::close(fd)) { try -@@ -51,12 +77,43 @@ MemoryStatisticsOS::~MemoryStatisticsOS() +@@ -51,12 +77,42 @@ MemoryStatisticsOS::~MemoryStatisticsOS() DB::tryLogCurrentException(__PRETTY_FUNCTION__); } } @@ -109,14 +106,13 @@ + ::procstat_freevmmap(pstat, kve); + ::procstat_freeprocs(pstat, kp); +#else -+ constexpr size_t buf_size = 1024; char buf[buf_size]; -@@ -98,10 +155,8 @@ MemoryStatisticsOS::Data MemoryStatisticsOS::get() con - data.shared *= PAGE_SIZE; - data.code *= PAGE_SIZE; - data.data_and_stack *= PAGE_SIZE; +@@ -99,10 +155,8 @@ MemoryStatisticsOS::Data MemoryStatisticsOS::get() con + data.shared *= page_size; + data.code *= page_size; + data.data_and_stack *= page_size; - +#endif return data; diff --git a/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.h b/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.h index 053ce988d569..dc2da1c5518e 100644 --- a/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.h +++ b/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.h @@ -1,4 +1,4 @@ ---- src/Common/MemoryStatisticsOS.h.orig 2020-08-31 16:22:57 UTC +--- src/Common/MemoryStatisticsOS.h.orig 2021-03-19 11:39:14 UTC +++ src/Common/MemoryStatisticsOS.h @@ -1,5 +1,4 @@ #pragma once diff --git a/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.cpp b/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.cpp index 0f7ea8b8ce75..209e04c8e017 100644 --- a/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.cpp +++ b/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.cpp @@ -1,7 +1,7 @@ ---- src/Interpreters/AsynchronousMetrics.cpp.orig 2020-08-31 16:22:57 UTC +--- src/Interpreters/AsynchronousMetrics.cpp.orig 2021-03-19 11:39:14 UTC +++ src/Interpreters/AsynchronousMetrics.cpp -@@ -194,7 +194,7 @@ void AsynchronousMetrics::update() - new_values["Uptime"] = context.getUptimeSeconds(); +@@ -196,7 +196,7 @@ void AsynchronousMetrics::update() + new_values["Uptime"] = global_context.getUptimeSeconds(); /// Process memory usage according to OS -#if defined(OS_LINUX) diff --git a/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.h b/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.h index 5fa3e02fcb07..6eecdbacede0 100644 --- a/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.h +++ b/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.h @@ -1,6 +1,6 @@ ---- src/Interpreters/AsynchronousMetrics.h.orig 2020-08-31 16:22:57 UTC +--- src/Interpreters/AsynchronousMetrics.h.orig 2021-03-19 11:39:14 UTC +++ src/Interpreters/AsynchronousMetrics.h -@@ -50,7 +50,7 @@ class AsynchronousMetrics (private) +@@ -78,7 +78,7 @@ class AsynchronousMetrics (private) bool quit {false}; AsynchronousMetricValues values; diff --git a/databases/clickhouse/pkg-plist b/databases/clickhouse/pkg-plist index 5563ebba6888..5b2a152c7487 100644 --- a/databases/clickhouse/pkg-plist +++ b/databases/clickhouse/pkg-plist @@ -4,54 +4,71 @@ bin/clickhouse-client bin/clickhouse-copier bin/clickhouse-extract-from-config bin/clickhouse-format +bin/clickhouse-git-import bin/clickhouse-local bin/clickhouse-obfuscator bin/clickhouse-odbc-bridge bin/clickhouse-report bin/clickhouse-server bin/clickhouse-test -bin/clickhouse-test-server bin/clickhouse-zookeeper-cli -@dir(clickhouse,,) %%ETCDIR%%-server -@dir(clickhouse,,) %%ETCDIR%%-client +bin/zk-test cmake/global-release.cmake cmake/global.cmake -%%ETCDIR%%-client/client-test.xml -%%ETCDIR%%-server/server-test.xml +@dir(clickhouse,,) %%ETCDIR%%-server +@dir(clickhouse,,) %%ETCDIR%%-client @sample %%ETCDIR%%-client/config.xml.sample @sample %%ETCDIR%%-server/config.xml.sample @sample %%ETCDIR%%-server/users.xml.sample -%%DATADIR%%-test/config/access_management.xml +%%DATADIR%%-test/config/README.md %%DATADIR%%-test/config/client_config.xml -%%DATADIR%%-test/config/clusters.xml -%%DATADIR%%-test/config/custom_settings_prefixes.xml -%%DATADIR%%-test/config/database_atomic_configd.xml -%%DATADIR%%-test/config/database_atomic_usersd.xml +%%DATADIR%%-test/config/config.d/clusters.xml +%%DATADIR%%-test/config/config.d/custom_settings_prefixes.xml +%%DATADIR%%-test/config/config.d/database_atomic.xml +%%DATADIR%%-test/config/config.d/disks.xml +%%DATADIR%%-test/config/config.d/graphite.xml +%%DATADIR%%-test/config/config.d/listen.xml +%%DATADIR%%-test/config/config.d/logging_no_rotate.xml +%%DATADIR%%-test/config/config.d/macros.xml +%%DATADIR%%-test/config/config.d/max_concurrent_queries.xml +%%DATADIR%%-test/config/config.d/metric_log.xml +%%DATADIR%%-test/config/config.d/part_log.xml +%%DATADIR%%-test/config/config.d/polymorphic_parts.xml +%%DATADIR%%-test/config/config.d/query_masking_rules.xml +%%DATADIR%%-test/config/config.d/secure_ports.xml +%%DATADIR%%-test/config/config.d/tcp_with_proxy.xml +%%DATADIR%%-test/config/config.d/test_cluster_with_incorrect_pw.xml +%%DATADIR%%-test/config/config.d/test_keeper_port.xml +%%DATADIR%%-test/config/config.d/text_log.xml +%%DATADIR%%-test/config/config.d/top_level_domains_lists.xml +%%DATADIR%%-test/config/config.d/top_level_domains_path.xml +%%DATADIR%%-test/config/config.d/zookeeper.xml %%DATADIR%%-test/config/decimals_dictionary.xml %%DATADIR%%-test/config/dhparam.pem -%%DATADIR%%-test/config/disks.xml -%%DATADIR%%-test/config/graphite.xml +%%DATADIR%%-test/config/executable_dictionary.xml +%%DATADIR%%-test/config/install.sh %%DATADIR%%-test/config/ints_dictionary.xml -%%DATADIR%%-test/config/listen.xml -%%DATADIR%%-test/config/log_queries.xml -%%DATADIR%%-test/config/macros.xml -%%DATADIR%%-test/config/metric_log.xml -%%DATADIR%%-test/config/part_log.xml -%%DATADIR%%-test/config/polymorphic_parts.xml -%%DATADIR%%-test/config/query_masking_rules.xml -%%DATADIR%%-test/config/readonly.xml -%%DATADIR%%-test/config/secure_ports.xml +%%DATADIR%%-test/config/lsan_suppressions.txt %%DATADIR%%-test/config/server.crt %%DATADIR%%-test/config/server.key %%DATADIR%%-test/config/strings_dictionary.xml -%%DATADIR%%-test/config/text_log.xml -%%DATADIR%%-test/config/zookeeper.xml +%%DATADIR%%-test/config/top_level_domains/public_suffix_list.dat +%%DATADIR%%-test/config/users.d/access_management.xml +%%DATADIR%%-test/config/users.d/database_atomic_drop_detach_sync.xml +%%DATADIR%%-test/config/users.d/database_ordinary.xml +%%DATADIR%%-test/config/users.d/database_replicated.xml +%%DATADIR%%-test/config/users.d/log_queries.xml +%%DATADIR%%-test/config/users.d/opentelemetry.xml +%%DATADIR%%-test/config/users.d/readonly.xml +%%DATADIR%%-test/config/users.d/remote_queries.xml +%%DATADIR%%-test/performance/ColumnMap.xml %%DATADIR%%-test/performance/IPv4.xml %%DATADIR%%-test/performance/IPv6.xml %%DATADIR%%-test/performance/README.md %%DATADIR%%-test/performance/agg_functions_min_max_any.xml %%DATADIR%%-test/performance/aggregate_functions_of_group_by_keys.xml %%DATADIR%%-test/performance/aggregating_merge_tree.xml +%%DATADIR%%-test/performance/aggregating_merge_tree_simple_aggregate_function_string.xml %%DATADIR%%-test/performance/aggregation_in_order.xml %%DATADIR%%-test/performance/analyze_array_tuples.xml %%DATADIR%%-test/performance/and_function.xml @@ -61,16 +78,24 @@ cmake/global.cmake %%DATADIR%%-test/performance/array_auc.xml %%DATADIR%%-test/performance/array_element.xml %%DATADIR%%-test/performance/array_fill.xml +%%DATADIR%%-test/performance/array_index_low_cardinality_numbers.xml +%%DATADIR%%-test/performance/array_index_low_cardinality_strings.xml %%DATADIR%%-test/performance/array_join.xml %%DATADIR%%-test/performance/array_reduce.xml +%%DATADIR%%-test/performance/async_remote_read.xml +%%DATADIR%%-test/performance/avg.xml +%%DATADIR%%-test/performance/avg_weighted.xml %%DATADIR%%-test/performance/base64.xml %%DATADIR%%-test/performance/base64_hits.xml %%DATADIR%%-test/performance/basename.xml +%%DATADIR%%-test/performance/bigint_arithm.xml %%DATADIR%%-test/performance/bitCount.xml %%DATADIR%%-test/performance/bit_operations_fixed_string.xml %%DATADIR%%-test/performance/bit_operations_fixed_string_numbers.xml -%%DATADIR%%-test/performance/bloom_filter.xml +%%DATADIR%%-test/performance/bloom_filter_insert.xml +%%DATADIR%%-test/performance/bloom_filter_select.xml %%DATADIR%%-test/performance/bounding_ratio.xml +%%DATADIR%%-test/performance/casts.xml %%DATADIR%%-test/performance/cidr.xml %%DATADIR%%-test/performance/codecs_float_insert.xml %%DATADIR%%-test/performance/codecs_float_select.xml @@ -86,13 +111,17 @@ cmake/global.cmake %%DATADIR%%-test/performance/constant_column_comparison.xml %%DATADIR%%-test/performance/constant_column_search.xml %%DATADIR%%-test/performance/count.xml +%%DATADIR%%-test/performance/countIf.xml +%%DATADIR%%-test/performance/countMatches.xml %%DATADIR%%-test/performance/cpu_synthetic.xml %%DATADIR%%-test/performance/cryptographic_hashes.xml %%DATADIR%%-test/performance/date_parsing.xml %%DATADIR%%-test/performance/date_time_64.xml %%DATADIR%%-test/performance/date_time_long.xml %%DATADIR%%-test/performance/date_time_short.xml +%%DATADIR%%-test/performance/datetime_comparison.xml %%DATADIR%%-test/performance/decimal_aggregates.xml +%%DATADIR%%-test/performance/decimal_casts.xml %%DATADIR%%-test/performance/decimal_parse.xml %%DATADIR%%-test/performance/distinct_combinator.xml %%DATADIR%%-test/performance/distributed_aggregation.xml @@ -101,14 +130,18 @@ cmake/global.cmake %%DATADIR%%-test/performance/early_constant_folding.xml %%DATADIR%%-test/performance/empty_string_deserialization.xml %%DATADIR%%-test/performance/empty_string_serialization.xml +%%DATADIR%%-test/performance/encodeXMLComponent.xml +%%DATADIR%%-test/performance/encrypt_decrypt.xml +%%DATADIR%%-test/performance/encrypt_decrypt_empty_string.xml +%%DATADIR%%-test/performance/encrypt_decrypt_empty_string_slow.xml %%DATADIR%%-test/performance/entropy.xml %%DATADIR%%-test/performance/extract.xml -%%DATADIR%%-test/performance/first_significant_subdomain.xml %%DATADIR%%-test/performance/fixed_string16.xml %%DATADIR%%-test/performance/float_formatting.xml %%DATADIR%%-test/performance/float_mod.xml %%DATADIR%%-test/performance/float_parsing.xml %%DATADIR%%-test/performance/format_date_time.xml +%%DATADIR%%-test/performance/format_readable.xml %%DATADIR%%-test/performance/functions_coding.xml %%DATADIR%%-test/performance/functions_geo.xml %%DATADIR%%-test/performance/functions_with_hash_tables.xml @@ -118,6 +151,8 @@ cmake/global.cmake %%DATADIR%%-test/performance/generate_table_function.xml %%DATADIR%%-test/performance/great_circle_dist.xml %%DATADIR%%-test/performance/group_array_moving_sum.xml +%%DATADIR%%-test/performance/group_by_fixed_keys.xml +%%DATADIR%%-test/performance/group_by_sundy_li.xml %%DATADIR%%-test/performance/h3.xml %%DATADIR%%-test/performance/if_array_num.xml %%DATADIR%%-test/performance/if_array_string.xml @@ -127,10 +162,13 @@ cmake/global.cmake %%DATADIR%%-test/performance/if_transform_strings_to_enum.xml %%DATADIR%%-test/performance/information_value.xml %%DATADIR%%-test/performance/injective_functions_inside_uniq.xml +%%DATADIR%%-test/performance/insert_parallel.xml %%DATADIR%%-test/performance/insert_select_default_small_block.xml +%%DATADIR%%-test/performance/insert_sequential_and_background_merges.xml %%DATADIR%%-test/performance/insert_values_with_expressions.xml %%DATADIR%%-test/performance/inserts_arrays_lowcardinality.xml %%DATADIR%%-test/performance/int_parsing.xml +%%DATADIR%%-test/performance/ip_trie.xml %%DATADIR%%-test/performance/jit_large_requests.xml %%DATADIR%%-test/performance/jit_small_requests.xml %%DATADIR%%-test/performance/joins_in_memory.xml @@ -146,6 +184,7 @@ cmake/global.cmake %%DATADIR%%-test/performance/logical_functions_small.xml %%DATADIR%%-test/performance/materialized_view_parallel_insert.xml %%DATADIR%%-test/performance/math.xml +%%DATADIR%%-test/performance/memory_cache_friendliness.xml %%DATADIR%%-test/performance/merge_table_streams.xml %%DATADIR%%-test/performance/merge_tree_huge_pk.xml %%DATADIR%%-test/performance/merge_tree_many_partitions.xml @@ -157,6 +196,10 @@ cmake/global.cmake %%DATADIR%%-test/performance/ngram_distance.xml %%DATADIR%%-test/performance/number_formatting_formats.xml %%DATADIR%%-test/performance/nyc_taxi.xml +%%DATADIR%%-test/performance/optimize_window_funnel.xml +%%DATADIR%%-test/performance/optimized_select_final.xml +%%DATADIR%%-test/performance/optimized_select_final_one_part.xml +%%DATADIR%%-test/performance/or_null_default.xml %%DATADIR%%-test/performance/order_by_decimals.xml %%DATADIR%%-test/performance/order_by_read_in_order.xml %%DATADIR%%-test/performance/order_by_single_column.xml @@ -173,7 +216,9 @@ cmake/global.cmake %%DATADIR%%-test/performance/polymorphic_parts_s.xml %%DATADIR%%-test/performance/pre_limit_no_sorting.xml %%DATADIR%%-test/performance/prewhere.xml +%%DATADIR%%-test/performance/prewhere_with_row_level_filter.xml %%DATADIR%%-test/performance/push_down_limit.xml +%%DATADIR%%-test/performance/quantile_merge.xml %%DATADIR%%-test/performance/questdb_sum_float32.xml %%DATADIR%%-test/performance/questdb_sum_float64.xml %%DATADIR%%-test/performance/questdb_sum_int32.xml @@ -187,7 +232,9 @@ cmake/global.cmake %%DATADIR%%-test/performance/read_hits_with_aio.xml %%DATADIR%%-test/performance/read_in_order_many_parts.xml %%DATADIR%%-test/performance/redundant_functions_in_order_by.xml +%%DATADIR%%-test/performance/reinterpret_as.xml %%DATADIR%%-test/performance/removing_group_by_keys.xml +%%DATADIR%%-test/performance/rewrite_sumIf.xml %%DATADIR%%-test/performance/right.xml %%DATADIR%%-test/performance/round_down.xml %%DATADIR%%-test/performance/round_methods.xml @@ -197,13 +244,17 @@ cmake/global.cmake %%DATADIR%%-test/performance/set_hits.xml %%DATADIR%%-test/performance/set_index.xml %%DATADIR%%-test/performance/simple_join_query.xml +%%DATADIR%%-test/performance/single_fixed_string_groupby.xml %%DATADIR%%-test/performance/slices_hits.xml %%DATADIR%%-test/performance/sort.xml %%DATADIR%%-test/performance/sort_radix_trivial.xml +%%DATADIR%%-test/performance/split_filter.xml %%DATADIR%%-test/performance/string_join.xml %%DATADIR%%-test/performance/string_set.xml %%DATADIR%%-test/performance/string_sort.xml +%%DATADIR%%-test/performance/subqueries.xml %%DATADIR%%-test/performance/sum.xml +%%DATADIR%%-test/performance/sumIf.xml %%DATADIR%%-test/performance/sum_map.xml %%DATADIR%%-test/performance/synthetic_hardware_benchmark.xml %%DATADIR%%-test/performance/trim_numbers.xml @@ -214,6 +265,7 @@ cmake/global.cmake %%DATADIR%%-test/performance/vectorize_aggregation_combinators.xml %%DATADIR%%-test/performance/visit_param_extract_raw.xml %%DATADIR%%-test/performance/website.xml +%%DATADIR%%-test/performance/window_functions.xml %%DATADIR%%-test/queries/0_stateless/00001_select_1.reference %%DATADIR%%-test/queries/0_stateless/00001_select_1.sql %%DATADIR%%-test/queries/0_stateless/00002_system_numbers.reference @@ -266,10 +318,10 @@ cmake/global.cmake %%DATADIR%%-test/queries/0_stateless/00025_implicitly_used_subquery_column.sql %%DATADIR%%-test/queries/0_stateless/00026_shard_something_distributed.reference %%DATADIR%%-test/queries/0_stateless/00026_shard_something_distributed.sql +%%DATADIR%%-test/queries/0_stateless/00027_argMinMax.reference +%%DATADIR%%-test/queries/0_stateless/00027_argMinMax.sql %%DATADIR%%-test/queries/0_stateless/00027_distinct_and_order_by.reference %%DATADIR%%-test/queries/0_stateless/00027_distinct_and_order_by.sql -%%DATADIR%%-test/queries/0_stateless/00027_simple_argMinArray.reference -%%DATADIR%%-test/queries/0_stateless/00027_simple_argMinArray.sql %%DATADIR%%-test/queries/0_stateless/00028_shard_big_agg_aj_distributed.reference %%DATADIR%%-test/queries/0_stateless/00028_shard_big_agg_aj_distributed.sql %%DATADIR%%-test/queries/0_stateless/00029_test_zookeeper_optimize_exception.reference @@ -512,8 +564,6 @@ cmake/global.cmake %%DATADIR%%-test/queries/0_stateless/00126_buffer.sql %%DATADIR%%-test/queries/0_stateless/00127_group_by_concat.reference %%DATADIR%%-test/queries/0_stateless/00127_group_by_concat.sql -%%DATADIR%%-test/queries/0_stateless/001283_strict_resize_bug.reference -%%DATADIR%%-test/queries/0_stateless/001283_strict_resize_bug.sql %%DATADIR%%-test/queries/0_stateless/00128_group_by_number_and_fixed_string.reference %%DATADIR%%-test/queries/0_stateless/00128_group_by_number_and_fixed_string.sql %%DATADIR%%-test/queries/0_stateless/00129_quantile_timing_weighted.reference @@ -726,6 +776,8 @@ cmake/global.cmake %%DATADIR%%-test/queries/0_stateless/00232_format_readable_size.sql %%DATADIR%%-test/queries/0_stateless/00233_position_function_family.reference %%DATADIR%%-test/queries/0_stateless/00233_position_function_family.sql +%%DATADIR%%-test/queries/0_stateless/00233_position_function_sql_comparibilty.reference +%%DATADIR%%-test/queries/0_stateless/00233_position_function_sql_comparibilty.sql %%DATADIR%%-test/queries/0_stateless/00234_disjunctive_equality_chains_optimization.reference %%DATADIR%%-test/queries/0_stateless/00234_disjunctive_equality_chains_optimization.sql %%DATADIR%%-test/queries/0_stateless/00235_create_temporary_table_as.reference @@ -804,7 +856,6 @@ cmake/global.cmake %%DATADIR%%-test/queries/0_stateless/00279_quantiles_permuted_args.sql %%DATADIR%%-test/queries/0_stateless/00280_hex_escape_sequence.reference %%DATADIR%%-test/queries/0_stateless/00280_hex_escape_sequence.sql -%%DATADIR%%-test/queries/0_stateless/00281_compile_sizeof_packed.re %%DATADIR%%-test/queries/0_stateless/00282_merging.reference %%DATADIR%%-test/queries/0_stateless/00282_merging.sql %%DATADIR%%-test/queries/0_stateless/00283_column_cut.reference @@ -1145,8 +1196,6 @@ cmake/global.cmake %%DATADIR%%-test/queries/0_stateless/00441_nulls_in.sql %%DATADIR%%-test/queries/0_stateless/00442_filter_by_nullable.reference %%DATADIR%%-test/queries/0_stateless/00442_filter_by_nullable.sql -%%DATADIR%%-test/queries/0_stateless/00443_merge_tree_uniform_read_distribution_0.reference -%%DATADIR%%-test/queries/0_stateless/00443_merge_tree_uniform_read_distribution_0.sh %%DATADIR%%-test/queries/0_stateless/00443_optimize_final_vertical_merge.reference %%DATADIR%%-test/queries/0_stateless/00443_optimize_final_vertical_merge.sh %%DATADIR%%-test/queries/0_stateless/00443_preferred_block_size_bytes.reference @@ -1277,6 +1326,8 @@ cmake/global.cmake %%DATADIR%%-test/queries/0_stateless/00499_json_enum_insert.sql %%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon.reference %%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon.sql +%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_2d_const.reference +%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_2d_const.sql %%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug.reference %%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug.sql %%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug_2.reference @@ -2123,6 +2174,8 @@ cmake/global.cmake %%DATADIR%%-test/queries/0_stateless/00753_alter_destination_for_storage_buffer.sql %%DATADIR%%-test/queries/0_stateless/00753_comment_columns_zookeeper.reference %%DATADIR%%-test/queries/0_stateless/00753_comment_columns_zookeeper.sql +%%DATADIR%%-test/queries/0_stateless/00753_distributed_system_columns_and_system_tables.reference +%%DATADIR%%-test/queries/0_stateless/00753_distributed_system_columns_and_system_tables.sql %%DATADIR%%-test/queries/0_stateless/00753_quantile_format.reference %%DATADIR%%-test/queries/0_stateless/00753_quantile_format.sql %%DATADIR%%-test/queries/0_stateless/00753_system_columns_and_system_tables.reference @@ -2273,15 +2326,30 @@ cmake/global.cmake %%DATADIR%%-test/queries/0_stateless/00824_filesystem.sql %%DATADIR%%-test/queries/0_stateless/00825_http_header_query_id.reference %%DATADIR%%-test/queries/0_stateless/00825_http_header_query_id.sh -%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format.proto -%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_input.insh -%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_input.reference -%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_input.sh -%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_output.reference -%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_output.sh -%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_syntax2.proto +%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_array_3dim.reference +%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_array_3dim.sh *** 1860 LINES SKIPPED *** From owner-dev-commits-ports-branches@freebsd.org Sun Apr 25 08:21:28 2021 Return-Path: Delivered-To: dev-commits-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 5769C5F9D69; Sun, 25 Apr 2021 08:21:28 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSgwS24GJz4rLc; Sun, 25 Apr 2021 08:21:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3A6BC10E25; Sun, 25 Apr 2021 08:21:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13P8LSa4004738; Sun, 25 Apr 2021 08:21:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13P8LSrr004737; Sun, 25 Apr 2021 08:21:28 GMT (envelope-from git) Date: Sun, 25 Apr 2021 08:21:28 GMT Message-Id: <202104250821.13P8LSrr004737@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rodrigo Osorio Subject: git: ff55ae246a44 - 2021Q2 - graphics/ufraw: Upgrade to latest version MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: ff55ae246a44875e8da59ae410e37294cc0f7519 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 08:21:28 -0000 The branch 2021Q2 has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=ff55ae246a44875e8da59ae410e37294cc0f7519 commit ff55ae246a44875e8da59ae410e37294cc0f7519 Author: Rodrigo Osorio AuthorDate: 2021-04-24 20:02:41 +0000 Commit: Rodrigo Osorio CommitDate: 2021-04-25 10:21:06 +0000 graphics/ufraw: Upgrade to latest version Major changes: * Intagrate multipleple fixes from openSUSE * Fix build against glib-2.68 * ufraw_preview: do now overwrite configuration with preview size * ufraw-gimp: properly send EXIF data to Gimp 2.9 and later * Suppress compiler warnings on implicit fallthrough * ufraw_developer: use fabs() instead of abs() for double * Fix GCC 9 OpenMP issues by drop default(none) * From Gentoo ufraw-0.17-cfitsio-automagic.patch * From Gentoo ufraw-0.22-jasper-automagic.patch * From Gentoo ufraw-0.22-jpeg9.patch * From Gentoo ufraw-0.22-exiv2-0.27.patch * 05_CVE-2018-19655.patch from Debian * Prevent crash when camera specified in .ufraw file is not in lensfun db * Fix crash on destroy of lensfun object on PEF images Security: CVE-2018-19655 MFH: 2021Q2 (cherry picked from commit 0e861af1558fee9f258c8ee67e3d48aff151986f) --- graphics/ufraw/Makefile | 5 ++-- graphics/ufraw/distinfo | 6 ++-- graphics/ufraw/files/patch-dcraw.cc | 41 --------------------------- graphics/ufraw/files/patch-gentoo_b5b414 | 28 ------------------ graphics/ufraw/files/patch-ufraw__conf.c | 11 ------- graphics/ufraw/files/patch-ufraw__developer.c | 11 ------- 6 files changed, 5 insertions(+), 97 deletions(-) diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile index 7a71c2965c1f..663bc662e952 100644 --- a/graphics/ufraw/Makefile +++ b/graphics/ufraw/Makefile @@ -1,8 +1,7 @@ # Created by: Mark Murray PORTNAME= ufraw -PORTVERSION= 0.22 -PORTREVISION= 17 +PORTVERSION= 0.22.20210424 CATEGORIES= graphics MAINTAINER= rodrigo@FreeBSD.org @@ -36,7 +35,7 @@ GIMP_DESC= Install GIMP plugin USE_GITHUB= yes GH_ACCOUNT= sergiomb2 GH_PROJECT= ufraw -GH_TAGNAME= 6d3259a +GH_TAGNAME= f34669b USE_GNOME+=glib20 gtk20 cairo gdkpixbuf2 diff --git a/graphics/ufraw/distinfo b/graphics/ufraw/distinfo index 7f81df2dd09f..08add293c091 100644 --- a/graphics/ufraw/distinfo +++ b/graphics/ufraw/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1521620815 -SHA256 (sergiomb2-ufraw-0.22-6d3259a_GH0.tar.gz) = 4a3b415bf86c7cadc71350a8f0a206cef79bb3c22a6a794a9d9894d6bc7ec6dc -SIZE (sergiomb2-ufraw-0.22-6d3259a_GH0.tar.gz) = 870086 +TIMESTAMP = 1619340633 +SHA256 (sergiomb2-ufraw-0.22.20210424-f34669b_GH0.tar.gz) = e577154b5b2256cfdc4dfc71018c190c5dcb2d92a5bfa3c13384d86aa28c5ec2 +SIZE (sergiomb2-ufraw-0.22.20210424-f34669b_GH0.tar.gz) = 871912 diff --git a/graphics/ufraw/files/patch-dcraw.cc b/graphics/ufraw/files/patch-dcraw.cc deleted file mode 100644 index b0c1fae315fa..000000000000 --- a/graphics/ufraw/files/patch-dcraw.cc +++ /dev/null @@ -1,41 +0,0 @@ ---- dcraw.cc.orig 2018-06-23 21:54:05 UTC -+++ dcraw.cc -@@ -2287,7 +2287,7 @@ void CLASS quicktake_100_load_raw() - - void CLASS kodak_radc_load_raw() - { -- static const char src[] = { -+ static const signed char src[] = { - 1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8, - 1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8, - 2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8, -@@ -3017,7 +3017,10 @@ void CLASS smal_decode_segment (unsigned - diff = diff ? -diff : 0x80; - if (ftell(ifp) + 12 >= (int) seg[1][1]) - diff = 0; -- raw_image[pix] = pred[pix & 1] += diff; -+ if(pix>=raw_width*raw_height) -+ derror(); -+ else -+ raw_image[pix] = pred[pix & 1] += diff; - if (!(pix & 1) && HOLE(pix / raw_width)) pix += 2; - } - maximum = 0xff; -@@ -8946,7 +8949,7 @@ void CLASS identify() - parse_fuji (get4()); - if (thumb_offset > 120) { - fseek (ifp, 120, SEEK_SET); -- is_raw += (i = get4()) && 1; -+ is_raw += (i = get4()) & 1; - if (is_raw == 2 && shot_select) - parse_fuji (i); - } -@@ -10192,7 +10195,7 @@ void CLASS tiff_head (struct tiff_hdr *t - strncpy (th->desc, desc, 512); - strncpy (th->make, make, 64); - strncpy (th->model, model, 64); -- strcpy (th->soft, "dcraw v"DCRAW_VERSION); -+ strcpy (th->soft, " dcraw v " DCRAW_VERSION); - t = localtime (×tamp); - sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d", - t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec); diff --git a/graphics/ufraw/files/patch-gentoo_b5b414 b/graphics/ufraw/files/patch-gentoo_b5b414 deleted file mode 100644 index 039244de4f2b..000000000000 --- a/graphics/ufraw/files/patch-gentoo_b5b414 +++ /dev/null @@ -1,28 +0,0 @@ -https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch - ---- ufraw_exiv2.cc.orig 2016-11-13 04:00:05 UTC -+++ ufraw_exiv2.cc -@@ -15,9 +15,8 @@ - #include "ufraw.h" - - #ifdef HAVE_EXIV2 --#include --#include --#include -+#include -+#include - #include - #include - -@@ -67,7 +66,11 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf) - if (exifData.empty()) { - std::string error(uf->filename); - error += ": No Exif data found in the file"; -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::Error(Exiv2::kerErrorMessage, error); -+#else - throw Exiv2::Error(1, error); -+#endif - } - - /* List of tag names taken from exiv2's printSummary() in actions.cpp */ diff --git a/graphics/ufraw/files/patch-ufraw__conf.c b/graphics/ufraw/files/patch-ufraw__conf.c deleted file mode 100644 index 5b5ae6dd4d74..000000000000 --- a/graphics/ufraw/files/patch-ufraw__conf.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ufraw_conf.c.orig 2016-11-13 04:00:05 UTC -+++ ufraw_conf.c -@@ -138,7 +138,7 @@ const conf_data conf_default = { - #elif HAVE_GIMP_2_4 - "gimp", /* remoteGimpCommand */ - #else -- "gimp-remote", /* remoteGimpCommand */ -+ "gimp", /* remoteGimpCommand */ - #endif - - /* EXIF data */ diff --git a/graphics/ufraw/files/patch-ufraw__developer.c b/graphics/ufraw/files/patch-ufraw__developer.c deleted file mode 100644 index 5e1e08163ee3..000000000000 --- a/graphics/ufraw/files/patch-ufraw__developer.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ufraw_developer.c.orig 2018-06-23 21:40:09 UTC -+++ ufraw_developer.c -@@ -387,7 +387,7 @@ static double findExpCoeff(double b) - else a = b; - bg = a / (1 - exp(-a)); - /* The limit on try is just to be sure there is no infinite loop. */ -- for (try = 0; abs(bg - b) > 0.001 || try < 100; try++) { -+ for (try = 0; fabs(bg - b) > 0.001 || try < 100; try++) { - a = a + (b - bg); - bg = a / (1 - exp(-a)); - } From owner-dev-commits-ports-branches@freebsd.org Sun Apr 25 14:33:06 2021 Return-Path: Delivered-To: dev-commits-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 D88BD6246CE; Sun, 25 Apr 2021 14:33:06 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSr9G5nWRz3RKv; Sun, 25 Apr 2021 14:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B96AD1600B; Sun, 25 Apr 2021 14:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13PEX6Z9098219; Sun, 25 Apr 2021 14:33:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13PEX6dE098218; Sun, 25 Apr 2021 14:33:06 GMT (envelope-from git) Date: Sun, 25 Apr 2021 14:33:06 GMT Message-Id: <202104251433.13PEX6dE098218@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Lewis Cook Subject: git: 91c1be95cdb6 - 2021Q2 - devel/gh: Resolve conflict with shells/fish MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lcook X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 91c1be95cdb690669d0aaad41ba8854d8f1feb42 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 14:33:06 -0000 The branch 2021Q2 has been updated by lcook: URL: https://cgit.FreeBSD.org/ports/commit/?id=91c1be95cdb690669d0aaad41ba8854d8f1feb42 commit 91c1be95cdb690669d0aaad41ba8854d8f1feb42 Author: Lewis Cook AuthorDate: 2021-04-25 14:25:01 +0000 Commit: Lewis Cook CommitDate: 2021-04-25 14:31:08 +0000 devel/gh: Resolve conflict with shells/fish PR: 255384 Reported by: Bjorn Neergaard (cherry picked from commit 36d76902abf2cb2e16da2dd31cf38e58adaf37a7) --- devel/gh/Makefile | 6 +++--- devel/gh/pkg-plist | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/gh/Makefile b/devel/gh/Makefile index 197b39c7ada7..4e2fa862f2e8 100644 --- a/devel/gh/Makefile +++ b/devel/gh/Makefile @@ -1,7 +1,7 @@ - PORTNAME= gh DISTVERSIONPREFIX= v DISTVERSION= 1.8.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= lcook@FreeBSD.org @@ -100,9 +100,9 @@ post-install-COMPLETIONS-on: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_DATA} ${GO_WRKSRC}/bash \ ${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME} - @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions + @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d ${INSTALL_DATA} ${GO_WRKSRC}/fish \ - ${STAGEDIR}${PREFIX}/share/fish/completions/${PORTNAME}.fish + ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d/${PORTNAME}.fish @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions ${INSTALL_DATA} ${GO_WRKSRC}/zsh \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME} diff --git a/devel/gh/pkg-plist b/devel/gh/pkg-plist index 6f0020ac96bf..b9c916c6674f 100644 --- a/devel/gh/pkg-plist +++ b/devel/gh/pkg-plist @@ -1,5 +1,5 @@ %%COMPLETIONS%%etc/bash_completion.d/gh -%%COMPLETIONS%%share/fish/completions/gh.fish +%%COMPLETIONS%%share/fish/vendor_completions.d/gh.fish %%COMPLETIONS%%share/zsh/site-functions/_gh %%MANPAGES%%man/man1/gh-alias-delete.1.gz %%MANPAGES%%man/man1/gh-alias-list.1.gz From owner-dev-commits-ports-branches@freebsd.org Sun Apr 25 17:30:14 2021 Return-Path: Delivered-To: dev-commits-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 77D5D5E0FA5; Sun, 25 Apr 2021 17:30:14 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSw5f2yV3z3qlT; Sun, 25 Apr 2021 17:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 58AD217F5D; Sun, 25 Apr 2021 17:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13PHUE9k028569; Sun, 25 Apr 2021 17:30:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13PHUEHS028563; Sun, 25 Apr 2021 17:30:14 GMT (envelope-from git) Date: Sun, 25 Apr 2021 17:30:14 GMT Message-Id: <202104251730.13PHUEHS028563@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bernhard Froehlich Subject: git: 06eb101ec65a - 2021Q2 - net/wireguard-kmod: Update to 0.0.20210415 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: decke X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 06eb101ec65a5fc16f9ffe9624f81f171efe4d08 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 17:30:14 -0000 The branch 2021Q2 has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=06eb101ec65a5fc16f9ffe9624f81f171efe4d08 commit 06eb101ec65a5fc16f9ffe9624f81f171efe4d08 Author: Bernhard Froehlich AuthorDate: 2021-04-17 06:00:14 +0000 Commit: Bernhard Froehlich CommitDate: 2021-04-25 17:27:01 +0000 net/wireguard-kmod: Update to 0.0.20210415 (cherry picked from commit a8664db756f8bf1c77487d67c655ee80b3fae590) --- net/wireguard-kmod/Makefile | 2 +- net/wireguard-kmod/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/wireguard-kmod/Makefile b/net/wireguard-kmod/Makefile index a43fa2d18b19..adc6f342d7de 100644 --- a/net/wireguard-kmod/Makefile +++ b/net/wireguard-kmod/Makefile @@ -1,6 +1,6 @@ PORTNAME= wireguard-kmod -PORTVERSION= 0.0.20210412 +PORTVERSION= 0.0.20210415 CATEGORIES= net net-vpn MASTER_SITES= https://git.zx2c4.com/wireguard-freebsd/snapshot/ DISTNAME= wireguard-freebsd-${PORTVERSION} diff --git a/net/wireguard-kmod/distinfo b/net/wireguard-kmod/distinfo index 840d5ffc74e4..7bbd90f99f69 100644 --- a/net/wireguard-kmod/distinfo +++ b/net/wireguard-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618337453 -SHA256 (wireguard-freebsd-0.0.20210412.tar.xz) = eff7fdff89949ea294177fe9b18fde99a016fc4ad44aaa0f31ba6c2cff5ac506 -SIZE (wireguard-freebsd-0.0.20210412.tar.xz) = 47708 +TIMESTAMP = 1618638847 +SHA256 (wireguard-freebsd-0.0.20210415.tar.xz) = 40dae82e27b37e236f761a2e84f892fe10ee183227287e7affdd5be571a1e612 +SIZE (wireguard-freebsd-0.0.20210415.tar.xz) = 46640 From owner-dev-commits-ports-branches@freebsd.org Sun Apr 25 17:30:15 2021 Return-Path: Delivered-To: dev-commits-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 C895A5E0A67; Sun, 25 Apr 2021 17:30:15 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSw5g5HY4z3r0F; Sun, 25 Apr 2021 17:30:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9297817EC8; Sun, 25 Apr 2021 17:30:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13PHUFHd029084; Sun, 25 Apr 2021 17:30:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13PHUFCn029081; Sun, 25 Apr 2021 17:30:15 GMT (envelope-from git) Date: Sun, 25 Apr 2021 17:30:15 GMT Message-Id: <202104251730.13PHUFCn029081@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bernhard Froehlich Subject: git: df94c37f6855 - 2021Q2 - net/wireguard-kmod: Use WRKSRC_SUBDIR MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: decke X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: df94c37f6855a7d9c73dd1d6cb3ea97c42b1b060 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 17:30:15 -0000 The branch 2021Q2 has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=df94c37f6855a7d9c73dd1d6cb3ea97c42b1b060 commit df94c37f6855a7d9c73dd1d6cb3ea97c42b1b060 Author: Po-Chuan Hsieh AuthorDate: 2021-04-18 05:18:41 +0000 Commit: Bernhard Froehlich CommitDate: 2021-04-25 17:28:30 +0000 net/wireguard-kmod: Use WRKSRC_SUBDIR Approved by: portmgr (blanket) (cherry picked from commit 8f9e838c66b4e052078eca546a6f68ac8d89d092) --- net/wireguard-kmod/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/wireguard-kmod/Makefile b/net/wireguard-kmod/Makefile index adc6f342d7de..48a3f97cdf83 100644 --- a/net/wireguard-kmod/Makefile +++ b/net/wireguard-kmod/Makefile @@ -9,13 +9,13 @@ MAINTAINER= decke@FreeBSD.org COMMENT= WireGuard implementation for the FreeBSD kernel LICENSE= MIT -LICENSE_FILE= ${WRKDIR}/${DISTNAME}/COPYING +LICENSE_FILE= ${WRKSRC}/../COPYING IGNORE_FreeBSD_11= only for FreeBSD 12.1 and newer USES= kmod tar:xz uidfix -WRKSRC= ${WRKDIR}/${DISTNAME}/src +WRKSRC_SUBDIR= src PLIST_FILES= ${KMODDIR}/if_wg.ko From owner-dev-commits-ports-branches@freebsd.org Sun Apr 25 17:30:16 2021 Return-Path: Delivered-To: dev-commits-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 E431E5E0F41; Sun, 25 Apr 2021 17:30:16 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSw5h5zmXz3r0G; Sun, 25 Apr 2021 17:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 947FC18138; Sun, 25 Apr 2021 17:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13PHUGba029606; Sun, 25 Apr 2021 17:30:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13PHUGQB029603; Sun, 25 Apr 2021 17:30:16 GMT (envelope-from git) Date: Sun, 25 Apr 2021 17:30:16 GMT Message-Id: <202104251730.13PHUGQB029603@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bernhard Froehlich Subject: git: 637319fe2cc2 - 2021Q2 - net/wireguard-kmod: Update to 0.0.20210424 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: decke X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 637319fe2cc230e50d50812e3ab738d7726d8325 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 17:30:17 -0000 The branch 2021Q2 has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=637319fe2cc230e50d50812e3ab738d7726d8325 commit 637319fe2cc230e50d50812e3ab738d7726d8325 Author: Bernhard Froehlich AuthorDate: 2021-04-25 11:48:58 +0000 Commit: Bernhard Froehlich CommitDate: 2021-04-25 17:28:57 +0000 net/wireguard-kmod: Update to 0.0.20210424 (cherry picked from commit 4933972df03262847a7609001138597495cd72d5) --- net/wireguard-kmod/Makefile | 2 +- net/wireguard-kmod/distinfo | 6 +- .../patch-dd04bc5aa4a3607fd2277a5d7953a2a20a411696 | 99 ++++++++++++++++++++++ 3 files changed, 103 insertions(+), 4 deletions(-) diff --git a/net/wireguard-kmod/Makefile b/net/wireguard-kmod/Makefile index 48a3f97cdf83..938c094e8296 100644 --- a/net/wireguard-kmod/Makefile +++ b/net/wireguard-kmod/Makefile @@ -1,6 +1,6 @@ PORTNAME= wireguard-kmod -PORTVERSION= 0.0.20210415 +PORTVERSION= 0.0.20210424 CATEGORIES= net net-vpn MASTER_SITES= https://git.zx2c4.com/wireguard-freebsd/snapshot/ DISTNAME= wireguard-freebsd-${PORTVERSION} diff --git a/net/wireguard-kmod/distinfo b/net/wireguard-kmod/distinfo index 7bbd90f99f69..6d488ac7d47f 100644 --- a/net/wireguard-kmod/distinfo +++ b/net/wireguard-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618638847 -SHA256 (wireguard-freebsd-0.0.20210415.tar.xz) = 40dae82e27b37e236f761a2e84f892fe10ee183227287e7affdd5be571a1e612 -SIZE (wireguard-freebsd-0.0.20210415.tar.xz) = 46640 +TIMESTAMP = 1619285662 +SHA256 (wireguard-freebsd-0.0.20210424.tar.xz) = bfa8d3c4854f802567db51a89fdea32e7bf98a3d54a525359bdb240f2e864735 +SIZE (wireguard-freebsd-0.0.20210424.tar.xz) = 49948 diff --git a/net/wireguard-kmod/files/patch-dd04bc5aa4a3607fd2277a5d7953a2a20a411696 b/net/wireguard-kmod/files/patch-dd04bc5aa4a3607fd2277a5d7953a2a20a411696 new file mode 100644 index 000000000000..3aabba31d857 --- /dev/null +++ b/net/wireguard-kmod/files/patch-dd04bc5aa4a3607fd2277a5d7953a2a20a411696 @@ -0,0 +1,99 @@ +From dd04bc5aa4a3607fd2277a5d7953a2a20a411696 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" +Date: Sat, 24 Apr 2021 16:12:23 -0400 +Subject: wg_noise: compile on 32-bit + +The lack of 64bit atomic helpers on 32bit is an annoyance. + +Signed-off-by: Jason A. Donenfeld +--- + src/wg_noise.c | 44 +++++++++++++++++++++++++++++++++++++------- + 1 file changed, 37 insertions(+), 7 deletions(-) + +diff --git a/src/wg_noise.c b/src/wg_noise.c +index 5ef7a58c3146..7acf1b6ab7cb 100644 +--- wg_noise.c ++++ wg_noise.c +@@ -780,11 +780,14 @@ noise_keypair_remote(struct noise_keypair *kp) + int + noise_keypair_nonce_next(struct noise_keypair *kp, uint64_t *send) + { ++ if (!ck_pr_load_bool(&kp->kp_can_send)) ++ return (EINVAL); ++ + #ifdef __LP64__ +- *send = atomic_fetchadd_64(&kp->kp_nonce_send, 1); ++ *send = ck_pr_faa_64(&kp->kp_nonce_send, 1); + #else + rw_wlock(&kp->kp_nonce_lock); +- *send = ctr->c_send++; ++ *send = kp->kp_nonce_send++; + rw_wunlock(&kp->kp_nonce_lock); + #endif + if (*send < REJECT_AFTER_MESSAGES) +@@ -821,7 +824,11 @@ noise_keypair_nonce_check(struct noise_keypair *kp, uint64_t recv) + for (i = 1; i <= top; i++) + kp->kp_backtrack[ + (i + index_ctr) & (COUNTER_NUM - 1)] = 0; ++#ifdef __LP64__ + ck_pr_store_64(&kp->kp_nonce_recv, recv); ++#else ++ kp->kp_nonce_recv = recv; ++#endif + } + + index_recv %= COUNTER_NUM; +@@ -844,14 +851,27 @@ noise_keep_key_fresh_send(struct noise_remote *r) + struct epoch_tracker et; + struct noise_keypair *current; + int keep_key_fresh; ++ uint64_t nonce; + + NET_EPOCH_ENTER(et); + current = ck_pr_load_ptr(&r->r_current); +- keep_key_fresh = current != NULL && ck_pr_load_bool(¤t->kp_can_send) && ( +- ck_pr_load_64(¤t->kp_nonce_send) > REKEY_AFTER_MESSAGES || +- (current->kp_is_initiator && noise_timer_expired(current->kp_birthdate, REKEY_AFTER_TIME, 0))); +- NET_EPOCH_EXIT(et); ++ keep_key_fresh = current != NULL && ck_pr_load_bool(¤t->kp_can_send); ++ if (!keep_key_fresh) ++ goto out; ++#ifdef __LP64__ ++ nonce = ck_pr_load_64(¤t->kp_nonce_send); ++#else ++ rw_rlock(¤t->kp_nonce_lock); ++ nonce = current->kp_nonce_send; ++ rw_runlock(¤t->kp_nonce_lock); ++#endif ++ keep_key_fresh = nonce > REKEY_AFTER_MESSAGES; ++ if (keep_key_fresh) ++ goto out; ++ keep_key_fresh = current->kp_is_initiator && noise_timer_expired(current->kp_birthdate, REKEY_AFTER_TIME, 0); + ++out: ++ NET_EPOCH_EXIT(et); + return (keep_key_fresh ? ESTALE : 0); + } + +@@ -885,7 +905,17 @@ noise_keypair_encrypt(struct noise_keypair *kp, uint32_t *r_idx, uint64_t nonce, + int + noise_keypair_decrypt(struct noise_keypair *kp, uint64_t nonce, struct mbuf *m) + { +- if (ck_pr_load_64(&kp->kp_nonce_recv) >= REJECT_AFTER_MESSAGES || ++ uint64_t cur_nonce; ++ ++#ifdef __LP64__ ++ cur_nonce = ck_pr_load_64(&kp->kp_nonce_recv); ++#else ++ rw_rlock(&kp->kp_nonce_lock); ++ cur_nonce = kp->kp_nonce_recv; ++ rw_runlock(&kp->kp_nonce_lock); ++#endif ++ ++ if (cur_nonce >= REJECT_AFTER_MESSAGES || + noise_timer_expired(kp->kp_birthdate, REJECT_AFTER_TIME, 0)) + return (EINVAL); + +-- +cgit v1.2.3-11-g984f + From owner-dev-commits-ports-branches@freebsd.org Sun Apr 25 17:34:38 2021 Return-Path: Delivered-To: dev-commits-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 80CD45E1156; Sun, 25 Apr 2021 17:34:38 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSwBk3DDqz3rG9; Sun, 25 Apr 2021 17:34:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5D12A18514; Sun, 25 Apr 2021 17:34:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13PHYcUa037022; Sun, 25 Apr 2021 17:34:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13PHYcBg037021; Sun, 25 Apr 2021 17:34:38 GMT (envelope-from git) Date: Sun, 25 Apr 2021 17:34:38 GMT Message-Id: <202104251734.13PHYcBg037021@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bernhard Froehlich Subject: git: 7adfd10e3576 - 2021Q2 - net/wireguard-tools: Use WRKSRC_SUBDIR MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: decke X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 7adfd10e357673957fd53cb5f5535f011c40742d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 17:34:38 -0000 The branch 2021Q2 has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=7adfd10e357673957fd53cb5f5535f011c40742d commit 7adfd10e357673957fd53cb5f5535f011c40742d Author: Po-Chuan Hsieh AuthorDate: 2021-04-18 05:18:49 +0000 Commit: Bernhard Froehlich CommitDate: 2021-04-25 17:33:55 +0000 net/wireguard-tools: Use WRKSRC_SUBDIR Approved by: portmgr (blanket) (cherry picked from commit 7b932c360faf383a6c59abd7c4a801ff9230cfe2) --- net/wireguard-tools/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/wireguard-tools/Makefile b/net/wireguard-tools/Makefile index 009e860a9fc4..c0b38a484120 100644 --- a/net/wireguard-tools/Makefile +++ b/net/wireguard-tools/Makefile @@ -9,14 +9,14 @@ MAINTAINER= decke@FreeBSD.org COMMENT= Fast, modern and secure VPN Tunnel LICENSE= GPLv2 -LICENSE_FILE= ${WRKDIR}/${DISTNAME}/COPYING +LICENSE_FILE= ${WRKSRC}/../COPYING FLAVORS= default lite lite_PKGNAMESUFFIX= -lite USES= gmake tar:xz -WRKSRC= ${WRKDIR}/${DISTNAME}/src +WRKSRC_SUBDIR= src MAKE_ARGS+= DEBUG=no WITH_BASHCOMPLETION=yes WITH_SYSTEMDUNITS=no MAKE_ENV+= MANDIR="${MANPREFIX}/man" \ From owner-dev-commits-ports-branches@freebsd.org Sun Apr 25 17:34:39 2021 Return-Path: Delivered-To: dev-commits-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 A3B6F5E10CA; Sun, 25 Apr 2021 17:34:39 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSwBl3x2Gz3qsb; Sun, 25 Apr 2021 17:34:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 785E618515; Sun, 25 Apr 2021 17:34:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13PHYdBY037045; Sun, 25 Apr 2021 17:34:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13PHYdgH037044; Sun, 25 Apr 2021 17:34:39 GMT (envelope-from git) Date: Sun, 25 Apr 2021 17:34:39 GMT Message-Id: <202104251734.13PHYdgH037044@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bernhard Froehlich Subject: git: 143f4ef92755 - 2021Q2 - net/wireguard-tools: Update to 1.0.20210424 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: decke X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 143f4ef9275516bf69b6c31b957def10f6e9832e Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 17:34:39 -0000 The branch 2021Q2 has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=143f4ef9275516bf69b6c31b957def10f6e9832e commit 143f4ef9275516bf69b6c31b957def10f6e9832e Author: Bernhard Froehlich AuthorDate: 2021-04-25 11:53:54 +0000 Commit: Bernhard Froehlich CommitDate: 2021-04-25 17:34:14 +0000 net/wireguard-tools: Update to 1.0.20210424 (cherry picked from commit b7985f90c1d3a2daaab5cdb1150884d2f322a621) --- net/wireguard-tools/Makefile | 3 +-- net/wireguard-tools/distinfo | 6 +++--- net/wireguard-tools/files/patch-wg-quick_freebsd.bash-1 | 17 ----------------- net/wireguard-tools/files/patch-wg-quick_freebsd.bash-2 | 17 ----------------- 4 files changed, 4 insertions(+), 39 deletions(-) diff --git a/net/wireguard-tools/Makefile b/net/wireguard-tools/Makefile index c0b38a484120..76f152e51349 100644 --- a/net/wireguard-tools/Makefile +++ b/net/wireguard-tools/Makefile @@ -1,7 +1,6 @@ PORTNAME= wireguard-tools -PORTVERSION= 1.0.20210315 -PORTREVISION= 4 +PORTVERSION= 1.0.20210424 CATEGORIES= net net-vpn MASTER_SITES= https://git.zx2c4.com/wireguard-tools/snapshot/ diff --git a/net/wireguard-tools/distinfo b/net/wireguard-tools/distinfo index 4c86269fb72f..e06efeab4d7b 100644 --- a/net/wireguard-tools/distinfo +++ b/net/wireguard-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1615824165 -SHA256 (wireguard-tools-1.0.20210315.tar.xz) = af001d5492be6bf58ef0bebe04b446b6f50eb53e1226fab679cc34af40733a22 -SIZE (wireguard-tools-1.0.20210315.tar.xz) = 96988 +TIMESTAMP = 1619350661 +SHA256 (wireguard-tools-1.0.20210424.tar.xz) = b288b0c43871d919629d7e77846ef0b47f8eeaa9ebc9cedeee8233fc6cc376ad +SIZE (wireguard-tools-1.0.20210424.tar.xz) = 96816 diff --git a/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-1 b/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-1 deleted file mode 100644 index b73bd664e441..000000000000 --- a/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-1 +++ /dev/null @@ -1,17 +0,0 @@ -From a43f0b634e714cd5cddff373b00c964a57e7b7fc Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Sun, 21 Mar 2021 10:15:32 -0600 -Subject: wg-quick: freebsd: check for socket using -S, not -f - -Signed-off-by: Jason A. Donenfeld ---- wg-quick/freebsd.bash.orig 2021-03-15 14:04:02 UTC -+++ wg-quick/freebsd.bash -@@ -168,7 +168,7 @@ if_exists() { - - del_if() { - [[ $HAVE_SET_DNS -eq 0 ]] || unset_dns -- if [[ -f /var/run/wireguard/$INTERFACE.sock ]]; then -+ if [[ -S /var/run/wireguard/$INTERFACE.sock ]]; then - cmd rm -f "/var/run/wireguard/$INTERFACE.sock" - else - cmd ifconfig "$INTERFACE" destroy diff --git a/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-2 b/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-2 deleted file mode 100644 index 96cb6def8649..000000000000 --- a/net/wireguard-tools/files/patch-wg-quick_freebsd.bash-2 +++ /dev/null @@ -1,17 +0,0 @@ -From 163cef8b9013898bbe0d0b8d4afd25264e999858 Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Tue, 23 Mar 2021 12:28:22 -0600 -Subject: wg-quick: freebsd: do not assume point-to-point interface flag - -Signed-off-by: Jason A. Donenfeld ---- wg-quick/freebsd.bash.orig 2021-03-23 19:38:00 UTC -+++ wg-quick/freebsd.bash -@@ -190,7 +190,7 @@ add_addr() { - if [[ $1 == *:* ]]; then - cmd ifconfig "$INTERFACE" inet6 "$1" alias - else -- cmd ifconfig "$INTERFACE" inet "$1" "${1%%/*}" alias -+ cmd ifconfig "$INTERFACE" inet "$1" alias - fi - } - From owner-dev-commits-ports-branches@freebsd.org Sun Apr 25 18:34:36 2021 Return-Path: Delivered-To: dev-commits-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 992015E2AE0; Sun, 25 Apr 2021 18:34:36 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSxWw3vZdz3tp7; Sun, 25 Apr 2021 18:34:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6A35918E68; Sun, 25 Apr 2021 18:34:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13PIYaWT016034; Sun, 25 Apr 2021 18:34:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13PIYaxL016033; Sun, 25 Apr 2021 18:34:36 GMT (envelope-from git) Date: Sun, 25 Apr 2021 18:34:36 GMT Message-Id: <202104251834.13PIYaxL016033@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bernhard Froehlich Subject: git: a3bb4c38f3be - 2021Q2 - net/wireguard-kmod: Add patch to fix panic due to missing epoch tracking in transmit MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: decke X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: a3bb4c38f3be163c3bacc24efa49e853e62b717c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 18:34:36 -0000 The branch 2021Q2 has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=a3bb4c38f3be163c3bacc24efa49e853e62b717c commit a3bb4c38f3be163c3bacc24efa49e853e62b717c Author: Bernhard Froehlich AuthorDate: 2021-04-25 18:29:29 +0000 Commit: Bernhard Froehlich CommitDate: 2021-04-25 18:33:47 +0000 net/wireguard-kmod: Add patch to fix panic due to missing epoch tracking in transmit Obtained from: https://git.zx2c4.com/wireguard-freebsd/commit/?id=e03bf597383cef7f16c41fa4952a6b04093e9e64 (cherry picked from commit 98c107c85696297c2a1ec986b3f76e67f7590771) --- net/wireguard-kmod/Makefile | 1 + .../patch-e03bf597383cef7f16c41fa4952a6b04093e9e64 | 52 ++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/net/wireguard-kmod/Makefile b/net/wireguard-kmod/Makefile index 938c094e8296..e0565d48f874 100644 --- a/net/wireguard-kmod/Makefile +++ b/net/wireguard-kmod/Makefile @@ -1,6 +1,7 @@ PORTNAME= wireguard-kmod PORTVERSION= 0.0.20210424 +PORTREVISION= 1 CATEGORIES= net net-vpn MASTER_SITES= https://git.zx2c4.com/wireguard-freebsd/snapshot/ DISTNAME= wireguard-freebsd-${PORTVERSION} diff --git a/net/wireguard-kmod/files/patch-e03bf597383cef7f16c41fa4952a6b04093e9e64 b/net/wireguard-kmod/files/patch-e03bf597383cef7f16c41fa4952a6b04093e9e64 new file mode 100644 index 000000000000..1705a0f9a69f --- /dev/null +++ b/net/wireguard-kmod/files/patch-e03bf597383cef7f16c41fa4952a6b04093e9e64 @@ -0,0 +1,52 @@ +From e03bf597383cef7f16c41fa4952a6b04093e9e64 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" +Date: Sun, 25 Apr 2021 10:45:39 -0400 +Subject: if_wg: re-add epoch tracking to transmit + +This was accidentally removed before. We need it to work around v6 core +bugs. + +Signed-off-by: Jason A. Donenfeld +--- + src/if_wg.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/if_wg.c b/src/if_wg.c +index 095a4f37f8dc..0c2565ce56c0 100644 +--- if_wg.c ++++ if_wg.c +@@ -2063,6 +2063,7 @@ error: + static int + wg_transmit(struct ifnet *ifp, struct mbuf *m) + { ++ struct epoch_tracker et; + struct wg_packet *pkt = m->m_pkthdr.PH_loc.ptr; + struct wg_softc *sc = ifp->if_softc; + struct wg_peer *peer; +@@ -2070,6 +2071,7 @@ wg_transmit(struct ifnet *ifp, struct mbuf *m) + int rc = 0; + sa_family_t peer_af; + ++ NET_EPOCH_ENTER(et); + /* Work around lifetime issue in the ipv6 mld code. */ + if (__predict_false((ifp->if_flags & IFF_DYING) || !sc)) { + rc = ENXIO; +@@ -2109,11 +2111,15 @@ wg_transmit(struct ifnet *ifp, struct mbuf *m) + wg_queue_push_staged(&peer->p_stage_queue, pkt); + wg_peer_send_staged(peer); + noise_remote_put(peer->p_remote); ++ NET_EPOCH_EXIT(et); ++ + return (0); + err_peer: + noise_remote_put(peer->p_remote); + err: + if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1); ++ NET_EPOCH_EXIT(et); ++ /* TODO: send ICMP unreachable? */ + wg_packet_free(pkt); + return (rc); + } +-- +cgit v1.2.3-11-g984f + From owner-dev-commits-ports-branches@freebsd.org Sun Apr 25 19:08:35 2021 Return-Path: Delivered-To: dev-commits-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 66A6E5E3F13; Sun, 25 Apr 2021 19:08:35 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSyH72T1kz4Qnq; Sun, 25 Apr 2021 19:08:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 43A101987F; Sun, 25 Apr 2021 19:08:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13PJ8ZWX056552; Sun, 25 Apr 2021 19:08:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13PJ8Zvn056551; Sun, 25 Apr 2021 19:08:35 GMT (envelope-from git) Date: Sun, 25 Apr 2021 19:08:35 GMT Message-Id: <202104251908.13PJ8Zvn056551@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: a5986e838367 - 2021Q2 - www/youtube_dl: update to 2021.04.26 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: a5986e838367a7669d921a1a5ae4938929128067 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 19:08:35 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=a5986e838367a7669d921a1a5ae4938929128067 commit a5986e838367a7669d921a1a5ae4938929128067 Author: Jan Beich AuthorDate: 2021-04-25 18:33:50 +0000 Commit: Jan Beich CommitDate: 2021-04-25 19:08:13 +0000 www/youtube_dl: update to 2021.04.26 Changes: https://github.com/ytdl-org/youtube-dl/releases/tag/2021.04.26 Reported by: GitHub (watch releases) (cherry picked from commit 943a2fd04133aa11312d53de809186df4532417e) --- www/youtube_dl/Makefile | 2 +- www/youtube_dl/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/youtube_dl/Makefile b/www/youtube_dl/Makefile index fa87bc05eb60..5fdb413a0e3f 100644 --- a/www/youtube_dl/Makefile +++ b/www/youtube_dl/Makefile @@ -1,6 +1,6 @@ PORTNAME= youtube_dl -PORTVERSION= 2021.04.17 +PORTVERSION= 2021.04.26 CATEGORIES= www MASTER_SITES= https://yt-dl.org/downloads/${PORTVERSION}/ DISTNAME= youtube-dl-${PORTVERSION} diff --git a/www/youtube_dl/distinfo b/www/youtube_dl/distinfo index f35016ac06c7..3f4de4aeedbe 100644 --- a/www/youtube_dl/distinfo +++ b/www/youtube_dl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618606178 -SHA256 (youtube-dl-2021.04.17.tar.gz) = 75eff59a6a81708e1bf075f1a46cea4058694c286f154a35ee7d6dd760da0e42 -SIZE (youtube-dl-2021.04.17.tar.gz) = 3331721 +TIMESTAMP = 1618606436 +SHA256 (youtube-dl-2021.04.26.tar.gz) = 4ccf21f4a0daee0d58bef569c71dd459bd1f629248995b4e4856b6926531ea4a +SIZE (youtube-dl-2021.04.26.tar.gz) = 3333530 From owner-dev-commits-ports-branches@freebsd.org Sun Apr 25 19:08:36 2021 Return-Path: Delivered-To: dev-commits-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 879D25E3E1A; Sun, 25 Apr 2021 19:08:36 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSyH83KTYz4Qnv; Sun, 25 Apr 2021 19:08:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6352B19367; Sun, 25 Apr 2021 19:08:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13PJ8aPF056585; Sun, 25 Apr 2021 19:08:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13PJ8aUd056584; Sun, 25 Apr 2021 19:08:36 GMT (envelope-from git) Date: Sun, 25 Apr 2021 19:08:36 GMT Message-Id: <202104251908.13PJ8aUd056584@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 943a2fd04133 - main - www/youtube_dl: update to 2021.04.26 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 943a2fd04133aa11312d53de809186df4532417e Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 19:08:36 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=943a2fd04133aa11312d53de809186df4532417e commit 943a2fd04133aa11312d53de809186df4532417e Author: Jan Beich AuthorDate: 2021-04-25 18:33:50 +0000 Commit: Jan Beich CommitDate: 2021-04-25 19:08:07 +0000 www/youtube_dl: update to 2021.04.26 Changes: https://github.com/ytdl-org/youtube-dl/releases/tag/2021.04.26 Reported by: GitHub (watch releases) --- www/youtube_dl/Makefile | 2 +- www/youtube_dl/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/youtube_dl/Makefile b/www/youtube_dl/Makefile index 675786dd6df7..edd9e6d2f11c 100644 --- a/www/youtube_dl/Makefile +++ b/www/youtube_dl/Makefile @@ -1,5 +1,5 @@ PORTNAME= youtube_dl -PORTVERSION= 2021.04.17 +PORTVERSION= 2021.04.26 CATEGORIES= www MASTER_SITES= https://yt-dl.org/downloads/${PORTVERSION}/ DISTNAME= youtube-dl-${PORTVERSION} diff --git a/www/youtube_dl/distinfo b/www/youtube_dl/distinfo index f35016ac06c7..3f4de4aeedbe 100644 --- a/www/youtube_dl/distinfo +++ b/www/youtube_dl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618606178 -SHA256 (youtube-dl-2021.04.17.tar.gz) = 75eff59a6a81708e1bf075f1a46cea4058694c286f154a35ee7d6dd760da0e42 -SIZE (youtube-dl-2021.04.17.tar.gz) = 3331721 +TIMESTAMP = 1618606436 +SHA256 (youtube-dl-2021.04.26.tar.gz) = 4ccf21f4a0daee0d58bef569c71dd459bd1f629248995b4e4856b6926531ea4a +SIZE (youtube-dl-2021.04.26.tar.gz) = 3333530 From owner-dev-commits-ports-branches@freebsd.org Sun Apr 25 20:33:41 2021 Return-Path: Delivered-To: dev-commits-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 AE0735E63AD; Sun, 25 Apr 2021 20:33:41 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FT09K4Pwpz4V75; Sun, 25 Apr 2021 20:33:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8A3FC1A6E3; Sun, 25 Apr 2021 20:33:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13PKXfrF076012; Sun, 25 Apr 2021 20:33:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13PKXfQx076011; Sun, 25 Apr 2021 20:33:41 GMT (envelope-from git) Date: Sun, 25 Apr 2021 20:33:41 GMT Message-Id: <202104252033.13PKXfQx076011@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 2a60a3fbd016 - 2021Q2 - www/gallery-dl: update to 1.17.3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 2a60a3fbd01650c8cfa7a0868ac564d3284f55e0 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 20:33:41 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a60a3fbd01650c8cfa7a0868ac564d3284f55e0 commit 2a60a3fbd01650c8cfa7a0868ac564d3284f55e0 Author: Jan Beich AuthorDate: 2021-04-25 19:23:26 +0000 Commit: Jan Beich CommitDate: 2021-04-25 20:32:34 +0000 www/gallery-dl: update to 1.17.3 Changes: https://github.com/mikf/gallery-dl/releases/tag/v1.17.3 Reported by: GitHub (watch releases) (cherry picked from commit 3394120fd8f72cf3b5cfcd867d872e884d5f0ee3) --- www/gallery-dl/Makefile | 2 +- www/gallery-dl/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/gallery-dl/Makefile b/www/gallery-dl/Makefile index 1ccade3e3021..9ee9a7d9b087 100644 --- a/www/gallery-dl/Makefile +++ b/www/gallery-dl/Makefile @@ -1,7 +1,7 @@ PORTNAME= gallery-dl DISTVERSIONPREFIX= v -DISTVERSION= 1.17.2 +DISTVERSION= 1.17.3 CATEGORIES= www # Implicit approval to commit trivial version updates. diff --git a/www/gallery-dl/distinfo b/www/gallery-dl/distinfo index 737b9f665c65..cb880f02869a 100644 --- a/www/gallery-dl/distinfo +++ b/www/gallery-dl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617391004 -SHA256 (mikf-gallery-dl-v1.17.2_GH0.tar.gz) = a486c10c6d00abe1f7f2d650b0a99d98b8499586d8b1fcd421e6f30420ebf704 -SIZE (mikf-gallery-dl-v1.17.2_GH0.tar.gz) = 347680 +TIMESTAMP = 1619378606 +SHA256 (mikf-gallery-dl-v1.17.3_GH0.tar.gz) = 350ea07d5d36e0ba982a5bfb869f3226195be196e0012401f350857ceb025c42 +SIZE (mikf-gallery-dl-v1.17.3_GH0.tar.gz) = 353605 From owner-dev-commits-ports-branches@freebsd.org Sun Apr 25 20:33:42 2021 Return-Path: Delivered-To: dev-commits-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 CF7145E617A; Sun, 25 Apr 2021 20:33:42 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FT09L5LZ8z4V05; Sun, 25 Apr 2021 20:33:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A7CEF1AAEC; Sun, 25 Apr 2021 20:33:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13PKXg0D076045; Sun, 25 Apr 2021 20:33:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13PKXgS1076044; Sun, 25 Apr 2021 20:33:42 GMT (envelope-from git) Date: Sun, 25 Apr 2021 20:33:42 GMT Message-Id: <202104252033.13PKXgS1076044@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 3394120fd8f7 - main - www/gallery-dl: update to 1.17.3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3394120fd8f72cf3b5cfcd867d872e884d5f0ee3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 20:33:43 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=3394120fd8f72cf3b5cfcd867d872e884d5f0ee3 commit 3394120fd8f72cf3b5cfcd867d872e884d5f0ee3 Author: Jan Beich AuthorDate: 2021-04-25 19:23:26 +0000 Commit: Jan Beich CommitDate: 2021-04-25 20:32:25 +0000 www/gallery-dl: update to 1.17.3 Changes: https://github.com/mikf/gallery-dl/releases/tag/v1.17.3 Reported by: GitHub (watch releases) --- www/gallery-dl/Makefile | 2 +- www/gallery-dl/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/gallery-dl/Makefile b/www/gallery-dl/Makefile index 175c0c12f0f3..1dda0d4bb7f9 100644 --- a/www/gallery-dl/Makefile +++ b/www/gallery-dl/Makefile @@ -1,6 +1,6 @@ PORTNAME= gallery-dl DISTVERSIONPREFIX= v -DISTVERSION= 1.17.2 +DISTVERSION= 1.17.3 CATEGORIES= www # Implicit approval to commit trivial version updates. diff --git a/www/gallery-dl/distinfo b/www/gallery-dl/distinfo index 737b9f665c65..cb880f02869a 100644 --- a/www/gallery-dl/distinfo +++ b/www/gallery-dl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617391004 -SHA256 (mikf-gallery-dl-v1.17.2_GH0.tar.gz) = a486c10c6d00abe1f7f2d650b0a99d98b8499586d8b1fcd421e6f30420ebf704 -SIZE (mikf-gallery-dl-v1.17.2_GH0.tar.gz) = 347680 +TIMESTAMP = 1619378606 +SHA256 (mikf-gallery-dl-v1.17.3_GH0.tar.gz) = 350ea07d5d36e0ba982a5bfb869f3226195be196e0012401f350857ceb025c42 +SIZE (mikf-gallery-dl-v1.17.3_GH0.tar.gz) = 353605 From owner-dev-commits-ports-branches@freebsd.org Sun Apr 25 20:53:38 2021 Return-Path: Delivered-To: dev-commits-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 7E3105EB20F; Sun, 25 Apr 2021 20:53:38 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FT0cL2jJ6z4c0h; Sun, 25 Apr 2021 20:53:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 375E91B016; Sun, 25 Apr 2021 20:53:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13PKrccU011496; Sun, 25 Apr 2021 20:53:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13PKrcCC011495; Sun, 25 Apr 2021 20:53:38 GMT (envelope-from git) Date: Sun, 25 Apr 2021 20:53:38 GMT Message-Id: <202104252053.13PKrcCC011495@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 63a2b7669b00 - 2021Q2 - www/adguardhome: Use pre-bilt html frontend tarballs and mantenance mode which allows to build them. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 63a2b7669b0088f00c627973cf1238549658370f Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 20:53:38 -0000 The branch 2021Q2 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=63a2b7669b0088f00c627973cf1238549658370f commit 63a2b7669b0088f00c627973cf1238549658370f Author: Yuri Victorovich AuthorDate: 2021-04-16 21:26:03 +0000 Commit: Yuri Victorovich CommitDate: 2021-04-25 20:53:35 +0000 www/adguardhome: Use pre-bilt html frontend tarballs and mantenance mode which allows to build them. Port was broken without this since they recently added the need for html frontend being presend before build and such frontend was missing. Reported by: Sandro Wirth (cherry picked from commit 990e47d4e491bbed9bdd626b4b89f186de5804c7) --- www/adguardhome/Makefile | 30 ++++++++++++++++++++++++++++++ www/adguardhome/distinfo | 6 +++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/www/adguardhome/Makefile b/www/adguardhome/Makefile index 60e99e25c6dc..3c8cd2da87f2 100644 --- a/www/adguardhome/Makefile +++ b/www/adguardhome/Makefile @@ -2,6 +2,7 @@ PORTNAME= adguardhome DISTVERSIONPREFIX= v DISTVERSION= 0.105.2 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= yuri@FreeBSD.org @@ -14,6 +15,35 @@ USES= go:modules GO_MODULE= github.com/AdguardTeam/AdGuardHome +# to rebuild the deps archives: +# 1. set DEV_UPDATE_MODE=yes +# 2. make makesum patch build +# 3. upload the *-html-build* archives +# 4. set DEV_UPDATE_MODE=no +# 5. make clean makesum + +DEV_UPDATE_MODE= no + +.if (${DEV_UPDATE_MODE} == "yes") +BUILD_DEPENDS= npm:www/npm \ + yarn:www/yarn +do-build: + @cd ${WRKSRC} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} js-deps js-build && \ + ${TAR} czf ${DISTDIR}/${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX} build && \ + ${TAR} czf ${DISTDIR}/${PORTNAME}-html-build2-${DISTVERSION}${EXTRACT_SUFX} build2 && \ + ${ECHO} "Please upload files ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX} and ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-html-build2-${DISTVERSION}${EXTRACT_SUFX}" +.else +MASTER_SITES= LOCAL/yuri/:deps +DISTFILES= ${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX}:deps \ + ${PORTNAME}-html-build2-${DISTVERSION}${EXTRACT_SUFX}:deps +EXTRACT_ONLY= ${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX} \ + ${PORTNAME}-html-build2-${DISTVERSION}${EXTRACT_SUFX} + +pre-build: + @${CP} -r ${WRKDIR}/build ${WRKDIR}/build2 ${WRKSRC}/ +.endif + PLIST_FILES= bin/${PORTNAME} .include diff --git a/www/adguardhome/distinfo b/www/adguardhome/distinfo index 3a9749f16558..d0a74207115c 100644 --- a/www/adguardhome/distinfo +++ b/www/adguardhome/distinfo @@ -1,4 +1,8 @@ -TIMESTAMP = 1615482485 +TIMESTAMP = 1618476839 +SHA256 (go/www_adguardhome/adguardhome-v0.105.2/adguardhome-html-build-0.105.2.tar.gz) = 4226f4e211d411470a9992355b58cb9fd2eb36d50922c5df7efa46cccc04b966 +SIZE (go/www_adguardhome/adguardhome-v0.105.2/adguardhome-html-build-0.105.2.tar.gz) = 2331678 +SHA256 (go/www_adguardhome/adguardhome-v0.105.2/adguardhome-html-build2-0.105.2.tar.gz) = 713d26da7def3291c23da2129c857ff321a12f444b7197ecfdaaedcef656bee3 +SIZE (go/www_adguardhome/adguardhome-v0.105.2/adguardhome-html-build2-0.105.2.tar.gz) = 2414450 SHA256 (go/www_adguardhome/adguardhome-v0.105.2/v0.105.2.mod) = 327afecea8c2cb272a04733275b9df5e127fd846a32e48ff40c7cecf83ef84c4 SIZE (go/www_adguardhome/adguardhome-v0.105.2/v0.105.2.mod) = 1750 SHA256 (go/www_adguardhome/adguardhome-v0.105.2/v0.105.2.zip) = f72335906f3f55786e228f20fba62c7f3980e1058aeaa7d7b4d01ae0f45e87aa From owner-dev-commits-ports-branches@freebsd.org Sun Apr 25 20:53:39 2021 Return-Path: Delivered-To: dev-commits-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 9D60D5EB0B3; Sun, 25 Apr 2021 20:53:39 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FT0cM3j71z4c5l; Sun, 25 Apr 2021 20:53:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5D4CD1B017; Sun, 25 Apr 2021 20:53:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13PKrdxI011524; Sun, 25 Apr 2021 20:53:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13PKrdIc011523; Sun, 25 Apr 2021 20:53:39 GMT (envelope-from git) Date: Sun, 25 Apr 2021 20:53:39 GMT Message-Id: <202104252053.13PKrdIc011523@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: c9f9ae1515c7 - 2021Q2 - www/adguardhome: Add rc script and pkg-message MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: c9f9ae1515c756aaf915ba11db82b77b224c2fea Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 20:53:39 -0000 The branch 2021Q2 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=c9f9ae1515c756aaf915ba11db82b77b224c2fea commit c9f9ae1515c756aaf915ba11db82b77b224c2fea Author: Yuri Victorovich AuthorDate: 2021-04-25 20:51:02 +0000 Commit: Yuri Victorovich CommitDate: 2021-04-25 20:53:36 +0000 www/adguardhome: Add rc script and pkg-message (cherry picked from commit c70aa54be27431b2e6b0adca99b3f733d2cf9200) --- www/adguardhome/Makefile | 6 +++++- www/adguardhome/files/adguardhome.in | 25 +++++++++++++++++++++++++ www/adguardhome/pkg-message | 11 +++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/www/adguardhome/Makefile b/www/adguardhome/Makefile index 3c8cd2da87f2..12a5bb45c616 100644 --- a/www/adguardhome/Makefile +++ b/www/adguardhome/Makefile @@ -2,7 +2,7 @@ PORTNAME= adguardhome DISTVERSIONPREFIX= v DISTVERSION= 0.105.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MAINTAINER= yuri@FreeBSD.org @@ -24,6 +24,10 @@ GO_MODULE= github.com/AdguardTeam/AdGuardHome DEV_UPDATE_MODE= no +USER= root # it has to run as root because it listens on the privileged DNS port +SUB_LIST= USER=${USER} +USE_RC_SUBR= ${PORTNAME} + .if (${DEV_UPDATE_MODE} == "yes") BUILD_DEPENDS= npm:www/npm \ yarn:www/yarn diff --git a/www/adguardhome/files/adguardhome.in b/www/adguardhome/files/adguardhome.in new file mode 100644 index 000000000000..902745da6a35 --- /dev/null +++ b/www/adguardhome/files/adguardhome.in @@ -0,0 +1,25 @@ +#!/bin/sh + +# PROVIDE: adguardhome +# REQUIRE: DAEMON NETWORKING +# KEYWORD: shutdown + +# Add the following lines to /etc/rc.conf to enable adguardhome: +# adguardhome_enable : set to "YES" to enable the daemon, default is "NO" + +. /etc/rc.subr + +name=adguardhome +rcvar=adguardhome_enable + +load_rc_config $name + +adguardhome_enable=${adguardhome_enable:-"NO"} + +logfile="/var/log/${name}.log" + +procname=%%PREFIX%%/bin/adguardhome +command="/usr/sbin/daemon" +command_args="-u %%USER%% -o ${logfile} -t ${name} %%PREFIX%%/bin/adguardhome" + +run_rc_command "$1" diff --git a/www/adguardhome/pkg-message b/www/adguardhome/pkg-message new file mode 100644 index 000000000000..1a789dcbcb7b --- /dev/null +++ b/www/adguardhome/pkg-message @@ -0,0 +1,11 @@ +[ +{ type: install + message: <