From nobody Mon Nov 8 09:06:45 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 702511851A75; Mon, 8 Nov 2021 09:06:46 +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 4Hnlbp0JXJz4mjC; Mon, 8 Nov 2021 09:06:46 +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 CE4416D44; Mon, 8 Nov 2021 09:06: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 1A896jRR060577; Mon, 8 Nov 2021 09:06:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A896juV060576; Mon, 8 Nov 2021 09:06:45 GMT (envelope-from git) Date: Mon, 8 Nov 2021 09:06:45 GMT Message-Id: <202111080906.1A896juV060576@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: d33e4c76bdc7 - 2021Q4 - devel/elfutils: Fix build after mempcpy(3) and wmempcpy(3) were added List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: d33e4c76bdc723c7059c841dc4ad14be6a30d8ac Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=d33e4c76bdc723c7059c841dc4ad14be6a30d8ac commit d33e4c76bdc723c7059c841dc4ad14be6a30d8ac Author: Yuri Victorovich AuthorDate: 2021-11-07 23:42:46 +0000 Commit: Yuri Victorovich CommitDate: 2021-11-08 09:06:43 +0000 devel/elfutils: Fix build after mempcpy(3) and wmempcpy(3) were added PR: 258092 (cherry picked from commit 06a7ac65bd3efb5eb1a1705a55f11acc812d941d) --- devel/elfutils/Makefile | 6 ++++++ devel/elfutils/files/patch-lib_eu-config.h | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/devel/elfutils/Makefile b/devel/elfutils/Makefile index 894ce37687dc..98b4cd366da5 100644 --- a/devel/elfutils/Makefile +++ b/devel/elfutils/Makefile @@ -48,6 +48,12 @@ CONFIGURE_ARGS+= --program-prefix=eu- # Disable debuginfod until option support can be added: CONFIGURE_ARGS+= --disable-debuginfod +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300512 # 2021-07-17 +CFLAGS+= -DFREEBSD_HAS_MEMPCPY +.endif + pre-configure: @${CP} -a \ ${LOCALBASE}/share/gnulib/lib/obstack.c \ diff --git a/devel/elfutils/files/patch-lib_eu-config.h b/devel/elfutils/files/patch-lib_eu-config.h index f9502d4abe2a..04549063aa1c 100644 --- a/devel/elfutils/files/patch-lib_eu-config.h +++ b/devel/elfutils/files/patch-lib_eu-config.h @@ -1,6 +1,6 @@ --- lib/eu-config.h.orig 2020-03-30 12:17:45 UTC +++ lib/eu-config.h -@@ -176,6 +176,182 @@ asm (".section predict_data, \"aw\"; .previous\n" +@@ -176,6 +176,186 @@ asm (".section predict_data, \"aw\"; .previous\n" #define ELFUTILS_HEADER(name) @@ -23,6 +23,9 @@ + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow" ++#ifndef FREEBSD_HAS_MEMPCPY // fix for the build failure, see bug#258092: mempcpy and wmempcpy were added in commits: ++// on 14: ee37f64cf875255338f917a9da76c643cf59786c on 2021-07-15 ++// on 13: dba677d13b26ad5422133b2ab76486b74d63ade4 on 2021-07-22 +static inline void * +mempcpy(void * restrict dst, const void * restrict src, size_t len) +{ @@ -36,6 +39,7 @@ + + return (wmemcpy(dst, src, len) + len); +} ++#endif +#pragma GCC diagnostic pop + +static inline void * From nobody Mon Nov 8 09:55:30 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5279B1845C14; Mon, 8 Nov 2021 09:55: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 4Hnmh31kmHz3Mps; Mon, 8 Nov 2021 09:55: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 16A6373E3; Mon, 8 Nov 2021 09:55: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 1A89tUBL026618; Mon, 8 Nov 2021 09:55:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A89tUjW026617; Mon, 8 Nov 2021 09:55:30 GMT (envelope-from git) Date: Mon, 8 Nov 2021 09:55:30 GMT Message-Id: <202111080955.1A89tUjW026617@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Tobias Kortkamp Subject: git: fa55693bc2b6 - 2021Q4 - editors/kakoune: Update to 2021.11.08 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: fa55693bc2b61725f72b93c6630734c26db77e95 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=fa55693bc2b61725f72b93c6630734c26db77e95 commit fa55693bc2b61725f72b93c6630734c26db77e95 Author: Tobias Kortkamp AuthorDate: 2021-11-08 06:55:56 +0000 Commit: Tobias Kortkamp CommitDate: 2021-11-08 09:55:13 +0000 editors/kakoune: Update to 2021.11.08 Changes: https://github.com/mawww/kakoune/releases/tag/v2021.11.08 (cherry picked from commit 4884ccdab0ba63ada7339ce83b47cf5468f82d99) --- editors/kakoune/Makefile | 2 +- editors/kakoune/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/editors/kakoune/Makefile b/editors/kakoune/Makefile index ab9c7f606441..2609975e5c8d 100644 --- a/editors/kakoune/Makefile +++ b/editors/kakoune/Makefile @@ -1,5 +1,5 @@ PORTNAME= kakoune -DISTVERSION= 2021.10.28 +DISTVERSION= 2021.11.08 CATEGORIES= editors MASTER_SITES= https://github.com/mawww/kakoune/releases/download/v${DISTVERSION}/ diff --git a/editors/kakoune/distinfo b/editors/kakoune/distinfo index 0eeb99a33f92..f3f69d909242 100644 --- a/editors/kakoune/distinfo +++ b/editors/kakoune/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635400713 -SHA256 (kakoune-2021.10.28.tar.bz2) = 2f4c93871dc31f6281712281a7119928b1d6d6f300dded84b2d3ce0ab27f2126 -SIZE (kakoune-2021.10.28.tar.bz2) = 537860 +TIMESTAMP = 1636354555 +SHA256 (kakoune-2021.11.08.tar.bz2) = aa30889d9da11331a243a8f40fe4f6a8619321b19217debac8f565e06eddb5f4 +SIZE (kakoune-2021.11.08.tar.bz2) = 538466 From nobody Mon Nov 8 11:52:09 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1C7C3183C62C; Mon, 8 Nov 2021 11:52: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 4HnqGf0CmGz4mC3; Mon, 8 Nov 2021 11:52: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 DCC151113E; Mon, 8 Nov 2021 11:52: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 1A8Bq9QT083851; Mon, 8 Nov 2021 11:52:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A8Bq9tZ083850; Mon, 8 Nov 2021 11:52:09 GMT (envelope-from git) Date: Mon, 8 Nov 2021 11:52:09 GMT Message-Id: <202111081152.1A8Bq9tZ083850@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mikael Urankar Subject: git: ee93a2ebb651 - 2021Q4 - devel/volk: Fix build on armv7. List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: ee93a2ebb651edbbf0408ddd93b61db831a2c4b1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee93a2ebb651edbbf0408ddd93b61db831a2c4b1 commit ee93a2ebb651edbbf0408ddd93b61db831a2c4b1 Author: Robert Clausecker AuthorDate: 2021-10-25 22:05:14 +0000 Commit: Mikael Urankar CommitDate: 2021-11-08 11:52:01 +0000 devel/volk: Fix build on armv7. This port does not build on armv7 due to inline assembly unsupported by clang. Fix the build by compiling with gcc on armv7. PR: 259447 Approved by: portmgr (build fix blanket) (cherry picked from commit 79ede500f770ed197458e9ae7cf87b2961c4dc16) --- devel/volk/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/devel/volk/Makefile b/devel/volk/Makefile index f1387a155ba5..11a8063d61c6 100644 --- a/devel/volk/Makefile +++ b/devel/volk/Makefile @@ -13,9 +13,15 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVO USES= cmake compiler:c++11-lang python:3.5+ +.include + +.if ${ARCH} == armv7 +USE_GCC= yes +.endif + USE_GITHUB= yes GH_ACCOUNT= gnuradio USE_LDCONFIG= yes -.include +.include From nobody Mon Nov 8 11:56:19 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 253AE183F746; Mon, 8 Nov 2021 11:56: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 4HnqMS0bWzz4nQj; Mon, 8 Nov 2021 11:56: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 E838411429; Mon, 8 Nov 2021 11:56: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 1A8BuJrq087270; Mon, 8 Nov 2021 11:56:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A8BuJJT087269; Mon, 8 Nov 2021 11:56:19 GMT (envelope-from git) Date: Mon, 8 Nov 2021 11:56:19 GMT Message-Id: <202111081156.1A8BuJJT087269@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mikael Urankar Subject: git: 7d2630fc659f - 2021Q4 - games/stonesoup: Fix build on armv6/armv7. List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 7d2630fc659f13bc2b230852ee4fc95c50a2ae15 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=7d2630fc659f13bc2b230852ee4fc95c50a2ae15 commit 7d2630fc659f13bc2b230852ee4fc95c50a2ae15 Author: Robert Clausecker AuthorDate: 2021-10-28 10:39:35 +0000 Commit: Mikael Urankar CommitDate: 2021-11-08 11:56:14 +0000 games/stonesoup: Fix build on armv6/armv7. Fix build on armv6/armv7 by removing a misguided OS-detection case. Fix build with WRKDIR inside a git-maintained ports tree. Turn the custom README into a pkg-message for better visibility. Take over maintainership of this unmaintained port. PR: 259499 (cherry picked from commit 5304a1914e4dfa3da4cb6d54932ff2f0d5e32f89) --- games/stonesoup/Makefile | 15 ++++----------- games/stonesoup/files/README.FreeBSD.in | 7 ------- games/stonesoup/files/patch-platform.h | 16 ++++++++++++++++ games/stonesoup/files/patch-util_gen__ver.pl | 12 ++++++++++++ games/stonesoup/files/pkg-message.in | 18 ++++++++++++++++++ games/stonesoup/pkg-plist | 1 - 6 files changed, 50 insertions(+), 19 deletions(-) diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile index 25fed763d150..9a9dfbd74967 100644 --- a/games/stonesoup/Makefile +++ b/games/stonesoup/Makefile @@ -2,18 +2,15 @@ PORTNAME= stonesoup PORTVERSION= 0.23.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games -MAINTAINER= ports@FreeBSD.org +MAINTAINER= fuz@fuz.su COMMENT= Dungeon Crawl Stone Soup - a fun, free rogue-like game LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/../../LICENSE -NOT_FOR_ARCHS= armv6 -NOT_FOR_ARCHS_REASON= missing platform \#define or unsupported compiler - BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} USES= bison compiler:c++11-lib gmake lua:51 perl5 pkgconfig \ @@ -32,7 +29,7 @@ SHEBANG_FILES= util/gen-mi-enum \ SAVEDIR= \~/.stonesoup WRKSRC_SUBDIR= crawl-ref/source -SUB_FILES= README.FreeBSD +SUB_FILES= pkg-message PLIST_SUB= SAVEDIR="${SAVEDIR}" MAKE_ARGS= prefix=${PREFIX} \ @@ -52,7 +49,7 @@ MAKE_ARGS= prefix=${PREFIX} \ SQLITE_LIB=-lsqlite3 \ V=yes -OPTIONS_DEFINE= SDL SOUND NOWIZARD LUA DOCS EXAMPLES +OPTIONS_DEFINE= SDL SOUND NOWIZARD LUA EXAMPLES OPTIONS_DEFAULT=LUA OPTIONS_SUB= yes @@ -92,10 +89,6 @@ pre-build: pre-install: @${FIND} ${WRKSRC}/dat -type f -name '*.orig' -delete -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/README.FreeBSD ${STAGEDIR}${DOCSDIR} - post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${STAGEDIR}${DATADIR}/settings/init.txt ${STAGEDIR}${EXAMPLESDIR}/sample.crawlrc diff --git a/games/stonesoup/files/README.FreeBSD.in b/games/stonesoup/files/README.FreeBSD.in deleted file mode 100644 index f6637795a0ba..000000000000 --- a/games/stonesoup/files/README.FreeBSD.in +++ /dev/null @@ -1,7 +0,0 @@ -The end-user documentation for ``Dungeon Crawl Stone Soup`` can be found -in-game and in `%%DATADIR%%/docs`. - -If the game fails to start after an upgrade try to delete the old save games -using `rm -rf ~/.stonesoup/saves`. - -Happy crawling! diff --git a/games/stonesoup/files/patch-platform.h b/games/stonesoup/files/patch-platform.h new file mode 100644 index 000000000000..b9c501af2fe1 --- /dev/null +++ b/games/stonesoup/files/patch-platform.h @@ -0,0 +1,16 @@ +--- platform.h.orig 2021-10-28 09:13:02 UTC ++++ platform.h +@@ -212,13 +212,6 @@ + #endif + + #if !defined (OS_DETECTED) +-#if defined (TARGET_CPU_ARM) +-#define OS_DETECTED +-#define TARGET_OS_NDSFIRMWARE +-#endif +-#endif +- +-#if !defined (OS_DETECTED) + #if defined (MSDOS) || defined (__DOS__) || defined (__DJGPP__) + #define OS_DETECTED + #define TARGET_OS_DOS diff --git a/games/stonesoup/files/patch-util_gen__ver.pl b/games/stonesoup/files/patch-util_gen__ver.pl new file mode 100644 index 000000000000..862c1d12e961 --- /dev/null +++ b/games/stonesoup/files/patch-util_gen__ver.pl @@ -0,0 +1,12 @@ +--- util/gen_ver.pl.orig 2021-10-28 09:37:07 UTC ++++ util/gen_ver.pl +@@ -13,8 +13,7 @@ $mergebase or $mergebase = ""; + + mkdir dirname($outfile); + +-$_ = `git describe --tags $mergebase 2> /dev/null` +- || (open(IN, "<", "$scriptpath/release_ver") ? ++$_ = (open(IN, "<", "$scriptpath/release_ver") ? + : die "No Git, and $scriptpath/release_ver doesn't exist.\n") + or die "couldn't get the version information\n"; + diff --git a/games/stonesoup/files/pkg-message.in b/games/stonesoup/files/pkg-message.in new file mode 100644 index 000000000000..d13b28906533 --- /dev/null +++ b/games/stonesoup/files/pkg-message.in @@ -0,0 +1,18 @@ +[ +{ type: install + message: < To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yasuhiro Kimura Subject: git: 7e2c4c33757e - 2021Q4 - security/clamav-lts: Fix plist error List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 7e2c4c33757e18feb6262ea8891bb4dc9d35a22c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=7e2c4c33757e18feb6262ea8891bb4dc9d35a22c commit 7e2c4c33757e18feb6262ea8891bb4dc9d35a22c Author: Yasuhiro Kimura AuthorDate: 2021-11-08 14:18:27 +0000 Commit: Yasuhiro Kimura CommitDate: 2021-11-08 14:50:17 +0000 security/clamav-lts: Fix plist error Fix plist error when user sets CLAMAVUSER to non-default value. This is direct commit to 2021Q4 branch as the commit that causes plist error is also direct one. PR: 259663 Reported by: ml at netfence dot it Fixes: 2da7ca992591 (security/clamav: Update to new bugfix release 0.103.4) Approved by: fluffy (ports-secteam) --- security/clamav/pkg-plist | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist index 12336ff3bf3e..9fe63d4e2866 100644 --- a/security/clamav/pkg-plist +++ b/security/clamav/pkg-plist @@ -78,18 +78,18 @@ bin/sigtool %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/Contribute.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/build-installer-packages.html -%%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/%%CLAMAVUSER%%-git-work-flow.html +%%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/clamav-git-work-flow.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/code-coverage.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/development-builds.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/fuzzing-sanitizers.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/github-pr-basics.html -%%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/lib%%CLAMAVUSER%%.html +%%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/libclamav.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/performance-profiling.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/personal-forks.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/testing-pull-requests.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Development/tips-and-tricks.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing.html -%%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Add-%%CLAMAVUSER%%-user.html +%%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Add-clamav-user.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Community-projects.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Docker.html %%PORTDOCS%%%%DOCSDIR%%/html/manual/Installing/Installing-from-source-Unix-old.html From nobody Mon Nov 8 17:53:24 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D70DA18436F3; Mon, 8 Nov 2021 17:53: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 4HnzHS5hVYz4tbF; Mon, 8 Nov 2021 17:53: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 A2962161B6; Mon, 8 Nov 2021 17:53: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 1A8HrO20068794; Mon, 8 Nov 2021 17:53:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A8HrOi1068793; Mon, 8 Nov 2021 17:53:24 GMT (envelope-from git) Date: Mon, 8 Nov 2021 17:53:24 GMT Message-Id: <202111081753.1A8HrOi1068793@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: a11f9c00e714 - 2021Q4 - x11-wm/plasma5-kwin: unbreak Xwayland support after 4ea20bee5063 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: a11f9c00e714212a48009593bb5c71c62dd47515 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=a11f9c00e714212a48009593bb5c71c62dd47515 commit a11f9c00e714212a48009593bb5c71c62dd47515 Author: Jan Beich AuthorDate: 2021-11-02 15:32:37 +0000 Commit: Jan Beich CommitDate: 2021-11-08 17:35:36 +0000 x11-wm/plasma5-kwin: unbreak Xwayland support after 4ea20bee5063 kwin_xwl: Failed to find free X11 connection socket PR: 259614 Approved by: tcberner (cherry picked from commit 03033c16bb99787ae83ea1a938550adfc1a6660a) --- x11-wm/plasma5-kwin/Makefile | 1 + .../files/patch-src_xwl_xwaylandsocket.cpp | 35 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/x11-wm/plasma5-kwin/Makefile b/x11-wm/plasma5-kwin/Makefile index 53230df60d29..64a87653bc99 100644 --- a/x11-wm/plasma5-kwin/Makefile +++ b/x11-wm/plasma5-kwin/Makefile @@ -1,5 +1,6 @@ PORTNAME= kwin DISTVERSION= ${KDE_PLASMA_VERSION} +PORTREVISION= 1 CATEGORIES= x11-wm kde kde-plasma MAINTAINER= kde@FreeBSD.org diff --git a/x11-wm/plasma5-kwin/files/patch-src_xwl_xwaylandsocket.cpp b/x11-wm/plasma5-kwin/files/patch-src_xwl_xwaylandsocket.cpp new file mode 100644 index 000000000000..ad44c2215dca --- /dev/null +++ b/x11-wm/plasma5-kwin/files/patch-src_xwl_xwaylandsocket.cpp @@ -0,0 +1,35 @@ +$ kwin_wayland --xwayland +[...] +kwin_xwl: Failed to find free X11 connection socket +Failed to establish X11 socket + +--- src/xwl/xwaylandsocket.cpp.orig 2021-08-31 11:41:03 UTC ++++ src/xwl/xwaylandsocket.cpp +@@ -179,10 +179,17 @@ XwaylandSocket::XwaylandSocket() + continue; + } + ++#if defined(Q_OS_LINUX) + const int abstractFileDescriptor = listen_helper(socketFilePath, UnixSocketAddress::Type::Abstract); ++#else ++ const int abstractFileDescriptor = listen_helper(socketFilePath + "_", UnixSocketAddress::Type::Unix); ++#endif + if (abstractFileDescriptor == -1) { + QFile::remove(lockFilePath); + QFile::remove(socketFilePath); ++#if !defined(Q_OS_LINUX) ++ QFile::remove(socketFilePath + "_"); ++#endif + close(unixFileDescriptor); + continue; + } +@@ -208,6 +215,9 @@ XwaylandSocket::~XwaylandSocket() + } + if (!m_socketFilePath.isEmpty()) { + QFile::remove(m_socketFilePath); ++#if !defined(Q_OS_LINUX) ++ QFile::remove(m_socketFilePath + "_"); ++#endif + } + if (!m_lockFilePath.isEmpty()) { + QFile::remove(m_lockFilePath); From nobody Mon Nov 8 17:53:25 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1E2351843C89; Mon, 8 Nov 2021 17:53: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 4HnzHT6ZfNz4tml; Mon, 8 Nov 2021 17:53: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 BF949160AB; Mon, 8 Nov 2021 17:53: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 1A8HrPlY068823; Mon, 8 Nov 2021 17:53:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A8HrP7K068822; Mon, 8 Nov 2021 17:53:25 GMT (envelope-from git) Date: Mon, 8 Nov 2021 17:53:25 GMT Message-Id: <202111081753.1A8HrP7K068822@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: 0048c2b36bdd - 2021Q4 - multimedia/ffmpeg: update to 4.4.1 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 0048c2b36bdd39b7e7f52bb2385818464ce2b369 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0048c2b36bdd39b7e7f52bb2385818464ce2b369 commit 0048c2b36bdd39b7e7f52bb2385818464ce2b369 Author: Tobias C. Berner AuthorDate: 2021-10-25 14:28:36 +0000 Commit: Jan Beich CommitDate: 2021-11-08 17:37:16 +0000 multimedia/ffmpeg: update to 4.4.1 (cherry picked from commit 41314f4bbeed4893189a4c61d69f29eb863aeac1) --- multimedia/ffmpeg/Makefile | 3 +-- multimedia/ffmpeg/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 1f74a216d7d1..5a5c3ed0b9a4 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,8 +1,7 @@ # Created by: Martin Matuska PORTNAME= ffmpeg -PORTVERSION= 4.4 -PORTREVISION= 4 +PORTVERSION= 4.4.1 PORTEPOCH= 1 CATEGORIES= multimedia audio net MASTER_SITES= https://ffmpeg.org/releases/ diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index ba4751551a0f..5653a5667639 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1617917322 -SHA256 (ffmpeg-4.4.tar.xz) = 06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909 -SIZE (ffmpeg-4.4.tar.xz) = 9557868 +TIMESTAMP = 1635171801 +SHA256 (ffmpeg-4.4.1.tar.xz) = eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02 +SIZE (ffmpeg-4.4.1.tar.xz) = 9557516 SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 376ea23e9d876390fbca936c80cb437bb9daa6232ff65df0ea91673e18b739ff SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 24259 SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = d16589efc4be2602a9f436e9938cfee0cc7b5ccd7a4a6b41c0c9a59ae0859fda From nobody Mon Nov 8 17:53:26 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 755EE1843E02; Mon, 8 Nov 2021 17:53: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 4HnzHW0wc2z4tXl; Mon, 8 Nov 2021 17:53: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 E1A5C1631B; Mon, 8 Nov 2021 17:53: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 1A8HrQg9068851; Mon, 8 Nov 2021 17:53:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A8HrQCB068850; Mon, 8 Nov 2021 17:53:26 GMT (envelope-from git) Date: Mon, 8 Nov 2021 17:53:26 GMT Message-Id: <202111081753.1A8HrQCB068850@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: 93c3542baf30 - 2021Q4 - multimedia/vmaf: unbreak legacy API consumers after 1868dedecc9a List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 93c3542baf308046ae79ee8abd3abd32875aab8c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=93c3542baf308046ae79ee8abd3abd32875aab8c commit 93c3542baf308046ae79ee8abd3abd32875aab8c Author: Jan Beich AuthorDate: 2021-11-08 16:34:49 +0000 Commit: Jan Beich CommitDate: 2021-11-08 17:37:50 +0000 multimedia/vmaf: unbreak legacy API consumers after 1868dedecc9a $ aomenc --tune=vmaf --output=foo.mp4 foo.y4m Pass 1/2 frame 1/0 0B 0 us 0.00 fpm [ETA unknown] libvmaf ERROR could not read model from path: "/usr/local/share/model/vmaf_v0.6.1.json" Fatal error: Failed to load VMAF model. $ ffmpeg -i foo.y4m -i bar.y4m -lavfi libvmaf -f null - [...] libvmaf INFO `compute_vmaf()` is deprecated and will be removed in a future libvmaf version libvmaf ERROR could not read model from path: "/usr/local/share/model/vmaf_v0.6.1.pkl" libvmaf ERROR support for pkl model files has been removed, use json libvmaf ERROR problem loading model file: /usr/local/share/model/vmaf_v0.6.1.pkl [Parsed_libvmaf_0 @ 0x8061b3b40] libvmaf encountered an error, check log for details (cherry picked from commit 7f163c23e1a732c8b65cb7b8ecfbcd9e8dfd1cd8) --- multimedia/ffmpeg/Makefile | 1 + multimedia/ffmpeg/files/patch-vmaf | 32 +++++++++++++++++++++++++++++++ multimedia/vmaf/Makefile | 6 ++++++ multimedia/vmaf/pkg-plist | 16 ++++++++++++++++ multimedia/x265/Makefile | 2 +- multimedia/x265/files/patch-source_x265.h | 13 +++++++++++++ 6 files changed, 69 insertions(+), 1 deletion(-) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 5a5c3ed0b9a4..80fdb8fcbbcf 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -2,6 +2,7 @@ PORTNAME= ffmpeg PORTVERSION= 4.4.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio net MASTER_SITES= https://ffmpeg.org/releases/ diff --git a/multimedia/ffmpeg/files/patch-vmaf b/multimedia/ffmpeg/files/patch-vmaf new file mode 100644 index 000000000000..b7b205fd9eb3 --- /dev/null +++ b/multimedia/ffmpeg/files/patch-vmaf @@ -0,0 +1,32 @@ +https://github.com/Netflix/vmaf/commit/122089fa3d23 + +--- doc/filters.texi.orig 2021-10-24 20:47:07 UTC ++++ doc/filters.texi +@@ -13875,14 +13875,14 @@ The obtained VMAF score is printed through the logging + It requires Netflix's vmaf library (libvmaf) as a pre-requisite. + After installing the library it can be enabled using: + @code{./configure --enable-libvmaf}. +-If no model path is specified it uses the default model: @code{vmaf_v0.6.1.pkl}. ++If no model path is specified it uses the default model: @code{vmaf_v0.6.1.json}. + + The filter has following options: + + @table @option + @item model_path + Set the model path which is to be used for SVM. +-Default value: @code{"/usr/local/share/model/vmaf_v0.6.1.pkl"} ++Default value: @code{"/usr/local/share/model/vmaf_v0.6.1.json"} + + @item log_path + Set the file path to be used to store logs. +--- libavfilter/vf_libvmaf.c.orig 2021-10-24 20:47:07 UTC ++++ libavfilter/vf_libvmaf.c +@@ -72,7 +72,7 @@ typedef struct LIBVMAFContext { + #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM + + static const AVOption libvmaf_options[] = { +- {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS}, ++ {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.json"}, 0, 1, FLAGS}, + {"log_path", "Set the file path to be used to store logs.", OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS}, + {"log_fmt", "Set the format of the log (csv, json or xml).", OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS}, + {"enable_transform", "Enables transform for computing vmaf.", OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS}, diff --git a/multimedia/vmaf/Makefile b/multimedia/vmaf/Makefile index 1930b845599e..b31de2adff0b 100644 --- a/multimedia/vmaf/Makefile +++ b/multimedia/vmaf/Makefile @@ -1,6 +1,7 @@ PORTNAME= vmaf DISTVERSIONPREFIX= v DISTVERSION= 2.2.1 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org @@ -22,4 +23,9 @@ USE_LDCONFIG= yes GH_ACCOUNT= Netflix WRKSRC_SUBDIR= lib${PORTNAME} +post-install: +# For legacy API consumers e.g., aom, x265 + (cd ${WRKSRC:H} && ${COPYTREE_SHARE} "model" \ + ${STAGEDIR}${DATADIR:H} "-name *.json") + .include diff --git a/multimedia/vmaf/pkg-plist b/multimedia/vmaf/pkg-plist index 64757f1ec926..2055ea823c47 100644 --- a/multimedia/vmaf/pkg-plist +++ b/multimedia/vmaf/pkg-plist @@ -10,3 +10,19 @@ lib/libvmaf.so lib/libvmaf.so.1 lib/libvmaf.so.1.1.2 libdata/pkgconfig/libvmaf.pc +share/model/other_models/nflx_v1.json +share/model/other_models/nflxtrain_norm_type_none.json +share/model/other_models/vmaf_v0.6.0.json +share/model/other_models/vmaf_v0.6.1mfz.json +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.json +share/model/vmaf_4k_v0.6.1.json +share/model/vmaf_b_v0.6.3.json +share/model/vmaf_float_4k_v0.6.1.json +share/model/vmaf_float_b_v0.6.3.json +share/model/vmaf_float_b_v0.6.3/vmaf_float_b_v0.6.3.json +share/model/vmaf_float_v0.6.1.json +share/model/vmaf_float_v0.6.1neg.json +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.json +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.json +share/model/vmaf_v0.6.1.json +share/model/vmaf_v0.6.1neg.json diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile index 985d516efacd..2fec20076168 100644 --- a/multimedia/x265/Makefile +++ b/multimedia/x265/Makefile @@ -2,7 +2,7 @@ PORTNAME= x265 PORTVERSION= 3.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= https://bitbucket.org/multicoreware/x265_git/get/${BB_TAG}.tar.gz?meow=/ diff --git a/multimedia/x265/files/patch-source_x265.h b/multimedia/x265/files/patch-source_x265.h new file mode 100644 index 000000000000..1fee612613ad --- /dev/null +++ b/multimedia/x265/files/patch-source_x265.h @@ -0,0 +1,13 @@ +https://github.com/Netflix/vmaf/commit/122089fa3d23 + +--- source/x265.h.orig 2020-09-16 15:52:49 UTC ++++ source/x265.h +@@ -733,7 +733,7 @@ typedef struct x265_vmaf_commondata + int enable_conf_interval; + }x265_vmaf_commondata; + +-static const x265_vmaf_commondata vcd[] = { { NULL, (char *)"/usr/local/share/model/vmaf_v0.6.1.pkl", NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 1, 0 } }; ++static const x265_vmaf_commondata vcd[] = { { NULL, (char *)"/usr/local/share/model/vmaf_v0.6.1.json", NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 1, 0 } }; + + /* x265 input parameters + * From nobody Mon Nov 8 19:11:46 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EE51D1857EB4; Mon, 8 Nov 2021 19:11:46 +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 4Hp11t5FLPz3vFy; Mon, 8 Nov 2021 19:11:46 +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 8B69F16EC1; Mon, 8 Nov 2021 19:11:46 +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 1A8JBkmj074812; Mon, 8 Nov 2021 19:11:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A8JBkoc074811; Mon, 8 Nov 2021 19:11:46 GMT (envelope-from git) Date: Mon, 8 Nov 2021 19:11:46 GMT Message-Id: <202111081911.1A8JBkoc074811@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: 817404d72a31 - 2021Q4 - multimedia/vmaf: unbreak built-in models after 1868dedecc9a List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 817404d72a315cf259a4e7190b670bb6106e0028 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=817404d72a315cf259a4e7190b670bb6106e0028 commit 817404d72a315cf259a4e7190b670bb6106e0028 Author: Jan Beich AuthorDate: 2021-11-08 15:33:57 +0000 Commit: Jan Beich CommitDate: 2021-11-08 19:11:03 +0000 multimedia/vmaf: unbreak built-in models after 1868dedecc9a $ ffmpeg -i foo.y4m -i bar.y4m -lavfi libvmaf -f null - [...] libvmaf WARNING no such built-in model: "vmaf_v0.6.1" [Parsed_libvmaf_0 @ 0x8061b33c0] could not load libvmaf model with version: vmaf_v0.6.1 [AVFilterGraph @ 0x8061b6880] Error initializing filter 'libvmaf' (cherry picked from commit 355579c2ebff93c22fe8d3bb1004103c4e2154b7) --- multimedia/vmaf/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/multimedia/vmaf/Makefile b/multimedia/vmaf/Makefile index b31de2adff0b..6e5b0370a4c7 100644 --- a/multimedia/vmaf/Makefile +++ b/multimedia/vmaf/Makefile @@ -1,7 +1,7 @@ PORTNAME= vmaf DISTVERSIONPREFIX= v DISTVERSION= 2.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org @@ -13,7 +13,8 @@ LICENSE_NAME= BSD-2-Clause Plus Patent License LICENSE_FILE= ${WRKSRC:H}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}} +BUILD_DEPENDS= xxd:editors/vim \ + ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_amd64= nasm:devel/nasm BUILD_DEPENDS_i386= nasm:devel/nasm From nobody Wed Nov 10 20:27:29 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BA47918501C0; Wed, 10 Nov 2021 20:27: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 4HqGcK4y1Mz3q1V; Wed, 10 Nov 2021 20:27: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 860081EDAF; Wed, 10 Nov 2021 20:27: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 1AAKRTPj009625; Wed, 10 Nov 2021 20:27:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AAKRTfu009624; Wed, 10 Nov 2021 20:27:29 GMT (envelope-from git) Date: Wed, 10 Nov 2021 20:27:29 GMT Message-Id: <202111102027.1AAKRTfu009624@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bernard Spil Subject: git: e6d29cbb18a2 - 2021Q4 - databases/mariadb105-server: Security update to 10.5.13 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: e6d29cbb18a27505fa93bf1092a7d61b052a0155 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e6d29cbb18a27505fa93bf1092a7d61b052a0155 commit e6d29cbb18a27505fa93bf1092a7d61b052a0155 Author: Bernard Spil AuthorDate: 2021-11-10 08:14:19 +0000 Commit: Bernard Spil CommitDate: 2021-11-10 20:24:52 +0000 databases/mariadb105-server: Security update to 10.5.13 MFH: 2021Q4 Security: c9387e4d-2f5f-11ec-8be6-d4c9ef517024 (cherry picked from commit c0485a60f8c19bc3e87fede1d40bd8e711e9593a) --- databases/mariadb105-server/Makefile | 4 +- databases/mariadb105-server/distinfo | 6 +- databases/mariadb105-server/files/patch-MDEV-26537 | 109 --------------------- .../files/patch-extra_CMakeLists.txt | 11 --- 4 files changed, 5 insertions(+), 125 deletions(-) diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile index 2d4f7c8c7baf..ed353ab07d3f 100644 --- a/databases/mariadb105-server/Makefile +++ b/databases/mariadb105-server/Makefile @@ -1,8 +1,8 @@ # Created by: Bernard Spil PORTNAME?= mariadb -PORTVERSION= 10.5.12 -PORTREVISION?= 1 +PORTVERSION= 10.5.13 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ diff --git a/databases/mariadb105-server/distinfo b/databases/mariadb105-server/distinfo index 148012cb3dbe..c5d7eddf1096 100644 --- a/databases/mariadb105-server/distinfo +++ b/databases/mariadb105-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1628155943 -SHA256 (mariadb-10.5.12.tar.gz) = ab4f1ca69a30c5372e191a68e8b543a74168327680fb1f4067e8cc0a5582e4bd -SIZE (mariadb-10.5.12.tar.gz) = 101914615 +TIMESTAMP = 1636446066 +SHA256 (mariadb-10.5.13.tar.gz) = 16f008c66831130e9263b2601265d566ffc4e890d37bacecd4dcecebfd0d1c58 +SIZE (mariadb-10.5.13.tar.gz) = 102047279 diff --git a/databases/mariadb105-server/files/patch-MDEV-26537 b/databases/mariadb105-server/files/patch-MDEV-26537 deleted file mode 100644 index 0fb9ecc7f529..000000000000 --- a/databases/mariadb105-server/files/patch-MDEV-26537 +++ /dev/null @@ -1,109 +0,0 @@ -From 716f04a40f225af11fa88e793441da96dd0ddf21 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= -Date: Fri, 10 Sep 2021 11:20:12 +0300 -Subject: [PATCH] MDEV-26537 InnoDB corrupts files due to incorrect st_blksize - calculation - -The st_blksize returned by fstat(2) is not documented to be -a power of 2, like we assumed in -commit 58252fff15acfe7c7b0452a87e202e3f8e454e19 (MDEV-26040). -While on Linux, the st_blksize appears to report the file system -block size, on FreeBSD it seems to be something similar to st_size. - -Also IBM AIX was affected by the bug. A simple test case that would -lead to a crash when using the minimum innodb_buffer_pool_size=5m: - -seq -f 'create table t%g engine=innodb select * from seq_1_to_200000;' \ -1 100|mysql test& -seq -f 'create table u%g engine=innodb select * from seq_1_to_200000;' \ -1 100|mysql test& - -We will fix this by not trusting st_blksize at all, and assuming that -the file system block size is 4096 bytes. We hope that no storage systems -with larger block size exist. Anything larger than 4096 bytes should be -unlikely, given that it is the minimum virtual memory page size of many -contemporary processors. - -While the block size 512 bytes of the venerable Seagate ST-225 is still -in widespread use, the minimum innodb_page_size is 4096 bytes, and -innodb_log_file_size can be set in integer multiples of 65536 bytes. - -The only occasion where InnoDB uses smaller block sizes than 4096 bytes -is with ROW_FORMAT=COMPRESSED tables with KEY_BLOCK_SIZE=1 -or KEY_BLOCK_SIZE=2 (or innodb_page_size=4096). For such tables, -we will from now on preallocate space in integer multiples of 4096 bytes -and let regular writes extend the file by 1024, 2048, or 3072 bytes. - -The view INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES.FS_BLOCK_SIZE -should report the raw st_blksize. - -For page_compressed tables, the function fil_space_get_block_size() -will map to 512 any st_blksize value that is larger than 4096. - -os_file_set_size(): Assume that the file system block size is 4096 bytes, -and only support extending files to integer multiples of 4096 bytes. - -fil_space_extend_must_retry(): Round down the preallocation size to -an integer multiple of 4096 bytes. ---- - mysql-test/suite/innodb/r/check_ibd_filesize,4k.rdiff | 2 +- - storage/innobase/fil/fil0fil.cc | 11 ++++++++--- - storage/innobase/os/os0file.cc | 7 ++++--- - 3 files changed, 13 insertions(+), 7 deletions(-) - -diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc -index 6af8b729d78c5..b9421df3ffbad 100644 ---- storage/innobase/fil/fil0fil.cc -+++ storage/innobase/fil/fil0fil.cc -@@ -578,10 +578,15 @@ fil_space_extend_must_retry( - - const unsigned page_size = space->physical_size(); - -- /* Datafile::read_first_page() expects srv_page_size bytes. -- fil_node_t::read_page0() expects at least 4 * srv_page_size bytes.*/ -+ /* Datafile::read_first_page() expects innodb_page_size bytes. -+ fil_node_t::read_page0() expects at least 4 * innodb_page_size bytes. -+ os_file_set_size() expects multiples of 4096 bytes. -+ For ROW_FORMAT=COMPRESSED tables using 1024-byte or 2048-byte -+ pages, we will preallocate up to an integer multiple of 4096 bytes, -+ and let normal writes append 1024, 2048, or 3072 bytes to the file. */ - os_offset_t new_size = std::max( -- os_offset_t(size - file_start_page_no) * page_size, -+ (os_offset_t(size - file_start_page_no) * page_size) -+ & ~os_offset_t(4095), - os_offset_t(FIL_IBD_FILE_INITIAL_SIZE << srv_page_size_shift)); - - *success = os_file_set_size(node->name, node->handle, new_size, -diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc -index dde1975ea08b5..9e1eeff202d4b 100644 ---- storage/innobase/os/os0file.cc -+++ storage/innobase/os/os0file.cc -@@ -3303,6 +3303,8 @@ os_file_set_size( - os_offset_t size, - bool is_sparse) - { -+ ut_ad(!(size & 4095)); -+ - #ifdef _WIN32 - /* On Windows, changing file size works well and as expected for both - sparse and normal files. -@@ -3344,7 +3346,7 @@ os_file_set_size( - if (current_size >= size) { - return true; - } -- current_size &= ~os_offset_t(statbuf.st_blksize - 1); -+ current_size &= ~4095ULL; - err = posix_fallocate(file, current_size, - size - current_size); - } -@@ -3384,8 +3386,7 @@ os_file_set_size( - if (fstat(file, &statbuf)) { - return false; - } -- os_offset_t current_size = statbuf.st_size -- & ~os_offset_t(statbuf.st_blksize - 1); -+ os_offset_t current_size = statbuf.st_size & ~4095ULL; - #endif - if (current_size >= size) { - return true; - diff --git a/databases/mariadb105-server/files/patch-extra_CMakeLists.txt b/databases/mariadb105-server/files/patch-extra_CMakeLists.txt deleted file mode 100644 index 6f662cf00bac..000000000000 --- a/databases/mariadb105-server/files/patch-extra_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- extra/CMakeLists.txt.orig 2020-06-23 15:10:16 UTC -+++ extra/CMakeLists.txt -@@ -46,7 +46,7 @@ ADD_CUSTOM_TARGET(GenError - DEPENDS - ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) - --MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) -+MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c COMPONENT Client) - TARGET_LINK_LIBRARIES(my_print_defaults mysys) - - MYSQL_ADD_EXECUTABLE(perror perror.c) From nobody Wed Nov 10 20:27:30 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2F50A185016D; Wed, 10 Nov 2021 20:27: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 4HqGcL6zzvz3pwQ; Wed, 10 Nov 2021 20:27: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 ACAAD1EF37; Wed, 10 Nov 2021 20:27: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 1AAKRUL9009649; Wed, 10 Nov 2021 20:27:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AAKRUJk009648; Wed, 10 Nov 2021 20:27:30 GMT (envelope-from git) Date: Wed, 10 Nov 2021 20:27:30 GMT Message-Id: <202111102027.1AAKRUJk009648@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bernard Spil Subject: git: c3f78f04ee20 - 2021Q4 - databases/mariadb104-server: Security update to 10.4.22 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: c3f78f04ee20a8f25b43ee17b1e5d78e33714a23 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=c3f78f04ee20a8f25b43ee17b1e5d78e33714a23 commit c3f78f04ee20a8f25b43ee17b1e5d78e33714a23 Author: Bernard Spil AuthorDate: 2021-11-10 13:11:36 +0000 Commit: Bernard Spil CommitDate: 2021-11-10 20:25:51 +0000 databases/mariadb104-server: Security update to 10.4.22 MFH: 2021Q4 Security: c9387e4d-2f5f-11ec-8be6-d4c9ef517024 (cherry picked from commit 346b5dd630f78b9ebde06ef757ac4498bd032ee0) --- databases/mariadb104-server/Makefile | 4 +- databases/mariadb104-server/distinfo | 6 +- databases/mariadb104-server/files/patch-MDEV-26537 | 126 --------------------- 3 files changed, 5 insertions(+), 131 deletions(-) diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile index 52bd6a11c638..a9e019f5c5ab 100644 --- a/databases/mariadb104-server/Makefile +++ b/databases/mariadb104-server/Makefile @@ -1,8 +1,8 @@ # Created by: Bernard Spil PORTNAME?= mariadb -PORTVERSION= 10.4.21 -PORTREVISION?= 1 +PORTVERSION= 10.4.22 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ diff --git a/databases/mariadb104-server/distinfo b/databases/mariadb104-server/distinfo index ae780beace2f..6691d74395ca 100644 --- a/databases/mariadb104-server/distinfo +++ b/databases/mariadb104-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1628423421 -SHA256 (mariadb-10.4.21.tar.gz) = 94dd2e6f5d286de8a7dccffe984015d4253a0568281c7440e772cfbe098a291d -SIZE (mariadb-10.4.21.tar.gz) = 84809537 +TIMESTAMP = 1636537152 +SHA256 (mariadb-10.4.22.tar.gz) = 44bdc36eeb02888296e961718bae808f3faab268ed49160a785248db60500c00 +SIZE (mariadb-10.4.22.tar.gz) = 84916052 diff --git a/databases/mariadb104-server/files/patch-MDEV-26537 b/databases/mariadb104-server/files/patch-MDEV-26537 deleted file mode 100644 index 05cf0f5a4ebc..000000000000 --- a/databases/mariadb104-server/files/patch-MDEV-26537 +++ /dev/null @@ -1,126 +0,0 @@ -From d09426f9e60fd93296464ec9eb5f9d85566437d3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= -Date: Fri, 10 Sep 2021 19:15:41 +0300 -Subject: [PATCH] MDEV-26537 InnoDB corrupts files due to incorrect st_blksize - calculation - -The st_blksize returned by fstat(2) is not documented to be -a power of 2, like we assumed in -commit 58252fff15acfe7c7b0452a87e202e3f8e454e19 (MDEV-26040). -While on Linux, the st_blksize appears to report the file system -block size (which hopefully is not smaller than the sector size -of the underlying block device), on FreeBSD we observed -st_blksize values that might have been something similar to st_size. - -Also IBM AIX was affected by this. A simple test case would -lead to a crash when using the minimum innodb_buffer_pool_size=5m -on both FreeBSD and AIX: - -seq -f 'create table t%g engine=innodb select * from seq_1_to_200000;' \ -1 100|mysql test& -seq -f 'create table u%g engine=innodb select * from seq_1_to_200000;' \ -1 100|mysql test& - -We will fix this by not trusting st_blksize at all, and assuming that -the smallest allowed write size (for O_DIRECT) is 4096 bytes. We hope -that no storage systems with larger block size exist. Anything larger -than 4096 bytes should be unlikely, given that it is the minimum -virtual memory page size of many contemporary processors. - -MariaDB Server on Microsoft Windows was not affected by this. - -While the 512-byte sector size of the venerable Seagate ST-225 is still -in widespread use, the minimum innodb_page_size is 4096 bytes, and -innodb_log_file_size can be set in integer multiples of 65536 bytes. - -The only occasion where InnoDB uses smaller data file block sizes than -4096 bytes is with ROW_FORMAT=COMPRESSED tables with KEY_BLOCK_SIZE=1 -or KEY_BLOCK_SIZE=2 (or innodb_page_size=4096). For such tables, -we will from now on preallocate space in integer multiples of 4096 bytes -and let regular writes extend the file by 1024, 2048, or 3072 bytes. - -The view INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES.FS_BLOCK_SIZE -should report the raw st_blksize. - -For page_compressed tables, the function fil_space_get_block_size() -will map to 512 any st_blksize value that is larger than 4096. - -os_file_set_size(): Assume that the file system block size is 4096 bytes, -and only support extending files to integer multiples of 4096 bytes. - -fil_space_extend_must_retry(): Round down the preallocation size to -an integer multiple of 4096 bytes. ---- mysql-test/suite/innodb/t/check_ibd_filesize.test.orig 2021-08-02 10:58:56 UTC -+++ mysql-test/suite/innodb/t/check_ibd_filesize.test -@@ -46,6 +46,12 @@ perl; - print "# bytes: ", (-s "$ENV{MYSQLD_DATADIR}/test/t1.ibd"), "\n"; - EOF - INSERT INTO t1 SELECT seq,REPEAT('a',30000) FROM seq_1_to_20; -+# Ensure that the file will be extended with the last 1024-byte page -+# after the file was pre-extended in 4096-byte increments. -+--disable_query_log -+FLUSH TABLE t1 FOR EXPORT; -+UNLOCK TABLES; -+--enable_query_log - perl; - print "# bytes: ", (-s "$ENV{MYSQLD_DATADIR}/test/t1.ibd"), "\n"; - EOF - mysql-test/suite/innodb/t/check_ibd_filesize.test | 6 ++++++ - storage/innobase/fil/fil0fil.cc | 13 +++++++++---- - storage/innobase/os/os0file.cc | 7 ++++--- - 3 files changed, 19 insertions(+), 7 deletions(-) - ---- storage/innobase/fil/fil0fil.cc.orig 2021-08-02 10:58:57 UTC -+++ storage/innobase/fil/fil0fil.cc -@@ -942,11 +942,17 @@ fil_space_extend_must_retry( - const page_size_t pageSize(space->flags); - const ulint page_size = pageSize.physical(); - -- /* fil_read_first_page() expects srv_page_size bytes. -- fil_node_open_file() expects at least 4 * srv_page_size bytes.*/ -- os_offset_t new_size = std::max( -- os_offset_t(size - file_start_page_no) * page_size, -+ /* fil_read_first_page() expects innodb_page_size bytes. -+ fil_node_open_file() expects at least 4 * innodb_page_size bytes. -+ os_file_set_size() expects multiples of 4096 bytes. -+ For ROW_FORMAT=COMPRESSED tables using 1024-byte or 2048-byte -+ pages, we will preallocate up to an integer multiple of 4096 bytes, -+ and let normal writes append 1024, 2048, or 3072 bytes to the file. */ -+ os_offset_t new_size = std::max( -+ (os_offset_t(size - file_start_page_no) * page_size) -+ & ~os_offset_t(4095), - os_offset_t(FIL_IBD_FILE_INITIAL_SIZE << srv_page_size_shift)); -+ - - *success = os_file_set_size(node->name, node->handle, new_size, - FSP_FLAGS_HAS_PAGE_COMPRESSION(space->flags)); ---- storage/innobase/os/os0file.cc.orig 2021-08-02 10:58:57 UTC -+++ storage/innobase/os/os0file.cc -@@ -5351,6 +5351,8 @@ os_file_set_size( - os_offset_t size, - bool is_sparse) - { -+ ut_ad(!(size & 4095)); -+ - #ifdef _WIN32 - /* On Windows, changing file size works well and as expected for both - sparse and normal files. -@@ -5392,7 +5394,7 @@ fallback: - if (current_size >= size) { - return true; - } -- current_size &= ~os_offset_t(statbuf.st_blksize - 1); -+ current_size &= ~4095ULL; - err = posix_fallocate(file, current_size, - size - current_size); - } -@@ -5432,8 +5434,7 @@ fallback: - if (fstat(file, &statbuf)) { - return false; - } -- os_offset_t current_size = statbuf.st_size -- & ~os_offset_t(statbuf.st_blksize - 1); -+ os_offset_t current_size = statbuf.st_size & ~4095ULL; - #endif - if (current_size >= size) { - return true; From nobody Wed Nov 10 20:27:31 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5067F18502BF; Wed, 10 Nov 2021 20:27:32 +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 4HqGcN0D1Lz3q1l; Wed, 10 Nov 2021 20:27:32 +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 C387A1F21A; Wed, 10 Nov 2021 20:27: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 1AAKRVQJ009678; Wed, 10 Nov 2021 20:27:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AAKRVdh009677; Wed, 10 Nov 2021 20:27:31 GMT (envelope-from git) Date: Wed, 10 Nov 2021 20:27:31 GMT Message-Id: <202111102027.1AAKRVdh009677@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bernard Spil Subject: git: 8056572ec5ab - 2021Q4 - databases/mariadb103-server: Security update to 10.3.32 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 8056572ec5ab2066dc87b510528ce631a51a1a63 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=8056572ec5ab2066dc87b510528ce631a51a1a63 commit 8056572ec5ab2066dc87b510528ce631a51a1a63 Author: Bernard Spil AuthorDate: 2021-11-10 20:20:28 +0000 Commit: Bernard Spil CommitDate: 2021-11-10 20:26:15 +0000 databases/mariadb103-server: Security update to 10.3.32 MFH: 2021Q4 Security: c9387e4d-2f5f-11ec-8be6-d4c9ef517024 (cherry picked from commit e31f0418e4a5c1691e86fc3f9460418fb6befebb) --- databases/mariadb103-server/Makefile | 4 +- databases/mariadb103-server/distinfo | 6 +- databases/mariadb103-server/files/patch-MDEV-26537 | 126 --------------------- 3 files changed, 5 insertions(+), 131 deletions(-) diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile index ae36e9bc3c2f..661ef7f620fa 100644 --- a/databases/mariadb103-server/Makefile +++ b/databases/mariadb103-server/Makefile @@ -1,8 +1,8 @@ # Created by: Bernard Spil PORTNAME?= mariadb -PORTVERSION= 10.3.31 -PORTREVISION?= 1 +PORTVERSION= 10.3.32 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ diff --git a/databases/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo index 31e29a79b9ae..12faf4cdb3be 100644 --- a/databases/mariadb103-server/distinfo +++ b/databases/mariadb103-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1628426460 -SHA256 (mariadb-10.3.31.tar.gz) = 20421dfe5750f510ab0ee23420337332e6799cd38fa31332e2841dfa956eb771 -SIZE (mariadb-10.3.31.tar.gz) = 73298653 +TIMESTAMP = 1636550062 +SHA256 (mariadb-10.3.32.tar.gz) = 948d0cdf2f92c60cff4232af9d724e0a4bbeafbb35762fa429e7ba5c3811c064 +SIZE (mariadb-10.3.32.tar.gz) = 73389214 diff --git a/databases/mariadb103-server/files/patch-MDEV-26537 b/databases/mariadb103-server/files/patch-MDEV-26537 deleted file mode 100644 index 05cf0f5a4ebc..000000000000 --- a/databases/mariadb103-server/files/patch-MDEV-26537 +++ /dev/null @@ -1,126 +0,0 @@ -From d09426f9e60fd93296464ec9eb5f9d85566437d3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= -Date: Fri, 10 Sep 2021 19:15:41 +0300 -Subject: [PATCH] MDEV-26537 InnoDB corrupts files due to incorrect st_blksize - calculation - -The st_blksize returned by fstat(2) is not documented to be -a power of 2, like we assumed in -commit 58252fff15acfe7c7b0452a87e202e3f8e454e19 (MDEV-26040). -While on Linux, the st_blksize appears to report the file system -block size (which hopefully is not smaller than the sector size -of the underlying block device), on FreeBSD we observed -st_blksize values that might have been something similar to st_size. - -Also IBM AIX was affected by this. A simple test case would -lead to a crash when using the minimum innodb_buffer_pool_size=5m -on both FreeBSD and AIX: - -seq -f 'create table t%g engine=innodb select * from seq_1_to_200000;' \ -1 100|mysql test& -seq -f 'create table u%g engine=innodb select * from seq_1_to_200000;' \ -1 100|mysql test& - -We will fix this by not trusting st_blksize at all, and assuming that -the smallest allowed write size (for O_DIRECT) is 4096 bytes. We hope -that no storage systems with larger block size exist. Anything larger -than 4096 bytes should be unlikely, given that it is the minimum -virtual memory page size of many contemporary processors. - -MariaDB Server on Microsoft Windows was not affected by this. - -While the 512-byte sector size of the venerable Seagate ST-225 is still -in widespread use, the minimum innodb_page_size is 4096 bytes, and -innodb_log_file_size can be set in integer multiples of 65536 bytes. - -The only occasion where InnoDB uses smaller data file block sizes than -4096 bytes is with ROW_FORMAT=COMPRESSED tables with KEY_BLOCK_SIZE=1 -or KEY_BLOCK_SIZE=2 (or innodb_page_size=4096). For such tables, -we will from now on preallocate space in integer multiples of 4096 bytes -and let regular writes extend the file by 1024, 2048, or 3072 bytes. - -The view INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES.FS_BLOCK_SIZE -should report the raw st_blksize. - -For page_compressed tables, the function fil_space_get_block_size() -will map to 512 any st_blksize value that is larger than 4096. - -os_file_set_size(): Assume that the file system block size is 4096 bytes, -and only support extending files to integer multiples of 4096 bytes. - -fil_space_extend_must_retry(): Round down the preallocation size to -an integer multiple of 4096 bytes. ---- mysql-test/suite/innodb/t/check_ibd_filesize.test.orig 2021-08-02 10:58:56 UTC -+++ mysql-test/suite/innodb/t/check_ibd_filesize.test -@@ -46,6 +46,12 @@ perl; - print "# bytes: ", (-s "$ENV{MYSQLD_DATADIR}/test/t1.ibd"), "\n"; - EOF - INSERT INTO t1 SELECT seq,REPEAT('a',30000) FROM seq_1_to_20; -+# Ensure that the file will be extended with the last 1024-byte page -+# after the file was pre-extended in 4096-byte increments. -+--disable_query_log -+FLUSH TABLE t1 FOR EXPORT; -+UNLOCK TABLES; -+--enable_query_log - perl; - print "# bytes: ", (-s "$ENV{MYSQLD_DATADIR}/test/t1.ibd"), "\n"; - EOF - mysql-test/suite/innodb/t/check_ibd_filesize.test | 6 ++++++ - storage/innobase/fil/fil0fil.cc | 13 +++++++++---- - storage/innobase/os/os0file.cc | 7 ++++--- - 3 files changed, 19 insertions(+), 7 deletions(-) - ---- storage/innobase/fil/fil0fil.cc.orig 2021-08-02 10:58:57 UTC -+++ storage/innobase/fil/fil0fil.cc -@@ -942,11 +942,17 @@ fil_space_extend_must_retry( - const page_size_t pageSize(space->flags); - const ulint page_size = pageSize.physical(); - -- /* fil_read_first_page() expects srv_page_size bytes. -- fil_node_open_file() expects at least 4 * srv_page_size bytes.*/ -- os_offset_t new_size = std::max( -- os_offset_t(size - file_start_page_no) * page_size, -+ /* fil_read_first_page() expects innodb_page_size bytes. -+ fil_node_open_file() expects at least 4 * innodb_page_size bytes. -+ os_file_set_size() expects multiples of 4096 bytes. -+ For ROW_FORMAT=COMPRESSED tables using 1024-byte or 2048-byte -+ pages, we will preallocate up to an integer multiple of 4096 bytes, -+ and let normal writes append 1024, 2048, or 3072 bytes to the file. */ -+ os_offset_t new_size = std::max( -+ (os_offset_t(size - file_start_page_no) * page_size) -+ & ~os_offset_t(4095), - os_offset_t(FIL_IBD_FILE_INITIAL_SIZE << srv_page_size_shift)); -+ - - *success = os_file_set_size(node->name, node->handle, new_size, - FSP_FLAGS_HAS_PAGE_COMPRESSION(space->flags)); ---- storage/innobase/os/os0file.cc.orig 2021-08-02 10:58:57 UTC -+++ storage/innobase/os/os0file.cc -@@ -5351,6 +5351,8 @@ os_file_set_size( - os_offset_t size, - bool is_sparse) - { -+ ut_ad(!(size & 4095)); -+ - #ifdef _WIN32 - /* On Windows, changing file size works well and as expected for both - sparse and normal files. -@@ -5392,7 +5394,7 @@ fallback: - if (current_size >= size) { - return true; - } -- current_size &= ~os_offset_t(statbuf.st_blksize - 1); -+ current_size &= ~4095ULL; - err = posix_fallocate(file, current_size, - size - current_size); - } -@@ -5432,8 +5434,7 @@ fallback: - if (fstat(file, &statbuf)) { - return false; - } -- os_offset_t current_size = statbuf.st_size -- & ~os_offset_t(statbuf.st_blksize - 1); -+ os_offset_t current_size = statbuf.st_size & ~4095ULL; - #endif - if (current_size >= size) { - return true; From nobody Wed Nov 10 22:04:58 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B93B017EC0D2; Wed, 10 Nov 2021 22:04: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 4HqJmp4wssz4sGH; Wed, 10 Nov 2021 22:04: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 8A96F20633; Wed, 10 Nov 2021 22:04: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 1AAM4wAK043728; Wed, 10 Nov 2021 22:04:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AAM4wAO043727; Wed, 10 Nov 2021 22:04:58 GMT (envelope-from git) Date: Wed, 10 Nov 2021 22:04:58 GMT Message-Id: <202111102204.1AAM4wAO043727@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: 23aa0917c6b5 - 2021Q4 - devel/intel-graphics-compiler: pacify stage-qa after 80eadab44ca1 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 23aa0917c6b56cc57e8c7b0ffbdba7eb9db14e65 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=23aa0917c6b56cc57e8c7b0ffbdba7eb9db14e65 commit 23aa0917c6b56cc57e8c7b0ffbdba7eb9db14e65 Author: Jan Beich AuthorDate: 2021-11-10 21:13:40 +0000 Commit: Jan Beich CommitDate: 2021-11-10 22:04:39 +0000 devel/intel-graphics-compiler: pacify stage-qa after 80eadab44ca1 Error: /usr/local/lib/libigc.so.1.0.1 is linked to /usr/local/llvm13/lib/libLLVM-13.so from devel/llvm13 but it is not declared as a dependency (cherry picked from commit 913ccecf2a920e26fa891a2a92537c2c01fc92f5) --- devel/intel-graphics-compiler/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devel/intel-graphics-compiler/Makefile b/devel/intel-graphics-compiler/Makefile index 338444e1547a..77e7633ec8bd 100644 --- a/devel/intel-graphics-compiler/Makefile +++ b/devel/intel-graphics-compiler/Makefile @@ -14,7 +14,8 @@ ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Only Intel GPUs on x86 are supported BUILD_DEPENDS= vc-intrinsics-${FLAVOR}>=s20210730:devel/vc-intrinsics@${FLAVOR} -LIB_DEPENDS= libopencl-clang.so.${FLAVOR:S/llvm//}:devel/opencl-clang@${FLAVOR} +LIB_DEPENDS= libLLVM-${FLAVOR:S/llvm//}.so:devel/${FLAVOR} \ + libopencl-clang.so.${FLAVOR:S/llvm//}:devel/opencl-clang@${FLAVOR} FLAVORS= ${12 11:L:S/^/llvm/} From nobody Thu Nov 11 00:39:49 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 053301842C4D; Thu, 11 Nov 2021 00:39:50 +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 4HqNCT33GTz4fTH; Thu, 11 Nov 2021 00:39:49 +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 3373722263; Thu, 11 Nov 2021 00:39:49 +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 1AB0dnsd043207; Thu, 11 Nov 2021 00:39:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AB0dn4T043206; Thu, 11 Nov 2021 00:39:49 GMT (envelope-from git) Date: Thu, 11 Nov 2021 00:39:49 GMT Message-Id: <202111110039.1AB0dn4T043206@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: a39e5055c351 - 2021Q4 - emulators/yuzu: update to s20211110 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: a39e5055c351f29ab0ecc31b0127bef3d09d3acc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=a39e5055c351f29ab0ecc31b0127bef3d09d3acc commit a39e5055c351f29ab0ecc31b0127bef3d09d3acc Author: Jan Beich AuthorDate: 2021-11-10 12:42:11 +0000 Commit: Jan Beich CommitDate: 2021-11-11 00:39:44 +0000 emulators/yuzu: update to s20211110 Changes: https://github.com/yuzu-emu/yuzu/compare/ced130297...bdabd17c7 (cherry picked from commit 0b5a159c2c80ea5c21ed51b2a6d9bfd304845f85) --- emulators/yuzu/Makefile | 4 ++-- emulators/yuzu/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index fef8ac25a756..c27769831365 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,5 +1,5 @@ PORTNAME= yuzu -PORTVERSION= s20211105 +PORTVERSION= s20211110 PORTREVISION?= 0 CATEGORIES= emulators @@ -33,7 +33,7 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \ USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= ced130297 +GH_TAGNAME= bdabd17c7 GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \ KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-32-ga3fdfe8:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \ KhronosGroup:Vulkan-Headers:v1.2.180:Vulkan_Headers/externals/Vulkan-Headers \ diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo index 048e73f6b5cb..f84d77cde68c 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1636128979 -SHA256 (yuzu-emu-yuzu-s20211105-ced130297_GH0.tar.gz) = 18822db7ecb6e8e640ed9a28bf2e9fe5513cb303cc120e5c409878a000728866 -SIZE (yuzu-emu-yuzu-s20211105-ced130297_GH0.tar.gz) = 4322545 +TIMESTAMP = 1636548131 +SHA256 (yuzu-emu-yuzu-s20211110-bdabd17c7_GH0.tar.gz) = a260cf5a787320814fde49bde7cb684088c319297059943e5f1aa9a44a68d6f2 +SIZE (yuzu-emu-yuzu-s20211110-bdabd17c7_GH0.tar.gz) = 4322649 SHA256 (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 8cd6d075b4da0ad5fb995eb37390e2e6088be8d41ab1cdfc7e7e4256bd991450 SIZE (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 2679189 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-32-ga3fdfe8_GH0.tar.gz) = bd629d6296dd374eb2aeff923c75895ba0f3ce6448dad89763930e65b954e0cb From nobody Thu Nov 11 01:30:05 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0DFDD185BC25; Thu, 11 Nov 2021 01:30: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 4HqPKT62q0z3Bp1; Thu, 11 Nov 2021 01:30: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 B074323217; Thu, 11 Nov 2021 01:30: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 1AB1U5YL011770; Thu, 11 Nov 2021 01:30:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AB1U5fv011767; Thu, 11 Nov 2021 01:30:05 GMT (envelope-from git) Date: Thu, 11 Nov 2021 01:30:05 GMT Message-Id: <202111110130.1AB1U5fv011767@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Wen Heping Subject: git: 86aeb6201615 - 2021Q4 - www/moodle311: Update to 3.11.4 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wen X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 86aeb6201615351be4ddf555c19880c8eb74e176 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by wen: URL: https://cgit.FreeBSD.org/ports/commit/?id=86aeb6201615351be4ddf555c19880c8eb74e176 commit 86aeb6201615351be4ddf555c19880c8eb74e176 Author: Wen Heping AuthorDate: 2021-11-11 01:25:35 +0000 Commit: Wen Heping CommitDate: 2021-11-11 01:29:12 +0000 www/moodle311: Update to 3.11.4 (cherry picked from commit 6d7015e212c797121061bf04db7a01f018fca6ac) --- www/moodle311/Makefile | 2 +- www/moodle311/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/moodle311/Makefile b/www/moodle311/Makefile index dbe163e2ff6e..98704bd84ea4 100644 --- a/www/moodle311/Makefile +++ b/www/moodle311/Makefile @@ -1,7 +1,7 @@ # Created by: Javier Martin Rueda PORTNAME= moodle -PORTVERSION= 3.11.3 +PORTVERSION= 3.11.4 CATEGORIES= www education MASTER_SITES= SF/moodle/Moodle/stable311/ PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//}${PHP_PKGNAMESUFFIX} diff --git a/www/moodle311/distinfo b/www/moodle311/distinfo index 34a9812eaa72..167358b32a4f 100644 --- a/www/moodle311/distinfo +++ b/www/moodle311/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1631516453 -SHA256 (moodle-3.11.3.tgz) = 274b4d84df82264b80d61841752d2490e8e296bf9073964a34216c0ccdf510ce -SIZE (moodle-3.11.3.tgz) = 59424884 +TIMESTAMP = 1636592469 +SHA256 (moodle-3.11.4.tgz) = 38f4c8985817b912bb6f12bc2826a7ebcff90f8dea50e10af93702ffd550c6ef +SIZE (moodle-3.11.4.tgz) = 60619233 From nobody Thu Nov 11 02:46:55 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4A269183ABDD; Thu, 11 Nov 2021 02:46: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 4HqR281bW0z3qSj; Thu, 11 Nov 2021 02:46: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 08C7124348; Thu, 11 Nov 2021 02:46: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 1AB2kthK015072; Thu, 11 Nov 2021 02:46:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AB2kt8U015071; Thu, 11 Nov 2021 02:46:55 GMT (envelope-from git) Date: Thu, 11 Nov 2021 02:46:55 GMT Message-Id: <202111110246.1AB2kt8U015071@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yasuhiro Kimura Subject: git: 676fbc40c668 - 2021Q4 - mail/rainloop: Fix SMTP AUTH PLAIN bug List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 676fbc40c6681b804f49eec4e05c0ae9ef655728 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=676fbc40c6681b804f49eec4e05c0ae9ef655728 commit 676fbc40c6681b804f49eec4e05c0ae9ef655728 Author: Yasuhiro Kimura AuthorDate: 2021-11-11 02:23:43 +0000 Commit: Yasuhiro Kimura CommitDate: 2021-11-11 02:46:35 +0000 mail/rainloop: Fix SMTP AUTH PLAIN bug While I'm here, * Switch to DISTVERSION * Pet portclippy * Re-format Makefile with portfmt Reference: https://github.com/RainLoop/rainloop-webmail/issues/1629 PR: 257017 Reported by: pi Obtained from: https://github.com/RainLoop/rainloop-webmail/issues/1629#issuecomment-540398127 MFH: 2021Q4 (cherry picked from commit 09c2f9d63931380306f66bcbef74667502a0c4e0) --- mail/rainloop-community/Makefile | 6 +++--- mail/rainloop/Makefile | 21 ++++++++++++++++----- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/mail/rainloop-community/Makefile b/mail/rainloop-community/Makefile index 0e0358b6f3e3..b63791cfb2f9 100644 --- a/mail/rainloop-community/Makefile +++ b/mail/rainloop-community/Makefile @@ -6,10 +6,10 @@ COMMENT= Modern and interactive webmail - community edition LICENSE= AGPLv3 +CONFLICTS_INSTALL= rainloop-[0-9]* + MASTERDIR= ${.CURDIR}/../rainloop -DISTINFO_FILE= ${.CURDIR}/distinfo PLIST= ${.CURDIR}/pkg-plist - -CONFLICTS_INSTALL= rainloop-[0-9]* +DISTINFO_FILE= ${.CURDIR}/distinfo .include "${MASTERDIR}/Makefile" diff --git a/mail/rainloop/Makefile b/mail/rainloop/Makefile index 6aa0ac18078d..37b9010a9499 100644 --- a/mail/rainloop/Makefile +++ b/mail/rainloop/Makefile @@ -1,5 +1,6 @@ PORTNAME= rainloop -PORTVERSION= 1.16.0 +DISTVERSION= 1.16.0 +PORTREVISION= 1 CATEGORIES= mail www MASTER_SITES= https://github.com/RainLoop/rainloop-webmail/releases/download/v${PORTVERSION}/ PKGNAMESUFFIX?= ${PHP_PKGNAMESUFFIX} @@ -16,20 +17,30 @@ LICENSE_PERMS= auto-accept .endif USES= php:web,flavors zip -NO_BUILD= yes +USE_PHP= curl dom iconv json openssl pcre simplexml spl xml zlib + NO_ARCH= yes +NO_BUILD= yes + NO_WRKSUBDIR= yes -USE_PHP= curl dom iconv json openssl pcre simplexml spl xml zlib -PLIST_SUB= VER="${PORTVERSION}" WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" +PLIST_SUB= VER="${PORTVERSION}" \ + WWWGRP="${WWWGRP}" \ + WWWOWN="${WWWOWN}" + +OPTIONS_DEFAULT= SQLITE OPTIONS_RADIO= DB OPTIONS_RADIO_DB= MYSQL PGSQL SQLITE -OPTIONS_DEFAULT= SQLITE MYSQL_USE= PHP=pdo_mysql PGSQL_USE= PHP=pdo_pgsql SQLITE_USE= PHP=pdo_sqlite +post-patch: + ${REINPLACE_CMD} 's/__USE_SINGLE_LINE_AUTH_PLAIN_COMMAND = false/__USE_SINGLE_LINE_AUTH_PLAIN_COMMAND = true/' \ + ${WRKSRC}/rainloop/v/${PORTVERSION}/app/libraries/MailSo/Smtp/SmtpClient.php + ${RM} ${WRKSRC}/rainloop/v/${PORTVERSION}/app/libraries/MailSo/Smtp/SmtpClient.php.bak + do-install: @${MKDIR} ${STAGEDIR}${WWWDIR}/data ${INSTALL_DATA} ${WRKSRC}/data/* ${STAGEDIR}${WWWDIR}/data From nobody Thu Nov 11 18:33:25 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2D2481853781; Thu, 11 Nov 2021 18:33: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 4Hqr2G0qD3z3mbH; Thu, 11 Nov 2021 18:33:26 +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 F0220114EF; Thu, 11 Nov 2021 18:33: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 1ABIXP6v083573; Thu, 11 Nov 2021 18:33:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ABIXPrt083572; Thu, 11 Nov 2021 18:33:25 GMT (envelope-from git) Date: Thu, 11 Nov 2021 18:33:25 GMT Message-Id: <202111111833.1ABIXPrt083572@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Glen Barber Subject: git: 8fd5a81f34c0 - Create tag release/12.3.0 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: ports X-Git-Refname: refs/tags/release/12.3.0 X-Git-Reftype: annotated tag X-Git-Commit: 8fd5a81f34c03d318957298327ad2bf8bd9a7fb4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The annotated tag release/12.3.0 has been created by gjb: URL: https://cgit.FreeBSD.org/ports/tag/?h=release/12.3.0 tag release/12.3.0 Tagger: Glen Barber TaggerDate: 2021-11-11 18:31:18 +0000 Tag commit 817404d72a31 as release/12.3.0 -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmGNYZIACgkQAxRYpUeP 4pPXTxAAjqtXfYCgFBsjLNyQRMUUz8zaXq+AP9oGtKhXx7NZ/ZdUJG/FIr/V7v6h l0yVTEtrjnKyUEP7unNrRXKozCgeEU3acHLTDJDO74/7m0WeuE1X3usLtkWiDgwX sFnE2Bcb1EU2UHOSxhl+IQnpYNFe2BdMAHWeciJ7G4oW3GaB4HNXhP+dKhbraI5f YTvmoBb9TV+Jp+9hy3jAQfE87+uru1MA1FRTFs5S1zK50MFyBfGdgNaF5tCNtMfm Evi1rMx2uKOkE+Jtcz4e59iCNW9wpvL96zAXBmk6hV0Mn/ocFBN9Jgmle8kNycXD FAJ7d7VBPlKvpwjUgrKs1VFxbJdAMo2ETOcc4ql5ZqEiGh8WdR63lDrPiOhy80qM C17c1s5a6Nq+Loi7sGU42kj0t81xd3NSOUuHMfAUzDXoAwhJ5KtBL4hfzIWl9DbM ZPFwmZIzv4OLpaMz860jM4o8QQwYryENydgw/qkuSEFhlWtGNGpEvQkt5PeUJHjV aJ+nCTp/c97PkNd6UK/vJbVNod1clRI67LYvBMUxZDzjC08J2Vxg81D/3/IDKqxG 8Uao+guCgc66+D+DQWEt7y383B7eTGukCkDkzNjLcMhLRUujDLfH8zLqlLczDaUC 7vTyTMG5xaNjmbmULaTtIHnTkz81MI68j8cDeq3tk8kpvndlotU= =3Y5Q -----END PGP SIGNATURE----- commit 817404d72a315cf259a4e7190b670bb6106e0028 Author: Jan Beich AuthorDate: 2021-11-08 15:33:57 +0000 Commit: Jan Beich CommitDate: 2021-11-08 19:11:03 +0000 multimedia/vmaf: unbreak built-in models after 1868dedecc9a $ ffmpeg -i foo.y4m -i bar.y4m -lavfi libvmaf -f null - [...] libvmaf WARNING no such built-in model: "vmaf_v0.6.1" [Parsed_libvmaf_0 @ 0x8061b33c0] could not load libvmaf model with version: vmaf_v0.6.1 [AVFilterGraph @ 0x8061b6880] Error initializing filter 'libvmaf' (cherry picked from commit 355579c2ebff93c22fe8d3bb1004103c4e2154b7) From nobody Fri Nov 12 00:04:52 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 88C271846032; Fri, 12 Nov 2021 00:04: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 4HqzNh3SzRz4ncx; Fri, 12 Nov 2021 00:04: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 57DFB1582F; Fri, 12 Nov 2021 00:04: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 1AC04q2B023816; Fri, 12 Nov 2021 00:04:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AC04qFU023815; Fri, 12 Nov 2021 00:04:52 GMT (envelope-from git) Date: Fri, 12 Nov 2021 00:04:52 GMT Message-Id: <202111120004.1AC04qFU023815@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Glen Barber Subject: git: c018515cd0b1 - 2021Q4 - misc/freebsd-release-manifests: 12.3: add RC1 checksums List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: c018515cd0b1a931d101c42bf49bffeecee6973f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by gjb: URL: https://cgit.FreeBSD.org/ports/commit/?id=c018515cd0b1a931d101c42bf49bffeecee6973f commit c018515cd0b1a931d101c42bf49bffeecee6973f Author: Glen Barber AuthorDate: 2021-11-12 00:03:38 +0000 Commit: Glen Barber CommitDate: 2021-11-12 00:04:40 +0000 misc/freebsd-release-manifests: 12.3: add RC1 checksums Remove BETA2 checksums Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 8c130154d24cd33a90aa5004734ef722f76c6949) --- misc/freebsd-release-manifests/Makefile | 2 +- .../files/MANIFESTS/amd64-amd64-12.3-BETA2 | 9 --------- .../files/MANIFESTS/amd64-amd64-12.3-RC1 | 9 +++++++++ .../files/MANIFESTS/arm64-aarch64-12.3-BETA2 | 7 ------- .../files/MANIFESTS/arm64-aarch64-12.3-RC1 | 7 +++++++ .../files/MANIFESTS/i386-i386-12.3-BETA2 | 7 ------- .../files/MANIFESTS/i386-i386-12.3-RC1 | 7 +++++++ .../files/MANIFESTS/powerpc-powerpc-12.3-BETA2 | 7 ------- .../files/MANIFESTS/powerpc-powerpc-12.3-RC1 | 7 +++++++ .../files/MANIFESTS/powerpc-powerpc64-12.3-BETA2 | 9 --------- .../files/MANIFESTS/powerpc-powerpc64-12.3-RC1 | 9 +++++++++ .../files/MANIFESTS/powerpc-powerpcspe-12.3-BETA2 | 7 ------- .../files/MANIFESTS/powerpc-powerpcspe-12.3-RC1 | 7 +++++++ .../files/MANIFESTS/sparc64-sparc64-12.3-BETA2 | 7 ------- .../files/MANIFESTS/sparc64-sparc64-12.3-RC1 | 7 +++++++ misc/freebsd-release-manifests/pkg-plist | 14 +++++++------- 16 files changed, 61 insertions(+), 61 deletions(-) diff --git a/misc/freebsd-release-manifests/Makefile b/misc/freebsd-release-manifests/Makefile index d6d8b16230b5..034a01a09dae 100644 --- a/misc/freebsd-release-manifests/Makefile +++ b/misc/freebsd-release-manifests/Makefile @@ -1,5 +1,5 @@ PORTNAME= freebsd-release-manifests -DISTVERSION= 20211104 +DISTVERSION= 20211111 PORTREVISION= 0 CATEGORIES= misc MASTER_SITES= # diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-12.3-BETA2 b/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-12.3-BETA2 deleted file mode 100644 index 2793e8cbc501..000000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-12.3-BETA2 +++ /dev/null @@ -1,9 +0,0 @@ -base-dbg.txz ce9fcb856e35cf77b1d2b5b2d93a122d11d81a7e40ed2176160eb43da8217942 1654 base_dbg "Base system (Debugging)" off -base.txz c994c7f6b159ec8e855dd327319fa59e332d75a50be42b3c1e5bf24cced7e127 26492 base "Base system (MANDATORY)" on -kernel-dbg.txz 9d2674979ed15dc3c8c5417a993140870c6d1bd38f4b5293b334d31de9436675 912 kernel_dbg "Kernel (Debugging)" on -kernel.txz 228a2609b76f199bf2d2c47f7fe2bfdd3abf530481200fc6e26135d07a124114 926 kernel "Kernel (MANDATORY)" on -lib32-dbg.txz 7a322889a3a3ae8e157b8fcb1db147b14f8306c8fd0f7a593dd53a71ecdf7393 244 lib32_dbg "32-bit compatibility libraries (Debugging)" off -lib32.txz 7a2bf3df7cd01b471df8cf5327aa6bc46ec63d7938ea88933b4e78637a258795 1013 lib32 "32-bit compatibility libraries" on -ports.txz bcd37b1ba86c59d8ae310c9a685e5a1620f47280cb37973cd872b29fa1b3f170 181750 ports "Ports tree" off -src.txz 32b5db69efd2610b8ef5b4491463e31ed3589237de9eca17bca24a86a10bbc9a 89724 src "System source tree" off -tests.txz 5e86640df1a068cd297a20d90f3bb4e1d6315a52329abc6e6477034f2455e482 6225 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-12.3-RC1 b/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-12.3-RC1 new file mode 100644 index 000000000000..e803ef582ea9 --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-12.3-RC1 @@ -0,0 +1,9 @@ +base-dbg.txz 3dac0164a3265da3cc2103e2f3bf3fbc76efb387f158a8ca41b449ff3cf0746a 1654 base_dbg "Base system (Debugging)" off +base.txz ea2a7df39bc716c82044c4f3fb495de17efcfb974a683fe384a7c23fd9e1d7ce 26492 base "Base system (MANDATORY)" on +kernel-dbg.txz d69923e4f9a2ae066b55b664c006d60a0df80591f4ee5dae5e0e30822407189b 912 kernel_dbg "Kernel (Debugging)" on +kernel.txz e0854d3c13a96d9b4916c15e438c2d24024976d592a1635091bb8cb97cd0bb80 926 kernel "Kernel (MANDATORY)" on +lib32-dbg.txz da836c52a738e283987234ea05a9e68611b2e2ba0471c1304455824d42b82a4e 244 lib32_dbg "32-bit compatibility libraries (Debugging)" off +lib32.txz 2f183ab93c667347b9fe49eefe655c3b4e10f33dd54409137f371ced58ecfd44 1013 lib32 "32-bit compatibility libraries" on +ports.txz 42f79435853bf9dddbf9ea89bcbeaf24e9a26610d76ca940b5c769f40dfb8712 181801 ports "Ports tree" off +src.txz 038d6f0f33bef0f9718b57a0b0b166231972a656f9d364dbb342f0cfc4a47934 89724 src "System source tree" off +tests.txz 7f9f55dc213abd973ebdf8e87824eb9be23b6be397e8a21756e372edc1af8ab8 6225 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-12.3-BETA2 b/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-12.3-BETA2 deleted file mode 100644 index e4f472c983e1..000000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-12.3-BETA2 +++ /dev/null @@ -1,7 +0,0 @@ -base-dbg.txz 7ae128ed1943027bd184e2199bf3370ef2cee1e719659d224183b508cfb64d1e 1623 base_dbg "Base system (Debugging)" off -base.txz 6f725e3a7aa9567b407c85182ca9e29ebcae8208038d55989ea5d2b81b5904ba 26162 base "Base system (MANDATORY)" on -kernel-dbg.txz ae2167ed68028a81b43ec67d1eefc7b766c60d682abd1b7d08d23335a24ffedd 629 kernel_dbg "Kernel (Debugging)" on -kernel.txz 89b46bd4e7459aa97cc2064fd487923487811fa4d2a24011f440d53050fe49c2 673 kernel "Kernel (MANDATORY)" on -ports.txz bcd37b1ba86c59d8ae310c9a685e5a1620f47280cb37973cd872b29fa1b3f170 181750 ports "Ports tree" off -src.txz 32b5db69efd2610b8ef5b4491463e31ed3589237de9eca17bca24a86a10bbc9a 89724 src "System source tree" off -tests.txz a11f39378c31b2900dd23a7b5bf3cc1bd9c88e9b4dc75e5117a558b50d40a274 6219 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-12.3-RC1 b/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-12.3-RC1 new file mode 100644 index 000000000000..5e7e4ea2cfd2 --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-12.3-RC1 @@ -0,0 +1,7 @@ +base-dbg.txz 9f4259361b0c56154ba53e3798aba9d4dcf1748a4d34c7819b0944d38f606b3d 1623 base_dbg "Base system (Debugging)" off +base.txz 4266478905b6e1163e4b83407fed047d7942e04b9848fa6a25372f7f61ce2a84 26162 base "Base system (MANDATORY)" on +kernel-dbg.txz 07e465946b9dbee869558d781873e570b522a8a0fb61008a6ec8d9d532a21ff6 629 kernel_dbg "Kernel (Debugging)" on +kernel.txz 1c35ce919dc6e71eaadfd7c306432ef0a799c091905e36f6d1f1b00beaafe0b1 673 kernel "Kernel (MANDATORY)" on +ports.txz 42f79435853bf9dddbf9ea89bcbeaf24e9a26610d76ca940b5c769f40dfb8712 181801 ports "Ports tree" off +src.txz 038d6f0f33bef0f9718b57a0b0b166231972a656f9d364dbb342f0cfc4a47934 89724 src "System source tree" off +tests.txz bac2c5a8169b688a65b43c5a5d2f83471b30190355608052956c4cab8f5bce6e 6219 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-12.3-BETA2 b/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-12.3-BETA2 deleted file mode 100644 index e956d95c9bda..000000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-12.3-BETA2 +++ /dev/null @@ -1,7 +0,0 @@ -base-dbg.txz 6c1f3a0d1610e8f128d29fb7960c03919ad91c3cee8a0296bc18d59e129a84b9 1652 base_dbg "Base system (Debugging)" off -base.txz b3759a0c56600759ecf1a068b40be6e4cfc9bfc52313018a715638aa0e620176 26483 base "Base system (MANDATORY)" on -kernel-dbg.txz 4c0a4f548a4cab223b624df21cbe247275ee62a54f4c4d1b48f7717d59a7ee41 902 kernel_dbg "Kernel (Debugging)" on -kernel.txz 3c78411aa96add641e5aae65d21ef72436f201b3df653efb248663026350b184 915 kernel "Kernel (MANDATORY)" on -ports.txz bcd37b1ba86c59d8ae310c9a685e5a1620f47280cb37973cd872b29fa1b3f170 181750 ports "Ports tree" off -src.txz 32b5db69efd2610b8ef5b4491463e31ed3589237de9eca17bca24a86a10bbc9a 89724 src "System source tree" off -tests.txz cfb6df4aa23bc64355b10872e0e65692b55b74271f2cce9e659c20b16b0f9a39 6225 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-12.3-RC1 b/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-12.3-RC1 new file mode 100644 index 000000000000..622a72c9f6f2 --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-12.3-RC1 @@ -0,0 +1,7 @@ +base-dbg.txz d86f4d7e9babe6506a7ee7f18ced7eca41db46395703f699fb788b26030b2a26 1652 base_dbg "Base system (Debugging)" off +base.txz 7825e6aee192bbfd7fb4997f0020d360c6949e24280fe1ed8d42d6f122c305b1 26483 base "Base system (MANDATORY)" on +kernel-dbg.txz 0b280ad3bd06aaf76a6b3b0946fe6964c2155e0ce24718d9e59143258bd8ad19 902 kernel_dbg "Kernel (Debugging)" on +kernel.txz b33d66c82ab22009063bff7f3fa142723bb4d82eccce68fc039e0fd4d326800c 915 kernel "Kernel (MANDATORY)" on +ports.txz 42f79435853bf9dddbf9ea89bcbeaf24e9a26610d76ca940b5c769f40dfb8712 181801 ports "Ports tree" off +src.txz 038d6f0f33bef0f9718b57a0b0b166231972a656f9d364dbb342f0cfc4a47934 89724 src "System source tree" off +tests.txz 8d23b9a7dffa21d84bca44895642d92649f0e28b77a88fbddd3b28df5c6eb5a2 6225 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-12.3-BETA2 b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-12.3-BETA2 deleted file mode 100644 index e6570128c934..000000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-12.3-BETA2 +++ /dev/null @@ -1,7 +0,0 @@ -base-dbg.txz e4d2f91d2e43c26140dc19648483ea4b7c46ea506e0330d135e2c77e33d3c05e 1609 base_dbg "Base system (Debugging)" off -base.txz 686f6c733e613fcbfd80fa540d924c0adffad8f1ae8fed12daf8519b6a1a437f 26158 base "Base system (MANDATORY)" on -kernel-dbg.txz 5379eae4e262fe4e1e7b44d16956cc0ba2274c960e0b3c1f9e3a95b5d45a648e 611 kernel_dbg "Kernel (Debugging)" on -kernel.txz 6dc428d5245478773ae4f2eb7369391c04bcc349728dc14b00f97e31e484f915 625 kernel "Kernel (MANDATORY)" on -ports.txz bcd37b1ba86c59d8ae310c9a685e5a1620f47280cb37973cd872b29fa1b3f170 181750 ports "Ports tree" off -src.txz 32b5db69efd2610b8ef5b4491463e31ed3589237de9eca17bca24a86a10bbc9a 89724 src "System source tree" off -tests.txz 1de4eb5ba95d48233d2da13447b73580d695604a30f69554f09ae723b9ee3a9c 6101 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-12.3-RC1 b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-12.3-RC1 new file mode 100644 index 000000000000..bc130795b755 --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-12.3-RC1 @@ -0,0 +1,7 @@ +base-dbg.txz f2d0ac44e447429705ce7e1815c6f9f5e55dc93df290c82eacaa84d336dbce56 1609 base_dbg "Base system (Debugging)" off +base.txz cd554d35269679bd3279f236baa4a23e67db03db7e341ef2717889572f230e62 26158 base "Base system (MANDATORY)" on +kernel-dbg.txz 6eccc0686fe7885745a83018b85e7a269a35d323dafff8bc320251ad86e9485e 611 kernel_dbg "Kernel (Debugging)" on +kernel.txz e5c41003f2a51ce0f062fc54782403022b9c8d36a8d10d0d066e80878bf21828 625 kernel "Kernel (MANDATORY)" on +ports.txz 42f79435853bf9dddbf9ea89bcbeaf24e9a26610d76ca940b5c769f40dfb8712 181801 ports "Ports tree" off +src.txz 038d6f0f33bef0f9718b57a0b0b166231972a656f9d364dbb342f0cfc4a47934 89724 src "System source tree" off +tests.txz 54959e3fc69f49c2bdba50eebaf3a5f03b750c15acda8f6742c92cbe6ebde926 6101 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-12.3-BETA2 b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-12.3-BETA2 deleted file mode 100644 index d061d9dd5458..000000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-12.3-BETA2 +++ /dev/null @@ -1,9 +0,0 @@ -base-dbg.txz 282c485ca7daa9372e0769df186890c5eb071115b4edecc2bf3b4b2306fe1bee 1617 base_dbg "Base system (Debugging)" off -base.txz 36c714490a0834aea13dad43377c07b5797098feac9ff404547845f9a07daa18 26186 base "Base system (MANDATORY)" on -kernel-dbg.txz ec4fe46bfb0cb684cd5af09e3531fe5a1dd622102eac6fe5672ca838fdd0a806 708 kernel_dbg "Kernel (Debugging)" on -kernel.txz 485fedb21f7386dcd24816841638e45f5ca4c6a1e05ec1a4cd7b903b9c85a887 722 kernel "Kernel (MANDATORY)" on -lib32-dbg.txz a533c6416218a66c25bb8f477657e97fdc3e75007a28c6874ba84ee4bdef049c 235 lib32_dbg "32-bit compatibility libraries (Debugging)" off -lib32.txz ba79a3c63be52e44561500592a84f13d1ffb436ef3b59e2035b2813cd1e33c45 974 lib32 "32-bit compatibility libraries" on -ports.txz bcd37b1ba86c59d8ae310c9a685e5a1620f47280cb37973cd872b29fa1b3f170 181750 ports "Ports tree" off -src.txz 32b5db69efd2610b8ef5b4491463e31ed3589237de9eca17bca24a86a10bbc9a 89724 src "System source tree" off -tests.txz 33fc16e848eaeff7f88f996eaef71554bc5b4848da38c30c600c03ea972e7cca 6104 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-12.3-RC1 b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-12.3-RC1 new file mode 100644 index 000000000000..97326f963ca8 --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-12.3-RC1 @@ -0,0 +1,9 @@ +base-dbg.txz 00a468888c6367c3952a2b24b26628ecde24637a65c93a0da3b8fc53fb26aeb7 1617 base_dbg "Base system (Debugging)" off +base.txz 1da6b67aa10805b4276467a1e0a3feaaa26697c6ca74ed46e392855c8e54cb3d 26186 base "Base system (MANDATORY)" on +kernel-dbg.txz 435ce380b18703e6606175b40f370adb4abfcc00c6646acf807c18a1fe2e49f9 708 kernel_dbg "Kernel (Debugging)" on +kernel.txz e26ca3f492cc88a26d12d9a9281c80ea665cdaf0167f0fe08760a664c7b8b077 722 kernel "Kernel (MANDATORY)" on +lib32-dbg.txz 01167441cf435bd15cbad95f3685fec24f84a74b42922687f9237ceb307407ba 235 lib32_dbg "32-bit compatibility libraries (Debugging)" off +lib32.txz 6c09fb81465b2d9e325c21b198d66fe5a1b9595d540a970fe523da2fcabf36bd 974 lib32 "32-bit compatibility libraries" on +ports.txz 42f79435853bf9dddbf9ea89bcbeaf24e9a26610d76ca940b5c769f40dfb8712 181801 ports "Ports tree" off +src.txz 038d6f0f33bef0f9718b57a0b0b166231972a656f9d364dbb342f0cfc4a47934 89724 src "System source tree" off +tests.txz 0fd5c08f689b614a3958570add9b5f59dad73586dffc68c7f6c3aa09eea5ffa2 6104 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpcspe-12.3-BETA2 b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpcspe-12.3-BETA2 deleted file mode 100644 index ae583928c0da..000000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpcspe-12.3-BETA2 +++ /dev/null @@ -1,7 +0,0 @@ -base-dbg.txz 42a09934fd93e1c89d6f4d41f795daa5daaade335c60b94b7a1ec8188c6a9adc 1608 base_dbg "Base system (Debugging)" off -base.txz 0073131d84cc46941bfc2d40cdcdaf2266a7cc395898fdada5d64f31063f923b 26153 base "Base system (MANDATORY)" on -kernel-dbg.txz ea577cc8a0eb4083d4dd001344ff18bdb34a26f2e798d3728769fd142fee8bbf 612 kernel_dbg "Kernel (Debugging)" on -kernel.txz 310108acf0239d4450f8c9798399b660b337c7beb61b0e610dd1423e4a814444 626 kernel "Kernel (MANDATORY)" on -ports.txz bcd37b1ba86c59d8ae310c9a685e5a1620f47280cb37973cd872b29fa1b3f170 181750 ports "Ports tree" off -src.txz 32b5db69efd2610b8ef5b4491463e31ed3589237de9eca17bca24a86a10bbc9a 89724 src "System source tree" off -tests.txz 62ad3d72b49e3366c9152f99ce3e9aab8023eb5d8157993d1497690fe8d0ce80 6101 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpcspe-12.3-RC1 b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpcspe-12.3-RC1 new file mode 100644 index 000000000000..c03c11ba0b0c --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpcspe-12.3-RC1 @@ -0,0 +1,7 @@ +base-dbg.txz 21c1f2beb1037ef8ad03e25201d03a23251a7bbf135114ba5583b2365ea9197b 1608 base_dbg "Base system (Debugging)" off +base.txz 01c28bbd10a7dcd7ed7a108844c18335811b1a866ea352f204e28178cf1f879b 26153 base "Base system (MANDATORY)" on +kernel-dbg.txz 087020f985c62345f8765579f3718bbc7ef69cd3ea44629ea4bdc58ba17e61cf 612 kernel_dbg "Kernel (Debugging)" on +kernel.txz 03a81ca2a412c42e48d278bf7033ee9cfbcc0250c1ac349cee616e9030e3fed0 626 kernel "Kernel (MANDATORY)" on +ports.txz 42f79435853bf9dddbf9ea89bcbeaf24e9a26610d76ca940b5c769f40dfb8712 181801 ports "Ports tree" off +src.txz 038d6f0f33bef0f9718b57a0b0b166231972a656f9d364dbb342f0cfc4a47934 89724 src "System source tree" off +tests.txz f5d722c2d110642854c3f91604fc829d51dcaffc8f2840e41d509733aff069e8 6101 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-12.3-BETA2 b/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-12.3-BETA2 deleted file mode 100644 index 357652e38c6f..000000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-12.3-BETA2 +++ /dev/null @@ -1,7 +0,0 @@ -base-dbg.txz f8b9370a2dae2e7f08af0ddf43fbd47569ea1aa387e3fc2caa95c04fe978bdf2 1608 base_dbg "Base system (Debugging)" off -base.txz b2172add0c82b2d0368859674d237aaf69d210e88e1d00f72312e21c2a7a3131 26091 base "Base system (MANDATORY)" on -kernel-dbg.txz 5e11421824600735d68e8af7e8381185c1fa64197196a014ce61805223d1ed81 594 kernel_dbg "Kernel (Debugging)" on -kernel.txz c8754a1299a0cc01245c230ae03dfc49836e1229678e0ca1d0c384a60be443a5 606 kernel "Kernel (MANDATORY)" on -ports.txz bcd37b1ba86c59d8ae310c9a685e5a1620f47280cb37973cd872b29fa1b3f170 181750 ports "Ports tree" off -src.txz 32b5db69efd2610b8ef5b4491463e31ed3589237de9eca17bca24a86a10bbc9a 89724 src "System source tree" off -tests.txz 4d4fc826e6f4efb66a58d8f8a7a7139f6504db86383ee401a1c3cae93cd9155e 6097 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-12.3-RC1 b/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-12.3-RC1 new file mode 100644 index 000000000000..c24ee0a2a871 --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-12.3-RC1 @@ -0,0 +1,7 @@ +base-dbg.txz c1904b9080e1987a4964e3dab331dbb20961b1df14c1adc243300e94fd491385 1608 base_dbg "Base system (Debugging)" off +base.txz e1f2c7aeb5b7550173a307e0459e106a06ea6aeb66c251c3709319bcd40c2f18 26091 base "Base system (MANDATORY)" on +kernel-dbg.txz de0afd28d440e737c4869bbd69e1c5224358ea516c390416aae69be595406f60 594 kernel_dbg "Kernel (Debugging)" on +kernel.txz 774129700398dd7ab8777a6bc3bf292e17eb6f65e6b24d46d35839f9523f331f 606 kernel "Kernel (MANDATORY)" on +ports.txz 42f79435853bf9dddbf9ea89bcbeaf24e9a26610d76ca940b5c769f40dfb8712 181801 ports "Ports tree" off +src.txz 038d6f0f33bef0f9718b57a0b0b166231972a656f9d364dbb342f0cfc4a47934 89724 src "System source tree" off +tests.txz b6e0e2fe74861774cb209ed44038faa86370b98a0d70de0b11cb92330b038cb0 6097 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/pkg-plist b/misc/freebsd-release-manifests/pkg-plist index 14edc687a8e3..84287ba9f131 100644 --- a/misc/freebsd-release-manifests/pkg-plist +++ b/misc/freebsd-release-manifests/pkg-plist @@ -13,13 +13,6 @@ %%DATADIR%%/MANIFESTS/powerpc-powerpc64le-13.0-RELEASE %%DATADIR%%/MANIFESTS/powerpc-powerpcspe-13.0-RELEASE %%DATADIR%%/MANIFESTS/riscv-riscv64-13.0-RELEASE -%%DATADIR%%/MANIFESTS/amd64-amd64-12.3-BETA2 -%%DATADIR%%/MANIFESTS/arm64-aarch64-12.3-BETA2 -%%DATADIR%%/MANIFESTS/i386-i386-12.3-BETA2 -%%DATADIR%%/MANIFESTS/powerpc-powerpc-12.3-BETA2 -%%DATADIR%%/MANIFESTS/powerpc-powerpc64-12.3-BETA2 -%%DATADIR%%/MANIFESTS/powerpc-powerpcspe-12.3-BETA2 -%%DATADIR%%/MANIFESTS/sparc64-sparc64-12.3-BETA2 %%DATADIR%%/MANIFESTS/amd64-amd64-12.3-BETA3 %%DATADIR%%/MANIFESTS/arm64-aarch64-12.3-BETA3 %%DATADIR%%/MANIFESTS/i386-i386-12.3-BETA3 @@ -27,3 +20,10 @@ %%DATADIR%%/MANIFESTS/powerpc-powerpc64-12.3-BETA3 %%DATADIR%%/MANIFESTS/powerpc-powerpcspe-12.3-BETA3 %%DATADIR%%/MANIFESTS/sparc64-sparc64-12.3-BETA3 +%%DATADIR%%/MANIFESTS/amd64-amd64-12.3-RC1 +%%DATADIR%%/MANIFESTS/arm64-aarch64-12.3-RC1 +%%DATADIR%%/MANIFESTS/i386-i386-12.3-RC1 +%%DATADIR%%/MANIFESTS/powerpc-powerpc-12.3-RC1 +%%DATADIR%%/MANIFESTS/powerpc-powerpc64-12.3-RC1 +%%DATADIR%%/MANIFESTS/powerpc-powerpcspe-12.3-RC1 +%%DATADIR%%/MANIFESTS/sparc64-sparc64-12.3-RC1 From nobody Fri Nov 12 06:06:03 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 223441843CDC; Fri, 12 Nov 2021 06:06: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 4Hr7PR6jL4z4cy4; Fri, 12 Nov 2021 06:06: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 A8DAD1A51B; Fri, 12 Nov 2021 06:06: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 1AC663MB002842; Fri, 12 Nov 2021 06:06:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AC663k7002841; Fri, 12 Nov 2021 06:06:03 GMT (envelope-from git) Date: Fri, 12 Nov 2021 06:06:03 GMT Message-Id: <202111120606.1AC663k7002841@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: e4f8ec7183d2 - 2021Q4 - devel/ruby-build: Update to 20211109 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: e4f8ec7183d2f598464a4689408678a8d59522c4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=e4f8ec7183d2f598464a4689408678a8d59522c4 commit e4f8ec7183d2f598464a4689408678a8d59522c4 Author: Koichiro Iwao AuthorDate: 2021-11-12 06:02:56 +0000 Commit: Koichiro Iwao CommitDate: 2021-11-12 06:05:54 +0000 devel/ruby-build: Update to 20211109 Changes: https://github.com/rbenv/ruby-build/releases/tag/v20211109 Sponsored by: HAW International (cherry picked from commit 93daebae57730944e2c172a9e97eb680162bf04f) --- 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 1fda35645f36..d02d1203216a 100644 --- a/devel/ruby-build/Makefile +++ b/devel/ruby-build/Makefile @@ -1,5 +1,5 @@ PORTNAME= ruby-build -PORTVERSION= 20211019 +PORTVERSION= 20211109 DISTVERSIONPREFIX= v CATEGORIES= devel ruby DIST_SUBDIR= rbenv diff --git a/devel/ruby-build/distinfo b/devel/ruby-build/distinfo index 82996d45abee..7b1a4393c9fb 100644 --- a/devel/ruby-build/distinfo +++ b/devel/ruby-build/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634716162 -SHA256 (rbenv/rbenv-ruby-build-v20211019_GH0.tar.gz) = 1e3e03bf36e5ab253803fd62a83acca246f78d5cbf96ccaec305a9ece02661a1 -SIZE (rbenv/rbenv-ruby-build-v20211019_GH0.tar.gz) = 73000 +TIMESTAMP = 1636611166 +SHA256 (rbenv/rbenv-ruby-build-v20211109_GH0.tar.gz) = 73d8f628bd15dc625d6ee6af7cec5d25bdec9a572b3f3c41b736912a18e5b59b +SIZE (rbenv/rbenv-ruby-build-v20211109_GH0.tar.gz) = 72903 From nobody Fri Nov 12 10:39:21 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 62BE4185C9CE; Fri, 12 Nov 2021 10:39: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 4HrFSn2LQ2z3K8H; Fri, 12 Nov 2021 10:39: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 301BE1DCC8; Fri, 12 Nov 2021 10:39: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 1ACAdLJX061603; Fri, 12 Nov 2021 10:39:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ACAdLAA061602; Fri, 12 Nov 2021 10:39:21 GMT (envelope-from git) Date: Fri, 12 Nov 2021 10:39:21 GMT Message-Id: <202111121039.1ACAdLAA061602@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 4882c4fae85a - 2021Q4 - ports-mgmt/pkg: update to 1.17.3 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 4882c4fae85a4d91340e6166af0e83eb0616bb95 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=4882c4fae85a4d91340e6166af0e83eb0616bb95 commit 4882c4fae85a4d91340e6166af0e83eb0616bb95 Author: Baptiste Daroussin AuthorDate: 2021-10-19 06:22:21 +0000 Commit: Baptiste Daroussin CommitDate: 2021-11-12 10:38:40 +0000 ports-mgmt/pkg: update to 1.17.3 Changes: - revert 2 regressions, * periodic script for audit which reduced verbosity * the fallback on version mismatch on pkg add - prevent an endless recursion on the solver - make fingerprint signature validation respect rootdir MFH after: 1 week (cherry picked from commit e9e85de23c6e0bf0947b7cf95dcd28fcffb2606c) --- ports-mgmt/pkg/Makefile | 2 +- ports-mgmt/pkg/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index c874d72f8464..3157ffa20ae0 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -1,5 +1,5 @@ PORTNAME= pkg -DISTVERSION= 1.17.2 +DISTVERSION= 1.17.3 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt #MASTER_SITES= \ diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo index 309a70615dd0..922bc80b9faa 100644 --- a/ports-mgmt/pkg/distinfo +++ b/ports-mgmt/pkg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1632212405 -SHA256 (freebsd-pkg-1.17.2_GH0.tar.gz) = daf56189d855781dc15d210fd264adc761591f86ffd4fcb7360015b004777061 -SIZE (freebsd-pkg-1.17.2_GH0.tar.gz) = 3898224 +TIMESTAMP = 1634623827 +SHA256 (freebsd-pkg-1.17.3_GH0.tar.gz) = 14810caf76e5ebdb692d4186d73dd7041a8cdb9a908e26921c84c53fccc827d0 +SIZE (freebsd-pkg-1.17.3_GH0.tar.gz) = 3898464 From nobody Fri Nov 12 10:39:22 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A3854185CAC4; Fri, 12 Nov 2021 10:39:22 +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 4HrFSp3Y4qz3KBW; Fri, 12 Nov 2021 10:39: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 59F2C1DFA1; Fri, 12 Nov 2021 10:39: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 1ACAdMtw061627; Fri, 12 Nov 2021 10:39:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ACAdMfv061626; Fri, 12 Nov 2021 10:39:22 GMT (envelope-from git) Date: Fri, 12 Nov 2021 10:39:22 GMT Message-Id: <202111121039.1ACAdMfv061626@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: bc6d63f1065b - 2021Q4 - ports-mgmt/pkg: update to 1.17.4 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: bc6d63f1065be68cf0c03c5c7a71893f7ac59bcb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=bc6d63f1065be68cf0c03c5c7a71893f7ac59bcb commit bc6d63f1065be68cf0c03c5c7a71893f7ac59bcb Author: Baptiste Daroussin AuthorDate: 2021-11-04 09:33:42 +0000 Commit: Baptiste Daroussin CommitDate: 2021-11-12 10:38:45 +0000 ports-mgmt/pkg: update to 1.17.4 Changes - ensure pkg waits for the programs executed by the triggers (cherry picked from commit 7f73a93ef2a0fdab0431357e772c583b9652d781) --- ports-mgmt/pkg/Makefile | 2 +- ports-mgmt/pkg/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index 3157ffa20ae0..2443a0fa90fc 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -1,5 +1,5 @@ PORTNAME= pkg -DISTVERSION= 1.17.3 +DISTVERSION= 1.17.4 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt #MASTER_SITES= \ diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo index 922bc80b9faa..c02e008b16bf 100644 --- a/ports-mgmt/pkg/distinfo +++ b/ports-mgmt/pkg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634623827 -SHA256 (freebsd-pkg-1.17.3_GH0.tar.gz) = 14810caf76e5ebdb692d4186d73dd7041a8cdb9a908e26921c84c53fccc827d0 -SIZE (freebsd-pkg-1.17.3_GH0.tar.gz) = 3898464 +TIMESTAMP = 1636018296 +SHA256 (freebsd-pkg-1.17.4_GH0.tar.gz) = 2ac2926573bc1f9f261925a72a02f63c3124b9428d0acba8092dfad7016fd848 +SIZE (freebsd-pkg-1.17.4_GH0.tar.gz) = 3898565 From nobody Fri Nov 12 10:39:23 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5AD25185C95F; Fri, 12 Nov 2021 10:39: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 4HrFSq4lWWz3K15; Fri, 12 Nov 2021 10:39: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 7AD1D1E006; Fri, 12 Nov 2021 10:39: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 1ACAdNL3061651; Fri, 12 Nov 2021 10:39:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ACAdNBi061650; Fri, 12 Nov 2021 10:39:23 GMT (envelope-from git) Date: Fri, 12 Nov 2021 10:39:23 GMT Message-Id: <202111121039.1ACAdNBi061650@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: e6ff6d4236ff - 2021Q4 - ports-mgmt/pkg: update to 1.17.5 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: e6ff6d4236ffa5383bf8768013524b44022bb288 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=e6ff6d4236ffa5383bf8768013524b44022bb288 commit e6ff6d4236ffa5383bf8768013524b44022bb288 Author: Baptiste Daroussin AuthorDate: 2021-11-12 10:12:43 +0000 Commit: Baptiste Daroussin CommitDate: 2021-11-12 10:38:56 +0000 ports-mgmt/pkg: update to 1.17.5 Changes from 1.17.4 to 1.17.5 - pkg add: only runs triggers at the end of the equivalent of a transaction - pkg search: fix the combinaison of -q and -o - pkg fetch: correctly exit with error on fetch failures - Improve error message when failing to drop privileges (cherry picked from commit 18793d10585f6e95abcc6e70d514f0fcdc18cbbc) --- ports-mgmt/pkg/Makefile | 2 +- ports-mgmt/pkg/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index 2443a0fa90fc..79d7c4427191 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -1,5 +1,5 @@ PORTNAME= pkg -DISTVERSION= 1.17.4 +DISTVERSION= 1.17.5 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt #MASTER_SITES= \ diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo index c02e008b16bf..0e828a5b79a8 100644 --- a/ports-mgmt/pkg/distinfo +++ b/ports-mgmt/pkg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1636018296 -SHA256 (freebsd-pkg-1.17.4_GH0.tar.gz) = 2ac2926573bc1f9f261925a72a02f63c3124b9428d0acba8092dfad7016fd848 -SIZE (freebsd-pkg-1.17.4_GH0.tar.gz) = 3898565 +TIMESTAMP = 1636711882 +SHA256 (freebsd-pkg-1.17.5_GH0.tar.gz) = 4ee22102c136898ec19e6359079a492dc898309bc284dd26e9ec9f5d8b5bae77 +SIZE (freebsd-pkg-1.17.5_GH0.tar.gz) = 3898974 From nobody Fri Nov 12 16:40:09 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 26E81183D82D; Fri, 12 Nov 2021 16:40: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 4HrPT60T7xz3R6C; Fri, 12 Nov 2021 16:40: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 E079A22C17; Fri, 12 Nov 2021 16:40: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 1ACGe9JZ044660; Fri, 12 Nov 2021 16:40:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ACGe9tb044657; Fri, 12 Nov 2021 16:40:09 GMT (envelope-from git) Date: Fri, 12 Nov 2021 16:40:09 GMT Message-Id: <202111121640.1ACGe9tb044657@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Gleb Popov Subject: git: 3a17aaa55efe - 2021Q4 - sysutils/consolekit2: Remove problematic patch. List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 3a17aaa55efe7905f5dc1ec6837450bf8dc5c17d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=3a17aaa55efe7905f5dc1ec6837450bf8dc5c17d commit 3a17aaa55efe7905f5dc1ec6837450bf8dc5c17d Author: Jesper Schmitz Mouridsen AuthorDate: 2021-11-04 15:45:20 +0000 Commit: Gleb Popov CommitDate: 2021-11-12 16:39:41 +0000 sysutils/consolekit2: Remove problematic patch. This change prevents ConsoleKit from tracking a currently active terminal. PR: 221452 Reviewed by: Greg V (cherry picked from commit bc31b1a620cadcdb5fa688de58d2fa04edccdc18) --- sysutils/consolekit2/Makefile | 2 +- sysutils/consolekit2/distinfo | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sysutils/consolekit2/Makefile b/sysutils/consolekit2/Makefile index 21220daa821d..f8df785b21f2 100644 --- a/sysutils/consolekit2/Makefile +++ b/sysutils/consolekit2/Makefile @@ -2,6 +2,7 @@ PORTNAME= consolekit PORTVERSION= 1.2.4 +PORTREVISION= 1 CATEGORIES= sysutils gnome PKGNAMESUFFIX= 2 @@ -10,7 +11,6 @@ PATCH_SITES= https://github.com/unrelentingtech/ConsoleKit2/commit/ PATCHFILES= 03eaa9779f2c9c7b0acf0521a5547036bdec2245.patch:-p1 \ 05f26e99539e7a442e57035ed6d64fdd9a50feb9.patch:-p1 \ ea4a569100dfa44a0c9d42b1cf7381fd8f88c837.patch:-p1 \ - 18a058576d118dec428d81c7e2e3369d9ec939d0.patch:-p1 \ 42b8c93b2b7c2a57a74580531c73ab736e95336a.patch:-p1 MAINTAINER= desktop@FreeBSD.org diff --git a/sysutils/consolekit2/distinfo b/sysutils/consolekit2/distinfo index dc669d7d9141..e8286fc34aa4 100644 --- a/sysutils/consolekit2/distinfo +++ b/sysutils/consolekit2/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1625779902 +TIMESTAMP = 1635592773 SHA256 (ConsoleKit2-ConsoleKit2-1.2.4-520b862_GH0.tar.gz) = a7632d616b455923afe810e955f869ecd62bd83d5422178188d7659d2656257b SIZE (ConsoleKit2-ConsoleKit2-1.2.4-520b862_GH0.tar.gz) = 256578 SHA256 (03eaa9779f2c9c7b0acf0521a5547036bdec2245.patch) = efcf04ccaba47ad4c979fa694baab3abe7f04fc24c90838b6cbf1e7d709056e6 @@ -7,7 +7,5 @@ SHA256 (05f26e99539e7a442e57035ed6d64fdd9a50feb9.patch) = 36eb5011e29173f955e27f SIZE (05f26e99539e7a442e57035ed6d64fdd9a50feb9.patch) = 1409 SHA256 (ea4a569100dfa44a0c9d42b1cf7381fd8f88c837.patch) = 37ce4fc9a2360089e3d3fadb1ea581fd2d4bcbc68d5981fdedf7baa1a6ad91e6 SIZE (ea4a569100dfa44a0c9d42b1cf7381fd8f88c837.patch) = 2336 -SHA256 (18a058576d118dec428d81c7e2e3369d9ec939d0.patch) = 46a79687dd3736469086fa68928d4914152b0c00eee994e03b418700ba115e96 -SIZE (18a058576d118dec428d81c7e2e3369d9ec939d0.patch) = 810 SHA256 (42b8c93b2b7c2a57a74580531c73ab736e95336a.patch) = 7a2a144352f137acbd933b48c1f465b3b3f17104eb163e7b2371220510ff2976 SIZE (42b8c93b2b7c2a57a74580531c73ab736e95336a.patch) = 916 From nobody Fri Nov 12 17:50:26 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CFB451838883; Fri, 12 Nov 2021 17:50: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 4HrR2B5TL3z4c8d; Fri, 12 Nov 2021 17:50:26 +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 9D4BB23C90; Fri, 12 Nov 2021 17:50: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 1ACHoQE3043759; Fri, 12 Nov 2021 17:50:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ACHoQXK043758; Fri, 12 Nov 2021 17:50:26 GMT (envelope-from git) Date: Fri, 12 Nov 2021 17:50:26 GMT Message-Id: <202111121750.1ACHoQXK043758@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Brooks Davis Subject: git: 3b3a785bf35d - 2021Q4 - devel/llvm13: fix building software with -fstack-protector-strong List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 3b3a785bf35d1b77e26324f7950791b460d80bd1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=3b3a785bf35d1b77e26324f7950791b460d80bd1 commit 3b3a785bf35d1b77e26324f7950791b460d80bd1 Author: Piotr Kubaj AuthorDate: 2021-11-12 17:31:00 +0000 Commit: Brooks Davis CommitDate: 2021-11-12 17:31:00 +0000 devel/llvm13: fix building software with -fstack-protector-strong Apply https://reviews.llvm.org/D109090 Fixes immediate segfault when executing binaries built by the port's compiler with -fstack-protector-strong. Submitted by: adalava (cherry picked from commit 531a51cc368cf2f53fd21923532964ba96965474) devel/llvm13: revert to the older powerpc64 fix The newer one apparently causes a regression on amd64 freestanding binaries. While here, fix some whitespace issues in Makefile. Submitted by: adalava (cherry picked from commit d326758c32dff2938c1da97c0df5926612c3efa2) --- devel/llvm13/Makefile | 8 ++++---- .../files/patch-llvm_lib_CodeGen_TargetLoweringBase.cpp | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile index 6a6dfde8cac4..da322d06b25b 100644 --- a/devel/llvm13/Makefile +++ b/devel/llvm13/Makefile @@ -385,7 +385,7 @@ _BE_LIBS_AMDGPU= AsmParser Disassembler Utils _BE_LIBS_BACKWARDS_AMDGPU=MCACustomBehaviour _BE_LIBS_ARM= AsmParser Disassembler Utils _BE_LIBS_AVR= AsmParser Disassembler -_BE_LIBS_BPF= AsmParser Disassembler +_BE_LIBS_BPF= AsmParser Disassembler _BE_LIBS_Hexagon= AsmParser Disassembler _BE_LIBS_Lanai= AsmParser Disassembler _BE_LIBS_MSP430= AsmParser Disassembler @@ -412,7 +412,7 @@ BE_PATTERN=${_BE_LIBS_STANDARD:O:S/$/.a/:ts|} _CRTLIBDIR= ${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/lib/freebsd _CRTBLDIR= ${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/share _COMPILER_RT_BLACKLISTS= cfi_ignorelist.txt -_COMPILER_RT_LIBS_i386= \ +_COMPILER_RT_LIBS_i386= \ libclang_rt.asan-i386.a \ libclang_rt.asan-i386.so \ libclang_rt.asan-preinit-i386.a \ @@ -432,7 +432,7 @@ _COMPILER_RT_LIBS_i386= \ .if ${ARCH} == "amd64" _COMPILER_RT_BLACKLISTS+= asan_ignorelist.txt _COMPILER_RT_BLACKLISTS+= msan_ignorelist.txt -_COMPILER_RT_LIBS= \ +_COMPILER_RT_LIBS= \ libclang_rt.asan-preinit-x86_64.a \ libclang_rt.asan-x86_64.a \ libclang_rt.asan-x86_64.a.syms \ @@ -490,7 +490,7 @@ MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin # Comment out plist entries for unsupported options. .for opt in ${_ALL_OPTIONS} .if !${OPTIONS_DEFINE:M${opt}} -PLIST_SUB+= ${opt}="@comment " +PLIST_SUB+= ${opt}="@comment " .endif .endfor diff --git a/devel/llvm13/files/patch-llvm_lib_CodeGen_TargetLoweringBase.cpp b/devel/llvm13/files/patch-llvm_lib_CodeGen_TargetLoweringBase.cpp new file mode 100644 index 000000000000..be583763f6ea --- /dev/null +++ b/devel/llvm13/files/patch-llvm_lib_CodeGen_TargetLoweringBase.cpp @@ -0,0 +1,14 @@ +diff --git a/contrib/llvm-project/llvm/lib/CodeGen/TargetLoweringBase.cpp b/contrib/llvm-project/llvm/lib/CodeGen/TargetLoweringBase.cpp +--- llvm/lib/CodeGen/TargetLoweringBase.cpp ++++ llvm/lib/CodeGen/TargetLoweringBase.cpp +@@ -1961,7 +1961,8 @@ + GlobalVariable::ExternalLinkage, nullptr, + "__stack_chk_guard"); + if (TM.getRelocationModel() == Reloc::Static && +- !TM.getTargetTriple().isWindowsGNUEnvironment()) ++ !TM.getTargetTriple().isWindowsGNUEnvironment() && ++ !(TM.getTargetTriple().isPPC64() && TM.getTargetTriple().isOSFreeBSD())) + GV->setDSOLocal(true); + } + } + From nobody Fri Nov 12 17:50:27 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 239331838809; Fri, 12 Nov 2021 17:50: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 4HrR2C6rNBz4cFd; Fri, 12 Nov 2021 17:50: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 BFA1723BAF; Fri, 12 Nov 2021 17:50: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 1ACHoR51043790; Fri, 12 Nov 2021 17:50:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ACHoR8P043789; Fri, 12 Nov 2021 17:50:27 GMT (envelope-from git) Date: Fri, 12 Nov 2021 17:50:27 GMT Message-Id: <202111121750.1ACHoR8P043789@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Brooks Davis Subject: git: 7199fa9647da - 2021Q4 - devel/llvm1[123]: Fix VIA PadLock xstore List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 7199fa9647da955f378022eb37ec6a6568b80577 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=7199fa9647da955f378022eb37ec6a6568b80577 commit 7199fa9647da955f378022eb37ec6a6568b80577 Author: Brooks Davis AuthorDate: 2021-11-12 17:31:00 +0000 Commit: Brooks Davis CommitDate: 2021-11-12 17:31:00 +0000 devel/llvm1[123]: Fix VIA PadLock xstore Pull in the code gen portion of upstream LLVM's 2d8c18fbbdd1. MFH: 2021Q4 Sponsored by: DARPA (cherry picked from commit 0cb1a5fe81b339b760e1d671269285e63d82c689) --- devel/llvm11/Makefile | 2 +- devel/llvm11/files/patch-lib_Target_X86_X86InstrSystem.td | 11 +++++++++++ devel/llvm12/Makefile | 2 +- .../llvm12/files/patch-llvm_lib_Target_X86_X86InstrSystem.td | 11 +++++++++++ devel/llvm13/Makefile | 2 +- .../llvm13/files/patch-llvm_lib_Target_X86_X86InstrSystem.td | 11 +++++++++++ 6 files changed, 36 insertions(+), 3 deletions(-) diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile index 5169370c65af..22fcb59ae045 100644 --- a/devel/llvm11/Makefile +++ b/devel/llvm11/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 11.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} diff --git a/devel/llvm11/files/patch-lib_Target_X86_X86InstrSystem.td b/devel/llvm11/files/patch-lib_Target_X86_X86InstrSystem.td new file mode 100644 index 000000000000..383e72a07cfc --- /dev/null +++ b/devel/llvm11/files/patch-lib_Target_X86_X86InstrSystem.td @@ -0,0 +1,11 @@ +--- lib/Target/X86/X86InstrSystem.td.orig ++++ lib/Target/X86/X86InstrSystem.td +@@ -573,7 +573,7 @@ + //===----------------------------------------------------------------------===// + // VIA PadLock crypto instructions + let Defs = [RAX, RDI], Uses = [RDX, RDI], SchedRW = [WriteSystem] in +- def XSTORE : I<0xa7, MRM_C0, (outs), (ins), "xstore", []>, TB, REP; ++ def XSTORE : I<0xa7, MRM_C0, (outs), (ins), "xstore", []>, TB; + + def : InstAlias<"xstorerng", (XSTORE)>; + diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile index 3a8cc22c1b28..f15b786f8a0a 100644 --- a/devel/llvm12/Makefile +++ b/devel/llvm12/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 12.0.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} diff --git a/devel/llvm12/files/patch-llvm_lib_Target_X86_X86InstrSystem.td b/devel/llvm12/files/patch-llvm_lib_Target_X86_X86InstrSystem.td new file mode 100644 index 000000000000..c855644e7719 --- /dev/null +++ b/devel/llvm12/files/patch-llvm_lib_Target_X86_X86InstrSystem.td @@ -0,0 +1,11 @@ +--- llvm/lib/Target/X86/X86InstrSystem.td.orig ++++ llvm/lib/Target/X86/X86InstrSystem.td +@@ -585,7 +585,7 @@ + //===----------------------------------------------------------------------===// + // VIA PadLock crypto instructions + let Defs = [RAX, RDI], Uses = [RDX, RDI], SchedRW = [WriteSystem] in +- def XSTORE : I<0xa7, MRM_C0, (outs), (ins), "xstore", []>, TB, REP; ++ def XSTORE : I<0xa7, MRM_C0, (outs), (ins), "xstore", []>, TB; + + def : InstAlias<"xstorerng", (XSTORE)>; + diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile index da322d06b25b..7de7bc6d4ecd 100644 --- a/devel/llvm13/Makefile +++ b/devel/llvm13/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 13.0.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} diff --git a/devel/llvm13/files/patch-llvm_lib_Target_X86_X86InstrSystem.td b/devel/llvm13/files/patch-llvm_lib_Target_X86_X86InstrSystem.td new file mode 100644 index 000000000000..c855644e7719 --- /dev/null +++ b/devel/llvm13/files/patch-llvm_lib_Target_X86_X86InstrSystem.td @@ -0,0 +1,11 @@ +--- llvm/lib/Target/X86/X86InstrSystem.td.orig ++++ llvm/lib/Target/X86/X86InstrSystem.td +@@ -585,7 +585,7 @@ + //===----------------------------------------------------------------------===// + // VIA PadLock crypto instructions + let Defs = [RAX, RDI], Uses = [RDX, RDI], SchedRW = [WriteSystem] in +- def XSTORE : I<0xa7, MRM_C0, (outs), (ins), "xstore", []>, TB, REP; ++ def XSTORE : I<0xa7, MRM_C0, (outs), (ins), "xstore", []>, TB; + + def : InstAlias<"xstorerng", (XSTORE)>; + From nobody Fri Nov 12 17:50:28 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C352018385EC; Fri, 12 Nov 2021 17:50: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 4HrR2F1FKSz4c5D; Fri, 12 Nov 2021 17:50: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 E8B692384D; Fri, 12 Nov 2021 17:50: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 1ACHoS8n043814; Fri, 12 Nov 2021 17:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ACHoSHQ043813; Fri, 12 Nov 2021 17:50:28 GMT (envelope-from git) Date: Fri, 12 Nov 2021 17:50:28 GMT Message-Id: <202111121750.1ACHoSHQ043813@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Brooks Davis Subject: git: a4b2e2d68c29 - 2021Q4 - devel/llvm13: fix install with MLIR disabled List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: a4b2e2d68c299e59e0edad2f066b8913f0773601 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=a4b2e2d68c299e59e0edad2f066b8913f0773601 commit a4b2e2d68c299e59e0edad2f066b8913f0773601 Author: Brooks Davis AuthorDate: 2021-11-12 17:31:01 +0000 Commit: Brooks Davis CommitDate: 2021-11-12 17:31:01 +0000 devel/llvm13: fix install with MLIR disabled PR: 259570 (reported here, but tangential) Reported by: stephen (cherry picked from commit 3f4163a191133d25b424dff14a6cde8d89c34e65) --- devel/llvm13/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile index 7de7bc6d4ecd..85d670a823ca 100644 --- a/devel/llvm13/Makefile +++ b/devel/llvm13/Makefile @@ -537,6 +537,9 @@ post-install-DOCS-on: .if ! ${PORT_OPTIONS:MLIT} ${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1 ${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1 +.endif +.if ! ${PORT_OPTIONS:MMLIR} + ${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/mlir-tblgen.1 .endif ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/ ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/ From nobody Fri Nov 12 17:50:29 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A74461838745; Fri, 12 Nov 2021 17:50: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 4HrR2H1kCTz4c8t; Fri, 12 Nov 2021 17:50: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 24B3123C1F; Fri, 12 Nov 2021 17:50: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 1ACHoUgP043838; Fri, 12 Nov 2021 17:50:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ACHoTF3043837; Fri, 12 Nov 2021 17:50:29 GMT (envelope-from git) Date: Fri, 12 Nov 2021 17:50:29 GMT Message-Id: <202111121750.1ACHoTF3043837@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Brooks Davis Subject: git: 1f93b867a1d9 - 2021Q4 - devel/llvm13: bump PORTREVISON List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 1f93b867a1d9f50a81661cf7d28307ca50ddac3e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f93b867a1d9f50a81661cf7d28307ca50ddac3e commit 1f93b867a1d9f50a81661cf7d28307ca50ddac3e Author: Brooks Davis AuthorDate: 2021-11-12 17:31:01 +0000 Commit: Brooks Davis CommitDate: 2021-11-12 17:31:01 +0000 devel/llvm13: bump PORTREVISON The patch fixed in d326758c32dff2938c1da97c0df5926612c3efa2 broke non-powerpc platforms so we need a bump for all platforms. Requested by: kib (cherry picked from commit 7506e42640814a3f02e6392f366d8d6ee1414978) --- devel/llvm13/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile index 85d670a823ca..e83420088f37 100644 --- a/devel/llvm13/Makefile +++ b/devel/llvm13/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 13.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} From nobody Sat Nov 13 00:39:11 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 32D561857941; Sat, 13 Nov 2021 00:39:12 +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 4Hrc5r0wjnz4xj3; Sat, 13 Nov 2021 00:39: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 00502198C; Sat, 13 Nov 2021 00:39: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 1AD0dB2N082919; Sat, 13 Nov 2021 00:39:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AD0dBoM082918; Sat, 13 Nov 2021 00:39:11 GMT (envelope-from git) Date: Sat, 13 Nov 2021 00:39:11 GMT Message-Id: <202111130039.1AD0dBoM082918@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: f557b14c0293 - 2021Q4 - emulators/yuzu: update to s20211111 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: f557b14c0293553e198c7ee1f0e819cef4c3d1ef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f557b14c0293553e198c7ee1f0e819cef4c3d1ef commit f557b14c0293553e198c7ee1f0e819cef4c3d1ef Author: Jan Beich AuthorDate: 2021-11-11 05:26:59 +0000 Commit: Jan Beich CommitDate: 2021-11-13 00:37:39 +0000 emulators/yuzu: update to s20211111 Changes: https://github.com/yuzu-emu/yuzu/compare/bdabd17c7...852858c2c (cherry picked from commit c000289a09d2dbc75008921b93cc215684baade0) --- emulators/yuzu/Makefile | 4 ++-- emulators/yuzu/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index c27769831365..7e68475b4f98 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,5 +1,5 @@ PORTNAME= yuzu -PORTVERSION= s20211110 +PORTVERSION= s20211111 PORTREVISION?= 0 CATEGORIES= emulators @@ -33,7 +33,7 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \ USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= bdabd17c7 +GH_TAGNAME= 852858c2c GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \ KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-32-ga3fdfe8:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \ KhronosGroup:Vulkan-Headers:v1.2.180:Vulkan_Headers/externals/Vulkan-Headers \ diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo index f84d77cde68c..92df25584659 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1636548131 -SHA256 (yuzu-emu-yuzu-s20211110-bdabd17c7_GH0.tar.gz) = a260cf5a787320814fde49bde7cb684088c319297059943e5f1aa9a44a68d6f2 -SIZE (yuzu-emu-yuzu-s20211110-bdabd17c7_GH0.tar.gz) = 4322649 +TIMESTAMP = 1636608419 +SHA256 (yuzu-emu-yuzu-s20211111-852858c2c_GH0.tar.gz) = 5891c79c6b8fae54d03e7b729b25c5352fbb9d04ce93bc1c25f01e04d14fb349 +SIZE (yuzu-emu-yuzu-s20211111-852858c2c_GH0.tar.gz) = 4322807 SHA256 (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 8cd6d075b4da0ad5fb995eb37390e2e6088be8d41ab1cdfc7e7e4256bd991450 SIZE (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 2679189 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-32-ga3fdfe8_GH0.tar.gz) = bd629d6296dd374eb2aeff923c75895ba0f3ce6448dad89763930e65b954e0cb From nobody Sat Nov 13 00:39:13 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A32FF1857ED2; Sat, 13 Nov 2021 00:39: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 4Hrc5s2ghpz4xrf; Sat, 13 Nov 2021 00:39: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 34984198D; Sat, 13 Nov 2021 00:39: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 1AD0dDg8082943; Sat, 13 Nov 2021 00:39:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AD0dDjg082942; Sat, 13 Nov 2021 00:39:13 GMT (envelope-from git) Date: Sat, 13 Nov 2021 00:39:13 GMT Message-Id: <202111130039.1AD0dDjg082942@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: 8007faf1ed28 - 2021Q4 - devel/sdl12-compat: update to s20211111 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 8007faf1ed28ccce8655a4e560e135a271e2cf3b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=8007faf1ed28ccce8655a4e560e135a271e2cf3b commit 8007faf1ed28ccce8655a4e560e135a271e2cf3b Author: Jan Beich AuthorDate: 2021-11-11 20:51:50 +0000 Commit: Jan Beich CommitDate: 2021-11-13 00:37:40 +0000 devel/sdl12-compat: update to s20211111 Changes: https://github.com/libsdl-org/sdl12-compat/compare/36a09e4...c4f9449 (cherry picked from commit 60c7ac0f05b02ecf60ae284afb27514f619ff050) --- devel/sdl12-compat/Makefile | 4 ++-- devel/sdl12-compat/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/sdl12-compat/Makefile b/devel/sdl12-compat/Makefile index e389e78b9096..277e3dd6b39b 100644 --- a/devel/sdl12-compat/Makefile +++ b/devel/sdl12-compat/Makefile @@ -1,5 +1,5 @@ PORTNAME= sdl12-compat -PORTVERSION= s20211015 +PORTVERSION= s20211111 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org @@ -17,7 +17,7 @@ CMAKE_OFF+= ${CMAKE_TESTING_ON} CMAKE_TESTING_ON= SDL12TESTS CMAKE_TESTING_TARGET= # post-test GH_ACCOUNT= libsdl-org -GH_TAGNAME= 36a09e4 +GH_TAGNAME= c4f9449 SUFFIX= -${PORTNAME:C/.*-//} PLIST_FILES= etc/libmap.d/${PORTNAME}.conf \ lib/libSDL-1.2${SUFFIX}.so \ diff --git a/devel/sdl12-compat/distinfo b/devel/sdl12-compat/distinfo index 053f34b3a2e9..91750d370201 100644 --- a/devel/sdl12-compat/distinfo +++ b/devel/sdl12-compat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634313400 -SHA256 (libsdl-org-sdl12-compat-s20211015-36a09e4_GH0.tar.gz) = 87c8f63312538e92533642acbb62a4dd0d3ddd714e08320fafaf16773604bd71 -SIZE (libsdl-org-sdl12-compat-s20211015-36a09e4_GH0.tar.gz) = 410713 +TIMESTAMP = 1636663910 +SHA256 (libsdl-org-sdl12-compat-s20211111-c4f9449_GH0.tar.gz) = 3369339b6b18a72a67c5c19df1c8886b31a854885e0fdf1cc4896b011d3adae7 +SIZE (libsdl-org-sdl12-compat-s20211111-c4f9449_GH0.tar.gz) = 415345 From nobody Sat Nov 13 00:39:14 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A59B71857DD1; Sat, 13 Nov 2021 00:39: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 4Hrc5t3gY7z4xwP; Sat, 13 Nov 2021 00:39: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 488881A10; Sat, 13 Nov 2021 00:39: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 1AD0dEcv082967; Sat, 13 Nov 2021 00:39:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AD0dEfn082966; Sat, 13 Nov 2021 00:39:14 GMT (envelope-from git) Date: Sat, 13 Nov 2021 00:39:14 GMT Message-Id: <202111130039.1AD0dEfn082966@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: c6b432885165 - 2021Q4 - x11/swaync: update to s20211110 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: c6b432885165a14ba8f6efaacc5caa85a4f80a0a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c6b432885165a14ba8f6efaacc5caa85a4f80a0a commit c6b432885165a14ba8f6efaacc5caa85a4f80a0a Author: Jan Beich AuthorDate: 2021-11-10 17:07:29 +0000 Commit: Jan Beich CommitDate: 2021-11-13 00:37:41 +0000 x11/swaync: update to s20211110 Changes: https://github.com/ErikReider/SwayNotificationCenter/compare/9aae9c9...56e41f2 (cherry picked from commit 09e0e417a7ac318939a98d87787f23ecf91db2b1) --- x11/swaync/Makefile | 4 ++-- x11/swaync/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/x11/swaync/Makefile b/x11/swaync/Makefile index 22cbc44a2875..7bd1ac220b19 100644 --- a/x11/swaync/Makefile +++ b/x11/swaync/Makefile @@ -1,5 +1,5 @@ PORTNAME= swaync -PORTVERSION= s20211020 +PORTVERSION= s20211110 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org @@ -18,7 +18,7 @@ USE_GITHUB= yes USE_GNOME= gdkpixbuf2 gtk30 introspection:build GH_ACCOUNT= ErikReider GH_PROJECT= SwayNotificationCenter -GH_TAGNAME= 9aae9c9 +GH_TAGNAME= 56e41f2 PLIST_FILES= bin/${PORTNAME} \ bin/${PORTNAME}-client \ "@sample etc/xdg/${PORTNAME}/config.json.sample" \ diff --git a/x11/swaync/distinfo b/x11/swaync/distinfo index d1ec0cd96913..7236747e1a05 100644 --- a/x11/swaync/distinfo +++ b/x11/swaync/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634748846 -SHA256 (ErikReider-SwayNotificationCenter-s20211020-9aae9c9_GH0.tar.gz) = b2173d71bcdc430eba38a851187a27bf7ce8df32cb2735eea1fd53a38330ce5a -SIZE (ErikReider-SwayNotificationCenter-s20211020-9aae9c9_GH0.tar.gz) = 9987345 +TIMESTAMP = 1636564049 +SHA256 (ErikReider-SwayNotificationCenter-s20211110-56e41f2_GH0.tar.gz) = 7f2301ede16acc4a79e10c5577c672ee91f9a72c6966ed38f1588ebb8bb8ebb0 +SIZE (ErikReider-SwayNotificationCenter-s20211110-56e41f2_GH0.tar.gz) = 9987393 From nobody Sat Nov 13 00:54:02 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6A1CE1839496; Sat, 13 Nov 2021 00:54: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 4HrcQy5qr2z53Rk; Sat, 13 Nov 2021 00:54: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 47DAA1C9B; Sat, 13 Nov 2021 00:54: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 1AD0s2AZ009144; Sat, 13 Nov 2021 00:54:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AD0s286009137; Sat, 13 Nov 2021 00:54:02 GMT (envelope-from git) Date: Sat, 13 Nov 2021 00:54:02 GMT Message-Id: <202111130054.1AD0s286009137@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: 4d9d34e84388 - 2021Q4 - x11-wm/river: backport upstream manpage fix List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 4d9d34e843880e7fd5d9ad62e3e4ed7f785717b5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4d9d34e843880e7fd5d9ad62e3e4ed7f785717b5 commit 4d9d34e843880e7fd5d9ad62e3e4ed7f785717b5 Author: Jan Beich AuthorDate: 2021-11-13 00:50:49 +0000 Commit: Jan Beich CommitDate: 2021-11-13 00:53:56 +0000 x11-wm/river: backport upstream manpage fix (cherry picked from commit 1d4d1fedb94d13283fc10fe7a433a99757a1e97f) --- x11-wm/river/Makefile | 7 ++++--- x11-wm/river/distinfo | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile index 51f8a5bb378a..8de81e744f7f 100644 --- a/x11-wm/river/Makefile +++ b/x11-wm/river/Makefile @@ -1,8 +1,12 @@ PORTNAME= river DISTVERSIONPREFIX= v DISTVERSION= 0.1.0 +PORTREVISION= 1 CATEGORIES= x11-wm +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 0cbe2b9fc34f.patch:-p1 # docs: remove reference to /etc/river/init + MAINTAINER= jbeich@FreeBSD.org COMMENT= Dynamic tiling Wayland compositor @@ -59,9 +63,6 @@ post-patch: # Respect devel/pkgconf default search @${REINPLACE_CMD} -e '/pkgconfig/s/share/libdata/' \ ${WRKSRC}/build.zig -# Respect PREFIX in path references - @${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \ - ${WRKSRC}/doc/${PORTNAME}ctl.1.scd do-build: @(cd ${WRKSRC} && ${MAKE_ENV} zig build ${CONFIGURE_ARGS}) diff --git a/x11-wm/river/distinfo b/x11-wm/river/distinfo index 1fee741d316e..a4040ac134bc 100644 --- a/x11-wm/river/distinfo +++ b/x11-wm/river/distinfo @@ -9,3 +9,5 @@ SHA256 (ifreund-zig-xkbcommon-10cdca6_GH0.tar.gz) = 9fee1bef4d7886977578519a2f59 SIZE (ifreund-zig-xkbcommon-10cdca6_GH0.tar.gz) = 19027 SHA256 (swaywm-zig-wlroots-9bb6b03_GH0.tar.gz) = 504f888b75a54f79a7d677ca9d95ffb791369fa9326108e1307dc77c6c7df66e SIZE (swaywm-zig-wlroots-9bb6b03_GH0.tar.gz) = 46084 +SHA256 (0cbe2b9fc34f.patch) = 64b283e1033f3d320a411b6ac4994aa953747167b76f59ed8899a517f82378d4 +SIZE (0cbe2b9fc34f.patch) = 985 From nobody Sat Nov 13 00:58:30 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E5898183B6B2; Sat, 13 Nov 2021 00:58: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 4HrcX65DB2z54sK; Sat, 13 Nov 2021 00:58: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 93BA91A70; Sat, 13 Nov 2021 00:58: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 1AD0wUwc009720; Sat, 13 Nov 2021 00:58:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AD0wUTM009719; Sat, 13 Nov 2021 00:58:30 GMT (envelope-from git) Date: Sat, 13 Nov 2021 00:58:30 GMT Message-Id: <202111130058.1AD0wUTM009719@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: 3f44b1f472c1 - 2021Q4 - x11-wm/river: restore /usr fix accidentally removed in 1d4d1fedb94d List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 3f44b1f472c12a703dd589ccb37547a09ed43a6b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f44b1f472c12a703dd589ccb37547a09ed43a6b commit 3f44b1f472c12a703dd589ccb37547a09ed43a6b Author: Jan Beich AuthorDate: 2021-11-13 00:55:59 +0000 Commit: Jan Beich CommitDate: 2021-11-13 00:58:27 +0000 x11-wm/river: restore /usr fix accidentally removed in 1d4d1fedb94d The manpage still has /usr refernces e.g., /usr/include/xkbcommon/xkbcommon-keysyms.h /usr/include/linux/input-event-codes.h (cherry picked from commit 0bef5c19453e3ed661f845a20fd1c4979112642c) --- x11-wm/river/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile index 8de81e744f7f..12567a4058bf 100644 --- a/x11-wm/river/Makefile +++ b/x11-wm/river/Makefile @@ -63,6 +63,9 @@ post-patch: # Respect devel/pkgconf default search @${REINPLACE_CMD} -e '/pkgconfig/s/share/libdata/' \ ${WRKSRC}/build.zig +# Respect PREFIX in path references + @${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \ + ${WRKSRC}/doc/${PORTNAME}ctl.1.scd do-build: @(cd ${WRKSRC} && ${MAKE_ENV} zig build ${CONFIGURE_ARGS}) From nobody Sat Nov 13 10:38:14 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 38B9C183FCA8; Sat, 13 Nov 2021 10:38: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 4HrsP30wRyz4vTQ; Sat, 13 Nov 2021 10:38: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 EF2BB11AF0; Sat, 13 Nov 2021 10:38: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 1ADAcEY4086217; Sat, 13 Nov 2021 10:38:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ADAcE40086216; Sat, 13 Nov 2021 10:38:14 GMT (envelope-from git) Date: Sat, 13 Nov 2021 10:38:14 GMT Message-Id: <202111131038.1ADAcE40086216@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: b19956a70644 - 2021Q4 - mail/mailman: re-enable fetching from GNU mirrors List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: b19956a706443169d64e9a0bca00a651e605c608 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=b19956a706443169d64e9a0bca00a651e605c608 commit b19956a706443169d64e9a0bca00a651e605c608 Author: Matthias Andree AuthorDate: 2021-10-20 21:12:37 +0000 Commit: Matthias Andree CommitDate: 2021-11-13 10:31:19 +0000 mail/mailman: re-enable fetching from GNU mirrors ...now that they have picked up Mark Sapiro's upload. (cherry picked from commit b1c10d267a23e1574d3bbe3a027f8519608adf8f) --- mail/mailman/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile index 48c078e6abb1..a5a447104393 100644 --- a/mail/mailman/Makefile +++ b/mail/mailman/Makefile @@ -3,12 +3,9 @@ PORTNAME= mailman DISTVERSION= 2.1.35 CATEGORIES= mail -MASTER_SITES= SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \ +MASTER_SITES= GNU \ + SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \ https://launchpad.net/mailman/${DISTVERSION:R}/${DISTVERSION}/+download/ -# GNU does not carry the 2.1.35 tarball, as of 2021-10-20T17:45Z -#MASTER_SITES= GNU \ -# SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \ -# https://launchpad.net/mailman/${DISTVERSION:R}/${DISTVERSION}/+download/ DIST_SUBDIR= mailman PATCH_SITES= LOCAL/mandree From nobody Sat Nov 13 10:38:15 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6386C183FCB3; Sat, 13 Nov 2021 10:38: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 4HrsP41pZTz4vYm; Sat, 13 Nov 2021 10:38: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 17FA011C6E; Sat, 13 Nov 2021 10:38: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 1ADAcG51086243; Sat, 13 Nov 2021 10:38:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ADAcF6T086242; Sat, 13 Nov 2021 10:38:15 GMT (envelope-from git) Date: Sat, 13 Nov 2021 10:38:15 GMT Message-Id: <202111131038.1ADAcF6T086242@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: 835b5e71120b - 2021Q4 - mail/mailman: security update to 2.1.37 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 835b5e71120b126c4cddd012f972661330810d32 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=835b5e71120b126c4cddd012f972661330810d32 commit 835b5e71120b126c4cddd012f972661330810d32 Author: Matthias Andree AuthorDate: 2021-11-13 10:27:55 +0000 Commit: Matthias Andree CommitDate: 2021-11-13 10:37:57 +0000 mail/mailman: security update to 2.1.37 - A potential XSS attack via the user options page has been reported by Harsh Jaiswal. This is fixed. CVE-2021-43331 (LP: #1949401) LP: A crafted URL to the user options page can execute arbitrary javascript. - A potential for for a list moderator to carry out an off-line brute force attack to obtain the list admin password has been reported by Andre Protas, Richard Cloke and Andy Nuttall of Apple. This is fixed. CVE-2021-43332 (LP: #1949403) LP: The CSRF token for the admindb page contains an encrypted version of the list admin password which could potentially be cracked by a moderator via an off-line brute force attack. ChangeLog: https://bazaar.launchpad.net/~mailman-coders/mailman/2.1/view/1879/NEWS#L2 MFH: 2021Q4 Security: 9d7a2b54-4468-11ec-8532-0d24c37c72c8 Security: CVE-2021-43331 Security: CVE-2021-43332 (cherry picked from commit f05ee16987d1bf5d7002e939614f853d99286fe7) --- mail/mailman/Makefile | 2 +- mail/mailman/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile index a5a447104393..8250bc733ec6 100644 --- a/mail/mailman/Makefile +++ b/mail/mailman/Makefile @@ -1,7 +1,7 @@ # Created by: n_hibma@qubesoft.com PORTNAME= mailman -DISTVERSION= 2.1.35 +DISTVERSION= 2.1.37 CATEGORIES= mail MASTER_SITES= GNU \ SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \ diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo index 1972fab47297..b7eb6f32f810 100644 --- a/mail/mailman/distinfo +++ b/mail/mailman/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1634751988 -SHA256 (mailman/mailman-2.1.35.tgz) = 4ac4d29648144049ef9fa5b1ecd5441b5bd5373111f200c933ebe5c589ba46bf -SIZE (mailman/mailman-2.1.35.tgz) = 9508348 +TIMESTAMP = 1636797368 +SHA256 (mailman/mailman-2.1.37.tgz) = 689ff350857728ccc4ed379ceef54b93f710af8740cabc3bfe0348173b6b3f4f +SIZE (mailman/mailman-2.1.37.tgz) = 9508379 SHA256 (mailman/msapiro-htdig-1822.patch.xz) = fa1da6fb7c0946a6723bc2766501c222fa73c8d794566a3b6e5718a7d1840265 SIZE (mailman/msapiro-htdig-1822.patch.xz) = 50700 From nobody Sat Nov 13 11:43:16 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B383F17F0473; Sat, 13 Nov 2021 11:43: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 4Hrtr44b9rz3nSL; Sat, 13 Nov 2021 11:43: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 7D9FF127E4; Sat, 13 Nov 2021 11:43: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 1ADBhGbq079823; Sat, 13 Nov 2021 11:43:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ADBhGR4079822; Sat, 13 Nov 2021 11:43:16 GMT (envelope-from git) Date: Sat, 13 Nov 2021 11:43:16 GMT Message-Id: <202111131143.1ADBhGR4079822@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mikael Urankar Subject: git: c04c2d088284 - 2021Q4 - net-mgmt/phpipam: Update to 1.4.4 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: c04c2d088284e45e3ede588dd89de5e393948ec1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=c04c2d088284e45e3ede588dd89de5e393948ec1 commit c04c2d088284e45e3ede588dd89de5e393948ec1 Author: Mikael Urankar AuthorDate: 2021-11-10 08:42:37 +0000 Commit: Mikael Urankar CommitDate: 2021-11-13 11:43:12 +0000 net-mgmt/phpipam: Update to 1.4.4 - Update to 1.4.4 - Add missing php modules - Fix folder permission Changes: https://github.com/phpipam/phpipam/releases/tag/v1.4.4 PR: 258700 (cherry picked from commit 7ae8747093e99782e245ad1399f8c707709778dd) --- net-mgmt/phpipam/Makefile | 8 ++++---- net-mgmt/phpipam/distinfo | 6 +++--- net-mgmt/phpipam/pkg-plist | 5 +++++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/net-mgmt/phpipam/Makefile b/net-mgmt/phpipam/Makefile index 5f40c0ee4039..5b2cd7bff474 100644 --- a/net-mgmt/phpipam/Makefile +++ b/net-mgmt/phpipam/Makefile @@ -1,7 +1,7 @@ # Created by: Jake Smith PORTNAME= phpipam -PORTVERSION= 1.4.3 +PORTVERSION= 1.4.4 CATEGORIES= net-mgmt MAINTAINER= jake@xz.cx @@ -14,10 +14,10 @@ RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR} USES= cpe gettext php:web tar: USE_GITHUB= yes -GH_TAGNAME= f6302da +GH_TAGNAME= a14bc06 -USE_PHP= ctype curl filter gd gettext gmp iconv json mbstring mcrypt \ - openssl pcntl pdo pdo_mysql session simplexml sockets +USE_PHP= ctype curl dom filter gd gettext gmp iconv json mbstring mcrypt \ + openssl pcntl pdo pdo_mysql posix session simplexml sockets NO_ARCH= yes NO_BUILD= yes diff --git a/net-mgmt/phpipam/distinfo b/net-mgmt/phpipam/distinfo index e1b494dacb7a..6f9d24ffe3e4 100644 --- a/net-mgmt/phpipam/distinfo +++ b/net-mgmt/phpipam/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1623913999 -SHA256 (phpipam-phpipam-1.4.3-f6302da_GH0.tar.gz) = 320972370847f9b4c8119adb541a47f2bb981ade98ae295d0952e3846860b392 -SIZE (phpipam-phpipam-1.4.3-f6302da_GH0.tar.gz) = 5034704 +TIMESTAMP = 1632439590 +SHA256 (phpipam-phpipam-1.4.4-a14bc06_GH0.tar.gz) = c00e01bc9df5125d915658447f54bfd20ebea2fa0ec51623c5f87d36ab5c1b17 +SIZE (phpipam-phpipam-1.4.4-a14bc06_GH0.tar.gz) = 5036788 diff --git a/net-mgmt/phpipam/pkg-plist b/net-mgmt/phpipam/pkg-plist index f6752f6aa7d1..3663dfa0c226 100644 --- a/net-mgmt/phpipam/pkg-plist +++ b/net-mgmt/phpipam/pkg-plist @@ -991,6 +991,11 @@ %%WWWDIR%%/UPDATE %%WWWDIR%%/upgrade/.htaccess %%WWWDIR%%/upgrade/index.php +@owner www +@group www +@dir %%WWWDIR%%/app/admin/import-export/upload +@owner +@group @dir %%WWWDIR%%/app/login/captcha @dir %%WWWDIR%%/functions/GoogleAuthenticator @dir %%WWWDIR%%/functions/php-saml From nobody Sat Nov 13 14:42:09 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9599418485A9; Sat, 13 Nov 2021 14:42: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 4HrypT3tlYz3lZM; Sat, 13 Nov 2021 14:42: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 66B8614A6F; Sat, 13 Nov 2021 14:42: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 1ADEg9i9021408; Sat, 13 Nov 2021 14:42:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ADEg9gf021407; Sat, 13 Nov 2021 14:42:09 GMT (envelope-from git) Date: Sat, 13 Nov 2021 14:42:09 GMT Message-Id: <202111131442.1ADEg9gf021407@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: 9332f52c370a - 2021Q4 - mail/thunderbird: update to 91.3.1 (rc1) List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 9332f52c370aec86a2a74c9462807ac13116bf4b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=9332f52c370aec86a2a74c9462807ac13116bf4b commit 9332f52c370aec86a2a74c9462807ac13116bf4b Author: Christoph Moench-Tegeder AuthorDate: 2021-11-13 14:40:35 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2021-11-13 14:41:57 +0000 mail/thunderbird: update to 91.3.1 (rc1) Release Notes (soon): https://www.thunderbird.net/en-US/thunderbird/91.3.1/releasenotes/ (cherry picked from commit 85a4f39831ed7216a6fe19f96b42c514d52cddd5) --- mail/thunderbird/Makefile | 5 ++--- mail/thunderbird/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index cdee8fc7a923..bf8982df9ef6 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -1,11 +1,10 @@ # Created by: Joe Marcus Clarke PORTNAME= thunderbird -DISTVERSION= 91.3.0 -PORTREVISION= 1 +DISTVERSION= 91.3.1 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index 98f3380d0f01..1fc87d503cda 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635862126 -SHA256 (thunderbird-91.3.0.source.tar.xz) = d3abcf55637fb21bd9d68a19c01780edd82e6e72b5e850b31de186dddc2708ad -SIZE (thunderbird-91.3.0.source.tar.xz) = 403256924 +TIMESTAMP = 1636812729 +SHA256 (thunderbird-91.3.1.source.tar.xz) = aeb914ae0eb6b2d2870a5ff58a982b7ce4a04fc2fc9674ced982bd397eec3142 +SIZE (thunderbird-91.3.1.source.tar.xz) = 403764984 From nobody Sat Nov 13 17:35:10 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 979301862050; Sat, 13 Nov 2021 17:35: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 4Hs2f6347lz3jRy; Sat, 13 Nov 2021 17:35: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 4185B175B6; Sat, 13 Nov 2021 17:35: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 1ADHZAKw049709; Sat, 13 Nov 2021 17:35:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ADHZAa4049708; Sat, 13 Nov 2021 17:35:10 GMT (envelope-from git) Date: Sat, 13 Nov 2021 17:35:10 GMT Message-Id: <202111131735.1ADHZAa4049708@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: ce5a189bf961 - 2021Q4 - x11/fuzzel: update to 1.6.5 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: ce5a189bf96103591c1e8df33cb1dabb1c384cae Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce5a189bf96103591c1e8df33cb1dabb1c384cae commit ce5a189bf96103591c1e8df33cb1dabb1c384cae Author: Jan Beich AuthorDate: 2021-11-13 14:11:36 +0000 Commit: Jan Beich CommitDate: 2021-11-13 17:26:35 +0000 x11/fuzzel: update to 1.6.5 Changes: https://codeberg.org/dnkl/fuzzel/releases/tag/1.6.5 Reported by: upstream (via mail) (cherry picked from commit d98fae49127b1d9944f21d2e6a58599b5d037471) --- x11/fuzzel/Makefile | 3 ++- x11/fuzzel/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/x11/fuzzel/Makefile b/x11/fuzzel/Makefile index 502c8b393d98..a6a4c039e421 100644 --- a/x11/fuzzel/Makefile +++ b/x11/fuzzel/Makefile @@ -1,5 +1,5 @@ PORTNAME= fuzzel -DISTVERSION= 1.6.4 +DISTVERSION= 1.6.5 CATEGORIES= x11 MASTER_SITES= https://codeberg.org/dnkl/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ @@ -15,6 +15,7 @@ BUILD_DEPENDS= tllist>=1.0.1:devel/tllist \ LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libwayland-client.so:graphics/wayland \ libfcft.so:x11-fonts/fcft \ + libfontconfig.so:x11-fonts/fontconfig \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c11 meson pkgconfig xorg diff --git a/x11/fuzzel/distinfo b/x11/fuzzel/distinfo index 8e2c798ddcb3..5581629472fb 100644 --- a/x11/fuzzel/distinfo +++ b/x11/fuzzel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633776425 -SHA256 (fuzzel-1.6.4.tar.gz) = 69d519c2dbcd53dc6a8e45f81f1240a2ea3ac9f420fffca8fcfce59001d443d7 -SIZE (fuzzel-1.6.4.tar.gz) = 384763 +TIMESTAMP = 1636812696 +SHA256 (fuzzel-1.6.5.tar.gz) = b0f1af8a4b38f0cd93722d0ec35e422b5163ec3392e16467c1af8c8de94333a0 +SIZE (fuzzel-1.6.5.tar.gz) = 389275 From nobody Sat Nov 13 23:33:53 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4CB72185F081; Sat, 13 Nov 2021 23:33: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 4HsBc21d8qz58X5; Sat, 13 Nov 2021 23:33: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 13BCA1C12E; Sat, 13 Nov 2021 23:33: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 1ADNXrQI031004; Sat, 13 Nov 2021 23:33:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ADNXrix031003; Sat, 13 Nov 2021 23:33:53 GMT (envelope-from git) Date: Sat, 13 Nov 2021 23:33:53 GMT Message-Id: <202111132333.1ADNXrix031003@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: 7c128489a0c8 - 2021Q4 - textproc/scdoc: update to 1.11.2 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 7c128489a0c87ffedfc76e429ebf938504bdd166 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c128489a0c87ffedfc76e429ebf938504bdd166 commit 7c128489a0c87ffedfc76e429ebf938504bdd166 Author: Jan Beich AuthorDate: 2021-11-13 08:04:45 +0000 Commit: Jan Beich CommitDate: 2021-11-13 23:26:56 +0000 textproc/scdoc: update to 1.11.2 Changes: https://git.sr.ht/%7Esircmpwn/scdoc/refs/1.11.2 Reported by: Repology (cherry picked from commit 263f10f446230fa795eae7b55980df5655c165e7) --- textproc/scdoc/Makefile | 4 ++-- textproc/scdoc/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/textproc/scdoc/Makefile b/textproc/scdoc/Makefile index 30094971f5ed..e28c06635b6c 100644 --- a/textproc/scdoc/Makefile +++ b/textproc/scdoc/Makefile @@ -1,5 +1,5 @@ PORTNAME= scdoc -DISTVERSION= 1.11.1 +DISTVERSION= 1.11.2 CATEGORIES= textproc MASTER_SITES= https://git.sr.ht/~sircmpwn/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ @@ -10,7 +10,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING USES= gmake -MAKE_ENV= PCDIR='$$(_INSTDIR)/libdata/pkgconfig' +MAKE_ENV= PCDIR='$$(PREFIX)/libdata/pkgconfig' TEST_TARGET= check PLIST_FILES= bin/${PORTNAME} \ libdata/pkgconfig/${PORTNAME}.pc \ diff --git a/textproc/scdoc/distinfo b/textproc/scdoc/distinfo index 12bb4667c66e..58aa26d7bd5f 100644 --- a/textproc/scdoc/distinfo +++ b/textproc/scdoc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1607263172 -SHA256 (scdoc-1.11.1.tar.gz) = 1098a1ed2e087596fc0b3f657c1c8a5e00412267aa4baf3619e36824306645b1 -SIZE (scdoc-1.11.1.tar.gz) = 12510 +TIMESTAMP = 1636790685 +SHA256 (scdoc-1.11.2.tar.gz) = e9ff9981b5854301789a6778ee64ef1f6d1e5f4829a9dd3e58a9a63eacc2e6f0 +SIZE (scdoc-1.11.2.tar.gz) = 12746