From nobody Mon Oct 25 10: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 97350181D49E; Mon, 25 Oct 2021 10:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HdBBn3vQHz3r5k; Mon, 25 Oct 2021 10:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 65C1227147; Mon, 25 Oct 2021 10:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19PAXrbI033245; Mon, 25 Oct 2021 10: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 19PAXrhs033244; Mon, 25 Oct 2021 10:33:53 GMT (envelope-from git) Date: Mon, 25 Oct 2021 10:33:53 GMT Message-Id: <202110251033.19PAXrhs033244@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Philip Paeps Subject: git: 7c6c750a793c - 2021Q4 - net/fort: new port: FORT Validator 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: philip X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 7c6c750a793c21ac10c5ce3cb33f61bc0f8aaa4e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by philip: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c6c750a793c21ac10c5ce3cb33f61bc0f8aaa4e commit 7c6c750a793c21ac10c5ce3cb33f61bc0f8aaa4e Author: Philip Paeps AuthorDate: 2021-10-22 05:53:47 +0000 Commit: Philip Paeps CommitDate: 2021-10-25 10:32:37 +0000 net/fort: new port: FORT Validator FORT Validator is an open source RPKI validator. This solution allows operators to validate BGP routing information against the RPKI repository for use in router configuration and resolution. Submitted by: Toni Kalombo (maintainer) Tested by: Mark Tinka (cherry picked from commit a679f9da38655155d6293ba194ce140f7531609c) --- net/Makefile | 1 + net/fort/Makefile | 41 +++++++++++++++++++++++++++++++ net/fort/distinfo | 3 +++ net/fort/files/fort.in | 47 ++++++++++++++++++++++++++++++++++++ net/fort/files/patch-src_Makefile.am | 11 +++++++++ net/fort/files/pkg-message.in | 25 +++++++++++++++++++ net/fort/pkg-descr | 7 ++++++ net/fort/pkg-plist | 5 ++++ 8 files changed, 140 insertions(+) diff --git a/net/Makefile b/net/Makefile index d5df5e4db1d6..449ad8cc492e 100644 --- a/net/Makefile +++ b/net/Makefile @@ -155,6 +155,7 @@ SUBDIR += findomain SUBDIR += flower SUBDIR += foreman-proxy + SUBDIR += fort SUBDIR += fpc-ldap SUBDIR += fpc-libenet SUBDIR += fpc-pcap diff --git a/net/fort/Makefile b/net/fort/Makefile new file mode 100644 index 000000000000..dd163a3ca597 --- /dev/null +++ b/net/fort/Makefile @@ -0,0 +1,41 @@ +PORTNAME= fort +DISTVERSION= 1.5.2 +CATEGORIES= net + +MAINTAINER= toni@devboks.com +COMMENT= FORT Validator is an open source RPKI validator + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +LIB_DEPENDS= libcurl.so:ftp/curl libjansson.so:devel/jansson \ + libxml2.so:textproc/libxml2 +RUN_DEPENDS= ${LOCALBASE}/bin/rsync:net/rsync + +USES= autoreconf pkgconfig ssl +USE_GCC= yes +USE_GITHUB= yes +USE_RC_SUBR= fort + +GH_ACCOUNT= NICMx +GH_PROJECT= FORT-validator + +GNU_CONFIGURE= yes + +SUB_FILES= pkg-message + +post-patch: + @${REINPLACE_CMD} -e "s|/tmp/fort|${ETCDIR}|" \ + ${WRKSRC}/examples/config.json + @${REINPLACE_CMD} -e "s|/usr/local/ssl|/etc/ssl|" \ + ${WRKSRC}/examples/config.json + @${REINPLACE_CMD} -e "s|rsync\",|${LOCALBASE}/bin/rsync\",|" \ + ${WRKSRC}/examples/config.json + @${REINPLACE_CMD} -e "/\"daemon\": false,/d" \ + ${WRKSRC}/examples/config.json +post-install: + @${MKDIR} ${STAGEDIR}${ETCDIR}/repository ${STAGEDIR}${ETCDIR}/tal + ${INSTALL_DATA} ${WRKSRC}/examples/config.json \ + ${STAGEDIR}${ETCDIR}/fort-config.json.sample + +.include diff --git a/net/fort/distinfo b/net/fort/distinfo new file mode 100644 index 000000000000..9a35cf2481e2 --- /dev/null +++ b/net/fort/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1634812159 +SHA256 (NICMx-FORT-validator-1.5.2_GH0.tar.gz) = c49b7badcf6dae05b7c9ae9cb3b1514d2b742d868b83f8b8deb0d7ae0a3e6bf2 +SIZE (NICMx-FORT-validator-1.5.2_GH0.tar.gz) = 482094 diff --git a/net/fort/files/fort.in b/net/fort/files/fort.in new file mode 100644 index 000000000000..57350ee26020 --- /dev/null +++ b/net/fort/files/fort.in @@ -0,0 +1,47 @@ +#!/bin/sh + +# PROVIDE: fort +# REQUIRE: DAEMON fort +# BEFORE: LOGIN +# KEYWORD: shutdown + +# Define fort_enable in /etc/rc.conf[.local] to enable it. +# +# fort_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable fort. + +. /etc/rc.subr + +name="fort" +rcvar=fort_enable +start_precmd=check_init +command="%%PREFIX%%/bin/${name}" + +load_rc_config $name +: ${fort_enable="NO"} +: ${wrkdir:="%%ETCDIR%%"} + + +fort_config=${fort_conf:-"%%ETCDIR%%/fort-config.json"} +required_file=${fort_config} +command_args="--configuration-file=${fort_config} --daemon=true" + +check_init() { + if [ ! -d ${wrkdir}/tal ]; then + echo + echo -n "Need to initialize fort with tals, " + echo "see man fort" + echo + exit 1 + fi + if [ ! -f ${fort_config} ]; then + echo + echo -n "Configuration file not found at ${fort_config} " + echo "Please create one before starting Fort, " + echo "see man fort" + echo + exit 1 + fi +} + +run_rc_command "$1" diff --git a/net/fort/files/patch-src_Makefile.am b/net/fort/files/patch-src_Makefile.am new file mode 100644 index 000000000000..7455183d1f5b --- /dev/null +++ b/net/fort/files/patch-src_Makefile.am @@ -0,0 +1,11 @@ +--- src/Makefile.am.orig 2021-09-20 02:51:17 UTC ++++ src/Makefile.am +@@ -130,7 +130,7 @@ fort_SOURCES += $(ASN_MODULE_SRCS) $(ASN_MODULE_HDRS) + fort_CFLAGS = -Wall -Wno-cpp -Wpedantic + # Feel free to temporarily remove this one if you're not using gcc 7.3.0. + #fort_CFLAGS += $(GCC_WARNS) +-fort_CFLAGS += -std=gnu11 -O2 -g $(FORT_FLAGS) ${XML2_CFLAGS} ++fort_CFLAGS += -std=gnu11 -O2 -g $(FORT_FLAGS) ${XML2_CFLAGS} ${JANSSON_CFLAGS} + fort_LDFLAGS = $(LDFLAGS_DEBUG) + fort_LDADD = ${JANSSON_LIBS} ${CURL_LIBS} ${XML2_LIBS} + diff --git a/net/fort/files/pkg-message.in b/net/fort/files/pkg-message.in new file mode 100644 index 000000000000..f9994a632db0 --- /dev/null +++ b/net/fort/files/pkg-message.in @@ -0,0 +1,25 @@ +[ +{ type: install + message: < To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Tobias Kortkamp Subject: git: 3f89e8c6edef - 2021Q4 - editors/kakoune: 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: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 3f89e8c6edef45b5d01cded849018ac652f6f2ef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f89e8c6edef45b5d01cded849018ac652f6f2ef commit 3f89e8c6edef45b5d01cded849018ac652f6f2ef Author: Robert Clausecker AuthorDate: 2021-10-25 11:49:33 +0000 Commit: Tobias Kortkamp CommitDate: 2021-10-25 12:35:07 +0000 editors/kakoune: fix build on armv6/armv7 https://github.com/mawww/kakoune/issues/4385 PR: 259434 (cherry picked from commit 13c431b0bfec55991792bb215e463584c2fc243d) --- editors/kakoune/files/patch-src_main.cc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/editors/kakoune/files/patch-src_main.cc b/editors/kakoune/files/patch-src_main.cc new file mode 100644 index 000000000000..0c4fd9b6f327 --- /dev/null +++ b/editors/kakoune/files/patch-src_main.cc @@ -0,0 +1,17 @@ +--- src/main.cc.orig 2021-10-25 11:31:24 UTC ++++ src/main.cc +@@ -1249,8 +1249,12 @@ int main(int argc, char* argv[]) + } + + #if defined(__ELF__) +-asm(R"( +-.pushsection ".debug_gdb_scripts", "MS",@progbits,1 ++#ifdef __arm__ ++# define PROGBITS "%progbits" ++#else ++# define PROGBITS "@progbits" ++#endif ++asm(".pushsection \".debug_gdb_scripts\", \"MS\"," PROGBITS ",1" R"( + .byte 4 + .ascii "kakoune-inline-gdb.py\n" + .ascii "import os.path\n" From nobody Tue Oct 26 00:30:37 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 80BDA1822210; Tue, 26 Oct 2021 00:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HdXmG1235z4WrJ; Tue, 26 Oct 2021 00:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 04D0512E78; Tue, 26 Oct 2021 00:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19Q0UbFl076484; Tue, 26 Oct 2021 00:30:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19Q0Ub6K076483; Tue, 26 Oct 2021 00:30:37 GMT (envelope-from git) Date: Tue, 26 Oct 2021 00:30:37 GMT Message-Id: <202110260030.19Q0Ub6K076483@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: 61b12bfc50b8 - 2021Q4 - emulators/yuzu: update to s20211025 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: 61b12bfc50b85acd1e63c9fc1b19ec2005c96d2b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=61b12bfc50b85acd1e63c9fc1b19ec2005c96d2b commit 61b12bfc50b85acd1e63c9fc1b19ec2005c96d2b Author: Jan Beich AuthorDate: 2021-10-25 13:17:49 +0000 Commit: Jan Beich CommitDate: 2021-10-26 00:30:30 +0000 emulators/yuzu: update to s20211025 Changes: https://github.com/yuzu-emu/yuzu/compare/5299554bb...63ed7d9af (cherry picked from commit e60fb7d44b72dd97520840f85edde5ebcaf653f8) --- 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 3ddbbbd53ca6..6936dbff9aa3 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,5 +1,5 @@ PORTNAME= yuzu -PORTVERSION= s20211023 +PORTVERSION= s20211025 PORTREVISION?= 0 CATEGORIES= emulators @@ -33,7 +33,7 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \ USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= 5299554bb +GH_TAGNAME= 63ed7d9af 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 5cddae8bcb4c..7f608b872403 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1635033184 -SHA256 (yuzu-emu-yuzu-s20211023-5299554bb_GH0.tar.gz) = a8f29cc4b8a3bc7373411b4c678691c6a4e676af67a0c9b115bc9369ce517cf2 -SIZE (yuzu-emu-yuzu-s20211023-5299554bb_GH0.tar.gz) = 4270645 +TIMESTAMP = 1635167869 +SHA256 (yuzu-emu-yuzu-s20211025-63ed7d9af_GH0.tar.gz) = 9668b422a0efcb36ab71116348631572934dd5e4cfc02800f7a266c1dff51d24 +SIZE (yuzu-emu-yuzu-s20211025-63ed7d9af_GH0.tar.gz) = 4270610 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 Tue Oct 26 15:55: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 5C8C31818E71; Tue, 26 Oct 2021 15:55:05 +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 4HdxGx1vlvz4n1N; Tue, 26 Oct 2021 15:55: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 220861F6B5; Tue, 26 Oct 2021 15:55: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 19QFt54Y005197; Tue, 26 Oct 2021 15:55:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19QFt5sW005196; Tue, 26 Oct 2021 15:55:05 GMT (envelope-from git) Date: Tue, 26 Oct 2021 15:55:05 GMT Message-Id: <202110261555.19QFt5sW005196@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: bfda574d1a63 - 2021Q4 - devel/efl: 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: bfda574d1a63d6fe5d5e7218d28c953675ffc508 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=bfda574d1a63d6fe5d5e7218d28c953675ffc508 commit bfda574d1a63d6fe5d5e7218d28c953675ffc508 Author: Robert Clausecker AuthorDate: 2021-10-25 18:52:02 +0000 Commit: Gleb Popov CommitDate: 2021-10-26 15:42:11 +0000 devel/efl: Fix build on armv6/armv7. The clang's integrated assembler is having problems with assembly sources, so bring in binutils as. PR: 259443 (cherry picked from commit 78d1e7e3c761c7c5821d6bda70d157fa3d179460) --- devel/efl/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/devel/efl/Makefile b/devel/efl/Makefile index f3f9b1ddbae5..f9ba342e2556 100644 --- a/devel/efl/Makefile +++ b/devel/efl/Makefile @@ -306,6 +306,11 @@ MESON_ARGS+= ${EVAS-LOADERS-DISABLER} MESON_ARGS+= -Db_asneeded=false .endif +.if ${ARCH:Marmv?} +BUILD_DEPENDS+= as:devel/binutils +CFLAGS+= -no-integrated-as +.endif + .if ${PORT_OPTIONS:MLUA} && ${PORT_OPTIONS:MCXX} EFL_BINDINGS= -Dbindings=lua,cxx .else From nobody Tue Oct 26 19:20: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 99AE21825297; Tue, 26 Oct 2021 19:20:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hf1qs3ssqz4jxr; Tue, 26 Oct 2021 19:20: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 60C95223A2; Tue, 26 Oct 2021 19:20: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 19QJKPHe080311; Tue, 26 Oct 2021 19:20:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19QJKPQf080310; Tue, 26 Oct 2021 19:20:25 GMT (envelope-from git) Date: Tue, 26 Oct 2021 19:20:25 GMT Message-Id: <202110261920.19QJKPQf080310@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: 9b3dd988d3a4 - 2021Q4 - www/firefox: update to 94.0 (rc2) 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: 9b3dd988d3a475a3ad7b68166f5b19f417301549 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b3dd988d3a475a3ad7b68166f5b19f417301549 commit 9b3dd988d3a475a3ad7b68166f5b19f417301549 Author: Christoph Moench-Tegeder AuthorDate: 2021-10-26 19:17:19 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2021-10-26 19:20:10 +0000 www/firefox: update to 94.0 (rc2) Release Notes (soon): https://www.mozilla.org/en-US/firefox/94.0/releasenotes/ (cherry picked from commit 6502ab1b26740b68bf710eb4aa8f927841e44a0a) --- www/firefox/Makefile | 11 +++++------ www/firefox/distinfo | 6 +++--- www/firefox/files/patch-bug1602730_comment5 | 24 ------------------------ 3 files changed, 8 insertions(+), 33 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 1318f0451975..268b6b40f1e0 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,22 +1,21 @@ # Created by: Alan Eldridge PORTNAME= firefox -DISTVERSION= 93.0 -PORTREVISION= 1 +DISTVERSION= 94.0 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.32:devel/nspr \ - nss>=3.70:security/nss \ - icu>=67.1,1:devel/icu \ + nss>=3.71:security/nss \ + icu>=69.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ - harfbuzz>=2.8.1:print/harfbuzz \ + harfbuzz>=2.9.1:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.37:graphics/png \ libvpx>=1.8.2:multimedia/libvpx \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 4d6458d79e11..bb261fd8eda0 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1632868474 -SHA256 (firefox-93.0.source.tar.xz) = a78f080f5849bc284b84299f3540934a12e961a7ea368b592ae6576ea1f97102 -SIZE (firefox-93.0.source.tar.xz) = 382181136 +TIMESTAMP = 1635270996 +SHA256 (firefox-94.0.source.tar.xz) = b5e1a5f6068f16992bb516d01875f3f04acd90f53ad5b7a11a6a5a66ff999f09 +SIZE (firefox-94.0.source.tar.xz) = 380022264 diff --git a/www/firefox/files/patch-bug1602730_comment5 b/www/firefox/files/patch-bug1602730_comment5 deleted file mode 100644 index 212221b6d5cf..000000000000 --- a/www/firefox/files/patch-bug1602730_comment5 +++ /dev/null @@ -1,24 +0,0 @@ ---- gfx/layers/composite/CompositableHost.cpp.orig 2020-09-12 21:47:42 UTC -+++ gfx/layers/composite/CompositableHost.cpp -@@ -10,6 +10,7 @@ - #include "Effects.h" // for EffectMask, Effect, etc - #include "gfxUtils.h" - #include "Layers.h" -+#include "mozilla/EndianUtils.h" - #include "mozilla/gfx/gfxVars.h" - #include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor - #include "mozilla/layers/TextureHost.h" // for TextureHost, etc -@@ -89,9 +90,13 @@ - } - MOZ_ASSERT(source); - -+ // Setting an alpha-mask here breaks the URL-bar on big endian (s390x) -+ // if the typed URL is too long for the textbox (automatic scrolling needed) -+#if MOZ_LITTLE_ENDIAN() - RefPtr effect = - new EffectMask(source, source->GetSize(), aTransform); - aEffects.mSecondaryEffects[EffectTypes::MASK] = effect; -+#endif - return true; - } - From nobody Tue Oct 26 22:18: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 9667118264C3; Tue, 26 Oct 2021 22:18: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 4Hf5nG2tl4z4ZJ3; Tue, 26 Oct 2021 22:18: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 40723246DC; Tue, 26 Oct 2021 22:18: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 19QMIQ5e012200; Tue, 26 Oct 2021 22:18:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19QMIQ4D012199; Tue, 26 Oct 2021 22:18:26 GMT (envelope-from git) Date: Tue, 26 Oct 2021 22:18:26 GMT Message-Id: <202110262218.19QMIQ4D012199@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: 69aea80d027f - 2021Q4 - multimedia/gmmlib: update to 21.3.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: 69aea80d027f31d678a5daebc8de8e39bdf529f1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=69aea80d027f31d678a5daebc8de8e39bdf529f1 commit 69aea80d027f31d678a5daebc8de8e39bdf529f1 Author: Jan Beich AuthorDate: 2021-10-14 13:58:46 +0000 Commit: Jan Beich CommitDate: 2021-10-26 22:18:12 +0000 multimedia/gmmlib: update to 21.3.2 Changes: https://github.com/intel/gmmlib/compare/intel-gmmlib-21.3.1...intel-gmmlib-21.3.2 Reported by: portscout (cherry picked from commit 25d5bc5599c07f9e554f65018434bc6d3bfe0ce9) --- multimedia/gmmlib/Makefile | 2 +- multimedia/gmmlib/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/multimedia/gmmlib/Makefile b/multimedia/gmmlib/Makefile index 20bf6921c2a7..780a401ad9ac 100644 --- a/multimedia/gmmlib/Makefile +++ b/multimedia/gmmlib/Makefile @@ -1,6 +1,6 @@ PORTNAME= gmmlib DISTVERSIONPREFIX= intel-${PORTNAME}- -DISTVERSION= 21.3.1 +DISTVERSION= 21.3.2 CATEGORIES= multimedia PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/multimedia/gmmlib/distinfo b/multimedia/gmmlib/distinfo index f0eb7c781120..7bf5ad6cdefa 100644 --- a/multimedia/gmmlib/distinfo +++ b/multimedia/gmmlib/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1631008773 -SHA256 (intel-gmmlib-intel-gmmlib-21.3.1_GH0.tar.gz) = d26a6512a1b3ca604dabe035ddaf47b4b445bd503eac69a59e4acb2d1f54634b -SIZE (intel-gmmlib-intel-gmmlib-21.3.1_GH0.tar.gz) = 746732 +TIMESTAMP = 1634219926 +SHA256 (intel-gmmlib-intel-gmmlib-21.3.2_GH0.tar.gz) = a6a61ff7e66cb710be1593f2afbda3b21c679fe953bf5e80a5b3f047c1cbdb6c +SIZE (intel-gmmlib-intel-gmmlib-21.3.2_GH0.tar.gz) = 746990 SHA256 (f17dd87c7f57.patch) = 0bdfd22e8f36a097c875796c7bbf7003a16cc7535fdf5d3caa3a7de9dc21c28e SIZE (f17dd87c7f57.patch) = 1485 SHA256 (7171f6d818fc.patch) = 8a3e8fb3aff618c41818df7e2a46af2b649a4a059b0ec37d053eeb5972dd846a From nobody Wed Oct 27 06:47:08 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 7B6DC181A80A; Wed, 27 Oct 2021 06:47: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 4HfK4F0w0Mz4cMN; Wed, 27 Oct 2021 06:47: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 D87B13503; Wed, 27 Oct 2021 06:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19R6l8WU091250; Wed, 27 Oct 2021 06:47:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19R6l8VN091249; Wed, 27 Oct 2021 06:47:08 GMT (envelope-from git) Date: Wed, 27 Oct 2021 06:47:08 GMT Message-Id: <202110270647.19R6l8VN091249@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kirill Ponomarev Subject: git: 13f3619de8bd - 2021Q4 - sysutils/py-salt: remove pyzmq<22.0.0 pin from requirements to fix some states execution. 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: krion X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 13f3619de8bdc35ce81d7b5d6923782e53faacca Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=13f3619de8bdc35ce81d7b5d6923782e53faacca commit 13f3619de8bdc35ce81d7b5d6923782e53faacca Author: Kirill Ponomarev AuthorDate: 2021-10-27 06:33:33 +0000 Commit: Kirill Ponomarev CommitDate: 2021-10-27 06:47:04 +0000 sysutils/py-salt: remove pyzmq<22.0.0 pin from requirements to fix some states execution. (cherry picked from commit ddffa24d1a494a4354d84b553f08f493e0220c11) --- sysutils/py-salt/Makefile | 1 + sysutils/py-salt/files/patch-requirements_zeromq.txt | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index eb09188b9c2c..65c495719ef4 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -2,6 +2,7 @@ PORTNAME= salt PORTVERSION= 3004 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-salt/files/patch-requirements_zeromq.txt b/sysutils/py-salt/files/patch-requirements_zeromq.txt new file mode 100644 index 000000000000..b6b723131c02 --- /dev/null +++ b/sysutils/py-salt/files/patch-requirements_zeromq.txt @@ -0,0 +1,10 @@ +--- requirements/zeromq.txt.old 2021-10-27 08:27:29.631303000 +0200 ++++ requirements/zeromq.txt 2021-10-27 08:27:56.967052000 +0200 +@@ -2,5 +2,5 @@ + -r crypto.txt + + pyzmq<=20.0.0 ; python_version < "3.6" +-pyzmq>=17.0.0,<22.0.0 ; python_version < "3.9" +-pyzmq>19.0.2,<22.0.0 ; python_version >= "3.9" ++pyzmq>=17.0.0 ; python_version < "3.9" ++pyzmq>19.0.2 ; python_version >= "3.9" From nobody Wed Oct 27 08:10: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 9E3391813E27; Wed, 27 Oct 2021 08:10:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HfLw33jGGz3Fx1; Wed, 27 Oct 2021 08:10:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5C0BF47E2; Wed, 27 Oct 2021 08:10:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19R8AB2k001610; Wed, 27 Oct 2021 08:10:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19R8ABK8001603; Wed, 27 Oct 2021 08:10:11 GMT (envelope-from git) Date: Wed, 27 Oct 2021 08:10:11 GMT Message-Id: <202110270810.19R8ABK8001603@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Philip Paeps Subject: git: f5006bb2aa6d - 2021Q4 - net/fort: don't depend on gcc10, fix version check 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: philip X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: f5006bb2aa6dcd5ec3a48becf32df9dd3ad80e92 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by philip: URL: https://cgit.FreeBSD.org/ports/commit/?id=f5006bb2aa6dcd5ec3a48becf32df9dd3ad80e92 commit f5006bb2aa6dcd5ec3a48becf32df9dd3ad80e92 Author: Philip Paeps AuthorDate: 2021-10-27 07:59:54 +0000 Commit: Philip Paeps CommitDate: 2021-10-27 08:09:44 +0000 net/fort: don't depend on gcc10, fix version check The current version of FORT builds fine with any c11 compiler. There is no need for USE_GCC. Patch the build system to correctly define the version of FORT as seen in the output of "fort --version" and the "User-Agent:" HTTP header. [1] Approved by: Toni Yannick Kalombo (maintainer) Reported by: Mark Tinka [1] (cherry picked from commit 9604608f8a2d458e8fbd0acb5fc492972098cc8e) --- net/fort/Makefile | 6 ++++-- net/fort/files/patch-configure.ac | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/net/fort/Makefile b/net/fort/Makefile index dd163a3ca597..f005b965dd2f 100644 --- a/net/fort/Makefile +++ b/net/fort/Makefile @@ -1,5 +1,6 @@ PORTNAME= fort DISTVERSION= 1.5.2 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= toni@devboks.com @@ -12,8 +13,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl libjansson.so:devel/jansson \ libxml2.so:textproc/libxml2 RUN_DEPENDS= ${LOCALBASE}/bin/rsync:net/rsync -USES= autoreconf pkgconfig ssl -USE_GCC= yes +USES= autoreconf compiler:c11 pkgconfig ssl USE_GITHUB= yes USE_RC_SUBR= fort @@ -25,6 +25,8 @@ GNU_CONFIGURE= yes SUB_FILES= pkg-message post-patch: + @${REINPLACE_CMD} -e "s|%%DISTVERSION%%|${DISTVERSION}|" \ + ${WRKSRC}/configure.ac @${REINPLACE_CMD} -e "s|/tmp/fort|${ETCDIR}|" \ ${WRKSRC}/examples/config.json @${REINPLACE_CMD} -e "s|/usr/local/ssl|/etc/ssl|" \ diff --git a/net/fort/files/patch-configure.ac b/net/fort/files/patch-configure.ac new file mode 100644 index 000000000000..36c0f268e1f3 --- /dev/null +++ b/net/fort/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2021-10-19 22:44:35 UTC ++++ configure.ac +@@ -2,7 +2,7 @@ + # Process this file with autoconf to produce a configure script. + + AC_PREREQ([2.69]) +-AC_INIT([fort], [m4_esyscmd_s([git describe --dirty --always --tags])], ++AC_INIT([fort], [%%DISTVERSION%%], + [fort-validator@nic.mx]) + AC_CONFIG_SRCDIR([src/main.c]) + AM_INIT_AUTOMAKE([subdir-objects]) From nobody Wed Oct 27 09:08: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 BF026182DBFE; Wed, 27 Oct 2021 09:08: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 4HfNCJ50Ncz3pYX; Wed, 27 Oct 2021 09:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8CF5F580E; Wed, 27 Oct 2021 09:08: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 19R98Slw078120; Wed, 27 Oct 2021 09:08:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19R98Sbh078119; Wed, 27 Oct 2021 09:08:28 GMT (envelope-from git) Date: Wed, 27 Oct 2021 09:08:28 GMT Message-Id: <202110270908.19R98Sbh078119@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: 6d7306b05858 - 2021Q4 - www/grafana8: Update to 8.1.6 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: 6d7306b058583f4b39036c9c2c5c73f2297318bb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=6d7306b058583f4b39036c9c2c5c73f2297318bb commit 6d7306b058583f4b39036c9c2c5c73f2297318bb Author: Boris Korzun AuthorDate: 2021-10-27 08:30:01 +0000 Commit: Yasuhiro Kimura CommitDate: 2021-10-27 09:07:44 +0000 www/grafana8: Update to 8.1.6 ReleaseNotes: https://grafana.com/blog/2021/10/05/grafana-7.5.11-and-8.1.6-released-with-critical-security-fix/ PR: 258962 Security: CVE-2021-39226 (cherry picked from commit 725c5eb1df6a47cad84a95b05ee2460868a93096) --- www/grafana8/Makefile | 13 ++++++------- www/grafana8/Makefile.modules | 3 ++- www/grafana8/distinfo | 16 +++++++++------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/www/grafana8/Makefile b/www/grafana8/Makefile index a398b223b068..b0c7a2cb01ce 100644 --- a/www/grafana8/Makefile +++ b/www/grafana8/Makefile @@ -1,6 +1,6 @@ PORTNAME= grafana DISTVERSIONPREFIX= v -DISTVERSION= 8.1.5 +DISTVERSION= 8.1.7 CATEGORIES= www MASTER_SITES+= https://dl.grafana.com/oss/release/:public \ https://gitea.com/xorm/builder/archive/:builder \ @@ -27,20 +27,19 @@ USES= cpe go:modules USE_GITHUB= yes USE_RC_SUBR= grafana -TAG= c725a42 +TAG= 34b8880 -GO_TARGET= ./pkg/cmd/grafana-server \ - ./pkg/cmd/grafana-cli +GO_TARGET= ./pkg/cmd/grafana-cli ./pkg/cmd/grafana-server GO_BUILDFLAGS= -ldflags="-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -SUB_LIST= GRAFANA_USER=${GRAFANA_USER} \ - GRAFANA_GROUP=${GRAFANA_GROUP} \ +SUB_LIST= GRAFANA_BUILDHASH=8037849dbb02d3339929 \ GRAFANA_DATADIR=${GRAFANA_DATADIR} \ + GRAFANA_GROUP=${GRAFANA_GROUP} \ GRAFANA_HOMEDIR=${GRAFANA_HOMEDIR} \ GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \ GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \ GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR} \ - GRAFANA_BUILDHASH=4bfd7b0ee99616560b7a + GRAFANA_USER=${GRAFANA_USER} GRAFANA_USER?= grafana GRAFANA_GROUP?= grafana diff --git a/www/grafana8/Makefile.modules b/www/grafana8/Makefile.modules index e529a704787b..fd74065c8db6 100644 --- a/www/grafana8/Makefile.modules +++ b/www/grafana8/Makefile.modules @@ -34,6 +34,7 @@ GH_TUPLE= \ cuelang:cue:v0.3.2:cuelang_cue/vendor/cuelang.org/go \ davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ deepmap:oapi-codegen:v1.3.13:deepmap_oapi_codegen/vendor/github.com/deepmap/oapi-codegen \ + dgryski:go-rendezvous:9f7001d12a5f:dgryski_go_rendezvous/vendor/github.com/dgryski/go-rendezvous \ docker:go-units:v0.4.0:docker_go_units/vendor/github.com/docker/go-units \ dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \ edsrzf:mmap-go:v1.0.0:edsrzf_mmap_go/vendor/github.com/edsrzf/mmap-go \ @@ -68,7 +69,7 @@ GH_TUPLE= \ go-openapi:strfmt:v0.20.1:go_openapi_strfmt/vendor/github.com/go-openapi/strfmt \ go-openapi:swag:v0.19.15:go_openapi_swag/vendor/github.com/go-openapi/swag \ go-openapi:validate:v0.20.2:go_openapi_validate/vendor/github.com/go-openapi/validate \ - go-redis:redis:v5.2.9:go_redis_redis/vendor/gopkg.in/redis.v5 \ + go-redis:redis:v8.11.3:go_redis_redis_v8/vendor/github.com/go-redis/redis/v8 \ go-sourcemap:sourcemap:v2.1.3:go_sourcemap_sourcemap/vendor/github.com/go-sourcemap/sourcemap \ go-sql-driver:mysql:v1.6.0:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \ go-stack:stack:v1.8.0:go_stack_stack/vendor/github.com/go-stack/stack \ diff --git a/www/grafana8/distinfo b/www/grafana8/distinfo index 5e052a101faf..3bcfba22b26a 100644 --- a/www/grafana8/distinfo +++ b/www/grafana8/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1632226213 -SHA256 (grafana-8.1.5.linux-amd64.tar.gz) = c84ee6857de97989d3762634630289ed232fcf88979af267733d34daf7455c58 -SIZE (grafana-8.1.5.linux-amd64.tar.gz) = 57202054 +TIMESTAMP = 1633548315 +SHA256 (grafana-8.1.7.linux-amd64.tar.gz) = 05aaa2874b152d252966a3dc70b0a53948ae627ba5a6b29fe60ec14d1a8ccbf3 +SIZE (grafana-8.1.7.linux-amd64.tar.gz) = 56240059 SHA256 (v0.3.6.tar.gz) = af49dbe70ab6b0eb31d69afd89c3260b82cb662607b66eac41b65d642faee6bb SIZE (v0.3.6.tar.gz) = 22747 SHA256 (v0.7.3.tar.gz) = 9709c0e8eec3045832f9da81c7bcacf1a32774cb674efcd5662dd8b4d82f70c1 SIZE (v0.7.3.tar.gz) = 21163 SHA256 (v0.8.2.tar.gz) = 871cec6861f88b22fe36879e854872f960fae58a4e87d93c6c43d90558c8fc84 SIZE (v0.8.2.tar.gz) = 413897 -SHA256 (grafana-grafana-v8.1.5_GH0.tar.gz) = 8b821910affa5ba3d2b72f77aff05a4c5150e9cccd1416d7621fbe2ea3aaa2c8 -SIZE (grafana-grafana-v8.1.5_GH0.tar.gz) = 11938061 +SHA256 (grafana-grafana-v8.1.7_GH0.tar.gz) = 08179d4cc19d689ee8e2ca2d903f26f768fe2092d7145912ead46c3335c8d90d +SIZE (grafana-grafana-v8.1.7_GH0.tar.gz) = 11939217 SHA256 (Azure-azure-sdk-for-go-023238f4c45f_GH0.tar.gz) = 7fc283310c39645475503e4388f96cbc721cca5d35de57bc17282188b70ce69c SIZE (Azure-azure-sdk-for-go-023238f4c45f_GH0.tar.gz) = 36528192 SHA256 (Azure-azure-sdk-for-go-2bc7350b1dcd_GH0.tar.gz) = a385b24461c2dd73a3e32e130f9bf51940cbd263d5abaa2486aab6a37b27b079 @@ -79,6 +79,8 @@ SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 SHA256 (deepmap-oapi-codegen-v1.3.13_GH0.tar.gz) = c206f58011623e4d6c5a158b0cef563426694bb1bf0b9cbe03be7180986706da SIZE (deepmap-oapi-codegen-v1.3.13_GH0.tar.gz) = 135335 +SHA256 (dgryski-go-rendezvous-9f7001d12a5f_GH0.tar.gz) = 29584550745fd4b8fce2e2f3def7b9d9ffe2b86cf9b6596b53a660c9bbfe27b6 +SIZE (dgryski-go-rendezvous-9f7001d12a5f_GH0.tar.gz) = 1699 SHA256 (docker-go-units-v0.4.0_GH0.tar.gz) = b411f15ca9b419880006f3944b8ec87dc3fe15cbba3beb6e04f2c03f9ea8370b SIZE (docker-go-units-v0.4.0_GH0.tar.gz) = 11514 SHA256 (dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c50cf5d8774f09cc10dbca5ae9803d8ba @@ -147,8 +149,8 @@ SHA256 (go-openapi-swag-v0.19.15_GH0.tar.gz) = 5d22d5a44970926178102eb80926f4cbf SIZE (go-openapi-swag-v0.19.15_GH0.tar.gz) = 35515 SHA256 (go-openapi-validate-v0.20.2_GH0.tar.gz) = 40145ab360fd08dc30396acdee8c7b46541f90b8613ad53b98a5786f439cf186 SIZE (go-openapi-validate-v0.20.2_GH0.tar.gz) = 463309 -SHA256 (go-redis-redis-v5.2.9_GH0.tar.gz) = 494f474925e89749124445cdebc5affd741f7532d2a4d6e4e2069b17d74f4fd2 -SIZE (go-redis-redis-v5.2.9_GH0.tar.gz) = 69991 +SHA256 (go-redis-redis-v8.11.3_GH0.tar.gz) = bb7878312056b1981f3a717cf4d0ea8b5c0a255d2e082b104c4b7e7a7dc1a3ea +SIZE (go-redis-redis-v8.11.3_GH0.tar.gz) = 146502 SHA256 (go-sourcemap-sourcemap-v2.1.3_GH0.tar.gz) = 9e5d9e6f1b7facedd58ef8bb2af86ddf906bfc0c3f377934603e900b21490956 SIZE (go-sourcemap-sourcemap-v2.1.3_GH0.tar.gz) = 6479 SHA256 (go-sql-driver-mysql-v1.6.0_GH0.tar.gz) = 25233aea6418ca7e2e8d83f1bf4f498ef7f79c8c0fee1dc2a8ba623372574b28 From nobody Wed Oct 27 09:36: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 C2BBF1819C4D; Wed, 27 Oct 2021 09:36: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 4HfNqF56HZz4RW0; Wed, 27 Oct 2021 09:36: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 8B9535C29; Wed, 27 Oct 2021 09:36: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 19R9a9YK017872; Wed, 27 Oct 2021 09:36:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19R9a9BH017871; Wed, 27 Oct 2021 09:36:09 GMT (envelope-from git) Date: Wed, 27 Oct 2021 09:36:09 GMT Message-Id: <202110270936.19R9a9BH017871@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 2e9489a1cd75 - 2021Q4 - */*: Revert "*/*: Make rails 6.1.3 available" 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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 2e9489a1cd7569759c94242c6e867236ff32f0c2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=2e9489a1cd7569759c94242c6e867236ff32f0c2 commit 2e9489a1cd7569759c94242c6e867236ff32f0c2 Author: Matthias Fechner AuthorDate: 2021-10-22 14:52:50 +0000 Commit: Matthias Fechner CommitDate: 2021-10-27 09:35:32 +0000 */*: Revert "*/*: Make rails 6.1.3 available" This reverts commit f4511dc4a7c439b30c898b75246d314a574f01cb. Add MOVED entries. These ports are not required anymore as gitlab 14.4.0 has upgrade now to rails 6.1.4.1. (cherry picked from commit 4a7e890e91522896eb83f1c2f278ce0414175333) --- MOVED | 25 ++++++++++ databases/Makefile | 2 - databases/rubygem-activemodel613/Makefile | 24 --------- databases/rubygem-activemodel613/distinfo | 3 -- databases/rubygem-activemodel613/pkg-descr | 10 ---- databases/rubygem-activerecord613/Makefile | 25 ---------- databases/rubygem-activerecord613/distinfo | 3 -- databases/rubygem-activerecord613/pkg-descr | 14 ------ devel/Makefile | 10 ---- devel/gitaly/Makefile | 4 +- devel/rubygem-actionview613/Makefile | 30 ----------- devel/rubygem-actionview613/distinfo | 3 -- devel/rubygem-actionview613/pkg-descr | 7 --- devel/rubygem-activejob613/Makefile | 28 ----------- devel/rubygem-activejob613/distinfo | 3 -- devel/rubygem-activejob613/pkg-descr | 19 ------- devel/rubygem-activesupport613/Makefile | 28 ----------- devel/rubygem-activesupport613/distinfo | 3 -- devel/rubygem-activesupport613/pkg-descr | 7 --- devel/rubygem-devise-rails613/Makefile | 28 ----------- devel/rubygem-devise-rails613/distinfo | 3 -- devel/rubygem-devise-rails613/pkg-descr | 3 -- devel/rubygem-devise47-rails613/Makefile | 31 ------------ devel/rubygem-devise47-rails613/distinfo | 3 -- devel/rubygem-devise47-rails613/pkg-descr | 3 -- .../Makefile | 26 ---------- .../distinfo | 3 -- .../pkg-descr | 7 --- devel/rubygem-gitlab-labkit/Makefile | 6 +-- devel/rubygem-graphiql-rails/Makefile | 4 +- devel/rubygem-health_check/Makefile | 4 +- devel/rubygem-peek-rails613/Makefile | 22 -------- devel/rubygem-peek-rails613/distinfo | 3 -- devel/rubygem-peek-rails613/pkg-descr | 16 ------ devel/rubygem-rails-i18n-rails613/Makefile | 21 -------- devel/rubygem-rails-i18n-rails613/distinfo | 3 -- devel/rubygem-rails-i18n-rails613/pkg-descr | 4 -- devel/rubygem-sidekiq-cron/Makefile | 3 +- devel/rubygem-web-console-rails613/Makefile | 26 ---------- devel/rubygem-web-console-rails613/distinfo | 3 -- devel/rubygem-web-console-rails613/pkg-descr | 3 -- devel/rubygem-webpacker-rails613/Makefile | 24 --------- devel/rubygem-webpacker-rails613/distinfo | 3 -- devel/rubygem-webpacker-rails613/pkg-descr | 9 ---- graphics/rubygem-invisible_captcha/Makefile | 4 +- mail/Makefile | 2 - mail/rubygem-actionmailbox613/Makefile | 29 ----------- mail/rubygem-actionmailbox613/distinfo | 3 -- mail/rubygem-actionmailbox613/pkg-descr | 15 ------ mail/rubygem-actionmailer613/Makefile | 29 ----------- mail/rubygem-actionmailer613/distinfo | 3 -- mail/rubygem-actionmailer613/pkg-descr | 15 ------ net/Makefile | 1 - net/rubygem-activestorage613/Makefile | 29 ----------- net/rubygem-activestorage613/distinfo | 3 -- .../files/patch-activestorage.gemspec | 28 ----------- net/rubygem-activestorage613/pkg-descr | 14 ------ security/Makefile | 1 - .../rubygem-devise-two-factor-rails613/Makefile | 26 ---------- .../rubygem-devise-two-factor-rails613/distinfo | 3 -- .../rubygem-devise-two-factor-rails613/pkg-descr | 3 -- security/rubygem-doorkeeper/Makefile | 2 +- textproc/Makefile | 3 -- textproc/rubygem-actiontext613/Makefile | 28 ----------- textproc/rubygem-actiontext613/distinfo | 3 -- textproc/rubygem-actiontext613/pkg-descr | 10 ---- textproc/rubygem-sass-rails-rails613/Makefile | 22 -------- textproc/rubygem-sass-rails-rails613/distinfo | 3 -- textproc/rubygem-sass-rails-rails613/pkg-descr | 3 -- textproc/rubygem-sassc-rails-rails613/Makefile | 26 ---------- textproc/rubygem-sassc-rails-rails613/distinfo | 3 -- textproc/rubygem-sassc-rails-rails613/pkg-descr | 5 -- www/Makefile | 6 --- www/gitlab-ce/Makefile | 18 +++---- www/rubygem-actioncable613/Makefile | 27 ---------- www/rubygem-actioncable613/distinfo | 3 -- www/rubygem-actioncable613/pkg-descr | 10 ---- www/rubygem-actionpack613/Makefile | 29 ----------- www/rubygem-actionpack613/distinfo | 3 -- www/rubygem-actionpack613/pkg-descr | 23 --------- www/rubygem-lograge-rails613/Makefile | 22 -------- www/rubygem-lograge-rails613/distinfo | 3 -- www/rubygem-lograge-rails613/pkg-descr | 8 --- www/rubygem-rails613/Makefile | 58 ---------------------- www/rubygem-rails613/distinfo | 3 -- www/rubygem-rails613/pkg-descr | 12 ----- www/rubygem-railties613/Makefile | 32 ------------ www/rubygem-railties613/distinfo | 3 -- www/rubygem-railties613/pkg-descr | 7 --- www/rubygem-responders-rails613/Makefile | 23 --------- www/rubygem-responders-rails613/distinfo | 3 -- www/rubygem-responders-rails613/pkg-descr | 3 -- 92 files changed, 48 insertions(+), 1073 deletions(-) diff --git a/MOVED b/MOVED index d3df73c3787e..0ce267001938 100644 --- a/MOVED +++ b/MOVED @@ -16499,3 +16499,28 @@ sysutils/cfengine-masterfiles311|sysutils/cfengine-masterfiles317|2021-09-30|Has mail/postfix35|mail/postfix|2021-09-30|Has expired: It is only here until FreeBSD 11 is EoL (Postfix >= 3.6 requires OpenSSL >= 1.1.x) graphics/drm-fbsd11.2-kmod||2021-09-30|Removed, only useful on EOL FreeBSD 11.4 devel/qca-legacy|devel/qca|2021-09-30|Removed, only useful on EOL FreeBSD 11.4 +databases/rubygem-activemodel613|databases/rubygem-activemodel61|2021-10-22|Removed: Use databases/rubygem-activemodel61 instead +databases/rubygem-activerecord613|databases/rubygem-activerecord61|2021-10-22|Removed: Use databases/rubygem-activerecord61 instead +devel/rubygem-actionview613|devel/rubygem-actionview61|2021-10-22|Removed: Use devel/rubygem-actionview61 instead +devel/rubygem-activejob613|devel/rubygem-activejob61|2021-10-22|Removed: Use devel/rubygem-activejob61 instead +devel/rubygem-activesupport613|devel/rubygem-activesupport61|2021-10-22|Removed: Use devel/rubygem-activesupport61 instead +devel/rubygem-devise-rails613|devel/rubygem-devise-rails61|2021-10-22|Removed: Use devel/rubygem-devise-rails61 instead +devel/rubygem-devise47-rails613|devel/rubygem-devise47-rails61|2021-10-22|Removed: Use devel/rubygem-devise47-rails61 instead +devel/rubygem-gettext_i18n_rails_js-rails613|devel/rubygem-gettext_i18n_rails_js-rails61|2021-10-22|Removed: Use devel/rubygem-gettext_i18n_rails_js-rails61 instead +devel/rubygem-peek-rails613|devel/rubygem-peek-rails61|2021-10-22|Removed: Use devel/rubygem-peek-rails61 instead +devel/rubygem-rails-i18n-rails613|devel/rubygem-rails-i18n-rails61|2021-10-22|Removed: Use devel/rubygem-rails-i18n-rails61 instead +devel/rubygem-web-console-rails613|devel/rubygem-web-console-rails61|2021-10-22|Removed: Use devel/rubygem-web-console-rails61 instead +devel/rubygem-webpacker-rails613|devel/rubygem-webpacker-rails61|2021-10-22|Removed: Use devel/rubygem-webpacker-rails61 instead +mail/rubygem-actionmailbox613|mail/rubygem-actionmailbox61|2021-10-22|Removed: Use mail/rubygem-actionmailbox61 instead +mail/rubygem-actionmailer613|mail/rubygem-actionmailer61|2021-10-22|Removed: Use mail/rubygem-actionmailer61 instead +net/rubygem-activestorage613|net/rubygem-activestorage61|2021-10-22|Removed: Use net/rubygem-activestorage61 instead +security/rubygem-devise-two-factor-rails613|security/rubygem-devise-two-factor-rails61|2021-10-22|Removed: Use security/rubygem-devise-two-factor-rails61 instead +textproc/rubygem-actiontext613|textproc/rubygem-actiontext61|2021-10-22|Removed: Use textproc/rubygem-actiontext61 instead +textproc/rubygem-sass-rails-rails613|textproc/rubygem-sass-rails-rails61|2021-10-22|Removed: Use textproc/rubygem-sass-rails-rails61 instead +textproc/rubygem-sassc-rails-rails613|textproc/rubygem-sassc-rails-rails61|2021-10-22|Removed: Use textproc/rubygem-sassc-rails-rails61 instead +www/rubygem-actioncable613|www/rubygem-actioncable61|2021-10-22|Removed: Use www/rubygem-actioncable61 instead +www/rubygem-actionpack613|www/rubygem-actionpack61|2021-10-22|Removed: Use www/rubygem-actionpack61 instead +www/rubygem-lograge-rails613|www/rubygem-lograge-rails61|2021-10-22|Removed: Use www/rubygem-lograge-rails61 instead +www/rubygem-rails613|www/rubygem-rails61|2021-10-22|Removed: Use www/rubygem-rails61 instead +www/rubygem-railties613|www/rubygem-railties61|2021-10-22|Removed: Use www/rubygem-railties61 instead +www/rubygem-responders-rails613|www/rubygem-responders-rails61|2021-10-22|Removed: Use www/rubygem-responders-rails61 instead diff --git a/databases/Makefile b/databases/Makefile index fef6a340f5f1..ab4e0546e798 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -879,7 +879,6 @@ SUBDIR += rubygem-activemodel52 SUBDIR += rubygem-activemodel60 SUBDIR += rubygem-activemodel61 - SUBDIR += rubygem-activemodel613 SUBDIR += rubygem-activerecord-explain-analyze SUBDIR += rubygem-activerecord-import SUBDIR += rubygem-activerecord-jdbc-adapter @@ -891,7 +890,6 @@ SUBDIR += rubygem-activerecord52 SUBDIR += rubygem-activerecord60 SUBDIR += rubygem-activerecord61 - SUBDIR += rubygem-activerecord613 SUBDIR += rubygem-after_commit_queue SUBDIR += rubygem-amalgalite SUBDIR += rubygem-arel diff --git a/databases/rubygem-activemodel613/Makefile b/databases/rubygem-activemodel613/Makefile deleted file mode 100644 index 4b30d701cce7..000000000000 --- a/databases/rubygem-activemodel613/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# Created by: Johannes Meixner - -PORTNAME= activemodel -PORTVERSION= 6.1.3.2 -CATEGORIES= databases rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= 613 - -MAINTAINER= mfechner@FreeBSD.org -COMMENT= Toolkit for building modeling frameworks - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/MIT-LICENSE - -RUN_DEPENDS= rubygem-activesupport613>=${PORTVERSION}:devel/rubygem-activesupport613 - -USES= gem -USE_RUBY= yes - -NO_ARCH= yes - -PORTSCOUT= limit:^6\.1\. - -.include diff --git a/databases/rubygem-activemodel613/distinfo b/databases/rubygem-activemodel613/distinfo deleted file mode 100644 index d4eb52d930f2..000000000000 --- a/databases/rubygem-activemodel613/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1633413586 -SHA256 (rubygem/activemodel-6.1.3.2.gem) = 5459410a49855d18b89ecf2d509cb74924e37559a01a991b41d9fb4c201cedbe -SIZE (rubygem/activemodel-6.1.3.2.gem) = 61952 diff --git a/databases/rubygem-activemodel613/pkg-descr b/databases/rubygem-activemodel613/pkg-descr deleted file mode 100644 index 5eee67fa991a..000000000000 --- a/databases/rubygem-activemodel613/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Active Model provides a known set of interfaces for usage in model classes. They -allow for Action Pack helpers to interact with non-Active Record models, for -example. Active Model also helps with building custom ORMs for use outside of -the Rails framework. - -Active Model provides a default module that implements the basic API required to -integrate with Action Pack out of the box: ActiveModel::Model. - -WWW: https://rubyonrails.org/ -WWW: https://github.com/rails/rails/tree/master/activemodel diff --git a/databases/rubygem-activerecord613/Makefile b/databases/rubygem-activerecord613/Makefile deleted file mode 100644 index fef2f3dc8544..000000000000 --- a/databases/rubygem-activerecord613/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# Created by: Johannes Meixner - -PORTNAME= activerecord -PORTVERSION= 6.1.3.2 -CATEGORIES= databases rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= 613 - -MAINTAINER= mfechner@FreeBSD.org -COMMENT= Object-relational mapping layer for Rails MVC Framework - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/MIT-LICENSE - -RUN_DEPENDS= rubygem-activemodel613>=${PORTVERSION}:databases/rubygem-activemodel613 \ - rubygem-activesupport613>=${PORTVERSION}:devel/rubygem-activesupport613 - -USES= gem -USE_RUBY= yes - -NO_ARCH= yes - -PORTSCOUT= limit:^6\.1\. - -.include diff --git a/databases/rubygem-activerecord613/distinfo b/databases/rubygem-activerecord613/distinfo deleted file mode 100644 index 0fa7a8f225f0..000000000000 --- a/databases/rubygem-activerecord613/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1633413635 -SHA256 (rubygem/activerecord-6.1.3.2.gem) = c8400e75c1caa43aefcc6dd1d21c427030f4190ee606931ff8f97da12a46e539 -SIZE (rubygem/activerecord-6.1.3.2.gem) = 429056 diff --git a/databases/rubygem-activerecord613/pkg-descr b/databases/rubygem-activerecord613/pkg-descr deleted file mode 100644 index 29c7987b2296..000000000000 --- a/databases/rubygem-activerecord613/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -Active Record connects classes to relational database tables to establish an -almost zero-configuration persistence layer for applications. The library -provides a base class that, when subclassed, sets up a mapping between the new -class and an existing table in the database. In the context of an application, -these classes are commonly referred to as models. Models can also be connected -to other models; this is done by defining associations. - -Active Record relies heavily on naming in that it uses class and association -names to establish mappings between respective database tables and foreign key -columns. Although these mappings can be defined explicitly, it's recommended to -follow naming conventions, especially when getting started with the library. - -WWW: https://rubyonrails.org/ -WWW: https://github.com/rails/rails/tree/master/activerecord diff --git a/devel/Makefile b/devel/Makefile index 0ecd52d2a21e..6671bc68ec53 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -5575,7 +5575,6 @@ SUBDIR += rubygem-actionview52 SUBDIR += rubygem-actionview60 SUBDIR += rubygem-actionview61 - SUBDIR += rubygem-actionview613 SUBDIR += rubygem-active_scaffold SUBDIR += rubygem-activejob4 SUBDIR += rubygem-activejob5 @@ -5583,7 +5582,6 @@ SUBDIR += rubygem-activejob52 SUBDIR += rubygem-activejob60 SUBDIR += rubygem-activejob61 - SUBDIR += rubygem-activejob613 SUBDIR += rubygem-activemessaging SUBDIR += rubygem-activerecord-deprecated_finders SUBDIR += rubygem-activesupport4 @@ -5592,7 +5590,6 @@ SUBDIR += rubygem-activesupport52 SUBDIR += rubygem-activesupport60 SUBDIR += rubygem-activesupport61 - SUBDIR += rubygem-activesupport613 SUBDIR += rubygem-airborne SUBDIR += rubygem-akismet SUBDIR += rubygem-algebrick @@ -6188,10 +6185,8 @@ SUBDIR += rubygem-devise-rails52 SUBDIR += rubygem-devise-rails60 SUBDIR += rubygem-devise-rails61 - SUBDIR += rubygem-devise-rails613 SUBDIR += rubygem-devise47-rails60 SUBDIR += rubygem-devise47-rails61 - SUBDIR += rubygem-devise47-rails613 SUBDIR += rubygem-did_you_mean SUBDIR += rubygem-dig_rb SUBDIR += rubygem-directory_watcher @@ -6307,7 +6302,6 @@ SUBDIR += rubygem-gettext_i18n_rails_js-rails52 SUBDIR += rubygem-gettext_i18n_rails_js-rails60 SUBDIR += rubygem-gettext_i18n_rails_js-rails61 - SUBDIR += rubygem-gettext_i18n_rails_js-rails613 SUBDIR += rubygem-gh SUBDIR += rubygem-gibbler SUBDIR += rubygem-gio2 @@ -6550,7 +6544,6 @@ SUBDIR += rubygem-peek-rails52 SUBDIR += rubygem-peek-rails60 SUBDIR += rubygem-peek-rails61 - SUBDIR += rubygem-peek-rails613 SUBDIR += rubygem-peek-rblineprof-rails52 SUBDIR += rubygem-peek-redis-rails52 SUBDIR += rubygem-pkg-config @@ -6599,7 +6592,6 @@ SUBDIR += rubygem-rails-i18n-rails52 SUBDIR += rubygem-rails-i18n-rails60 SUBDIR += rubygem-rails-i18n-rails61 - SUBDIR += rubygem-rails-i18n-rails613 SUBDIR += rubygem-rails-observers SUBDIR += rubygem-rainbow SUBDIR += rubygem-rake @@ -6873,7 +6865,6 @@ SUBDIR += rubygem-weakref SUBDIR += rubygem-web-console-rails60 SUBDIR += rubygem-web-console-rails61 - SUBDIR += rubygem-web-console-rails613 SUBDIR += rubygem-web-console2 SUBDIR += rubygem-web-console3-rails5 SUBDIR += rubygem-web-console3-rails50 @@ -6882,7 +6873,6 @@ SUBDIR += rubygem-webfinger SUBDIR += rubygem-webpacker-rails60 SUBDIR += rubygem-webpacker-rails61 - SUBDIR += rubygem-webpacker-rails613 SUBDIR += rubygem-webpacker4-rails5 SUBDIR += rubygem-webpacker4-rails50 SUBDIR += rubygem-webpacker4-rails60 diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index d2d9e3f6e30e..12ab0cc9661a 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitaly DISTVERSION= 14.3.2 -PORTREVISION= 2 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -15,7 +15,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-rugged>=1.1<2:devel/rubygem-rugged \ rubygem-github-linguist>=7.12.1<8:textproc/rubygem-github-linguist \ rubygem-gitlab-markup>=1.7.1<1.8.0:textproc/rubygem-gitlab-markup \ - rubygem-activesupport613>=6.1.3.2<6.1.4:devel/rubygem-activesupport613 \ + rubygem-activesupport61>=6.1.3.2<6.1.4:devel/rubygem-activesupport61 \ rubygem-rdoc>=6.3.2<7.0:devel/rubygem-rdoc \ rubygem-gitlab-gollum-lib>=4.2.7.10.gitlab.1<4.2.8:www/rubygem-gitlab-gollum-lib \ rubygem-gitlab-gollum-rugged_adapter>=0.4.4.4.gitlab.1<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \ diff --git a/devel/rubygem-actionview613/Makefile b/devel/rubygem-actionview613/Makefile deleted file mode 100644 index 1f21eb3eff90..000000000000 --- a/devel/rubygem-actionview613/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Created by: Steve Wills - -PORTNAME= actionview -PORTVERSION= 6.1.3.2 -CATEGORIES= devel rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= 613 - -MAINTAINER= mfechner@FreeBSD.org -COMMENT= Rendering framework putting the V in MVC (part of Rails) - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/MIT-LICENSE - -RUN_DEPENDS= rubygem-activesupport613>=${PORTVERSION}:devel/rubygem-activesupport613 \ - rubygem-builder>=3.1<4:devel/rubygem-builder \ - rubygem-erubi>=1.4<2:www/rubygem-erubi \ - rubygem-rails-dom-testing-rails61>=2.0<3:textproc/rubygem-rails-dom-testing-rails61 \ - rubygem-rails-html-sanitizer>=1.2.0<2:textproc/rubygem-rails-html-sanitizer - -USES= cpe gem -USE_RUBY= yes - -NO_ARCH= yes - -CPE_VENDOR= rubyonrails - -PORTSCOUT= limit:^6\.1\. - -.include diff --git a/devel/rubygem-actionview613/distinfo b/devel/rubygem-actionview613/distinfo deleted file mode 100644 index a76cbcdbf7b1..000000000000 --- a/devel/rubygem-actionview613/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1633413406 -SHA256 (rubygem/actionview-6.1.3.2.gem) = 56fb0011ed74b19915c4068c0778d737ea9bbadc7ecd7461502c6b379e58cde4 -SIZE (rubygem/actionview-6.1.3.2.gem) = 171008 diff --git a/devel/rubygem-actionview613/pkg-descr b/devel/rubygem-actionview613/pkg-descr deleted file mode 100644 index 6f62c739aebb..000000000000 --- a/devel/rubygem-actionview613/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Action View is a framework for handling view template lookup and rendering, and -provides view helpers that assist when building HTML forms, Atom feeds and more. -Template formats that Action View handles are ERB (embedded Ruby, typically used -to inline short Ruby snippets inside HTML), and XML Builder. - -WWW: https://rubyonrails.org/ -WWW: https://github.com/rails/rails/tree/master/actionview diff --git a/devel/rubygem-activejob613/Makefile b/devel/rubygem-activejob613/Makefile deleted file mode 100644 index fe7fd86ab4b8..000000000000 --- a/devel/rubygem-activejob613/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# Created by: Johannes Jost Meixner - -PORTNAME= activejob -PORTVERSION= 6.1.3.2 -CATEGORIES= devel rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= 613 - -MAINTAINER= mfechner@FreeBSD.org -COMMENT= Job class declarations for a variety of queueing backends - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/MIT-LICENSE - -RUN_DEPENDS= rubygem-activesupport613>=${PORTVERSION}:devel/rubygem-activesupport613 \ - rubygem-globalid-rails61>=0.3.6:databases/rubygem-globalid-rails61 - -USES= cpe gem -USE_RUBY= yes - -NO_ARCH= yes - -CPE_VENDOR= rubyonrails -CPE_PRODUCT= active_job - -PORTSCOUT= limit:^6\.1\. - -.include diff --git a/devel/rubygem-activejob613/distinfo b/devel/rubygem-activejob613/distinfo deleted file mode 100644 index eb24e5157e1e..000000000000 --- a/devel/rubygem-activejob613/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1633413475 -SHA256 (rubygem/activejob-6.1.3.2.gem) = b8f7949f79e583e69077e995fc084ed6c505012a7011f7faa41d7606d5ca005d -SIZE (rubygem/activejob-6.1.3.2.gem) = 32768 diff --git a/devel/rubygem-activejob613/pkg-descr b/devel/rubygem-activejob613/pkg-descr deleted file mode 100644 index 9219e7ada1d9..000000000000 --- a/devel/rubygem-activejob613/pkg-descr +++ /dev/null @@ -1,19 +0,0 @@ -Active Job is a framework for declaring jobs and making them run on a variety of -queuing backends. These jobs can be everything from regularly scheduled -clean-ups, to billing charges, to mailings. Anything that can be chopped up into -small units of work and run in parallel, really. - -It also serves as the backend for Action Mailer's #deliver_later functionality -that makes it easy to turn any mailing into a job for running later. That's one -of the most common jobs in a modern web application: sending emails outside of -the request-response cycle, so the user doesn't have to wait on it. - -The main point is to ensure that all Rails apps will have a job infrastructure -in place, even if it's in the form of an "immediate runner". We can then have -framework features and other gems build on top of that, without having to worry -about API differences between Delayed Job and Resque. Picking your queuing -backend becomes more of an operational concern, then. And you'll be able to -switch between them without having to rewrite your jobs. - -WWW: https://rubyonrails.org/ -WWW: https://github.com/rails/rails/tree/master/activejob diff --git a/devel/rubygem-activesupport613/Makefile b/devel/rubygem-activesupport613/Makefile deleted file mode 100644 index 056fe5554686..000000000000 --- a/devel/rubygem-activesupport613/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# Created by: Jonathan Weiss () - -PORTNAME= activesupport -PORTVERSION= 6.1.3.2 -CATEGORIES= devel rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= 613 - -MAINTAINER= mfechner@FreeBSD.org -COMMENT= Utility classes and extension that are required by Rails MVC Framework - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/MIT-LICENSE - -RUN_DEPENDS= rubygem-concurrent-ruby>=1.0.2<2:devel/rubygem-concurrent-ruby \ - rubygem-i18n>=1.6,2<2,2:devel/rubygem-i18n \ - rubygem-minitest>=5.1:devel/rubygem-minitest \ - rubygem-tzinfo>=2.0<3:devel/rubygem-tzinfo \ - rubygem-zeitwerk>=2.3<3:devel/rubygem-zeitwerk - -USES= gem -USE_RUBY= yes - -NO_ARCH= yes - -PORTSCOUT= limit:^6\.1\. - -.include diff --git a/devel/rubygem-activesupport613/distinfo b/devel/rubygem-activesupport613/distinfo deleted file mode 100644 index f037824f9cae..000000000000 --- a/devel/rubygem-activesupport613/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1633413512 -SHA256 (rubygem/activesupport-6.1.3.2.gem) = d9074834deca6676aabd432f16c392e991eca1f675cbcefc38671a0a7d6b5db3 -SIZE (rubygem/activesupport-6.1.3.2.gem) = 219136 diff --git a/devel/rubygem-activesupport613/pkg-descr b/devel/rubygem-activesupport613/pkg-descr deleted file mode 100644 index 8f9f21005487..000000000000 --- a/devel/rubygem-activesupport613/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Active Support is a collection of utility classes and standard library -extensions that were found useful for the Rails framework. These additions -reside in this package so they can be loaded as needed in Ruby projects outside -of Rails. - -WWW: https://rubyonrails.org/ -WWW: https://github.com/rails/rails/tree/master/activesupport diff --git a/devel/rubygem-devise-rails613/Makefile b/devel/rubygem-devise-rails613/Makefile deleted file mode 100644 index 08ce4060d880..000000000000 --- a/devel/rubygem-devise-rails613/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# Created by: rpsfa@rit.edu - -PORTNAME= devise -PORTVERSION= 4.8.0 -CATEGORIES= devel rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= -rails613 - -MAINTAINER= ruby@FreeBSD.org -COMMENT= Flexible authentication solution for Rails with Warden - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/MIT-LICENSE - -RUN_DEPENDS= rubygem-bcrypt>=3.0<4:security/rubygem-bcrypt \ - rubygem-orm_adapter>=0.1<1:devel/rubygem-orm_adapter \ - rubygem-railties613>=4.1.0:www/rubygem-railties613 \ - rubygem-responders-rails613>=0:www/rubygem-responders-rails613 \ - rubygem-warden>=1.2.3<1.3:devel/rubygem-warden - -USES= cpe gem -USE_RUBY= yes - -CPE_VENDOR= plataformatec - -NO_ARCH= yes - -.include diff --git a/devel/rubygem-devise-rails613/distinfo b/devel/rubygem-devise-rails613/distinfo deleted file mode 100644 index 51c190a46e4e..000000000000 --- a/devel/rubygem-devise-rails613/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1619910383 -SHA256 (rubygem/devise-4.8.0.gem) = bf82eadc09e9d48b8b9b00d76e6399a54ff3d851fc0b1b5c85ebc031ffd4e029 -SIZE (rubygem/devise-4.8.0.gem) = 91136 diff --git a/devel/rubygem-devise-rails613/pkg-descr b/devel/rubygem-devise-rails613/pkg-descr deleted file mode 100644 index 6496f1a6eaf7..000000000000 --- a/devel/rubygem-devise-rails613/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Flexible authentication solution for Rails with Warden - -WWW: https://github.com/heartcombo/devise diff --git a/devel/rubygem-devise47-rails613/Makefile b/devel/rubygem-devise47-rails613/Makefile deleted file mode 100644 index be379fce3c44..000000000000 --- a/devel/rubygem-devise47-rails613/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# Created by: rpsfa@rit.edu - -PORTNAME= devise -PORTVERSION= 4.7.3 -PORTREVISION= 1 -CATEGORIES= devel rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= 47-rails613 - -MAINTAINER= mfechner@FreeBSD.org -COMMENT= Flexible authentication solution for Rails with Warden - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/MIT-LICENSE - -RUN_DEPENDS= rubygem-bcrypt>=3.0<4:security/rubygem-bcrypt \ - rubygem-orm_adapter>=0.1<1:devel/rubygem-orm_adapter \ - rubygem-railties613>=4.1.0:www/rubygem-railties613 \ - rubygem-responders-rails613>=0:www/rubygem-responders-rails613 \ - rubygem-warden>=1.2.3<1.3:devel/rubygem-warden - -USES= cpe gem -USE_RUBY= yes - -CPE_VENDOR= plataformatec - -NO_ARCH= yes - -PORTSCOUT= limit:^4\.7\. - -.include diff --git a/devel/rubygem-devise47-rails613/distinfo b/devel/rubygem-devise47-rails613/distinfo deleted file mode 100644 index bd5b88489c5c..000000000000 --- a/devel/rubygem-devise47-rails613/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1600709982 -SHA256 (rubygem/devise-4.7.3.gem) = 2c8e3d731a05d7a6df0cd32bddcd7668f56b6d0c8e898a8c7c8dd584019cd86b -SIZE (rubygem/devise-4.7.3.gem) = 89600 diff --git a/devel/rubygem-devise47-rails613/pkg-descr b/devel/rubygem-devise47-rails613/pkg-descr deleted file mode 100644 index 6496f1a6eaf7..000000000000 --- a/devel/rubygem-devise47-rails613/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Flexible authentication solution for Rails with Warden - -WWW: https://github.com/heartcombo/devise diff --git a/devel/rubygem-gettext_i18n_rails_js-rails613/Makefile b/devel/rubygem-gettext_i18n_rails_js-rails613/Makefile deleted file mode 100644 index 982b99bc62f4..000000000000 --- a/devel/rubygem-gettext_i18n_rails_js-rails613/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# Created by: Po-Chuan Hsieh - -PORTNAME= gettext_i18n_rails_js -PORTVERSION= 1.3.0 -PORTREVISION= 1 -CATEGORIES= devel rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= -rails613 - -MAINTAINER= mfechner@FreeBSD.org -COMMENT= Make gettext_i18n_rails .po files as JSON - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE - -RUN_DEPENDS= rubygem-gettext>=3.0.2:devel/rubygem-gettext \ - rubygem-gettext_i18n_rails>=0.7.1:devel/rubygem-gettext_i18n_rails \ - rubygem-po_to_json>=1.0.0:converters/rubygem-po_to_json \ - rubygem-rails613>=3.2.0:www/rubygem-rails613 - -USES= gem -USE_RUBY= yes - -NO_ARCH= yes - -.include diff --git a/devel/rubygem-gettext_i18n_rails_js-rails613/distinfo b/devel/rubygem-gettext_i18n_rails_js-rails613/distinfo deleted file mode 100644 index 739f5b181914..000000000000 --- a/devel/rubygem-gettext_i18n_rails_js-rails613/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1496105567 -SHA256 (rubygem/gettext_i18n_rails_js-1.3.0.gem) = 5d10afe4be3639bff78c50a56768c20f39aecdabc580c08aa45573911c2bd687 -SIZE (rubygem/gettext_i18n_rails_js-1.3.0.gem) = 24576 diff --git a/devel/rubygem-gettext_i18n_rails_js-rails613/pkg-descr b/devel/rubygem-gettext_i18n_rails_js-rails613/pkg-descr deleted file mode 100644 index a7790d053d39..000000000000 --- a/devel/rubygem-gettext_i18n_rails_js-rails613/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -GettextI18nRailsJs extends gettext_i18n_rails, making your .PO files available -to client side Javascript as JSON. It will find translations inside your .js, -.coffee, .handlebars and .mustache files, then it will create JSON versions of -your .PO files so you can serve them with the rest of your assets, thus letting -you access all your translations offline from client side Javascript. - -WWW: https://github.com/webhippie/gettext_i18n_rails_js diff --git a/devel/rubygem-gitlab-labkit/Makefile b/devel/rubygem-gitlab-labkit/Makefile index 8bcda56714c8..b49d1b41e38b 100644 --- a/devel/rubygem-gitlab-labkit/Makefile +++ b/devel/rubygem-gitlab-labkit/Makefile @@ -2,7 +2,7 @@ PORTNAME= gitlab-labkit PORTVERSION= 0.21.1 -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -12,8 +12,8 @@ COMMENT= Instrumentation for GitLab LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-actionpack613>=5<7:www/rubygem-actionpack613 \ - rubygem-activesupport613>=5<7:devel/rubygem-activesupport613 \ +RUN_DEPENDS= rubygem-actionpack61>=5<7:www/rubygem-actionpack61 \ + rubygem-activesupport61>=5<7:devel/rubygem-activesupport61 \ rubygem-grpc>=1.30.2<2:net/rubygem-grpc \ rubygem-jaeger-client>=1.1<2:devel/rubygem-jaeger-client \ rubygem-opentracing>=0.4<1.0:devel/rubygem-opentracing \ diff --git a/devel/rubygem-graphiql-rails/Makefile b/devel/rubygem-graphiql-rails/Makefile index e80b5926f1f7..d8def7b73ab2 100644 --- a/devel/rubygem-graphiql-rails/Makefile +++ b/devel/rubygem-graphiql-rails/Makefile @@ -1,6 +1,6 @@ PORTNAME= graphiql-rails PORTVERSION= 1.4.11 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -10,7 +10,7 @@ COMMENT= Use the GraphiQL IDE for GraphQL with Ruby on Rails LICENSE= MIT RUN_DEPENDS= rubygem-sprockets-rails-rails61>=0:devel/rubygem-sprockets-rails-rails61 \ - rubygem-railties613>=0:www/rubygem-railties613 + rubygem-railties61>=0:www/rubygem-railties61 USES= gem USE_RUBY= yes diff --git a/devel/rubygem-health_check/Makefile b/devel/rubygem-health_check/Makefile index 0cdc3edf0aa3..38615ed9595a 100644 --- a/devel/rubygem-health_check/Makefile +++ b/devel/rubygem-health_check/Makefile @@ -2,7 +2,7 @@ PORTNAME= health_check PORTVERSION= 3.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -12,7 +12,7 @@ COMMENT= Simple health check of Rails app for uptime monitoring LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE -RUN_DEPENDS= rubygem-railties613>=5.0:www/rubygem-railties613 +RUN_DEPENDS= rubygem-railties61>=5.0:www/rubygem-railties61 USES= gem shebangfix USE_RUBY= yes diff --git a/devel/rubygem-peek-rails613/Makefile b/devel/rubygem-peek-rails613/Makefile deleted file mode 100644 index 1c3066d6d1bb..000000000000 --- a/devel/rubygem-peek-rails613/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# Created by: Po-Chuan Hsieh - -PORTNAME= peek -PORTVERSION= 1.1.0 -CATEGORIES= devel rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= -rails613 - -MAINTAINER= mfechner@FreeBSD.org -COMMENT= Take a peek into your Rails application - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -RUN_DEPENDS= rubygem-railties613>=4.0.0:www/rubygem-railties613 - -USES= gem -USE_RUBY= yes - -NO_ARCH= yes - -.include diff --git a/devel/rubygem-peek-rails613/distinfo b/devel/rubygem-peek-rails613/distinfo deleted file mode 100644 index 9ef19d243bd1..000000000000 --- a/devel/rubygem-peek-rails613/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1576923479 -SHA256 (rubygem/peek-1.1.0.gem) = d6501ead8cde46d8d8ed0d59eb6f0ba713d0a41c11a2c4a81447b2dce37b3ecc -SIZE (rubygem/peek-1.1.0.gem) = 25600 diff --git a/devel/rubygem-peek-rails613/pkg-descr b/devel/rubygem-peek-rails613/pkg-descr deleted file mode 100644 index fc65d2f486b2..000000000000 --- a/devel/rubygem-peek-rails613/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -This is a profiling tool originally built at GitHub to help us get an insight -into our application. Now, we have extracted this into Peek, so that other Rails -application can experience the same benefit. - -Peek puts a little bar on top of your application to show you all sorts of -helpful information about your application. From the screenshot above, you can -see that Peek provides information about database queries, cache, Resque workers -and more. However, this is only part of Peek's beauty. - -The true beauty of Peek lies in the fact that it is an extensible platform. If -there are some performance metrics that you need but are not available on Peek, -you can find it from the list of available Peek Views and integrate it into -Peek. Even if you do not find what you want on Peek Views, you can always create -your own. - -WWW: https://github.com/peek/peek diff --git a/devel/rubygem-rails-i18n-rails613/Makefile b/devel/rubygem-rails-i18n-rails613/Makefile deleted file mode 100644 index 99c491073f4d..000000000000 --- a/devel/rubygem-rails-i18n-rails613/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -PORTNAME= rails-i18n -PORTVERSION= 6.0.0 -CATEGORIES= devel rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= -rails613 - -MAINTAINER= ruby@FreeBSD.org -COMMENT= Common locale data and translations for Rails i18n - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/MIT-LICENSE.txt - -RUN_DEPENDS= rubygem-i18n>=0.7,2<2,2:devel/rubygem-i18n \ - rubygem-railties613>=6.0<7:www/rubygem-railties613 - -USES= gem -USE_RUBY= yes - -NO_ARCH= yes - -.include diff --git a/devel/rubygem-rails-i18n-rails613/distinfo b/devel/rubygem-rails-i18n-rails613/distinfo deleted file mode 100644 index 77db0b17e177..000000000000 --- a/devel/rubygem-rails-i18n-rails613/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1582615250 -SHA256 (rubygem/rails-i18n-6.0.0.gem) = 072c38eb0add07a91a2581bb8d240f86b7e1253f8356eb46b5f76e44ce7eac16 -SIZE (rubygem/rails-i18n-6.0.0.gem) = 109568 diff --git a/devel/rubygem-rails-i18n-rails613/pkg-descr b/devel/rubygem-rails-i18n-rails613/pkg-descr deleted file mode 100644 index ed2e76abc61a..000000000000 --- a/devel/rubygem-rails-i18n-rails613/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -A set of common locale data and translations to internationalize and/or localize -your Rails applications. - -WWW: https://github.com/svenfuchs/rails-i18n diff --git a/devel/rubygem-sidekiq-cron/Makefile b/devel/rubygem-sidekiq-cron/Makefile index 4f0a7f40e680..6eec61566f79 100644 --- a/devel/rubygem-sidekiq-cron/Makefile +++ b/devel/rubygem-sidekiq-cron/Makefile @@ -2,6 +2,7 @@ PORTNAME= sidekiq-cron PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -13,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt # Use the same rubygem-sidekiq for www/gitlab-ce and its dependencies RUN_DEPENDS= rubygem-fugit>=1.1<2:devel/rubygem-fugit \ - rubygem-sidekiq5>=4.2.1:devel/rubygem-sidekiq5 + rubygem-sidekiq>=4.2.1:devel/rubygem-sidekiq USES= gem USE_RUBY= yes diff --git a/devel/rubygem-web-console-rails613/Makefile b/devel/rubygem-web-console-rails613/Makefile deleted file mode 100644 index bf9532cd75e4..000000000000 --- a/devel/rubygem-web-console-rails613/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -PORTNAME= web-console -PORTVERSION= 4.1.0 -CATEGORIES= devel rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= -rails613 - -MAINTAINER= mfechner@FreeBSD.org -COMMENT= Debugging tool for your Ruby on Rails applications - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/MIT-LICENSE - -RUN_DEPENDS= rubygem-activemodel613>=6.0.0:databases/rubygem-activemodel613 \ - rubygem-actionview613>=6.0.0:devel/rubygem-actionview613 \ - rubygem-bindex>=0.4.0:devel/rubygem-bindex \ - rubygem-railties613>=6.0.0:www/rubygem-railties613 - -USES= cpe gem -USE_RUBY= yes - -NO_ARCH= yes - -CPE_VENDOR= rubyonrails -CPE_PRODUCT= web_console - -.include diff --git a/devel/rubygem-web-console-rails613/distinfo b/devel/rubygem-web-console-rails613/distinfo deleted file mode 100644 index 0bdff82aecc3..000000000000 --- a/devel/rubygem-web-console-rails613/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1611665625 -SHA256 (rubygem/web-console-4.1.0.gem) = a9896d990e84f7ae44d99c40bb7d82f19455009c33f140458f3a5696449a3035 -SIZE (rubygem/web-console-4.1.0.gem) = 29184 diff --git a/devel/rubygem-web-console-rails613/pkg-descr b/devel/rubygem-web-console-rails613/pkg-descr deleted file mode 100644 index bde8f8c75ee5..000000000000 --- a/devel/rubygem-web-console-rails613/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -A debugging tool for your Ruby on Rails applications. - -WWW: https://github.com/rails/web-console diff --git a/devel/rubygem-webpacker-rails613/Makefile b/devel/rubygem-webpacker-rails613/Makefile deleted file mode 100644 index 413915af7eec..000000000000 --- a/devel/rubygem-webpacker-rails613/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -PORTNAME= webpacker -PORTVERSION= 5.4.3 -CATEGORIES= devel rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= -rails613 - -MAINTAINER= mfechner@FreeBSD.org -COMMENT= Use Webpack to manage app-like JavaScript modules in Rails - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/MIT-LICENSE - -RUN_DEPENDS= rubygem-activesupport613>=5.2:devel/rubygem-activesupport613 \ - rubygem-rack-proxy>=0.6.1:www/rubygem-rack-proxy \ *** 1074 LINES SKIPPED *** From nobody Wed Oct 27 09:36: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 A864918199FE; Wed, 27 Oct 2021 09:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HfNqG627pz4RYV; Wed, 27 Oct 2021 09:36: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 A7B6E5A62; Wed, 27 Oct 2021 09:36: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 19R9aABZ017896; Wed, 27 Oct 2021 09:36:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19R9aAup017895; Wed, 27 Oct 2021 09:36:10 GMT (envelope-from git) Date: Wed, 27 Oct 2021 09:36:10 GMT Message-Id: <202110270936.19R9aAup017895@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: ee4189c5bdf8 - 2021Q4 - devel/gitaly: Update to 14.4.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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: ee4189c5bdf88a89a09784c0e6ae3a916dd2abce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee4189c5bdf88a89a09784c0e6ae3a916dd2abce commit ee4189c5bdf88a89a09784c0e6ae3a916dd2abce Author: Matthias Fechner AuthorDate: 2021-10-26 19:17:47 +0000 Commit: Matthias Fechner CommitDate: 2021-10-27 09:35:32 +0000 devel/gitaly: Update to 14.4.0 Is required for gitlab-ce 14.4.0. (cherry picked from commit bebf78bb80770e9e7bb34803ccf6d42235027adf) --- devel/gitaly/Makefile | 13 +++++++------ devel/gitaly/distinfo | 6 +++--- devel/gitaly/files/patch-Makefile | 8 ++++---- devel/gitaly/files/patch-ruby_Gemfile | 15 +++++---------- 4 files changed, 19 insertions(+), 23 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 12ab0cc9661a..2a1d8fe5e8ea 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitaly -DISTVERSION= 14.3.2 -PORTREVISION= 1 +DISTVERSION= 14.4.0 +PORTREVISION= 0 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -15,7 +15,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-rugged>=1.1<2:devel/rubygem-rugged \ rubygem-github-linguist>=7.12.1<8:textproc/rubygem-github-linguist \ rubygem-gitlab-markup>=1.7.1<1.8.0:textproc/rubygem-gitlab-markup \ - rubygem-activesupport61>=6.1.3.2<6.1.4:devel/rubygem-activesupport61 \ + rubygem-activesupport61>=6.1.4.1<6.1.4.2:devel/rubygem-activesupport61 \ rubygem-rdoc>=6.3.2<7.0:devel/rubygem-rdoc \ rubygem-gitlab-gollum-lib>=4.2.7.10.gitlab.1<4.2.8:www/rubygem-gitlab-gollum-lib \ rubygem-gitlab-gollum-rugged_adapter>=0.4.4.4.gitlab.1<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \ @@ -23,7 +23,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-sentry-raven>=3.0<4:devel/rubygem-sentry-raven \ rubygem-faraday>=1.0.1<2:www/rubygem-faraday \ rubygem-rbtrace>=0.4.14:devel/rubygem-rbtrace \ - rubygem-gitlab-labkit>=0.21<0.22:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.21.1<0.22:devel/rubygem-gitlab-labkit \ rubygem-licensee>=9.14.1<9.15:devel/rubygem-licensee \ rubygem-google-protobuf317>=3.17.3<3.18:devel/rubygem-google-protobuf317 BUILD_DEPENDS= gem:devel/ruby-gems \ @@ -45,12 +45,12 @@ MAKE_ENV+= ${GO_ENV} USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= 52407ecfce7fc39b4f5f6db15cc6cb4e9a8c1f60 +GL_COMMIT= 7abdbce59731637552b86002fcbe8754b3d98623 # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-vendor -# 137dd +# 138dd GH_TUPLE= \ Azure:azure-pipeline-go:v0.2.3:azure_azure_pipeline_go/vendor/github.com/Azure/azure-pipeline-go \ Azure:azure-storage-blob-go:v0.13.0:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \ @@ -227,3 +227,4 @@ post-install: s#${DATADIR_REL}/bin#@(,,555) ${DATADIR_REL}/bin#; ' >> ${TMPPLIST} .include + diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index ed5f4d04d0ec..98200b8edf7c 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1633159372 +TIMESTAMP = 1634895409 SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102 SHA256 (Azure-azure-storage-blob-go-v0.13.0_GH0.tar.gz) = 6bf7145210331efa3f0417f6684cf764c22743cf23122048ec136600daebf443 @@ -267,8 +267,8 @@ SHA256 (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 7ce80a93d0fdbeb6760f97d6d166d11c215 SIZE (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 8421 SHA256 (gonum-gonum-v0.8.2_GH0.tar.gz) = a2aad1ac038d36d568939910f39eb0c58cae3c6f0b18df3ca74a8daa954d1663 SIZE (gonum-gonum-v0.8.2_GH0.tar.gz) = 3226037 -SHA256 (gitlab-org-gitaly-52407ecfce7fc39b4f5f6db15cc6cb4e9a8c1f60_GL0.tar.gz) = 35ccd4d036e07ae9f780504525fc059012c9d091ec496abf29260de4ba37054c -SIZE (gitlab-org-gitaly-52407ecfce7fc39b4f5f6db15cc6cb4e9a8c1f60_GL0.tar.gz) = 3672392 +SHA256 (gitlab-org-gitaly-7abdbce59731637552b86002fcbe8754b3d98623_GL0.tar.gz) = 2ea3095292b34a592d3b9df2f1d2edff12fed1a158b83769319d678d60776103 +SIZE (gitlab-org-gitaly-7abdbce59731637552b86002fcbe8754b3d98623_GL0.tar.gz) = 3704742 SHA256 (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = a00e10d3dbe50e7c70b75c5fcf7d42a039a24c13b0b751a0339bb18261ac50af SIZE (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = 124516 SHA256 (gitlab-org-labkit-397363e2404ac0276b1959373a1c1c2bc1610d67_GL0.tar.gz) = e48dae8ea183f946189a9ac7e4cbe4bc0fa583e6baafb0074a3463a879565ecb diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile index 3e742b7462d6..431fb6f0d04a 100644 --- a/devel/gitaly/files/patch-Makefile +++ b/devel/gitaly/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2021-09-21 10:03:53 UTC +--- Makefile.orig 2021-10-21 21:58:10 UTC +++ Makefile -@@ -287,7 +287,7 @@ help: +@@ -292,7 +292,7 @@ help: .PHONY: build ## Build Go binaries and install required Ruby Gems. @@ -9,7 +9,7 @@ go install ${GO_LDFLAGS} -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $(call find_commands)) ${Q}# We use version suffix for the gitaly-git2go binary to support compatibility contract between ${Q}# gitaly and gitaly-git2go during upgrade deployment. -@@ -468,9 +468,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a +@@ -473,9 +473,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a # step. Both Omnibus and CNG assume it is in the Gitaly root, not in # _build. Hence the '../' in front. ${SOURCE_DIR}/.ruby-bundle: ${GITALY_RUBY_DIR}/Gemfile.lock ${GITALY_RUBY_DIR}/Gemfile @@ -20,7 +20,7 @@ ${Q}touch $@ ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE -@@ -546,7 +544,7 @@ ${TOOLS_DIR}/protoc.zip: TOOL_VERSION = ${PROTOC_VERSI +@@ -551,7 +549,7 @@ ${TOOLS_DIR}/protoc.zip: TOOL_VERSION = ${PROTOC_VERSI ${TOOLS_DIR}/protoc.zip: ${TOOLS_DIR}/protoc.version ${Q}if [ -z "${PROTOC_URL}" ]; then echo "Cannot generate protos on unsupported platform ${OS}" && exit 1; fi curl -o $@.tmp --silent --show-error -L ${PROTOC_URL} diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile index 2e700525ffc0..dadd748f9300 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -1,6 +1,6 @@ ---- ruby/Gemfile.orig 2021-08-31 13:54:28 UTC +--- ruby/Gemfile.orig 2021-10-21 21:58:10 UTC +++ ruby/Gemfile -@@ -7,27 +7,16 @@ gem 'activesupport', '~> 6.1.3.2' +@@ -7,7 +7,7 @@ gem 'activesupport', '~> 6.1.4.1' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false @@ -9,17 +9,13 @@ gem 'sentry-raven', '~> 3.0', require: false gem 'faraday', '~> 1.0' gem 'rbtrace', require: false - - # Labkit provides observability functionality --gem 'gitlab-labkit', '~> 0.20.0' -+gem 'gitlab-labkit', '~> 0.21.0' - - # Detects the open source license the repository includes +@@ -19,15 +19,5 @@ gem 'gitlab-labkit', '~> 0.21.1' # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 9.14.1' -gem 'google-protobuf', '~> 3.17.0' -- ++gem 'google-protobuf', '~> 3.17.3' + -group :development, :test do - gem 'rubocop', '~> 0.69', require: false - gem 'rspec', require: false @@ -30,4 +26,3 @@ - - gem 'grpc-tools', '= 1.30.2' -end -+gem 'google-protobuf', '~> 3.17.3' From nobody Wed Oct 27 09:36: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 5027D1819D83; Wed, 27 Oct 2021 09:36: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 4HfNqH72vqz4RTZ; Wed, 27 Oct 2021 09:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CCF095C2A; Wed, 27 Oct 2021 09:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19R9aBcm017927; Wed, 27 Oct 2021 09:36:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19R9aBll017926; Wed, 27 Oct 2021 09:36:11 GMT (envelope-from git) Date: Wed, 27 Oct 2021 09:36:11 GMT Message-Id: <202110270936.19R9aBll017926@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: d56b27498da1 - 2021Q4 - devel/rubygem-gitlab-labkit: Update to 0.21.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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: d56b27498da1aa64c59ac8f62bb214e3af0a3988 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=d56b27498da1aa64c59ac8f62bb214e3af0a3988 commit d56b27498da1aa64c59ac8f62bb214e3af0a3988 Author: Matthias Fechner AuthorDate: 2021-10-26 19:18:56 +0000 Commit: Matthias Fechner CommitDate: 2021-10-27 09:35:32 +0000 devel/rubygem-gitlab-labkit: Update to 0.21.2 Required for gitlab-ce 14.4.0. (cherry picked from commit 9f139bf40fef91a3423cb0b1484e1ec5d9aa38a6) --- devel/rubygem-gitlab-labkit/Makefile | 4 +-- devel/rubygem-gitlab-labkit/distinfo | 6 ++--- .../files/patch-gitlab-labkit.gemspec | 29 ---------------------- 3 files changed, 5 insertions(+), 34 deletions(-) diff --git a/devel/rubygem-gitlab-labkit/Makefile b/devel/rubygem-gitlab-labkit/Makefile index b49d1b41e38b..07cc27d7bbe3 100644 --- a/devel/rubygem-gitlab-labkit/Makefile +++ b/devel/rubygem-gitlab-labkit/Makefile @@ -1,7 +1,7 @@ # Created by: Matthias Fechner PORTNAME= gitlab-labkit -PORTVERSION= 0.21.1 +PORTVERSION= 0.21.2 PORTREVISION= 0 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-actionpack61>=5<7:www/rubygem-actionpack61 \ rubygem-activesupport61>=5<7:devel/rubygem-activesupport61 \ - rubygem-grpc>=1.30.2<2:net/rubygem-grpc \ + rubygem-grpc>=1.30<2:net/rubygem-grpc \ rubygem-jaeger-client>=1.1<2:devel/rubygem-jaeger-client \ rubygem-opentracing>=0.4<1.0:devel/rubygem-opentracing \ rubygem-pg_query>=2.1<3:databases/rubygem-pg_query \ diff --git a/devel/rubygem-gitlab-labkit/distinfo b/devel/rubygem-gitlab-labkit/distinfo index a9bcc5be2b40..7b8e1beea84f 100644 --- a/devel/rubygem-gitlab-labkit/distinfo +++ b/devel/rubygem-gitlab-labkit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1630392923 -SHA256 (rubygem/gitlab-labkit-0.21.1.gem) = b8eedd54dfcf5aab95406ea06c82cbd473cfc8a78f4ac7ed5393e9c2e589ac27 -SIZE (rubygem/gitlab-labkit-0.21.1.gem) = 27648 +TIMESTAMP = 1634895156 +SHA256 (rubygem/gitlab-labkit-0.21.2.gem) = 297c8752bbfa6ceab25bd164abfc02f3a5d8ed7a7c54166b96bf8598a7a97f76 +SIZE (rubygem/gitlab-labkit-0.21.2.gem) = 27648 diff --git a/devel/rubygem-gitlab-labkit/files/patch-gitlab-labkit.gemspec b/devel/rubygem-gitlab-labkit/files/patch-gitlab-labkit.gemspec deleted file mode 100644 index f56a43d20000..000000000000 --- a/devel/rubygem-gitlab-labkit/files/patch-gitlab-labkit.gemspec +++ /dev/null @@ -1,29 +0,0 @@ ---- gitlab-labkit.gemspec.orig 2021-08-31 07:01:11 UTC -+++ gitlab-labkit.gemspec -@@ -24,7 +24,7 @@ Gem::Specification.new do |s| - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q.freeze, [">= 5.0.0", "< 7.0.0"]) - s.add_runtime_dependency(%q.freeze, [">= 5.0.0", "< 7.0.0"]) -- s.add_runtime_dependency(%q.freeze, ["~> 1.30.2"]) -+ s.add_runtime_dependency(%q.freeze, ["~> 1.30"]) - s.add_runtime_dependency(%q.freeze, ["~> 1.1"]) - s.add_runtime_dependency(%q.freeze, ["~> 0.4"]) - s.add_runtime_dependency(%q.freeze, ["~> 2.1"]) -@@ -47,7 +47,7 @@ Gem::Specification.new do |s| - else - s.add_dependency(%q.freeze, [">= 5.0.0", "< 7.0.0"]) - s.add_dependency(%q.freeze, [">= 5.0.0", "< 7.0.0"]) -- s.add_dependency(%q.freeze, ["~> 1.30.2"]) -+ s.add_dependency(%q.freeze, ["~> 1.30"]) - s.add_dependency(%q.freeze, ["~> 1.1"]) - s.add_dependency(%q.freeze, ["~> 0.4"]) - s.add_dependency(%q.freeze, ["~> 2.1"]) -@@ -71,7 +71,7 @@ Gem::Specification.new do |s| - else - s.add_dependency(%q.freeze, [">= 5.0.0", "< 7.0.0"]) - s.add_dependency(%q.freeze, [">= 5.0.0", "< 7.0.0"]) -- s.add_dependency(%q.freeze, ["~> 1.30.2"]) -+ s.add_dependency(%q.freeze, ["~> 1.30"]) - s.add_dependency(%q.freeze, ["~> 1.1"]) - s.add_dependency(%q.freeze, ["~> 0.4"]) - s.add_dependency(%q.freeze, ["~> 2.1"]) From nobody Wed Oct 27 09:36:12 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 63B721819AF4; Wed, 27 Oct 2021 09:36: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 4HfNqK529dz4RbT; Wed, 27 Oct 2021 09:36: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 EF9A35676; Wed, 27 Oct 2021 09:36: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 19R9aCe2017951; Wed, 27 Oct 2021 09:36:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19R9aCRo017950; Wed, 27 Oct 2021 09:36:12 GMT (envelope-from git) Date: Wed, 27 Oct 2021 09:36:12 GMT Message-Id: <202110270936.19R9aCRo017950@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: f349e05ebdf9 - 2021Q4 - devel/rubygem-gitlab-sidekiq-fetcher: Update to 0.8.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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: f349e05ebdf9207fb2c1cd27f603cf77165ecd11 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=f349e05ebdf9207fb2c1cd27f603cf77165ecd11 commit f349e05ebdf9207fb2c1cd27f603cf77165ecd11 Author: Matthias Fechner AuthorDate: 2021-10-26 19:19:41 +0000 Commit: Matthias Fechner CommitDate: 2021-10-27 09:35:32 +0000 devel/rubygem-gitlab-sidekiq-fetcher: Update to 0.8.0 Required for gitlab-ce 14.4.0. (cherry picked from commit 05618b5f9b6a31b1375f8d3b5763c31945da9deb) --- devel/rubygem-gitlab-sidekiq-fetcher/Makefile | 4 ++-- devel/rubygem-gitlab-sidekiq-fetcher/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/rubygem-gitlab-sidekiq-fetcher/Makefile b/devel/rubygem-gitlab-sidekiq-fetcher/Makefile index a804c0ac4bed..e3a6622b5ff5 100644 --- a/devel/rubygem-gitlab-sidekiq-fetcher/Makefile +++ b/devel/rubygem-gitlab-sidekiq-fetcher/Makefile @@ -1,7 +1,7 @@ # Created by: Matthias Fechner PORTNAME= gitlab-sidekiq-fetcher -PORTVERSION= 0.5.6 +PORTVERSION= 0.8.0 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -10,7 +10,7 @@ COMMENT= Redis reliable queue pattern implemented in Sidekiq LICENSE= RUBY -RUN_DEPENDS= rubygem-sidekiq5>=5<6:devel/rubygem-sidekiq5 +RUN_DEPENDS= rubygem-sidekiq>=6.1<7:devel/rubygem-sidekiq USES= gem USE_RUBY= yes diff --git a/devel/rubygem-gitlab-sidekiq-fetcher/distinfo b/devel/rubygem-gitlab-sidekiq-fetcher/distinfo index 10caa0adfa6e..34c6a7eb9751 100644 --- a/devel/rubygem-gitlab-sidekiq-fetcher/distinfo +++ b/devel/rubygem-gitlab-sidekiq-fetcher/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619165362 -SHA256 (rubygem/gitlab-sidekiq-fetcher-0.5.6.gem) = f9369de8cabcde774a6c46d266b4b31a7ae7b9a4b048d4c229c5506f37b86820 -SIZE (rubygem/gitlab-sidekiq-fetcher-0.5.6.gem) = 19968 +TIMESTAMP = 1634898319 +SHA256 (rubygem/gitlab-sidekiq-fetcher-0.8.0.gem) = 9c564caa2a958d44a8d78672dc23b2a206102d0223b41b77b58626a945e37362 +SIZE (rubygem/gitlab-sidekiq-fetcher-0.8.0.gem) = 19968 From nobody Wed Oct 27 09:36: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 90A511819AFC; Wed, 27 Oct 2021 09:36: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 4HfNqM0D7Bz4RWF; Wed, 27 Oct 2021 09:36: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 2A0B55677; Wed, 27 Oct 2021 09:36: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 19R9aEJ4017975; Wed, 27 Oct 2021 09:36:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19R9aE9K017974; Wed, 27 Oct 2021 09:36:14 GMT (envelope-from git) Date: Wed, 27 Oct 2021 09:36:14 GMT Message-Id: <202110270936.19R9aE9K017974@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 80ae5b61b637 - 2021Q4 - devel/rubygem-grape-entity: Update to 0.10.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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 80ae5b61b6370d058c10ba9dcc0cd9162138e480 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=80ae5b61b6370d058c10ba9dcc0cd9162138e480 commit 80ae5b61b6370d058c10ba9dcc0cd9162138e480 Author: Matthias Fechner AuthorDate: 2021-10-26 19:20:13 +0000 Commit: Matthias Fechner CommitDate: 2021-10-27 09:35:33 +0000 devel/rubygem-grape-entity: Update to 0.10.1 Required for gitlab-ce 14.4.0. (cherry picked from commit a7c2e749703312538d817c6c0475573e62568921) --- devel/rubygem-grape-entity/Makefile | 4 ++-- devel/rubygem-grape-entity/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/rubygem-grape-entity/Makefile b/devel/rubygem-grape-entity/Makefile index 3df95f1bac8f..3a8bca4002a4 100644 --- a/devel/rubygem-grape-entity/Makefile +++ b/devel/rubygem-grape-entity/Makefile @@ -1,6 +1,6 @@ PORTNAME= grape-entity -PORTVERSION= 0.9.0 -PORTREVISION= 1 +PORTVERSION= 0.10.1 +PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-grape-entity/distinfo b/devel/rubygem-grape-entity/distinfo index 742c9aa8c58a..dfe6802e7f20 100644 --- a/devel/rubygem-grape-entity/distinfo +++ b/devel/rubygem-grape-entity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1621457801 -SHA256 (rubygem/grape-entity-0.9.0.gem) = d9cda1edcdbe53e5851c4ce0087c4b7319b4227374f50da48d737b2adb18136b -SIZE (rubygem/grape-entity-0.9.0.gem) = 45568 +TIMESTAMP = 1634897944 +SHA256 (rubygem/grape-entity-0.10.1.gem) = 64fa167c2d55e0e8195a4c7e5a78dddbfdedf9aba55a164bdab9c53351066780 +SIZE (rubygem/grape-entity-0.10.1.gem) = 46080 From nobody Wed Oct 27 09:36: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 2DCCB1819BFB; Wed, 27 Oct 2021 09:36: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 4HfNqM56Ngz4RkR; Wed, 27 Oct 2021 09:36: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 4C6395D8E; Wed, 27 Oct 2021 09:36:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19R9aFis017999; Wed, 27 Oct 2021 09:36:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19R9aFaK017998; Wed, 27 Oct 2021 09:36:15 GMT (envelope-from git) Date: Wed, 27 Oct 2021 09:36:15 GMT Message-Id: <202110270936.19R9aFaK017998@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: c084290f0756 - 2021Q4 - net/gitlab-agent: Update to 14.4.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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: c084290f0756e784db8aa9f828d2370781ebf2e3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=c084290f0756e784db8aa9f828d2370781ebf2e3 commit c084290f0756e784db8aa9f828d2370781ebf2e3 Author: Matthias Fechner AuthorDate: 2021-10-26 19:20:59 +0000 Commit: Matthias Fechner CommitDate: 2021-10-27 09:35:33 +0000 net/gitlab-agent: Update to 14.4.0 Required for gitlab-ce 14.4.0. (cherry picked from commit 0d8202327a79344cb7735c20bcbe0f977775f9a8) --- net/gitlab-agent/Makefile | 12 ++++++------ net/gitlab-agent/distinfo | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile index 53648cbe26b6..82e2ec99ea33 100644 --- a/net/gitlab-agent/Makefile +++ b/net/gitlab-agent/Makefile @@ -1,7 +1,7 @@ # Created by: Matthias Fechner PORTNAME= gitlab-agent -PORTVERSION= 14.3.3 +PORTVERSION= 14.4.0 PORTREVISION= 0 CATEGORIES= net @@ -19,12 +19,12 @@ USES= go:modules USE_GITLAB= yes GL_ACCOUNT= gitlab-org/cluster-integration # Find the commit hash here: https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/tags -GL_COMMIT= 80c75d64b933d306966baba139f4b99301bd50a1 +GL_COMMIT= 8b11694dd188b58234e776e3b0bad604145041b3 # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-vendor -# 195dd +# 194dd GH_TUPLE= \ Azure:go-ansiterm:d6e3b3328b78:azure_go_ansiterm/vendor/github.com/Azure/go-ansiterm \ Azure:go-autorest:79a63e70c4d8:azure_go_autorest_adal \ @@ -92,15 +92,15 @@ GH_TUPLE= \ golang:groupcache:41bb18bfe9da:golang_groupcache/vendor/github.com/golang/groupcache \ golang:mock:v1.6.0:golang_mock/vendor/github.com/golang/mock \ golang:mod:v0.4.2:golang_mod/vendor/golang.org/x/mod \ - golang:net:0714010a04ed:golang_net/vendor/golang.org/x/net \ + golang:net:aaa1db679c0d:golang_net/vendor/golang.org/x/net \ golang:oauth2:6f1e6394065a:golang_oauth2/vendor/golang.org/x/oauth2 \ golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \ golang:sync:036812b2e83c:golang_sync/vendor/golang.org/x/sync \ - golang:sys:e5e7981a1069:golang_sys/vendor/golang.org/x/sys \ + golang:sys:d867a43fc93e:golang_sys/vendor/golang.org/x/sys \ golang:term:6a3ed077a48d:golang_term/vendor/golang.org/x/term \ golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \ golang:time:1f47c861a9ac:golang_time/vendor/golang.org/x/time \ - golang:tools:v0.1.4:golang_tools/vendor/golang.org/x/tools \ + golang:tools:v0.1.7:golang_tools/vendor/golang.org/x/tools \ golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \ google:btree:v1.0.0:google_btree/vendor/github.com/google/btree \ google:go-cmp:v0.5.6:google_go_cmp/vendor/github.com/google/go-cmp \ diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index d522cc536eec..e8cefbbc7cbe 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1632235221 +TIMESTAMP = 1634896538 SHA256 (Azure-go-ansiterm-d6e3b3328b78_GH0.tar.gz) = ee1ebe2efef498be1c558bf71e143289db2d21e2d42592503ad2d4a989006821 SIZE (Azure-go-ansiterm-d6e3b3328b78_GH0.tar.gz) = 20946 SHA256 (Azure-go-autorest-79a63e70c4d8_GH0.tar.gz) = d7156c20c47fcd04edae683e718a1e72dcb9178a3b07e6c18615cee5b1dd67d6 @@ -131,24 +131,24 @@ SHA256 (golang-mock-v1.6.0_GH0.tar.gz) = 470174971c3a63361149a30f5b2d3a716a198af SIZE (golang-mock-v1.6.0_GH0.tar.gz) = 69251 SHA256 (golang-mod-v0.4.2_GH0.tar.gz) = ce4131eb443ac67ededb139a43bae4fbb2c4b84843936495c6a6de92b8033917 SIZE (golang-mod-v0.4.2_GH0.tar.gz) = 104584 -SHA256 (golang-net-0714010a04ed_GH0.tar.gz) = 62ba863366262fbbc211a65b1301f7fcf75f5f710fd979c27607af49ea51ba21 -SIZE (golang-net-0714010a04ed_GH0.tar.gz) = 1250017 +SHA256 (golang-net-aaa1db679c0d_GH0.tar.gz) = 7215c0c172218c3e51137422a39790f6921cb4e62d01437ff4d59beab48aa966 +SIZE (golang-net-aaa1db679c0d_GH0.tar.gz) = 1253118 SHA256 (golang-oauth2-6f1e6394065a_GH0.tar.gz) = 260cf2761fb6e0aae005d4b40e05fcf34a9269f1dc54dd520debf7c750ff66bf SIZE (golang-oauth2-6f1e6394065a_GH0.tar.gz) = 84251 SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3 SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702 SHA256 (golang-sync-036812b2e83c_GH0.tar.gz) = 75ac8fc16bdceb2496c4a9cc98584b70c29032d91a9e57a624acb073e3232fda SIZE (golang-sync-036812b2e83c_GH0.tar.gz) = 18752 -SHA256 (golang-sys-e5e7981a1069_GH0.tar.gz) = 7b3cfa7b3f60212105dcfb744f9fa9f5ddbfff29b45347c8a8fa6e7d64ab8455 -SIZE (golang-sys-e5e7981a1069_GH0.tar.gz) = 1202976 +SHA256 (golang-sys-d867a43fc93e_GH0.tar.gz) = 975cb1564c51481d205cb4ee0f311429347ea345d96188a7db5e846deb2e6f10 +SIZE (golang-sys-d867a43fc93e_GH0.tar.gz) = 1203125 SHA256 (golang-term-6a3ed077a48d_GH0.tar.gz) = 6760076add528b90a5e07ad357eef6f11ec03e19eebe66d1b1ef383fd9214e9a SIZE (golang-term-6a3ed077a48d_GH0.tar.gz) = 15333 SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760 SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095 SHA256 (golang-time-1f47c861a9ac_GH0.tar.gz) = 2548d6d6813621c77fa36a5783e36939d3f4427d962ba58415645f89fcb70925 SIZE (golang-time-1f47c861a9ac_GH0.tar.gz) = 9533 -SHA256 (golang-tools-v0.1.4_GH0.tar.gz) = a97b750bb373bf051ea26889570b01cfa08380656c766a4856da7c7f55a7c1bd -SIZE (golang-tools-v0.1.4_GH0.tar.gz) = 2822942 +SHA256 (golang-tools-v0.1.7_GH0.tar.gz) = b88cae9ca14fc3f18ff714c8014929c8c2c63d15805416d49d88b51f201e9fbf +SIZE (golang-tools-v0.1.7_GH0.tar.gz) = 2884220 SHA256 (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 71975d658357e170fd6a41f92539cde8b39c9cd8bfe5931b6311bc5f5c0da0d7 SIZE (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 13664 SHA256 (google-btree-v1.0.0_GH0.tar.gz) = 9f53e0e1330a4dbe92100d516606791f7196bf828ba93d693ef4d5c1cbd5fe30 @@ -379,8 +379,8 @@ SHA256 (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = c178bcad325857dba29551c16f40707701a SIZE (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = 38010 SHA256 (xlab-treeprint-v1.0.0_GH0.tar.gz) = 95659f235a30a28fd54e8f7226e8e200ec3344568493d6c2a3efc60667f37c2c SIZE (xlab-treeprint-v1.0.0_GH0.tar.gz) = 6549 -SHA256 (gitlab-org/cluster-integration-gitlab-agent-80c75d64b933d306966baba139f4b99301bd50a1_GL0.tar.gz) = 1820f159c8aef805a1d3005ec61c4ff2b3bb5e13c1efbec2316cde9c9384b13e -SIZE (gitlab-org/cluster-integration-gitlab-agent-80c75d64b933d306966baba139f4b99301bd50a1_GL0.tar.gz) = 496028 +SHA256 (gitlab-org/cluster-integration-gitlab-agent-8b11694dd188b58234e776e3b0bad604145041b3_GL0.tar.gz) = 5635340d956b89f47206baed219e5d36e841e05b02e4d6a05a36c5d6565b09fb +SIZE (gitlab-org/cluster-integration-gitlab-agent-8b11694dd188b58234e776e3b0bad604145041b3_GL0.tar.gz) = 502754 SHA256 (gitlab-org-gitaly-31bbf1c0f7cd100c63f44f52a14575da1579276a_GL0.tar.gz) = ab01d1c8eae20d66f6e2b6fa250d736161903e533e88b6988d95d5772f997308 SIZE (gitlab-org-gitaly-31bbf1c0f7cd100c63f44f52a14575da1579276a_GL0.tar.gz) = 3625365 SHA256 (gitlab-org-labkit-56e2f8af39d9bea0f038a8d2135a1cc89016c62a_GL0.tar.gz) = aa2ff5039452d633f2310b9e497b0f4fc9a9118eed2200f2045305b963893e6b From nobody Wed Oct 27 09:36: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 1D5071819E20; Wed, 27 Oct 2021 09:36:18 +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 4HfNqP0f7sz4RZ2; Wed, 27 Oct 2021 09:36: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 72CCB5E0E; Wed, 27 Oct 2021 09:36: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 19R9aGRv018023; Wed, 27 Oct 2021 09:36:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19R9aGqr018022; Wed, 27 Oct 2021 09:36:16 GMT (envelope-from git) Date: Wed, 27 Oct 2021 09:36:16 GMT Message-Id: <202110270936.19R9aGqr018022@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 251fd792eb7a - 2021Q4 - net/rubygem-gitlab-fog-azure-rm: Update to 1.2.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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 251fd792eb7ae0ed0d95b4156509a518bd6377a0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=251fd792eb7ae0ed0d95b4156509a518bd6377a0 commit 251fd792eb7ae0ed0d95b4156509a518bd6377a0 Author: Matthias Fechner AuthorDate: 2021-10-26 19:21:30 +0000 Commit: Matthias Fechner CommitDate: 2021-10-27 09:35:33 +0000 net/rubygem-gitlab-fog-azure-rm: Update to 1.2.0 Required for gitlab-ce 14.4.0. (cherry picked from commit 242cdcbfefe9c2683144fbaddd3efd21dde46327) --- net/rubygem-gitlab-fog-azure-rm/Makefile | 2 +- net/rubygem-gitlab-fog-azure-rm/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/rubygem-gitlab-fog-azure-rm/Makefile b/net/rubygem-gitlab-fog-azure-rm/Makefile index a7390cade084..2e5f3bc0e0dd 100644 --- a/net/rubygem-gitlab-fog-azure-rm/Makefile +++ b/net/rubygem-gitlab-fog-azure-rm/Makefile @@ -1,7 +1,7 @@ # Created by: Matthias Fechner PORTNAME= gitlab-fog-azure-rm -PORTVERSION= 1.1.1 +PORTVERSION= 1.2.0 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-gitlab-fog-azure-rm/distinfo b/net/rubygem-gitlab-fog-azure-rm/distinfo index 677950938209..289e1f9d4cce 100644 --- a/net/rubygem-gitlab-fog-azure-rm/distinfo +++ b/net/rubygem-gitlab-fog-azure-rm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1624171681 -SHA256 (rubygem/gitlab-fog-azure-rm-1.1.1.gem) = 09c5f48e3600352c062180b18efe54ff10629f3654e136db1f1b4be1fd1eaecc -SIZE (rubygem/gitlab-fog-azure-rm-1.1.1.gem) = 61440 +TIMESTAMP = 1634898055 +SHA256 (rubygem/gitlab-fog-azure-rm-1.2.0.gem) = 90242d99e7ca1bbc1a2f7d2e80cd173ae429f40cd7017ec2b46f18e43fd829c2 +SIZE (rubygem/gitlab-fog-azure-rm-1.2.0.gem) = 61952 From nobody Wed Oct 27 09:36:17 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 3ACC91819F21; Wed, 27 Oct 2021 09:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HfNqR08Bcz4Rn7; Wed, 27 Oct 2021 09:36:18 +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 8D84B5D8F; Wed, 27 Oct 2021 09:36:17 +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 19R9aHWA018053; Wed, 27 Oct 2021 09:36:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19R9aHf8018052; Wed, 27 Oct 2021 09:36:17 GMT (envelope-from git) Date: Wed, 27 Oct 2021 09:36:17 GMT Message-Id: <202110270936.19R9aHf8018052@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 5206d1ed7350 - 2021Q4 - textproc/gitlab-elasticsearch-indexer: Update to 2.16.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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 5206d1ed7350a8b2f6fbc90f13d6fdf6449a452c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=5206d1ed7350a8b2f6fbc90f13d6fdf6449a452c commit 5206d1ed7350a8b2f6fbc90f13d6fdf6449a452c Author: Matthias Fechner AuthorDate: 2021-10-26 19:22:07 +0000 Commit: Matthias Fechner CommitDate: 2021-10-27 09:35:33 +0000 textproc/gitlab-elasticsearch-indexer: Update to 2.16.0 Required for gitlab-ce 14.4.0. (cherry picked from commit 3d984338de5ec8c138ca79a994b00180b4e737d7) --- textproc/gitlab-elasticsearch-indexer/Makefile | 8 +++++--- textproc/gitlab-elasticsearch-indexer/distinfo | 10 +++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile index b379f036adc0..a878e3495c1e 100644 --- a/textproc/gitlab-elasticsearch-indexer/Makefile +++ b/textproc/gitlab-elasticsearch-indexer/Makefile @@ -1,7 +1,7 @@ # Created by: Matthias Fechner PORTNAME= gitlab-elasticsearch-indexer -PORTVERSION= 2.13.0 +PORTVERSION= 2.16.0 PORTREVISION= 0 CATEGORIES= textproc @@ -21,17 +21,19 @@ USES= gmake go:modules pkgconfig USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer/-/tags -GL_COMMIT= 31d8f69fc3155cfb266d2d8828722bf25dc8f22e +GL_COMMIT= 16bf7ce3b308ef505f6624cae32a9ae6b6db93ea # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-vendor -# 30dd +# 32dd GH_TUPLE= \ aws:aws-sdk-go:v1.27.0:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \ davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ deoxxa:aws_signing_client:c20ee106809e:deoxxa_aws_signing_client/vendor/github.com/deoxxa/aws_signing_client \ fortytw2:leaktest:v1.3.0:fortytw2_leaktest/vendor/github.com/fortytw2/leaktest \ + go-enry:go-enry:v2.7.1:go_enry_go_enry_v2/vendor/github.com/go-enry/go-enry/v2 \ + go-enry:go-oniguruma:v1.2.1:go_enry_go_oniguruma/vendor/github.com/go-enry/go-oniguruma \ go-yaml:yaml:9f266ea9e77c:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \ golang:mod:v0.4.1:golang_mod/vendor/golang.org/x/mod \ golang:net:5f4716e94777:golang_net/vendor/golang.org/x/net \ diff --git a/textproc/gitlab-elasticsearch-indexer/distinfo b/textproc/gitlab-elasticsearch-indexer/distinfo index 9a88091b4964..df81c06b0893 100644 --- a/textproc/gitlab-elasticsearch-indexer/distinfo +++ b/textproc/gitlab-elasticsearch-indexer/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1630398094 +TIMESTAMP = 1634896137 SHA256 (aws-aws-sdk-go-v1.27.0_GH0.tar.gz) = 9f3dc12e43f795efad08a8ac37c5179546bbceb6485e569125f64e829f9a64dc SIZE (aws-aws-sdk-go-v1.27.0_GH0.tar.gz) = 13666537 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e @@ -7,6 +7,10 @@ SHA256 (deoxxa-aws_signing_client-c20ee106809e_GH0.tar.gz) = 209275015c4670eff32 SIZE (deoxxa-aws_signing_client-c20ee106809e_GH0.tar.gz) = 4323 SHA256 (fortytw2-leaktest-v1.3.0_GH0.tar.gz) = 897726ed584a7c442eb660406e3438d4585b00c5f3769360eb19b18cace35292 SIZE (fortytw2-leaktest-v1.3.0_GH0.tar.gz) = 5281 +SHA256 (go-enry-go-enry-v2.7.1_GH0.tar.gz) = 5b964e7597da0a7dbb0fdb1645f86ec025c19033b7dd6c7776f40e167246eb94 +SIZE (go-enry-go-enry-v2.7.1_GH0.tar.gz) = 3352302 +SHA256 (go-enry-go-oniguruma-v1.2.1_GH0.tar.gz) = e3c2389e61b5c1c7ee137560d645e2d82e5a119349930de35d81b91b92da81ed +SIZE (go-enry-go-oniguruma-v1.2.1_GH0.tar.gz) = 13799 SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04 SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898 SHA256 (golang-mod-v0.4.1_GH0.tar.gz) = 548935751dbc1c29a27bf1b1de6d7ffe58b752d6ad7bc1f254e6ea89ae2ddd59 @@ -49,8 +53,8 @@ SHA256 (sirupsen-logrus-v1.7.1_GH0.tar.gz) = 01b02793ed1545b87f6f219e5467ef587cb SIZE (sirupsen-logrus-v1.7.1_GH0.tar.gz) = 46795 SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5aa2beb58ef7a94530d7724b5739a8d6 SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073 -SHA256 (gitlab-org-gitlab-elasticsearch-indexer-31d8f69fc3155cfb266d2d8828722bf25dc8f22e_GL0.tar.gz) = 60c8a7a6a7f3065c7e097c66520e934feba1aa335baa3491ed64ddc1fcb8cfa1 -SIZE (gitlab-org-gitlab-elasticsearch-indexer-31d8f69fc3155cfb266d2d8828722bf25dc8f22e_GL0.tar.gz) = 80969 +SHA256 (gitlab-org-gitlab-elasticsearch-indexer-16bf7ce3b308ef505f6624cae32a9ae6b6db93ea_GL0.tar.gz) = d18ca2fe459d43fed76d944d3a5ecdff53c521cb1fd214f86129c86024e014c9 +SIZE (gitlab-org-gitlab-elasticsearch-indexer-16bf7ce3b308ef505f6624cae32a9ae6b6db93ea_GL0.tar.gz) = 64546 SHA256 (gitlab-org-gitaly-aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb_GL0.tar.gz) = b6375220620fcf60e31b2067fc6cff1449cd3a2dff7c3896e3a5cb9f86ef876b SIZE (gitlab-org-gitaly-aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb_GL0.tar.gz) = 2775132 SHA256 (gitlab-org-labkit-d04f253f79d934e8e3d6872f56fd392df9a934da_GL0.tar.gz) = 525750b1fa1de1236b7f7a041abec36c01737a070239e91f4810317e8945d9d1 From nobody Wed Oct 27 09:36:18 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 AD5761819E41; Wed, 27 Oct 2021 09:36: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 4HfNqS0pRnz4RqS; Wed, 27 Oct 2021 09:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ABB165A63; Wed, 27 Oct 2021 09:36:18 +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 19R9aIi3018077; Wed, 27 Oct 2021 09:36:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19R9aIbb018076; Wed, 27 Oct 2021 09:36:18 GMT (envelope-from git) Date: Wed, 27 Oct 2021 09:36:18 GMT Message-Id: <202110270936.19R9aIbb018076@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 1b2497edd36f - 2021Q4 - www/gitlab-pages: Update to 1.46.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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 1b2497edd36fd9e0907f173bf8db28237656d6bd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=1b2497edd36fd9e0907f173bf8db28237656d6bd commit 1b2497edd36fd9e0907f173bf8db28237656d6bd Author: Matthias Fechner AuthorDate: 2021-10-26 19:22:42 +0000 Commit: Matthias Fechner CommitDate: 2021-10-27 09:35:33 +0000 www/gitlab-pages: Update to 1.46.0 Required for gitlab-ce 14.4.0. (cherry picked from commit d19046a0131f626c18c2de3c361b40e9f808e458) --- www/gitlab-pages/Makefile | 6 +++--- www/gitlab-pages/distinfo | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile index c80a8136c372..0548ded190ce 100644 --- a/www/gitlab-pages/Makefile +++ b/www/gitlab-pages/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-pages -PORTVERSION= 1.45.0 +PORTVERSION= 1.46.0 CATEGORIES= www MAINTAINER= swills@FreeBSD.org @@ -15,7 +15,7 @@ USE_GITHUB= nodefault GL_ACCOUNT= gitlab-org # Find the here: https://gitlab.com/gitlab-org/gitlab-pages/tags -GL_COMMIT= 4d9934063df5eacce7d681d921ba456b7f10ed1e +GL_COMMIT= 5e86747b6287381e2f23afe837ede1820876cf8d # Build with: make gomod-vendor # 53dd @@ -37,6 +37,7 @@ GH_TUPLE= \ golang:protobuf:v1.4.0:golang_protobuf/vendor/github.com/golang/protobuf \ golang:sys:665e8c7367d1:golang_sys/vendor/golang.org/x/sys \ golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \ + golang:time:9d24e82272b4:golang_time/vendor/golang.org/x/time \ google:go-genproto:ca5a22157cba:google_go_genproto/vendor/google.golang.org/genproto \ google:pprof:d4f498aebedc:google_pprof/vendor/github.com/google/pprof \ googleapis:gax-go:v2.0.5:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \ @@ -65,7 +66,6 @@ GH_TUPLE= \ rs:cors:v1.7.0:rs_cors/vendor/github.com/rs/cors \ sebest:xff:6c115e0ffa35:sebest_xff/vendor/github.com/sebest/xff \ sirupsen:logrus:v1.7.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ - stretchr:objx:v0.1.1:stretchr_objx/vendor/github.com/stretchr/objx \ stretchr:testify:v1.6.1:stretchr_testify/vendor/github.com/stretchr/testify \ tj:assert:v0.0.3:tj_assert/vendor/github.com/tj/assert \ tj:go-redirects:5c02ead0bbc5:tj_go_redirects/vendor/github.com/tj/go-redirects diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index ff91f8c155e0..e0d8e390324e 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1632235485 +TIMESTAMP = 1634897594 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867 SHA256 (census-instrumentation-opencensus-go-v0.22.2_GH0.tar.gz) = 0aa930142b669d7c47e2b8343f6adc9f03414a9c45763c5f746de95231d6ad6d @@ -33,6 +33,8 @@ SHA256 (golang-sys-665e8c7367d1_GH0.tar.gz) = 19c3498496d91ac9c0c0226c9b832c23a0 SIZE (golang-sys-665e8c7367d1_GH0.tar.gz) = 1200405 SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185 SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332 +SHA256 (golang-time-9d24e82272b4_GH0.tar.gz) = 7452a7b879ee5984709b2165f6212ad9464977f06d440140b8690e61695aa404 +SIZE (golang-time-9d24e82272b4_GH0.tar.gz) = 9313 SHA256 (google-go-genproto-ca5a22157cba_GH0.tar.gz) = 06778b867759fad0b06fac4067911e616184aa40061cbd37cffaa950399ad7d4 SIZE (google-go-genproto-ca5a22157cba_GH0.tar.gz) = 5960232 SHA256 (google-pprof-d4f498aebedc_GH0.tar.gz) = 996b1f210183d8541a3a3cf22a2045396e4473cb92123c1b13613c0726a7bb76 @@ -89,16 +91,14 @@ SHA256 (sebest-xff-6c115e0ffa35_GH0.tar.gz) = e39b98f5b0622d8d6599ca14011b4e1483 SIZE (sebest-xff-6c115e0ffa35_GH0.tar.gz) = 4000 SHA256 (sirupsen-logrus-v1.7.0_GH0.tar.gz) = a7baaa1c646441d002f3867b5998b6b45b629ecfad317d468a981e23e0c9c6ca SIZE (sirupsen-logrus-v1.7.0_GH0.tar.gz) = 46392 -SHA256 (stretchr-objx-v0.1.1_GH0.tar.gz) = 3bb0a581651f4c040435a70167ab60b723c5af04a5b0326af3c8b01ccc6fdcf0 -SIZE (stretchr-objx-v0.1.1_GH0.tar.gz) = 75768 SHA256 (stretchr-testify-v1.6.1_GH0.tar.gz) = 40fd7204ab72ca9d8759f1cc3604dd17f556a0f9177f6fc05dd0cad9f06e708f SIZE (stretchr-testify-v1.6.1_GH0.tar.gz) = 84215 SHA256 (tj-assert-v0.0.3_GH0.tar.gz) = 1596d9e6f2ba75f1b5e4b9b8f4a86ac4834723f1abaff4a717ba8c6896387f05 SIZE (tj-assert-v0.0.3_GH0.tar.gz) = 9922 SHA256 (tj-go-redirects-5c02ead0bbc5_GH0.tar.gz) = d244a66f06ecb1283e38d9371d0a906cfcf9e3f651288448f52ca3e69bf66a95 SIZE (tj-go-redirects-5c02ead0bbc5_GH0.tar.gz) = 3070 -SHA256 (gitlab-org-gitlab-pages-4d9934063df5eacce7d681d921ba456b7f10ed1e_GL0.tar.gz) = a790ab4b154ceab882a9f812eadd71368f74e63f4bcf35f5e9d134db991ecb6a -SIZE (gitlab-org-gitlab-pages-4d9934063df5eacce7d681d921ba456b7f10ed1e_GL0.tar.gz) = 217463 +SHA256 (gitlab-org-gitlab-pages-5e86747b6287381e2f23afe837ede1820876cf8d_GL0.tar.gz) = 939ee0ad7a2dd4fc1dddb422bb27176499e4ad78f9de70c50957dcc4a65675fb +SIZE (gitlab-org-gitlab-pages-5e86747b6287381e2f23afe837ede1820876cf8d_GL0.tar.gz) = 219584 SHA256 (gitlab-org-go-mimedb-e7aae885685d3b4c73716eae321d8486e914ad74_GL0.tar.gz) = c4faae244f7203b243d31704efedb97ef6f8e1faf6b2f70e87555e0f6e19d426 SIZE (gitlab-org-go-mimedb-e7aae885685d3b4c73716eae321d8486e914ad74_GL0.tar.gz) = 17978 SHA256 (gitlab-org-labkit-949268af2aa8352c644cb1cbc63cf4112972d2c9_GL0.tar.gz) = 655809f0ff0c8b4c97e3a021dc6ebce9ffeabdd17927aae3973b5295e099db1a From nobody Wed Oct 27 09:36: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 74B4B1819F3D; Wed, 27 Oct 2021 09:36: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 4HfNqT51DQz4RWZ; Wed, 27 Oct 2021 09:36: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 D4A0F5D90; Wed, 27 Oct 2021 09:36: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 19R9aJSH018101; Wed, 27 Oct 2021 09:36:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19R9aJev018100; Wed, 27 Oct 2021 09:36:19 GMT (envelope-from git) Date: Wed, 27 Oct 2021 09:36:19 GMT Message-Id: <202110270936.19R9aJev018100@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: a472c2a7a8bd - 2021Q4 - www/gitlab-workhorse: Update to 14.4.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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: a472c2a7a8bd5ff03c35c6de3c46109a4500196f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=a472c2a7a8bd5ff03c35c6de3c46109a4500196f commit a472c2a7a8bd5ff03c35c6de3c46109a4500196f Author: Matthias Fechner AuthorDate: 2021-10-26 19:23:22 +0000 Commit: Matthias Fechner CommitDate: 2021-10-27 09:35:34 +0000 www/gitlab-workhorse: Update to 14.4.0 Required for gitlab-ce 14.4.0. (cherry picked from commit e492c6fd35a3cacf44267efc13b73ef83eb7706a) --- www/gitlab-workhorse/Makefile | 55 ++++++++++---------- www/gitlab-workhorse/distinfo | 90 ++++++++++++++++----------------- www/gitlab-workhorse/files/patch-go.mod | 8 +-- www/gitlab-workhorse/files/patch-go.sum | 11 ++-- 4 files changed, 79 insertions(+), 85 deletions(-) diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index 55b2e5f40b9c..dd695e440f25 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,7 +1,7 @@ # Created by: Torsten Zuehlsdorff PORTNAME= gitlab-workhorse -PORTVERSION= 14.3.2 +PORTVERSION= 14.4.0 PORTREVISION= 0 CATEGORIES= www @@ -23,30 +23,29 @@ USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT= 92acfb1b8a9019b3fa3c817d251b2624d55da26d +GL_COMMIT= 51b27ab58055b65e14e68b19604e4823389adb73 # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-vendor -# 106dd +# 103dd GH_TUPLE= \ Azure:azure-pipeline-go:v0.2.3:azure_azure_pipeline_go/vendor/github.com/Azure/azure-pipeline-go \ - Azure:azure-storage-blob-go:6df5d9af221d:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \ - Azure:go-autorest:autorest/v0.11.12:azure_go_autorest_autorest \ + Azure:azure-storage-blob-go:v0.13.0:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \ + Azure:go-autorest:79a63e70c4d8:azure_go_autorest_adal \ + Azure:go-autorest:autorest/v0.11.18:azure_go_autorest_autorest \ Azure:go-autorest:b3a0b30a7423:azure_go_autorest_date \ - Azure:go-autorest:b8bf08c40b80:azure_go_autorest_adal \ - Azure:go-autorest:logger/v0.2.0:azure_go_autorest_logger \ + Azure:go-autorest:logger/v0.2.1:azure_go_autorest_logger \ Azure:go-autorest:tracing/v0.6.0:azure_go_autorest_tracing \ Azure:go-autorest:v14.2.0:azure_go_autorest/vendor/github.com/Azure/go-autorest \ BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \ DataDog:datadog-go:v4.4.0:datadog_datadog_go/vendor/github.com/DataDog/datadog-go \ DataDog:dd-trace-go:v1.31.1:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \ - DataDog:sketches-go:v1.0.0:datadog_sketches_go/vendor/github.com/DataDog/sketches-go \ FZambia:sentinel:v1.0.0:fzambia_sentinel/vendor/github.com/FZambia/sentinel \ Microsoft:go-winio:v0.4.19:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \ StackExchange:wmi:cbe66965904d:stackexchange_wmi/vendor/github.com/StackExchange/wmi \ alecthomas:chroma:v0.7.3:alecthomas_chroma/vendor/github.com/alecthomas/chroma \ - aws:aws-sdk-go:v1.37.0:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \ + aws:aws-sdk-go:v1.38.35:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \ beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \ census-ecosystem:opencensus-go-exporter-stackdriver:v0.13.8:census_ecosystem_opencensus_go_exporter_stackdriver/vendor/contrib.go.opencensus.io/exporter/stackdriver \ census-instrumentation:opencensus-go:v0.23.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \ @@ -66,37 +65,36 @@ GH_TUPLE= \ gogo:protobuf:v1.3.2:gogo_protobuf/vendor/github.com/gogo/protobuf \ golang-jwt:jwt:v4.0.0:golang_jwt_jwt_v4/vendor/github.com/golang-jwt/jwt/v4 \ golang:appengine:v1.6.7:golang_appengine/vendor/google.golang.org/appengine \ - golang:crypto:be400aefbc4c:golang_crypto/vendor/golang.org/x/crypto \ + golang:crypto:38f3c27a63bf:golang_crypto/vendor/golang.org/x/crypto \ golang:gddo:af0f2af80721:golang_gddo/vendor/github.com/golang/gddo \ golang:groupcache:41bb18bfe9da:golang_groupcache/vendor/github.com/golang/groupcache \ golang:image:e7c1f5e7dbb8:golang_image/vendor/golang.org/x/image \ golang:lint:83fdc39ff7b5:golang_lint/vendor/golang.org/x/lint \ - golang:mod:v0.4.1:golang_mod/vendor/golang.org/x/mod \ - golang:net:d523dce5a7f4:golang_net/vendor/golang.org/x/net \ - golang:oauth2:5e61552d6c78:golang_oauth2/vendor/golang.org/x/oauth2 \ + golang:mod:v0.4.2:golang_mod/vendor/golang.org/x/mod \ + golang:net:0714010a04ed:golang_net/vendor/golang.org/x/net \ + golang:oauth2:81ed05c6b58c:golang_oauth2/vendor/golang.org/x/oauth2 \ golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \ golang:sync:036812b2e83c:golang_sync/vendor/golang.org/x/sync \ - golang:sys:f1c623a9e750:golang_sys/vendor/golang.org/x/sys \ - golang:text:v0.3.5:golang_text/vendor/golang.org/x/text \ - golang:time:3af7569d3a1e:golang_time/vendor/golang.org/x/time \ + golang:sys:0981d6026fa6:golang_sys/vendor/golang.org/x/sys \ + golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \ + golang:time:f8bda1e9f3ba:golang_time/vendor/golang.org/x/time \ golang:tools:v0.1.0:golang_tools/vendor/golang.org/x/tools \ golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \ gomodule:redigo:v2.0.0:gomodule_redigo/vendor/github.com/gomodule/redigo \ - google:go-cloud:5094f54ed8bb:google_go_cloud/vendor/gocloud.dev \ + google:go-cloud:v0.23.0:google_go_cloud/vendor/gocloud.dev \ google:go-cmp:v0.5.5:google_go_cmp/vendor/github.com/google/go-cmp \ - google:go-genproto:c14fb6ef47c3:google_go_genproto/vendor/google.golang.org/genproto \ + google:go-genproto:4a47615972c2:google_go_genproto/vendor/google.golang.org/genproto \ google:pprof:cbba55b83ad5:google_pprof/vendor/github.com/google/pprof \ - google:uuid:v1.1.2:google_uuid/vendor/github.com/google/uuid \ - google:wire:v0.4.0:google_wire/vendor/github.com/google/wire \ - googleapis:gax-go:v2.0.2:googleapis_gax_go/vendor/github.com/googleapis/gax-go \ - googleapis:gax-go:v2.0.5:googleapis_gax_go_v2 \ - googleapis:google-api-go-client:v0.45.0:googleapis_google_api_go_client/vendor/google.golang.org/api \ + google:uuid:v1.2.0:google_uuid/vendor/github.com/google/uuid \ + google:wire:v0.5.0:google_wire/vendor/github.com/google/wire \ + googleapis:gax-go:v2.0.5:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \ + googleapis:google-api-go-client:v0.46.0:googleapis_google_api_go_client/vendor/google.golang.org/api \ googleapis:google-cloud-go:v0.81.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \ gopherjs:gopherjs:0766667cb4d1:gopherjs_gopherjs/vendor/github.com/gopherjs/gopherjs \ gorilla:websocket:v1.4.1:gorilla_websocket/vendor/github.com/gorilla/websocket \ grpc-ecosystem:go-grpc-middleware:v1.3.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \ grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \ - grpc:grpc-go:v1.37.0:grpc_grpc_go/vendor/google.golang.org/grpc \ + grpc:grpc-go:v1.38.0:grpc_grpc_go/vendor/google.golang.org/grpc \ hashicorp:yamux:a95892c5f864:hashicorp_yamux/vendor/github.com/hashicorp/yamux \ jmespath:go-jmespath:v0.4.0:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \ johannesboyne:gofakes3:02d71f533bec:johannesboyne_gofakes3/vendor/github.com/johannesboyne/gofakes3 \ @@ -128,11 +126,11 @@ GH_TUPLE= \ smartystreets:goconvey:v1.6.4:smartystreets_goconvey/vendor/github.com/smartystreets/goconvey \ stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \ tinylib:msgp:v1.1.2:tinylib_msgp/vendor/github.com/tinylib/msgp \ - uber-go:atomic:v1.5.0:uber_go_atomic/vendor/go.uber.org/atomic \ + uber-go:atomic:v1.7.0:uber_go_atomic/vendor/go.uber.org/atomic \ uber:jaeger-client-go:v2.27.0:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \ uber:jaeger-lib:v2.4.1:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib -GL_TUPLE= gitlab-org:gitaly:e078d5bd7c5eb37caa222faa15010ce6decc6aa6:gitlab_org_gitaly_v14/vendor/gitlab.com/gitlab-org/gitaly/v14 \ +GL_TUPLE= gitlab-org:gitaly:df7dadcc3f74276a7176234d4b1475299f46c05c:gitlab_org_gitaly_v14/vendor/gitlab.com/gitlab-org/gitaly/v14 \ gitlab-org:labkit:9205b46eea68f47a36cefa783a306476f0b2dbfd:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit @@ -142,7 +140,7 @@ PLIST_FILES= bin/gitlab-resize-image \ bin/gitlab-zip-metadata PLIST_DIRS= ${WWWDIR} -# 13dd +# 11dd post-extract: @${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest @${RLN} ${WRKSRC_azure_go_autorest_autorest}/autorest ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest @@ -154,11 +152,10 @@ post-extract: @${RLN} ${WRKSRC_azure_go_autorest_logger}/logger ${WRKSRC}/vendor/github.com/Azure/go-autorest/logger @${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/tracing @${RLN} ${WRKSRC_azure_go_autorest_tracing}/tracing ${WRKSRC}/vendor/github.com/Azure/go-autorest/tracing - @${RM} -r ${WRKSRC}/vendor/github.com/googleapis/gax-go/v2 - @${RLN} ${WRKSRC_googleapis_gax_go_v2}/v2 ${WRKSRC}/vendor/github.com/googleapis/gax-go/v2 post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME} .include + diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 59808c3d77f6..073562693179 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,16 +1,16 @@ -TIMESTAMP = 1633159257 +TIMESTAMP = 1634883120 SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102 -SHA256 (Azure-azure-storage-blob-go-6df5d9af221d_GH0.tar.gz) = 31047920e4c507f913b9922ad920a2e9f6d48e6056bdc6869b6c257e3ab095a7 -SIZE (Azure-azure-storage-blob-go-6df5d9af221d_GH0.tar.gz) = 240532 -SHA256 (Azure-go-autorest-autorest-v0.11.12_GH0.tar.gz) = 79b749fc9e13670756e6a83bc966c04232990aa6fa26a7e0c0910aab3924f591 -SIZE (Azure-go-autorest-autorest-v0.11.12_GH0.tar.gz) = 169481 +SHA256 (Azure-azure-storage-blob-go-v0.13.0_GH0.tar.gz) = 6bf7145210331efa3f0417f6684cf764c22743cf23122048ec136600daebf443 +SIZE (Azure-azure-storage-blob-go-v0.13.0_GH0.tar.gz) = 242403 +SHA256 (Azure-go-autorest-79a63e70c4d8_GH0.tar.gz) = d7156c20c47fcd04edae683e718a1e72dcb9178a3b07e6c18615cee5b1dd67d6 +SIZE (Azure-go-autorest-79a63e70c4d8_GH0.tar.gz) = 175215 +SHA256 (Azure-go-autorest-autorest-v0.11.18_GH0.tar.gz) = c6fc9480fbdc441b40e45ca97244ea3bdd82efe245a52fdd7cb2faa58b4d55b2 +SIZE (Azure-go-autorest-autorest-v0.11.18_GH0.tar.gz) = 175246 SHA256 (Azure-go-autorest-b3a0b30a7423_GH0.tar.gz) = 51b31571a26a5287eb67251aa69407bb6145f58253bdbb2e610b7eab7b0d762f SIZE (Azure-go-autorest-b3a0b30a7423_GH0.tar.gz) = 167123 -SHA256 (Azure-go-autorest-b8bf08c40b80_GH0.tar.gz) = dfdc6112ced1c0886d6a2b8053f6cad514c675cad1123894abb3e4ee414bfd88 -SIZE (Azure-go-autorest-b8bf08c40b80_GH0.tar.gz) = 170523 -SHA256 (Azure-go-autorest-logger-v0.2.0_GH0.tar.gz) = 5d38b489d18d837ffeafbc354dbffde3bea71014318d465a7c2f4690e5bc4372 -SIZE (Azure-go-autorest-logger-v0.2.0_GH0.tar.gz) = 167096 +SHA256 (Azure-go-autorest-logger-v0.2.1_GH0.tar.gz) = fac35805dc320638a322b407c0cd0c471932a4855e9ef0485c85e533af8146dc +SIZE (Azure-go-autorest-logger-v0.2.1_GH0.tar.gz) = 175062 SHA256 (Azure-go-autorest-tracing-v0.6.0_GH0.tar.gz) = b43cd0127dd6e91debe1eb98873e219817b71c10988d0a6c550e4ad19a29a8ea SIZE (Azure-go-autorest-tracing-v0.6.0_GH0.tar.gz) = 167113 SHA256 (Azure-go-autorest-v14.2.0_GH0.tar.gz) = d0db0e47112570e3f2bd2e38ae56338f1e74625dd4cb553007082fdad5fd844d @@ -21,8 +21,6 @@ SHA256 (DataDog-datadog-go-v4.4.0_GH0.tar.gz) = ca4e63041f5e0a176f0affd7a5997925 SIZE (DataDog-datadog-go-v4.4.0_GH0.tar.gz) = 43175 SHA256 (DataDog-dd-trace-go-v1.31.1_GH0.tar.gz) = 9e16bb928d2445fd3430b25b0acbb562077a4c93ad737eeed67bcb38eac8c9ab SIZE (DataDog-dd-trace-go-v1.31.1_GH0.tar.gz) = 601733 -SHA256 (DataDog-sketches-go-v1.0.0_GH0.tar.gz) = 882d27e9f2b65f8b1de6f0f53fe141044df31ccc02abb6ca12d7a74ebd8b7b7b -SIZE (DataDog-sketches-go-v1.0.0_GH0.tar.gz) = 22089 SHA256 (FZambia-sentinel-v1.0.0_GH0.tar.gz) = ae08e912e4fd69a0c5d11f832a484f13695ce20e8d32878eba23bc89d9d79e5e SIZE (FZambia-sentinel-v1.0.0_GH0.tar.gz) = 7919 SHA256 (Microsoft-go-winio-v0.4.19_GH0.tar.gz) = aa80cb2aa45ffd97808c2365c554f839757408f822a0774a356b7b918360fc20 @@ -31,8 +29,8 @@ SHA256 (StackExchange-wmi-cbe66965904d_GH0.tar.gz) = 14dbc4af6952acdb1b941d002cd SIZE (StackExchange-wmi-cbe66965904d_GH0.tar.gz) = 11279 SHA256 (alecthomas-chroma-v0.7.3_GH0.tar.gz) = 1007e82cc44cea04542c282b19bab25a59cb1e53149aaa7f0e2d9ce72ba80114 SIZE (alecthomas-chroma-v0.7.3_GH0.tar.gz) = 615181 -SHA256 (aws-aws-sdk-go-v1.37.0_GH0.tar.gz) = d0bc2f98fe8ead35497d267ee9dc534ab26a5417bb5ca61ce63ca75e9a801b1d -SIZE (aws-aws-sdk-go-v1.37.0_GH0.tar.gz) = 18127514 +SHA256 (aws-aws-sdk-go-v1.38.35_GH0.tar.gz) = 1c1cd41669e75f4225b8fda42f7500f21408d0a8575ad3665542338ba267242b +SIZE (aws-aws-sdk-go-v1.38.35_GH0.tar.gz) = 18967606 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867 SHA256 (census-ecosystem-opencensus-go-exporter-stackdriver-v0.13.8_GH0.tar.gz) = 759ac647e059e4fddf4857bcac7b5a82a4a5c389a15dd67b74f647bb8dcf127e @@ -71,8 +69,8 @@ SHA256 (golang-jwt-jwt-v4.0.0_GH0.tar.gz) = 5d305c23625c50ed87968122a7fe17d76066 SIZE (golang-jwt-jwt-v4.0.0_GH0.tar.gz) = 40180 SHA256 (golang-appengine-v1.6.7_GH0.tar.gz) = c623d81235f7c9699e299b328191d813337dd57dcc800d7afdb5130e8c321a8f SIZE (golang-appengine-v1.6.7_GH0.tar.gz) = 333007 -SHA256 (golang-crypto-be400aefbc4c_GH0.tar.gz) = 52f3f5dc88c5ab7428a9bed403127266d1b5fc90af6a4f6685f98259bb7b7452 -SIZE (golang-crypto-be400aefbc4c_GH0.tar.gz) = 1722808 +SHA256 (golang-crypto-38f3c27a63bf_GH0.tar.gz) = b55bc13c8a313ed80310a84eb7cceb303532774439493636a89b17c170250e31 +SIZE (golang-crypto-38f3c27a63bf_GH0.tar.gz) = 1731839 SHA256 (golang-gddo-af0f2af80721_GH0.tar.gz) = a37eabe7bf2035e51718154b821f2aed6a384e4b7365e9a62463047e0872e24d SIZE (golang-gddo-af0f2af80721_GH0.tar.gz) = 2256821 SHA256 (golang-groupcache-41bb18bfe9da_GH0.tar.gz) = 1e89795970d6593affdafe1d09dcf947681ca1ea82528e8e4fb9974a77f2e394 @@ -81,46 +79,44 @@ SHA256 (golang-image-e7c1f5e7dbb8_GH0.tar.gz) = 424ce3674771f00cc1112826e745efb1 SIZE (golang-image-e7c1f5e7dbb8_GH0.tar.gz) = 4895813 SHA256 (golang-lint-83fdc39ff7b5_GH0.tar.gz) = 5014077abbc075c3b4b459f7ad98cc1c28f2ae6bde906a9d8ed19d8c8b97987a SIZE (golang-lint-83fdc39ff7b5_GH0.tar.gz) = 31889 -SHA256 (golang-mod-v0.4.1_GH0.tar.gz) = 548935751dbc1c29a27bf1b1de6d7ffe58b752d6ad7bc1f254e6ea89ae2ddd59 -SIZE (golang-mod-v0.4.1_GH0.tar.gz) = 102751 -SHA256 (golang-net-d523dce5a7f4_GH0.tar.gz) = 2845c6b37390b25a88a8a71e211e1ed9da8a1f6363baa275d6d30e8dd0d00a21 -SIZE (golang-net-d523dce5a7f4_GH0.tar.gz) = 1252646 -SHA256 (golang-oauth2-5e61552d6c78_GH0.tar.gz) = 01ea885d501ffceaecaef9a91a433c3391583f4ee6cae16115ebb2ccafcc90c9 -SIZE (golang-oauth2-5e61552d6c78_GH0.tar.gz) = 78982 +SHA256 (golang-mod-v0.4.2_GH0.tar.gz) = ce4131eb443ac67ededb139a43bae4fbb2c4b84843936495c6a6de92b8033917 +SIZE (golang-mod-v0.4.2_GH0.tar.gz) = 104584 +SHA256 (golang-net-0714010a04ed_GH0.tar.gz) = 62ba863366262fbbc211a65b1301f7fcf75f5f710fd979c27607af49ea51ba21 +SIZE (golang-net-0714010a04ed_GH0.tar.gz) = 1250017 +SHA256 (golang-oauth2-81ed05c6b58c_GH0.tar.gz) = 84828c3d8d1e1b5fdec9fef502f37308de4244571316063f72beb0bb20f07fe0 +SIZE (golang-oauth2-81ed05c6b58c_GH0.tar.gz) = 79557 SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3 SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702 SHA256 (golang-sync-036812b2e83c_GH0.tar.gz) = 75ac8fc16bdceb2496c4a9cc98584b70c29032d91a9e57a624acb073e3232fda SIZE (golang-sync-036812b2e83c_GH0.tar.gz) = 18752 -SHA256 (golang-sys-f1c623a9e750_GH0.tar.gz) = 15a6f78a91827579b9e204b14e4efa338840b5cd797d03400cea62a0b9d8bed5 -SIZE (golang-sys-f1c623a9e750_GH0.tar.gz) = 1219335 -SHA256 (golang-text-v0.3.5_GH0.tar.gz) = f85d1185ba116cd40ef8cf702fe1d960ed41d039c08fd314dbeb5866f3166f27 -SIZE (golang-text-v0.3.5_GH0.tar.gz) = 8348127 -SHA256 (golang-time-3af7569d3a1e_GH0.tar.gz) = 93c79ee7ad72641dc5ebd47e6ecffa66e878e367ddbbef48208ff82a0b6fc7e0 -SIZE (golang-time-3af7569d3a1e_GH0.tar.gz) = 9619 +SHA256 (golang-sys-0981d6026fa6_GH0.tar.gz) = 1027a8cd31706610f83425e844a1ea03309526ed499d5cab13ecf9f53d923eca +SIZE (golang-sys-0981d6026fa6_GH0.tar.gz) = 1235549 +SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760 +SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095 +SHA256 (golang-time-f8bda1e9f3ba_GH0.tar.gz) = e068a34e54894c9c189ba2c2e5b7ea9116ed661f6a7c0d0e744d8e0066017ebb +SIZE (golang-time-f8bda1e9f3ba_GH0.tar.gz) = 9656 SHA256 (golang-tools-v0.1.0_GH0.tar.gz) = 88f66c1a7ff0f7fce20c0808d2769baa977f56f74197c9681cd864d0977e97a2 SIZE (golang-tools-v0.1.0_GH0.tar.gz) = 2683055 SHA256 (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 71975d658357e170fd6a41f92539cde8b39c9cd8bfe5931b6311bc5f5c0da0d7 SIZE (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 13664 SHA256 (gomodule-redigo-v2.0.0_GH0.tar.gz) = b97a9b0298c371c80b4ba141cb683eaa003c8825a5b02526a03435f6e7568289 SIZE (gomodule-redigo-v2.0.0_GH0.tar.gz) = 42976 -SHA256 (google-go-cloud-5094f54ed8bb_GH0.tar.gz) = 07575ad4f9bee02ae440190e188c43325c5b24733546eb7c565a7deca260b62a -SIZE (google-go-cloud-5094f54ed8bb_GH0.tar.gz) = 2594866 +SHA256 (google-go-cloud-v0.23.0_GH0.tar.gz) = 7d5688a41b79443f775c5db9118e27f3d37a6b9f9e0064635eb800fa25244ae5 +SIZE (google-go-cloud-v0.23.0_GH0.tar.gz) = 2619492 SHA256 (google-go-cmp-v0.5.5_GH0.tar.gz) = 8f1a0041f484812ae219e7548a13d5269c947cfcdea6031d40cdc85cd0663b3e SIZE (google-go-cmp-v0.5.5_GH0.tar.gz) = 102358 -SHA256 (google-go-genproto-c14fb6ef47c3_GH0.tar.gz) = 26b5114e119b8945b16a7205d55e1dbd3c006940ac4568d670081690ef7210a8 -SIZE (google-go-genproto-c14fb6ef47c3_GH0.tar.gz) = 8642924 +SHA256 (google-go-genproto-4a47615972c2_GH0.tar.gz) = b24811e4ac7d0d46c4778cb87a4afd77f99eaf152fd43609fcb004ed1f4b98df +SIZE (google-go-genproto-4a47615972c2_GH0.tar.gz) = 8968771 SHA256 (google-pprof-cbba55b83ad5_GH0.tar.gz) = 637bcea06f4a595d126e02e94075c625bc283ac9056904e68bb57fb2b125e47f SIZE (google-pprof-cbba55b83ad5_GH0.tar.gz) = 1717915 -SHA256 (google-uuid-v1.1.2_GH0.tar.gz) = e650558e314307cf33391d0a9ef575b418188206d61cb9751e9f11bceb0874d0 -SIZE (google-uuid-v1.1.2_GH0.tar.gz) = 13871 -SHA256 (google-wire-v0.4.0_GH0.tar.gz) = dacea2edfd662d5206269bf7c99f9c3a1b0ab9f74d01255ea22faf68ad9c16c1 -SIZE (google-wire-v0.4.0_GH0.tar.gz) = 87136 -SHA256 (googleapis-gax-go-v2.0.2_GH0.tar.gz) = 624786968d59eb032cfe049f139ddc14be1be5d508c34ebf520edc3946bae2ac -SIZE (googleapis-gax-go-v2.0.2_GH0.tar.gz) = 8942 +SHA256 (google-uuid-v1.2.0_GH0.tar.gz) = 53ba896ce398435b3ba4f9375f5d4908b09c79daaa54ecd4e5000b7bef984380 +SIZE (google-uuid-v1.2.0_GH0.tar.gz) = 14158 +SHA256 (google-wire-v0.5.0_GH0.tar.gz) = 97f21d31d8a2b3b04feeee1467697c863919b62882ab2ec450ee282dab076812 +SIZE (google-wire-v0.5.0_GH0.tar.gz) = 88112 SHA256 (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 3089affe6f5e27f7a6d494cb399aa6baf232384f763f548ad5ddfbea0e88e59c SIZE (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 15328 -SHA256 (googleapis-google-api-go-client-v0.45.0_GH0.tar.gz) = 628120c26b3db51e218d50b3555eb552a12993e5c1096b4ed8ad200bae925985 -SIZE (googleapis-google-api-go-client-v0.45.0_GH0.tar.gz) = 20020236 +SHA256 (googleapis-google-api-go-client-v0.46.0_GH0.tar.gz) = 33cd2b3a446679cc8dbbbcc64aaf730241ee3400ac0c89021922683b12355e3d +SIZE (googleapis-google-api-go-client-v0.46.0_GH0.tar.gz) = 20181199 SHA256 (googleapis-google-cloud-go-v0.81.0_GH0.tar.gz) = 307f191f0ebcd71b96ec66554670eb3cf0398c64a427e43651472b5d9616f1ae SIZE (googleapis-google-cloud-go-v0.81.0_GH0.tar.gz) = 3510192 SHA256 (gopherjs-gopherjs-0766667cb4d1_GH0.tar.gz) = bc4d58aabc0e9958a9b8f9ebd835f1deabe5061750d070fc1e2e41fe6e6d643a @@ -131,8 +127,8 @@ SHA256 (grpc-ecosystem-go-grpc-middleware-v1.3.0_GH0.tar.gz) = c9b908202c05a7f82 SIZE (grpc-ecosystem-go-grpc-middleware-v1.3.0_GH0.tar.gz) = 103780 SHA256 (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = eba66530952a126ab869205bdb909af607bfd9eb09f00207b62eb29140258aa9 SIZE (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = 24760 -SHA256 (grpc-grpc-go-v1.37.0_GH0.tar.gz) = ab96e0de7416d1d26ea5c98417d21cd72b2c66094b80ba3ab1d03f4a5aa728ca -SIZE (grpc-grpc-go-v1.37.0_GH0.tar.gz) = 1236791 +SHA256 (grpc-grpc-go-v1.38.0_GH0.tar.gz) = fd6a2e2ae9e810670fdb63d196275ddb171e7f99f3bb801a02dde973de2f557b +SIZE (grpc-grpc-go-v1.38.0_GH0.tar.gz) = 1253222 SHA256 (hashicorp-yamux-a95892c5f864_GH0.tar.gz) = 9468ab6cee06cee3e1883a99f5d763bd8d9111e13ce499c5f5f5a705a9979789 SIZE (hashicorp-yamux-a95892c5f864_GH0.tar.gz) = 24397 SHA256 (jmespath-go-jmespath-v0.4.0_GH0.tar.gz) = aa86d00b6836345eee196c13df2df084a18e0b1159935de9289f2ef6a7fe375d @@ -195,15 +191,15 @@ SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5a SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073 SHA256 (tinylib-msgp-v1.1.2_GH0.tar.gz) = 9759dc9f45160ff1161d670d019f509d55e12b22dfc8a8e1ed71f4c358ee1a01 SIZE (tinylib-msgp-v1.1.2_GH0.tar.gz) = 83078 -SHA256 (uber-go-atomic-v1.5.0_GH0.tar.gz) = 3b003515efb86c67aced0ce9e954cca50964ee0afe83e5a63dfe43aa58347290 -SIZE (uber-go-atomic-v1.5.0_GH0.tar.gz) = 9365 +SHA256 (uber-go-atomic-v1.7.0_GH0.tar.gz) = 4d655e90a23d023b36607e2ce94c3b7bf650d41c81c0faff32432581d9099ad1 +SIZE (uber-go-atomic-v1.7.0_GH0.tar.gz) = 18566 SHA256 (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 7590acdefcbbf9553bd3415bc7e5ec977731646363c5350d56faba31a097d996 SIZE (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 210139 SHA256 (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = c178bcad325857dba29551c16f40707701adf6e3a9e01e1ca3e5edfc3c6de8bc SIZE (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = 38010 -SHA256 (gitlab-org-gitlab-foss-92acfb1b8a9019b3fa3c817d251b2624d55da26d_GL0.tar.gz) = d618d90f40dd63d5b85d8540ee0d31578cf4a317f5ea3b5432c53b0187a0da5b -SIZE (gitlab-org-gitlab-foss-92acfb1b8a9019b3fa3c817d251b2624d55da26d_GL0.tar.gz) = 94745309 -SHA256 (gitlab-org-gitaly-e078d5bd7c5eb37caa222faa15010ce6decc6aa6_GL0.tar.gz) = 31a6c86d809082126e11e98e050749932861297a3d21c8e4756b5618e06ac9fd -SIZE (gitlab-org-gitaly-e078d5bd7c5eb37caa222faa15010ce6decc6aa6_GL0.tar.gz) = 3465551 +SHA256 (gitlab-org-gitlab-foss-51b27ab58055b65e14e68b19604e4823389adb73_GL0.tar.gz) = 6092274b8b3292f0c1956ee31591ece91c47ebf2c213ab793ea6fa4b5b7e35f7 +SIZE (gitlab-org-gitlab-foss-51b27ab58055b65e14e68b19604e4823389adb73_GL0.tar.gz) = 94863812 +SHA256 (gitlab-org-gitaly-df7dadcc3f74276a7176234d4b1475299f46c05c_GL0.tar.gz) = 4c403ee52c1d42d54e9acd14026796782e8272e74c8eb7c3cedf9c924697647e +SIZE (gitlab-org-gitaly-df7dadcc3f74276a7176234d4b1475299f46c05c_GL0.tar.gz) = 3703056 SHA256 (gitlab-org-labkit-9205b46eea68f47a36cefa783a306476f0b2dbfd_GL0.tar.gz) = c957c444298dd0f9ade07cb643d03e455dcc28d24bd203ead8d241bf50c6df57 SIZE (gitlab-org-labkit-9205b46eea68f47a36cefa783a306476f0b2dbfd_GL0.tar.gz) = 146429 diff --git a/www/gitlab-workhorse/files/patch-go.mod b/www/gitlab-workhorse/files/patch-go.mod index f62248c3d236..507f4c7b4584 100644 --- a/www/gitlab-workhorse/files/patch-go.mod +++ b/www/gitlab-workhorse/files/patch-go.mod @@ -1,9 +1,9 @@ ---- go.mod.orig 2021-08-31 07:42:01 UTC +--- go.mod.orig 2021-10-22 06:09:00 UTC +++ go.mod -@@ -37,6 +37,6 @@ require ( - golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 +@@ -36,6 +36,6 @@ require ( + golang.org/x/net v0.0.0-20210505214959-0714010a04ed golang.org/x/tools v0.1.0 - google.golang.org/grpc v1.37.0 + google.golang.org/grpc v1.38.0 - gopkg.in/DataDog/dd-trace-go.v1 v1.31.0 // indirect + gopkg.in/DataDog/dd-trace-go.v1 v1.31.1 // indirect honnef.co/go/tools v0.1.3 diff --git a/www/gitlab-workhorse/files/patch-go.sum b/www/gitlab-workhorse/files/patch-go.sum index a32f06ef4f6c..115eefd1eb72 100644 --- a/www/gitlab-workhorse/files/patch-go.sum +++ b/www/gitlab-workhorse/files/patch-go.sum @@ -1,14 +1,15 @@ ---- go.sum.orig 2021-08-31 07:42:22 UTC +--- go.sum.orig 2021-10-22 06:12:32 UTC +++ go.sum -@@ -101,6 +101,7 @@ github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmd +@@ -100,6 +100,8 @@ github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmd github.com/DataDog/datadog-go v4.4.0+incompatible h1:R7WqXWP4fIOAqWJtUKmSfuc7eDsBT58k9AY5WSHVosk= github.com/DataDog/datadog-go v4.4.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/gostackparse v0.5.0/go.mod h1:lTfqcJKqS9KnXQGnyQMCugq3u1FP6UZMfWR0aitKFMM= ++github.com/DataDog/sketches-go v1.0.0 h1:chm5KSXO7kO+ywGWJ0Zs6tdmWU8PBXSbywFVciL6BG4= +github.com/DataDog/sketches-go v1.0.0/go.mod h1:O+XkJHWk9w4hDwY2ZUDU31ZC9sNYlYo8DiFsxjYeo1k= github.com/FZambia/sentinel v1.0.0 h1:KJ0ryjKTZk5WMp0dXvSdNqp3lFaW1fNFuEYfrkLOYIc= github.com/FZambia/sentinel v1.0.0/go.mod h1:ytL1Am/RLlAoAXG6Kj5LNuw/TRRQrv2rt2FT26vP5gI= - github.com/GoogleCloudPlatform/cloudsql-proxy v1.19.1/go.mod h1:+yYmuKqcBVkgRePGpUhTA9OEg0XsnFE96eZ6nJ2yCQM= -@@ -369,6 +370,7 @@ github.com/google/go-replayers/grpcreplay v1.0.0/go.mo + github.com/GoogleCloudPlatform/cloudsql-proxy v1.22.0/go.mod h1:mAm5O/zik2RFmcpigNjg6nMotDL8ZXJaxKzgGVcSMFA= +@@ -390,6 +392,7 @@ github.com/google/go-replayers/grpcreplay v1.0.0/go.mo github.com/google/go-replayers/httpreplay v0.1.2 h1:HCfx+dQzwN9XbGTHF8qJ+67WN8glL9FTWV5rraCJ/jU= github.com/google/go-replayers/httpreplay v0.1.2/go.mod h1:YKZViNhiGgqdBlUbI2MwGpq4pXxNmhJLPHQ7cv2b5no= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -16,7 +17,7 @@ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible h1:xmapqc1AyLoB+ddYT6r04bD9lIjlOqGaREovi0SzFaE= github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -@@ -1263,6 +1265,8 @@ gopkg.in/DataDog/dd-trace-go.v1 v1.7.0/go.mod h1:DVp8H +@@ -1327,6 +1330,8 @@ gopkg.in/DataDog/dd-trace-go.v1 v1.7.0/go.mod h1:DVp8H gopkg.in/DataDog/dd-trace-go.v1 v1.30.0/go.mod h1:SnKViq44dv/0gjl9RpkP0Y2G3BJSRkp6eYdCSu39iI8= gopkg.in/DataDog/dd-trace-go.v1 v1.31.0 h1:ouY+DNlRTckk63TNh468tPWBC21qBZPniVQXQs0iq10= gopkg.in/DataDog/dd-trace-go.v1 v1.31.0/go.mod h1:SnKViq44dv/0gjl9RpkP0Y2G3BJSRkp6eYdCSu39iI8= From nobody Wed Oct 27 09:36:20 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 25E5F1819D61; Wed, 27 Oct 2021 09:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HfNqT63lgz4Rl4; Wed, 27 Oct 2021 09:36: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 F29495C2B; Wed, 27 Oct 2021 09:36:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19R9aKJx018125; Wed, 27 Oct 2021 09:36:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19R9aKfG018124; Wed, 27 Oct 2021 09:36:20 GMT (envelope-from git) Date: Wed, 27 Oct 2021 09:36:20 GMT Message-Id: <202110270936.19R9aKfG018124@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: fddbf3e082b6 - 2021Q4 - www/gitlab-ce: Update to 14.4.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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: fddbf3e082b6e2729b948d05a0c821acd2d33929 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=fddbf3e082b6e2729b948d05a0c821acd2d33929 commit fddbf3e082b6e2729b948d05a0c821acd2d33929 Author: Matthias Fechner AuthorDate: 2021-10-26 19:24:05 +0000 Commit: Matthias Fechner CommitDate: 2021-10-27 09:35:34 +0000 www/gitlab-ce: Update to 14.4.0 Changelog: https://about.gitlab.com/releases/2021/10/22/gitlab-14-4-released/ I included the following patch to fix a problem with sidekiq-cron gem version 1.2.0: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73093 (cherry picked from commit 46b95c05501c643fada4e953533f5eb9ff3caba6) --- www/gitlab-ce/Makefile | 33 ++++++++++------------ www/gitlab-ce/distinfo | 6 ++-- www/gitlab-ce/files/patch-Gemfile | 19 ++++--------- .../files/patch-config_gitlab.yml.example | 6 ++-- .../files/patch-config_redis.cache.yml.example | 11 -------- .../files/patch-config_redis.queues.yml.example | 11 -------- .../patch-config_redis.shared__state.yml.example | 11 -------- ...b_gitlab_sidekiq__logging_structured__logger.rb | 10 +++++++ www/gitlab-ce/pkg-message | 4 +-- 9 files changed, 38 insertions(+), 73 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index d189b92fa667..d911ef7fe0a9 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,8 +1,8 @@ # Created by: Torsten Zuehlsdorff PORTNAME= gitlab-ce -PORTVERSION= 14.3.2 -PORTREVISION= 3 +PORTVERSION= 14.4.0 +PORTREVISION= 0 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -15,16 +15,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # which makes maintaining this long list much easier! MY_DEPENDS= git>=2.32.0:devel/git \ gitaly>=${PORTVERSION}:devel/gitaly \ - gitlab-elasticsearch-indexer>=2.13.0:textproc/gitlab-elasticsearch-indexer \ - gitlab-agent>=14.3.3:net/gitlab-agent \ - gitlab-pages>=1.44.0:www/gitlab-pages \ + gitlab-elasticsearch-indexer>=2.16.0:textproc/gitlab-elasticsearch-indexer \ + gitlab-agent>=14.4.0:net/gitlab-agent \ + gitlab-pages>=1.46.0:www/gitlab-pages \ gitlab-shell>=13.21.1:devel/gitlab-shell \ gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \ redis>=6.0.14:databases/redis \ yarn>=1.10.0:www/yarn \ gtar>0:archivers/gtar \ bash>0:shells/bash \ - rubygem-rails61>=6.1.3.2<6.1.4:www/rubygem-rails61 \ + rubygem-rails61>=6.1.4.1<6.1.4.2:www/rubygem-rails61 \ rubygem-bootsnap14>=1.4.6<2.0:devel/rubygem-bootsnap14 \ rubygem-responders-rails61>=3.0<4.0:www/rubygem-responders-rails61 \ rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \ @@ -80,7 +80,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-gitlab_omniauth-ldap>=2.1.1<2.2.0:net/rubygem-gitlab_omniauth-ldap \ rubygem-net-ldap>0.16.3:net/rubygem-net-ldap \ rubygem-grape>=1.5.2<1.6:devel/rubygem-grape \ - rubygem-grape-entity>=0.9.0<0.10.0,1:devel/rubygem-grape-entity \ + rubygem-grape-entity>=0.10.0<0.11.0,1:devel/rubygem-grape-entity \ rubygem-rack-cors>=1.0.6<1.1.0:www/rubygem-rack-cors \ rubygem-graphql>=1.11.8<1.12:devel/rubygem-graphql \ rubygem-graphiql-rails>=1.4.10<1.5.0:devel/rubygem-graphiql-rails \ @@ -100,7 +100,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-fog-openstack>=1.0<2.0:net/rubygem-fog-openstack \ rubygem-fog-rackspace>=0.1.1<1.2.0:net/rubygem-fog-rackspace \ rubygem-fog-aliyun>=0.3<1.0:net/rubygem-fog-aliyun \ - rubygem-gitlab-fog-azure-rm>=1.1.1<1.2:net/rubygem-gitlab-fog-azure-rm \ + rubygem-gitlab-fog-azure-rm>=1.2.0<1.3:net/rubygem-gitlab-fog-azure-rm \ rubygem-google-api-client>=0.33<1:devel/rubygem-google-api-client \ rubygem-unf>=0.1.4<0.2.0:textproc/rubygem-unf \ rubygem-seed-fu>=2.3.7<2.4.0:databases/rubygem-seed-fu \ @@ -115,7 +115,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-deckar01-task_list=2.3.1:www/rubygem-deckar01-task_list \ rubygem-gitlab-markup>=1.7.1<1.8.0:textproc/rubygem-gitlab-markup \ rubygem-github-markup17>=1.7.0<1.8.0:textproc/rubygem-github-markup17 \ - rubygem-commonmarker>=0.21<1.0:textproc/rubygem-commonmarker \ + rubygem-commonmarker>=0.23.2<0.24:textproc/rubygem-commonmarker \ rubygem-kramdown>=2.3.1<2.4:textproc/rubygem-kramdown \ rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \ rubygem-rdoc>=6.3.2<7:devel/rubygem-rdoc \ @@ -126,7 +126,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-asciidoctor-include-ext>=0.3.1<0.4.0:textproc/rubygem-asciidoctor-include-ext \ rubygem-asciidoctor-plantuml>=0.0.12<0.1:textproc/rubygem-asciidoctor-plantuml \ rubygem-asciidoctor-kroki>=0.5.0<0.6:textproc/rubygem-asciidoctor-kroki \ - rubygem-rouge>=3.26.0<3.27:textproc/rubygem-rouge \ + rubygem-rouge>=3.26.1<3.27:textproc/rubygem-rouge \ rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \ rubygem-bootstrap_form>=4.2.0<4.3.0:devel/rubygem-bootstrap_form \ rubygem-nokogiri>=1.11.5<1.12:textproc/rubygem-nokogiri \ @@ -140,10 +140,10 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-puma_worker_killer>=0.3.1:www/rubygem-puma_worker_killer \ rubygem-state_machines-activerecord>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord \ rubygem-acts-as-taggable-on>=7.0<8.0:www/rubygem-acts-as-taggable-on \ - rubygem-sidekiq5>=5.2.9<5.3.0:devel/rubygem-sidekiq5 \ + rubygem-sidekiq>=6.2.2<6.3:devel/rubygem-sidekiq \ rubygem-sidekiq-cron>=1.0<2.0:devel/rubygem-sidekiq-cron \ rubygem-redis-namespace>=1.8.1<1.9.0:databases/rubygem-redis-namespace \ - rubygem-gitlab-sidekiq-fetcher>=0.5.6<0.5.7:devel/rubygem-gitlab-sidekiq-fetcher \ + rubygem-gitlab-sidekiq-fetcher>=0.8.0<0.9:devel/rubygem-gitlab-sidekiq-fetcher \ rubygem-fugit12>=1.2.1<1.3.0:devel/rubygem-fugit12 \ rubygem-httparty>=0.16.4<0.17.0:www/rubygem-httparty \ rubygem-rainbow>=3.0<4.0:devel/rubygem-rainbow \ @@ -153,7 +153,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-version_sorter>=2.2.4<2.3.0:textproc/rubygem-version_sorter \ rubygem-js_regex>=3.7<4.0:textproc/rubygem-js_regex \ rubygem-device_detector>=0:devel/rubygem-device_detector \ - rubygem-redis>=4.1.4<5:databases/rubygem-redis \ + rubygem-redis>=4.4.0<4.5:databases/rubygem-redis \ rubygem-connection_pool>=2.0<3.0:net/rubygem-connection_pool \ rubygem-redis-actionpack-rails61>=5.2.0<5.3:databases/rubygem-redis-actionpack-rails61 \ rubygem-discordrb-webhooks>=3.4<4.0:net-im/rubygem-discordrb-webhooks \ @@ -222,7 +222,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-ed25519>=1.2<2.0:security/rubygem-ed25519 \ rubygem-bcrypt_pbkdf>=1.0<2.0:security/rubygem-bcrypt_pbkdf \ rubygem-spamcheck>=0.1.0<0.2:net/rubygem-spamcheck \ - rubygem-gitaly>=14.3.0.pre.rc1<14.4.0:net/rubygem-gitaly \ + rubygem-gitaly>=14.3.0.pre.rc2<14.4.0:net/rubygem-gitaly \ rubygem-kas-grpc>=0.0.2,1<0.0.3,1:net/rubygem-kas-grpc \ rubygem-grpc>=1.30.2<2:net/rubygem-grpc \ rubygem-google-protobuf317>=3.17.1<3.18:devel/rubygem-google-protobuf317 \ @@ -270,7 +270,7 @@ USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT= 92acfb1b8a9019b3fa3c817d251b2624d55da26d +GL_COMMIT= 51b27ab58055b65e14e68b19604e4823389adb73 USERS= git GROUPS= git @@ -301,13 +301,10 @@ do-install: # get files for workdir with: find . -name "*.example" ${MV} ${WRKSRC}/config/puma.rb.example ${WRKSRC}/config/puma.rb.sample ${MV} ${WRKSRC}/config/secrets.yml.example ${WRKSRC}/config/secrets.yml.sample - ${MV} ${WRKSRC}/config/redis.cache.yml.example ${WRKSRC}/config/redis.cache.yml.sample ${MV} ${WRKSRC}/config/sidekiq.yml.example ${WRKSRC}/config/sidekiq.yml.sample ${MV} ${WRKSRC}/config/cable.yml.example ${WRKSRC}/config/cable.yml.sample ${MV} ${WRKSRC}/config/gitlab.yml.example ${WRKSRC}/config/gitlab.yml.sample - ${MV} ${WRKSRC}/config/redis.queues.yml.example ${WRKSRC}/config/redis.queues.yml.sample ${MV} ${WRKSRC}/config/initializers/devise_password_length.rb.example ${WRKSRC}/config/initializers/devise_password_length.rb.sample - ${MV} ${WRKSRC}/config/redis.shared_state.yml.example ${WRKSRC}/config/redis.shared_state.yml.sample ${MV} ${WRKSRC}/config/resque.yml.example ${WRKSRC}/config/resque.yml.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab ${WRKSRC}/lib/support/nginx/gitlab.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab-ssl ${WRKSRC}/lib/support/nginx/gitlab-ssl.sample diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 9bf43cd68a07..4da5eed1052b 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633159240 -SHA256 (gitlab-org-gitlab-foss-92acfb1b8a9019b3fa3c817d251b2624d55da26d_GL0.tar.gz) = d618d90f40dd63d5b85d8540ee0d31578cf4a317f5ea3b5432c53b0187a0da5b -SIZE (gitlab-org-gitlab-foss-92acfb1b8a9019b3fa3c817d251b2624d55da26d_GL0.tar.gz) = 94745309 +TIMESTAMP = 1634899418 +SHA256 (gitlab-org-gitlab-foss-51b27ab58055b65e14e68b19604e4823389adb73_GL0.tar.gz) = 6092274b8b3292f0c1956ee31591ece91c47ebf2c213ab793ea6fa4b5b7e35f7 +SIZE (gitlab-org-gitlab-foss-51b27ab58055b65e14e68b19604e4823389adb73_GL0.tar.gz) = 94863812 diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index a00d2284d787..21aff8dff2a0 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2021-10-01 16:06:26 UTC +--- Gemfile.orig 2021-10-21 22:00:37 UTC +++ Gemfile @@ -88,7 +88,7 @@ gem 'gpgme', '~> 2.0.19' # GitLab fork with several improvements to original library. For full list of changes @@ -17,15 +17,6 @@ gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import) gem 'hashie' -@@ -229,7 +228,7 @@ gem 'js_regex', '~> 3.7' - gem 'device_detector' - - # Redis --gem 'redis', '~> 4.1.4' -+gem 'redis', '~> 4.1' - gem 'connection_pool', '~> 2.0' - - # Redis session store @@ -332,106 +331,10 @@ gem 'snowplow-tracker', '~> 0.6.1' # Metrics @@ -39,7 +30,7 @@ - gem 'lefthook', '~> 0.7.0', require: false - gem 'solargraph', '~> 0.43', require: false - -- gem 'letter_opener_web', '~> 1.4.0' +- gem 'letter_opener_web', '~> 1.4.1' - - # Better errors handler - gem 'better_errors', '~> 2.9.0' @@ -53,7 +44,7 @@ - gem 'bullet', '~> 6.1.3' - gem 'pry-byebug' - gem 'pry-rails', '~> 0.3.9' -- gem 'pry-shell', '~> 0.4.0' +- gem 'pry-shell', '~> 0.5.0' - - gem 'awesome_print', require: false - @@ -122,7 +113,7 @@ - gem 'webmock', '~> 3.9.1' - gem 'rails-controller-testing' - gem 'concurrent-ruby', '~> 1.1' -- gem 'test-prof', '~> 0.12.0' +- gem 'test-prof', '~> 1.0.7' - gem 'rspec_junit_formatter' - gem 'guard-rspec' - @@ -133,7 +124,7 @@ gem 'octokit', '~> 4.15' # https://gitlab.com/gitlab-org/gitlab/issues/207207 -@@ -479,7 +382,7 @@ gem 'gitaly', '~> 14.3.0.pre.rc1' +@@ -479,7 +382,7 @@ gem 'gitaly', '~> 14.3.0.pre.rc2' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index 6c9974f4a7df..943d15234fb2 100644 --- a/www/gitlab-ce/files/patch-config_gitlab.yml.example +++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example @@ -1,4 +1,4 @@ ---- config/gitlab.yml.example.orig 2021-10-01 16:06:26 UTC +--- config/gitlab.yml.example.orig 2021-10-21 22:00:37 UTC +++ config/gitlab.yml.example @@ -1128,14 +1128,14 @@ production: &base # real path not the symlink. @@ -50,7 +50,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1220,13 +1220,13 @@ production: &base +@@ -1223,13 +1223,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -66,7 +66,7 @@ ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1453,13 +1453,13 @@ test: +@@ -1459,13 +1459,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: diff --git a/www/gitlab-ce/files/patch-config_redis.cache.yml.example b/www/gitlab-ce/files/patch-config_redis.cache.yml.example deleted file mode 100644 index 6b4ab859e73a..000000000000 --- a/www/gitlab-ce/files/patch-config_redis.cache.yml.example +++ /dev/null @@ -1,11 +0,0 @@ ---- config/redis.cache.yml.example.orig 2020-05-23 10:51:33 UTC -+++ config/redis.cache.yml.example -@@ -18,7 +18,7 @@ test: - # url: redis://localhost:6380 - production: - # Redis (single instance) -- url: unix:/var/run/redis/redis.cache.sock -+ url: unix:/var/run/redis/redis.sock - ## - # Redis + Sentinel (for HA) - # diff --git a/www/gitlab-ce/files/patch-config_redis.queues.yml.example b/www/gitlab-ce/files/patch-config_redis.queues.yml.example deleted file mode 100644 index 1d760f26bde3..000000000000 --- a/www/gitlab-ce/files/patch-config_redis.queues.yml.example +++ /dev/null @@ -1,11 +0,0 @@ ---- config/redis.queues.yml.example.orig 2020-05-23 10:52:06 UTC -+++ config/redis.queues.yml.example -@@ -18,7 +18,7 @@ test: - # url: redis://localhost:6381 - production: - # Redis (single instance) -- url: unix:/var/run/redis/redis.queues.sock -+ url: unix:/var/run/redis/redis.sock - ## - # Redis + Sentinel (for HA) - # diff --git a/www/gitlab-ce/files/patch-config_redis.shared__state.yml.example b/www/gitlab-ce/files/patch-config_redis.shared__state.yml.example deleted file mode 100644 index 1e7e1b9e5a11..000000000000 --- a/www/gitlab-ce/files/patch-config_redis.shared__state.yml.example +++ /dev/null @@ -1,11 +0,0 @@ ---- config/redis.shared_state.yml.example.orig 2020-05-23 10:48:31 UTC -+++ config/redis.shared_state.yml.example -@@ -18,7 +18,7 @@ test: - # url: redis://localhost:6382 - production: - # Redis (single instance) -- url: unix:/var/run/redis/redis.shared_state.sock -+ url: unix:/var/run/redis/redis.sock - ## - # Redis + Sentinel (for HA) - # diff --git a/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_structured__logger.rb b/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_structured__logger.rb new file mode 100644 index 000000000000..46586cc70edf --- /dev/null +++ b/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_structured__logger.rb @@ -0,0 +1,10 @@ +--- lib/gitlab/sidekiq_logging/structured_logger.rb.orig 2021-10-26 19:13:52 UTC ++++ lib/gitlab/sidekiq_logging/structured_logger.rb +@@ -2,6 +2,7 @@ + + require 'active_record' + require 'active_record/log_subscriber' ++require 'sidekiq/job_logger' + + module Gitlab + module SidekiqLogging diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message index b245648b6653..6fa2671da9c8 100644 --- a/www/gitlab-ce/pkg-message +++ b/www/gitlab-ce/pkg-message @@ -6,7 +6,7 @@ Gitlab was installed successfully. You now need to set up the various components of Gitlab, so please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/14.3-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/14.4-freebsd.md EOM type: install } @@ -20,7 +20,7 @@ EOM If you just installed an major upgrade of GitLab, for example you switched from 12.6.x to 12.7.x, please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/14.2-14.3-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/14.3-14.4-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at: From nobody Wed Oct 27 14:36: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 1D95018288E8; Wed, 27 Oct 2021 14:36: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 4HfWTH0D57z4kbd; Wed, 27 Oct 2021 14:36: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 DCE4B11DDF; Wed, 27 Oct 2021 14:36: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 19REa24a016560; Wed, 27 Oct 2021 14:36:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19REa2Pd016559; Wed, 27 Oct 2021 14:36:02 GMT (envelope-from git) Date: Wed, 27 Oct 2021 14:36:02 GMT Message-Id: <202110271436.19REa2Pd016559@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: de3740db2588 - 2021Q4 - graphics/librsvg2-rust: unbreak fetch due to repo growth 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: de3740db25888a3255b3c9c240107721939cabe6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=de3740db25888a3255b3c9c240107721939cabe6 commit de3740db25888a3255b3c9c240107721939cabe6 Author: Jan Beich AuthorDate: 2021-10-27 14:33:23 +0000 Commit: Jan Beich CommitDate: 2021-10-27 14:35:54 +0000 graphics/librsvg2-rust: unbreak fetch due to repo growth => Fetched file size mismatch (expected 10895, actual 10911) -index 53bbd00b..93d3b4f7 100644 +index 53bbd00bb..93d3b4f79 100644 -index 9d328923..476a6f77 100644 +index 9d3289230..476a6f776 100644 -index 93d3b4f7..58953e6a 100644 +index 93d3b4f79..58953e6a0 100644 -index 476a6f77..9fa9a2e1 100644 +index 476a6f776..9fa9a2e15 100644 -index 58953e6a..3f915cd0 100644 +index 58953e6a0..3f915cd01 100644 -index 9fa9a2e1..34dfc992 100644 +index 9fa9a2e15..34dfc992e 100644 -index 3f915cd0..4f751ece 100644 +index 3f915cd01..4f751ece4 100644 -index 34dfc992..20cd0f40 100644 +index 34dfc992e..20cd0f40b 100644 PR: 259471 (cherry picked from commit 26bd69ec208f129f6fe16c9d0bc778dd7ef64122) --- graphics/librsvg2-rust/distinfo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graphics/librsvg2-rust/distinfo b/graphics/librsvg2-rust/distinfo index 8bcbb85704c0..707b63e3ec20 100644 --- a/graphics/librsvg2-rust/distinfo +++ b/graphics/librsvg2-rust/distinfo @@ -1,5 +1,5 @@ TIMESTAMP = 1633082129 SHA256 (gnome2/librsvg-2.52.0.tar.xz) = bd821fb3e16494b61f5185addd23b726b064f203122b3ab4b3d5d7a44e6bf393 SIZE (gnome2/librsvg-2.52.0.tar.xz) = 23196792 -SHA256 (gnome2/92df18a3faf80c1d6d35899d9a5d22c74adfb8f8.patch) = 0fcdd9f890b93e0128bd2fd948ffbffdaa7fe888ba4ce066e14e4cc50d5444f4 -SIZE (gnome2/92df18a3faf80c1d6d35899d9a5d22c74adfb8f8.patch) = 10895 +SHA256 (gnome2/92df18a3faf80c1d6d35899d9a5d22c74adfb8f8.patch) = cc41edd9a3b7f201fdb216be43e2539fc12c4c15c43867377b9e93d0d03f5ea1 +SIZE (gnome2/92df18a3faf80c1d6d35899d9a5d22c74adfb8f8.patch) = 10911 From nobody Wed Oct 27 14:50:34 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 66446182F7B4; Wed, 27 Oct 2021 14:50:34 +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 4HfWp22QHBz4pRc; Wed, 27 Oct 2021 14:50:34 +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 3448E12066; Wed, 27 Oct 2021 14:50:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19REoY0n039000; Wed, 27 Oct 2021 14:50:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19REoYoD038999; Wed, 27 Oct 2021 14:50:34 GMT (envelope-from git) Date: Wed, 27 Oct 2021 14:50:34 GMT Message-Id: <202110271450.19REoYoD038999@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: 6a25fe1ffc96 - 2021Q4 - multimedia/assimp: Fix build on 32 bit platforms 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: 6a25fe1ffc96b5ea79c1fef1bc0bee6ff8453069 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a25fe1ffc96b5ea79c1fef1bc0bee6ff8453069 commit 6a25fe1ffc96b5ea79c1fef1bc0bee6ff8453069 Author: Robert Clausecker AuthorDate: 2021-10-27 14:42:01 +0000 Commit: Yuri Victorovich CommitDate: 2021-10-27 14:48:35 +0000 multimedia/assimp: Fix build on 32 bit platforms PR: 259483 (cherry picked from commit c1f6d03bf9305cd02ab733359989fd33c6675231) --- multimedia/assimp/Makefile | 4 +- multimedia/assimp/files/patch-contrib-zip | 1729 +++++++++++++++++++++++++++++ 2 files changed, 1730 insertions(+), 3 deletions(-) diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile index 4d42a7b1c32c..6722cb3d1786 100644 --- a/multimedia/assimp/Makefile +++ b/multimedia/assimp/Makefile @@ -1,6 +1,7 @@ PORTNAME= assimp DISTVERSIONPREFIX= v DISTVERSION= 5.0.1 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org @@ -9,9 +10,6 @@ COMMENT= Library to import various 3D model formats in a uniform manner LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_i386= typedef redefinition with different types, see https://github.com/assimp/assimp/issues/2954 -BROKEN_powerpc= typedef redefinition with different types, see https://github.com/assimp/assimp/issues/2954 - LIB_DEPENDS= libminizip.so:archivers/minizip USES= cmake compiler:c++11-lib localbase:ldflags pkgconfig diff --git a/multimedia/assimp/files/patch-contrib-zip b/multimedia/assimp/files/patch-contrib-zip new file mode 100644 index 000000000000..a1d0dd899da6 --- /dev/null +++ b/multimedia/assimp/files/patch-contrib-zip @@ -0,0 +1,1729 @@ +Update contrib/zip to 0.1.18 to fix a build failure on 32 bit platforms. +This patch is a combination of two upstream patches [1][2] slightly +edited to fit FreeBSD conventions and to skip files not shipped in the +distribution. See upstream issue 2954 [3] for details. + +[1]: https://github.com/assimp/assimp/commit/f78446b14aff46db2ef27d062a275b6a01fd68b1.diff +[2]: https://github.com/assimp/assimp/commit/f78446b14aff46db2ef27d062a275b6a01fd68b1.diff +[3]: https://github.com/assimp/assimp/issues/2954 + +diff -u contrib/zip/CMakeLists.txt contrib/zip/CMakeLists.txt +--- contrib/zip/CMakeLists.txt ++++ contrib/zip/CMakeLists.txt +@@ -1,10 +1,14 @@ +-cmake_minimum_required(VERSION 2.8) +-project(zip) +-enable_language(C) ++cmake_minimum_required(VERSION 3.0) ++ ++project(zip ++ LANGUAGES C ++ VERSION "0.1.18") + set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) + ++option(CMAKE_DISABLE_TESTING "Disable test creation" OFF) ++ + if (MSVC) +- # Use secure functions by defaualt and suppress warnings about "deprecated" functions ++ # Use secure functions by default and suppress warnings about "deprecated" functions + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_NONSTDC_NO_WARNINGS=1 /D _CRT_SECURE_NO_WARNINGS=1") +@@ -17,23 +21,71 @@ + # zip + set(SRC src/miniz.h src/zip.h src/zip.c) + add_library(${PROJECT_NAME} ${SRC}) +-target_include_directories(${PROJECT_NAME} INTERFACE src) ++target_include_directories(${PROJECT_NAME} PUBLIC ++ $ ++ $ ++) + + # test + if (NOT CMAKE_DISABLE_TESTING) + enable_testing() + add_subdirectory(test) + find_package(Sanitizers) +- add_sanitizers(${PROJECT_NAME} test.exe) +- add_sanitizers(${PROJECT_NAME} test_miniz.exe) ++ add_sanitizers(${PROJECT_NAME} ${test_out}) + endif() + ++#### ++# Installation (https://github.com/forexample/package-example) { ++ ++set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") ++set(INCLUDE_INSTALL_DIR "include") ++ ++set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") ++ ++# Configuration ++set(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}ConfigVersion.cmake") ++set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}Config.cmake") ++set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") ++set(NAMESPACE "${PROJECT_NAME}::") ++ ++# Include module with fuction 'write_basic_package_version_file' ++include(CMakePackageConfigHelpers) ++ ++# Note: PROJECT_VERSION is used as a VERSION ++write_basic_package_version_file( ++ "${VERSION_CONFIG}" COMPATIBILITY SameMajorVersion ++) ++ ++# Use variables: ++# * TARGETS_EXPORT_NAME ++# * PROJECT_NAME ++configure_package_config_file( ++ "cmake/Config.cmake.in" ++ "${PROJECT_CONFIG}" ++ INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}" ++) ++ ++install( ++ FILES "${PROJECT_CONFIG}" "${VERSION_CONFIG}" ++ DESTINATION "${CONFIG_INSTALL_DIR}" ++) ++ ++install( ++ EXPORT "${TARGETS_EXPORT_NAME}" ++ NAMESPACE "${NAMESPACE}" ++ DESTINATION "${CONFIG_INSTALL_DIR}" ++) ++ ++# } ++ + install(TARGETS ${PROJECT_NAME} ++ EXPORT ${TARGETS_EXPORT_NAME} + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +- COMPONENT library) +-install(FILES ${PROJECT_SOURCE_DIR}/src/zip.h DESTINATION include) ++ INCLUDES DESTINATION ${INCLUDE_INSTALL_DIR} ++) ++install(FILES ${PROJECT_SOURCE_DIR}/src/zip.h DESTINATION ${INCLUDE_INSTALL_DIR}/zip) + + # uninstall target (https://gitlab.kitware.com/cmake/community/wikis/FAQ#can-i-do-make-uninstall-with-cmake) + if(NOT TARGET uninstall) +@@ -46,2 +98,11 @@ + COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake) ++endif() ++ ++find_package(Doxygen) ++if(DOXYGEN_FOUND) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) ++ add_custom_target(doc ++ ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile ++ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ++ COMMENT "Generating API documentation with Doxygen" VERBATIM) + endif() +diff -u contrib/zip/README.md contrib/zip/README.md +--- contrib/zip/README.md ++++ contrib/zip/README.md +@@ -1,10 +1,8 @@ + ### A portable (OSX/Linux/Windows), simple zip library written in C + This is done by hacking awesome [miniz](https://code.google.com/p/miniz) library and layering functions on top of the miniz v1.15 API. + +-[![Windows](https://ci.appveyor.com/api/projects/status/bph8dr3jacgmjv32/branch/master?svg=true&label=windows)](https://ci.appveyor.com/project/kuba--/zip) +-[![Linux](https://travis-ci.org/kuba--/zip.svg?branch=master&label=linux%2fosx)](https://travis-ci.org/kuba--/zip) ++[![Build](https://github.com/kuba--/zip/workflows/build/badge.svg)](https://github.com/kuba--/zip/actions?query=workflow%3Abuild) + [![Version](https://badge.fury.io/gh/kuba--%2Fzip.svg)](https://github.com/kuba--/zip/releases) +-[![Codecov](https://codecov.io/gh/kuba--/zip/branch/master/graph/badge.svg)](https://codecov.io/gh/kuba--/zip) + + + # The Idea +@@ -71,7 +69,7 @@ + zip_extract("foo.zip", "/tmp", on_extract_entry, &arg); + ``` + +-* Extract a zip entry into memory. ++* Extract a zip entry into memory. + ```c + void *buf = NULL; + size_t bufsize; +@@ -89,7 +87,7 @@ + free(buf); + ``` + +-* Extract a zip entry into memory (no internal allocation). ++* Extract a zip entry into memory (no internal allocation). + ```c + unsigned char *buf; + size_t bufsize; +@@ -110,7 +108,7 @@ + free(buf); + ``` + +-* Extract a zip entry into memory using callback. ++* Extract a zip entry into memory using callback. + ```c + struct buffer_t { + char *data; +@@ -144,7 +142,7 @@ + ``` + + +-* Extract a zip entry into a file. ++* Extract a zip entry into a file. + ```c + struct zip_t *zip = zip_open("foo.zip", 0, 'r'); + { +@@ -157,7 +155,7 @@ + zip_close(zip); + ``` + +-* List of all zip entries ++* List of all zip entries + ```c + struct zip_t *zip = zip_open("foo.zip", 0, 'r'); + int i, n = zip_total_entries(zip); +@@ -174,7 +172,7 @@ + zip_close(zip); + ``` + +-## Bindings ++# Bindings + Compile zip library as a dynamic library. + ```shell + $ mkdir build +@@ -213,3 +211,50 @@ ++} ++``` ++ ++### Rust (ffi) ++```rust ++extern crate libc; ++use std::ffi::CString; ++ ++#[repr(C)] ++pub struct Zip { ++ _private: [u8; 0], ++} ++ ++#[link(name = "zip")] ++extern "C" { ++ fn zip_open(path: *const libc::c_char, level: libc::c_int, mode: libc::c_char) -> *mut Zip; ++ fn zip_close(zip: *mut Zip) -> libc::c_void; ++ ++ fn zip_entry_open(zip: *mut Zip, entryname: *const libc::c_char) -> libc::c_int; ++ fn zip_entry_close(zip: *mut Zip) -> libc::c_int; ++ fn zip_entry_write( ++ zip: *mut Zip, ++ buf: *const libc::c_void, ++ bufsize: libc::size_t, ++ ) -> libc::c_int; ++} ++ ++fn main() { ++ let path = CString::new("/tmp/test.zip").unwrap(); ++ let mode: libc::c_char = 'w' as libc::c_char; ++ ++ let entryname = CString::new("test.txt").unwrap(); ++ let content = "test content\0"; ++ ++ unsafe { ++ let zip: *mut Zip = zip_open(path.as_ptr(), 5, mode); ++ { ++ zip_entry_open(zip, entryname.as_ptr()); ++ { ++ let buf = content.as_ptr() as *const libc::c_void; ++ let bufsize = content.len() as libc::size_t; ++ zip_entry_write(zip, buf, bufsize); ++ } ++ zip_entry_close(zip); ++ } ++ zip_close(zip); ++ } + } + ``` + +unchanged: +--- contrib/zip/src/miniz.h ++++ contrib/zip/src/miniz.h +@@ -221,6 +221,7 @@ + #ifndef MINIZ_HEADER_INCLUDED + #define MINIZ_HEADER_INCLUDED + ++#include + #include + + // Defines to completely disable specific portions of miniz.c: +@@ -284,7 +285,8 @@ + /* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES only if not set */ + #if !defined(MINIZ_USE_UNALIGNED_LOADS_AND_STORES) + #if MINIZ_X86_OR_X64_CPU +-/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient integer loads and stores from unaligned addresses. */ ++/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient ++ * integer loads and stores from unaligned addresses. */ + #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1 + #define MINIZ_UNALIGNED_USE_MEMCPY + #else +@@ -354,6 +356,44 @@ enum { + MZ_FIXED = 4 + }; + ++/* miniz error codes. Be sure to update mz_zip_get_error_string() if you add or ++ * modify this enum. */ ++typedef enum { ++ MZ_ZIP_NO_ERROR = 0, ++ MZ_ZIP_UNDEFINED_ERROR, ++ MZ_ZIP_TOO_MANY_FILES, ++ MZ_ZIP_FILE_TOO_LARGE, ++ MZ_ZIP_UNSUPPORTED_METHOD, ++ MZ_ZIP_UNSUPPORTED_ENCRYPTION, ++ MZ_ZIP_UNSUPPORTED_FEATURE, ++ MZ_ZIP_FAILED_FINDING_CENTRAL_DIR, ++ MZ_ZIP_NOT_AN_ARCHIVE, ++ MZ_ZIP_INVALID_HEADER_OR_CORRUPTED, ++ MZ_ZIP_UNSUPPORTED_MULTIDISK, ++ MZ_ZIP_DECOMPRESSION_FAILED, ++ MZ_ZIP_COMPRESSION_FAILED, ++ MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE, ++ MZ_ZIP_CRC_CHECK_FAILED, ++ MZ_ZIP_UNSUPPORTED_CDIR_SIZE, ++ MZ_ZIP_ALLOC_FAILED, ++ MZ_ZIP_FILE_OPEN_FAILED, ++ MZ_ZIP_FILE_CREATE_FAILED, ++ MZ_ZIP_FILE_WRITE_FAILED, ++ MZ_ZIP_FILE_READ_FAILED, ++ MZ_ZIP_FILE_CLOSE_FAILED, ++ MZ_ZIP_FILE_SEEK_FAILED, ++ MZ_ZIP_FILE_STAT_FAILED, ++ MZ_ZIP_INVALID_PARAMETER, ++ MZ_ZIP_INVALID_FILENAME, ++ MZ_ZIP_BUF_TOO_SMALL, ++ MZ_ZIP_INTERNAL_ERROR, ++ MZ_ZIP_FILE_NOT_FOUND, ++ MZ_ZIP_ARCHIVE_TOO_LARGE, ++ MZ_ZIP_VALIDATION_FAILED, ++ MZ_ZIP_WRITE_CALLBACK_FAILED, ++ MZ_ZIP_TOTAL_ERRORS ++} mz_zip_error; ++ + // Method + #define MZ_DEFLATED 8 + +@@ -696,6 +736,7 @@ typedef size_t (*mz_file_read_func)(void *pOpaque, mz_uint64 file_ofs, + void *pBuf, size_t n); + typedef size_t (*mz_file_write_func)(void *pOpaque, mz_uint64 file_ofs, + const void *pBuf, size_t n); ++typedef mz_bool (*mz_file_needs_keepalive)(void *pOpaque); + + struct mz_zip_internal_state_tag; + typedef struct mz_zip_internal_state_tag mz_zip_internal_state; +@@ -707,13 +748,27 @@ typedef enum { + MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED = 3 + } mz_zip_mode; + +-typedef struct mz_zip_archive_tag { ++typedef enum { ++ MZ_ZIP_TYPE_INVALID = 0, ++ MZ_ZIP_TYPE_USER, ++ MZ_ZIP_TYPE_MEMORY, ++ MZ_ZIP_TYPE_HEAP, ++ MZ_ZIP_TYPE_FILE, ++ MZ_ZIP_TYPE_CFILE, ++ MZ_ZIP_TOTAL_TYPES ++} mz_zip_type; ++ ++typedef struct { + mz_uint64 m_archive_size; + mz_uint64 m_central_directory_file_ofs; +- mz_uint m_total_files; ++ ++ /* We only support up to UINT32_MAX files in zip64 mode. */ ++ mz_uint32 m_total_files; + mz_zip_mode m_zip_mode; ++ mz_zip_type m_zip_type; ++ mz_zip_error m_last_error; + +- mz_uint m_file_offset_alignment; ++ mz_uint64 m_file_offset_alignment; + + mz_alloc_func m_pAlloc; + mz_free_func m_pFree; +@@ -722,6 +777,7 @@ typedef struct mz_zip_archive_tag { + + mz_file_read_func m_pRead; + mz_file_write_func m_pWrite; ++ mz_file_needs_keepalive m_pNeeds_keepalive; + void *m_pIO_opaque; + + mz_zip_internal_state *m_pState; +@@ -1263,6 +1319,9 @@ mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, + int strategy); + #endif // #ifndef MINIZ_NO_ZLIB_APIS + ++#define MZ_UINT16_MAX (0xFFFFU) ++#define MZ_UINT32_MAX (0xFFFFFFFFU) ++ + #ifdef __cplusplus + } + #endif +@@ -1311,6 +1370,11 @@ typedef unsigned char mz_validate_uint64[sizeof(mz_uint64) == 8 ? 1 : -1]; + ((mz_uint32)(((const mz_uint8 *)(p))[3]) << 24U)) + #endif + ++#define MZ_READ_LE64(p) \ ++ (((mz_uint64)MZ_READ_LE32(p)) | \ ++ (((mz_uint64)MZ_READ_LE32((const mz_uint8 *)(p) + sizeof(mz_uint32))) \ ++ << 32U)) ++ + #ifdef _MSC_VER + #define MZ_FORCEINLINE __forceinline + #elif defined(__GNUC__) +@@ -4160,6 +4224,17 @@ enum { + MZ_ZIP_LOCAL_DIR_HEADER_SIZE = 30, + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE = 46, + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE = 22, ++ ++ /* ZIP64 archive identifier and record sizes */ ++ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG = 0x06064b50, ++ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG = 0x07064b50, ++ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE = 56, ++ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE = 20, ++ MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID = 0x0001, ++ MZ_ZIP_DATA_DESCRIPTOR_ID = 0x08074b50, ++ MZ_ZIP_DATA_DESCRIPTER_SIZE64 = 24, ++ MZ_ZIP_DATA_DESCRIPTER_SIZE32 = 16, ++ + // Central directory header record offsets + MZ_ZIP_CDH_SIG_OFS = 0, + MZ_ZIP_CDH_VERSION_MADE_BY_OFS = 4, +@@ -4199,6 +4274,31 @@ enum { + MZ_ZIP_ECDH_CDIR_SIZE_OFS = 12, + MZ_ZIP_ECDH_CDIR_OFS_OFS = 16, + MZ_ZIP_ECDH_COMMENT_SIZE_OFS = 20, ++ ++ /* ZIP64 End of central directory locator offsets */ ++ MZ_ZIP64_ECDL_SIG_OFS = 0, /* 4 bytes */ ++ MZ_ZIP64_ECDL_NUM_DISK_CDIR_OFS = 4, /* 4 bytes */ ++ MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS = 8, /* 8 bytes */ ++ MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS = 16, /* 4 bytes */ ++ ++ /* ZIP64 End of central directory header offsets */ ++ MZ_ZIP64_ECDH_SIG_OFS = 0, /* 4 bytes */ ++ MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS = 4, /* 8 bytes */ ++ MZ_ZIP64_ECDH_VERSION_MADE_BY_OFS = 12, /* 2 bytes */ ++ MZ_ZIP64_ECDH_VERSION_NEEDED_OFS = 14, /* 2 bytes */ ++ MZ_ZIP64_ECDH_NUM_THIS_DISK_OFS = 16, /* 4 bytes */ ++ MZ_ZIP64_ECDH_NUM_DISK_CDIR_OFS = 20, /* 4 bytes */ ++ MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS = 24, /* 8 bytes */ ++ MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS = 32, /* 8 bytes */ ++ MZ_ZIP64_ECDH_CDIR_SIZE_OFS = 40, /* 8 bytes */ ++ MZ_ZIP64_ECDH_CDIR_OFS_OFS = 48, /* 8 bytes */ ++ MZ_ZIP_VERSION_MADE_BY_DOS_FILESYSTEM_ID = 0, ++ MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG = 0x10, ++ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED = 1, ++ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG = 32, ++ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION = 64, ++ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_LOCAL_DIR_IS_MASKED = 8192, ++ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8 = 1 << 11 + }; + + typedef struct { +@@ -4211,7 +4311,24 @@ struct mz_zip_internal_state_tag { + mz_zip_array m_central_dir; + mz_zip_array m_central_dir_offsets; + mz_zip_array m_sorted_central_dir_offsets; ++ ++ /* The flags passed in when the archive is initially opened. */ ++ uint32_t m_init_flags; ++ ++ /* MZ_TRUE if the archive has a zip64 end of central directory headers, etc. ++ */ ++ mz_bool m_zip64; ++ ++ /* MZ_TRUE if we found zip64 extended info in the central directory (m_zip64 ++ * will also be slammed to true too, even if we didn't find a zip64 end of ++ * central dir header, etc.) */ ++ mz_bool m_zip64_has_extended_info_fields; ++ ++ /* These fields are used by the file, FILE, memory, and memory/heap read/write ++ * helpers. */ + MZ_FILE *m_pFile; ++ mz_uint64 m_file_archive_start_ofs; ++ + void *m_pMem; + size_t m_mem_size; + size_t m_mem_capacity; +@@ -4363,6 +4480,13 @@ static mz_bool mz_zip_set_file_times(const char *pFilename, time_t access_time, + #endif /* #ifndef MINIZ_NO_STDIO */ + #endif /* #ifndef MINIZ_NO_TIME */ + ++static MZ_FORCEINLINE mz_bool mz_zip_set_error(mz_zip_archive *pZip, ++ mz_zip_error err_num) { ++ if (pZip) ++ pZip->m_last_error = err_num; ++ return MZ_FALSE; ++} ++ + static mz_bool mz_zip_reader_init_internal(mz_zip_archive *pZip, + mz_uint32 flags) { + (void)flags; +@@ -4480,127 +4604,346 @@ mz_zip_reader_sort_central_dir_offsets_by_filename(mz_zip_archive *pZip) { + } + } + +-static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip, +- mz_uint32 flags) { +- mz_uint cdir_size, num_this_disk, cdir_disk_index; +- mz_uint64 cdir_ofs; ++static mz_bool mz_zip_reader_locate_header_sig(mz_zip_archive *pZip, ++ mz_uint32 record_sig, ++ mz_uint32 record_size, ++ mz_int64 *pOfs) { + mz_int64 cur_file_ofs; +- const mz_uint8 *p; + mz_uint32 buf_u32[4096 / sizeof(mz_uint32)]; + mz_uint8 *pBuf = (mz_uint8 *)buf_u32; +- mz_bool sort_central_dir = +- ((flags & MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0); +- // Basic sanity checks - reject files which are too small, and check the first +- // 4 bytes of the file to make sure a local header is there. +- if (pZip->m_archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) ++ ++ /* Basic sanity checks - reject files which are too small */ ++ if (pZip->m_archive_size < record_size) + return MZ_FALSE; +- // Find the end of central directory record by scanning the file from the end +- // towards the beginning. ++ ++ /* Find the record by scanning the file from the end towards the beginning. */ + cur_file_ofs = + MZ_MAX((mz_int64)pZip->m_archive_size - (mz_int64)sizeof(buf_u32), 0); + for (;;) { + int i, + n = (int)MZ_MIN(sizeof(buf_u32), pZip->m_archive_size - cur_file_ofs); ++ + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, n) != (mz_uint)n) + return MZ_FALSE; +- for (i = n - 4; i >= 0; --i) +- if (MZ_READ_LE32(pBuf + i) == MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG) +- break; ++ ++ for (i = n - 4; i >= 0; --i) { ++ mz_uint s = MZ_READ_LE32(pBuf + i); ++ if (s == record_sig) { ++ if ((pZip->m_archive_size - (cur_file_ofs + i)) >= record_size) ++ break; ++ } ++ } ++ + if (i >= 0) { + cur_file_ofs += i; + break; + } ++ ++ /* Give up if we've searched the entire file, or we've gone back "too far" ++ * (~64kb) */ + if ((!cur_file_ofs) || ((pZip->m_archive_size - cur_file_ofs) >= +- (0xFFFF + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE))) ++ (MZ_UINT16_MAX + record_size))) + return MZ_FALSE; ++ + cur_file_ofs = MZ_MAX(cur_file_ofs - (sizeof(buf_u32) - 3), 0); + } +- // Read and verify the end of central directory record. ++ ++ *pOfs = cur_file_ofs; ++ return MZ_TRUE; ++} ++ ++static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip, ++ mz_uint flags) { ++ mz_uint cdir_size = 0, cdir_entries_on_this_disk = 0, num_this_disk = 0, ++ cdir_disk_index = 0; ++ mz_uint64 cdir_ofs = 0; ++ mz_int64 cur_file_ofs = 0; ++ const mz_uint8 *p; ++ ++ mz_uint32 buf_u32[4096 / sizeof(mz_uint32)]; ++ mz_uint8 *pBuf = (mz_uint8 *)buf_u32; ++ mz_bool sort_central_dir = ++ ((flags & MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0); ++ mz_uint32 zip64_end_of_central_dir_locator_u32 ++ [(MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE + sizeof(mz_uint32) - 1) / ++ sizeof(mz_uint32)]; ++ mz_uint8 *pZip64_locator = (mz_uint8 *)zip64_end_of_central_dir_locator_u32; ++ ++ mz_uint32 zip64_end_of_central_dir_header_u32 ++ [(MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / ++ sizeof(mz_uint32)]; ++ mz_uint8 *pZip64_end_of_central_dir = ++ (mz_uint8 *)zip64_end_of_central_dir_header_u32; ++ ++ mz_uint64 zip64_end_of_central_dir_ofs = 0; ++ ++ /* Basic sanity checks - reject files which are too small, and check the first ++ * 4 bytes of the file to make sure a local header is there. */ ++ if (pZip->m_archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) ++ return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); ++ ++ if (!mz_zip_reader_locate_header_sig( ++ pZip, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG, ++ MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE, &cur_file_ofs)) ++ return mz_zip_set_error(pZip, MZ_ZIP_FAILED_FINDING_CENTRAL_DIR); ++ ++ /* Read and verify the end of central directory record. */ + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) != + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) +- return MZ_FALSE; +- if ((MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_SIG_OFS) != +- MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG) || +- ((pZip->m_total_files = +- MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS)) != +- MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS))) +- return MZ_FALSE; ++ return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); ++ ++ if (MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_SIG_OFS) != ++ MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG) ++ return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); ++ ++ if (cur_file_ofs >= (MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE + ++ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)) { ++ if (pZip->m_pRead(pZip->m_pIO_opaque, ++ cur_file_ofs - MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE, ++ pZip64_locator, ++ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) == ++ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) { ++ if (MZ_READ_LE32(pZip64_locator + MZ_ZIP64_ECDL_SIG_OFS) == ++ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG) { ++ zip64_end_of_central_dir_ofs = MZ_READ_LE64( ++ pZip64_locator + MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS); ++ if (zip64_end_of_central_dir_ofs > ++ (pZip->m_archive_size - MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)) ++ return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); ++ ++ if (pZip->m_pRead(pZip->m_pIO_opaque, zip64_end_of_central_dir_ofs, ++ pZip64_end_of_central_dir, ++ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) == ++ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) { ++ if (MZ_READ_LE32(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_SIG_OFS) == ++ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG) { ++ pZip->m_pState->m_zip64 = MZ_TRUE; ++ } ++ } ++ } ++ } ++ } + ++ pZip->m_total_files = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS); ++ cdir_entries_on_this_disk = ++ MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS); + num_this_disk = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_NUM_THIS_DISK_OFS); + cdir_disk_index = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_NUM_DISK_CDIR_OFS); ++ cdir_size = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_SIZE_OFS); ++ cdir_ofs = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_OFS_OFS); ++ ++ if (pZip->m_pState->m_zip64) { ++ mz_uint32 zip64_total_num_of_disks = ++ MZ_READ_LE32(pZip64_locator + MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS); ++ mz_uint64 zip64_cdir_total_entries = MZ_READ_LE64( ++ pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS); ++ mz_uint64 zip64_cdir_total_entries_on_this_disk = MZ_READ_LE64( ++ pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS); ++ mz_uint64 zip64_size_of_end_of_central_dir_record = MZ_READ_LE64( ++ pZip64_end_of_central_dir + MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS); ++ mz_uint64 zip64_size_of_central_directory = ++ MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_SIZE_OFS); ++ ++ if (zip64_size_of_end_of_central_dir_record < ++ (MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE - 12)) ++ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); ++ ++ if (zip64_total_num_of_disks != 1U) ++ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); ++ ++ /* Check for miniz's practical limits */ ++ if (zip64_cdir_total_entries > MZ_UINT32_MAX) ++ return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); ++ ++ pZip->m_total_files = (mz_uint32)zip64_cdir_total_entries; ++ ++ if (zip64_cdir_total_entries_on_this_disk > MZ_UINT32_MAX) ++ return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); ++ ++ cdir_entries_on_this_disk = ++ (mz_uint32)zip64_cdir_total_entries_on_this_disk; ++ ++ /* Check for miniz's current practical limits (sorry, this should be enough ++ * for millions of files) */ ++ if (zip64_size_of_central_directory > MZ_UINT32_MAX) ++ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE); ++ ++ cdir_size = (mz_uint32)zip64_size_of_central_directory; ++ ++ num_this_disk = MZ_READ_LE32(pZip64_end_of_central_dir + ++ MZ_ZIP64_ECDH_NUM_THIS_DISK_OFS); ++ ++ cdir_disk_index = MZ_READ_LE32(pZip64_end_of_central_dir + ++ MZ_ZIP64_ECDH_NUM_DISK_CDIR_OFS); ++ ++ cdir_ofs = ++ MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_OFS_OFS); ++ } ++ ++ if (pZip->m_total_files != cdir_entries_on_this_disk) ++ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); ++ + if (((num_this_disk | cdir_disk_index) != 0) && + ((num_this_disk != 1) || (cdir_disk_index != 1))) +- return MZ_FALSE; ++ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); + +- if ((cdir_size = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_SIZE_OFS)) < +- pZip->m_total_files * MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) +- return MZ_FALSE; ++ if (cdir_size < pZip->m_total_files * MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) ++ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + +- cdir_ofs = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_OFS_OFS); + if ((cdir_ofs + (mz_uint64)cdir_size) > pZip->m_archive_size) +- return MZ_FALSE; ++ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + pZip->m_central_directory_file_ofs = cdir_ofs; + + if (pZip->m_total_files) { + mz_uint i, n; +- +- // Read the entire central directory into a heap block, and allocate another +- // heap block to hold the unsorted central dir file record offsets, and +- // another to hold the sorted indices. ++ /* Read the entire central directory into a heap block, and allocate another ++ * heap block to hold the unsorted central dir file record offsets, and ++ * possibly another to hold the sorted indices. */ + if ((!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir, cdir_size, + MZ_FALSE)) || + (!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir_offsets, + pZip->m_total_files, MZ_FALSE))) +- return MZ_FALSE; ++ return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + if (sort_central_dir) { + if (!mz_zip_array_resize(pZip, + &pZip->m_pState->m_sorted_central_dir_offsets, + pZip->m_total_files, MZ_FALSE)) +- return MZ_FALSE; ++ return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + if (pZip->m_pRead(pZip->m_pIO_opaque, cdir_ofs, + pZip->m_pState->m_central_dir.m_p, + cdir_size) != cdir_size) +- return MZ_FALSE; ++ return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + +- // Now create an index into the central directory file records, do some +- // basic sanity checking on each record, and check for zip64 entries (which +- // are not yet supported). ++ /* Now create an index into the central directory file records, do some ++ * basic sanity checking on each record */ + p = (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p; + for (n = cdir_size, i = 0; i < pZip->m_total_files; ++i) { +- mz_uint total_header_size, comp_size, decomp_size, disk_index; ++ mz_uint total_header_size, disk_index, bit_flags, filename_size, ++ ext_data_size; ++ mz_uint64 comp_size, decomp_size, local_header_ofs; ++ + if ((n < MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) || + (MZ_READ_LE32(p) != MZ_ZIP_CENTRAL_DIR_HEADER_SIG)) +- return MZ_FALSE; ++ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); ++ + MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, + i) = + (mz_uint32)(p - (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p); ++ + if (sort_central_dir) + MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_sorted_central_dir_offsets, + mz_uint32, i) = i; ++ + comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS); + decomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS); +- if (((!MZ_READ_LE32(p + MZ_ZIP_CDH_METHOD_OFS)) && +- (decomp_size != comp_size)) || +- (decomp_size && !comp_size) || (decomp_size == 0xFFFFFFFF) || +- (comp_size == 0xFFFFFFFF)) +- return MZ_FALSE; ++ local_header_ofs = MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS); ++ filename_size = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS); ++ ext_data_size = MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS); ++ ++ if ((!pZip->m_pState->m_zip64_has_extended_info_fields) && ++ (ext_data_size) && ++ (MZ_MAX(MZ_MAX(comp_size, decomp_size), local_header_ofs) == ++ MZ_UINT32_MAX)) { ++ /* Attempt to find zip64 extended information field in the entry's extra ++ * data */ ++ mz_uint32 extra_size_remaining = ext_data_size; ++ ++ if (extra_size_remaining) { ++ const mz_uint8 *pExtra_data; ++ void *buf = NULL; ++ ++ if (MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size + ext_data_size > ++ n) { ++ buf = MZ_MALLOC(ext_data_size); ++ if (buf == NULL) ++ return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); ++ ++ if (pZip->m_pRead(pZip->m_pIO_opaque, ++ cdir_ofs + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + ++ filename_size, ++ buf, ext_data_size) != ext_data_size) { ++ MZ_FREE(buf); ++ return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); ++ } ++ ++ pExtra_data = (mz_uint8 *)buf; ++ } else { ++ pExtra_data = p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size; ++ } ++ ++ do { ++ mz_uint32 field_id; ++ mz_uint32 field_data_size; ++ ++ if (extra_size_remaining < (sizeof(mz_uint16) * 2)) { ++ MZ_FREE(buf); ++ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); ++ } ++ ++ field_id = MZ_READ_LE16(pExtra_data); ++ field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16)); ++ ++ if ((field_data_size + sizeof(mz_uint16) * 2) > ++ extra_size_remaining) { ++ MZ_FREE(buf); ++ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); ++ } ++ ++ if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID) { ++ /* Ok, the archive didn't have any zip64 headers but it uses a ++ * zip64 extended information field so mark it as zip64 anyway ++ * (this can occur with infozip's zip util when it reads ++ * compresses files from stdin). */ ++ pZip->m_pState->m_zip64 = MZ_TRUE; ++ pZip->m_pState->m_zip64_has_extended_info_fields = MZ_TRUE; ++ break; ++ } ++ ++ pExtra_data += sizeof(mz_uint16) * 2 + field_data_size; ++ extra_size_remaining = ++ extra_size_remaining - sizeof(mz_uint16) * 2 - field_data_size; ++ } while (extra_size_remaining); ++ ++ MZ_FREE(buf); ++ } ++ } ++ ++ /* I've seen archives that aren't marked as zip64 that uses zip64 ext ++ * data, argh */ ++ if ((comp_size != MZ_UINT32_MAX) && (decomp_size != MZ_UINT32_MAX)) { ++ if (((!MZ_READ_LE32(p + MZ_ZIP_CDH_METHOD_OFS)) && ++ (decomp_size != comp_size)) || ++ (decomp_size && !comp_size)) ++ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); ++ } ++ + disk_index = MZ_READ_LE16(p + MZ_ZIP_CDH_DISK_START_OFS); +- if ((disk_index != num_this_disk) && (disk_index != 1)) +- return MZ_FALSE; +- if (((mz_uint64)MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS) + +- MZ_ZIP_LOCAL_DIR_HEADER_SIZE + comp_size) > pZip->m_archive_size) +- return MZ_FALSE; ++ if ((disk_index == MZ_UINT16_MAX) || ++ ((disk_index != num_this_disk) && (disk_index != 1))) ++ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); ++ ++ if (comp_size != MZ_UINT32_MAX) { ++ if (((mz_uint64)MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS) + ++ MZ_ZIP_LOCAL_DIR_HEADER_SIZE + comp_size) > pZip->m_archive_size) ++ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); ++ } ++ ++ bit_flags = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS); ++ if (bit_flags & MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_LOCAL_DIR_IS_MASKED) ++ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION); ++ + if ((total_header_size = MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + + MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS) + + MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS) + + MZ_READ_LE16(p + MZ_ZIP_CDH_COMMENT_LEN_OFS)) > + n) +- return MZ_FALSE; ++ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); ++ + n -= total_header_size; + p += total_header_size; + } +diff -u contrib/zip/src/zip.c contrib/zip/src/zip.c +--- contrib/zip/src/zip.c ++++ contrib/zip/src/zip.c +@@ -24,7 +24,6 @@ + ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) && \ + (P)[1] == ':') + #define FILESYSTEM_PREFIX_LEN(P) (HAS_DEVICE(P) ? 2 : 0) +-#define ISSLASH(C) ((C) == '/' || (C) == '\\') + + #else + +@@ -48,7 +47,7 @@ + #endif + + #ifndef ISSLASH +-#define ISSLASH(C) ((C) == '/') ++#define ISSLASH(C) ((C) == '/' || (C) == '\\') + #endif + + #define CLEANUP(ptr) \ +@@ -78,26 +77,34 @@ + return base; + } + +-static int mkpath(const char *path) { +- char const *p; ++static int mkpath(char *path) { ++ char *p; + char npath[MAX_PATH + 1]; + int len = 0; + int has_device = HAS_DEVICE(path); + + memset(npath, 0, MAX_PATH + 1); +- +-#ifdef _WIN32 +- // only on windows fix the path +- npath[0] = path[0]; +- npath[1] = path[1]; +- len = 2; +-#endif // _WIN32 +- ++ if (has_device) { ++ // only on windows ++ npath[0] = path[0]; ++ npath[1] = path[1]; ++ len = 2; ++ } + for (p = path + len; *p && len < MAX_PATH; p++) { + if (ISSLASH(*p) && ((!has_device && len > 0) || (has_device && len > 2))) { +- if (MKDIR(npath) == -1) +- if (errno != EEXIST) ++#if defined(_WIN32) || defined(__WIN32__) || defined(_MSC_VER) || \ ++ defined(__MINGW32__) ++#else ++ if ('\\' == *p) { ++ *p = '/'; ++ } ++#endif ++ ++ if (MKDIR(npath) == -1) { ++ if (errno != EEXIST) { + return -1; ++ } ++ } + } + npath[len++] = *p; + } +@@ -215,6 +222,20 @@ + } + } + ++int zip_is64(struct zip_t *zip) { ++ if (!zip) { ++ // zip_t handler is not initialized ++ return -1; ++ } *** 789 LINES SKIPPED *** From nobody Wed Oct 27 15:50: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 529CB182056F; Wed, 27 Oct 2021 15:50: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 4HfY6w1rZTz3Nwk; Wed, 27 Oct 2021 15:50: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 202B112FA3; Wed, 27 Oct 2021 15:50: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 19RFoGVH016476; Wed, 27 Oct 2021 15:50:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19RFoGxu016471; Wed, 27 Oct 2021 15:50:16 GMT (envelope-from git) Date: Wed, 27 Oct 2021 15:50:16 GMT Message-Id: <202110271550.19RFoGxu016471@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: 69221920c9fa - 2021Q4 - security/py-fail2ban: Add upstream patch to fix possible RCE vulnerability 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: 69221920c9faeff24c581ac1ee6d89ca4f1bbf11 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=69221920c9faeff24c581ac1ee6d89ca4f1bbf11 commit 69221920c9faeff24c581ac1ee6d89ca4f1bbf11 Author: Yasuhiro Kimura AuthorDate: 2021-10-20 09:42:38 +0000 Commit: Yasuhiro Kimura CommitDate: 2021-10-27 15:49:50 +0000 security/py-fail2ban: Add upstream patch to fix possible RCE vulnerability * Switch to DISTVERSION * Pet portclippy * Reformat Makefile with portfmt PR: 259297 Approved by: maintainer Obtained from: https://github.com/fail2ban/fail2ban/commit/410a6ce5c80dd981c22752da034f2529b5eee844 MFH: 2021Q4 Security: CVE-2021-32749 Security: https://github.com/fail2ban/fail2ban/security/advisories/GHSA-m985-3f3v-cwmm Differential Revision: https://reviews.freebsd.org/D32576 (cherry picked from commit 644e5b65b9503bed420885c9fefc8b3941dd009d) --- security/py-fail2ban/Makefile | 26 ++-- security/py-fail2ban/files/patch-CVE-2021-32749 | 158 ++++++++++++++++++++++++ 2 files changed, 169 insertions(+), 15 deletions(-) diff --git a/security/py-fail2ban/Makefile b/security/py-fail2ban/Makefile index 3d557c22d2cd..28d37d32a73f 100644 --- a/security/py-fail2ban/Makefile +++ b/security/py-fail2ban/Makefile @@ -1,6 +1,6 @@ PORTNAME= fail2ban -PORTVERSION= 0.11.2 -PORTREVISION= 2 +DISTVERSION= 0.11.2 +PORTREVISION= 3 CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,24 +15,22 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} USES= cpe python:3.6+,patch shebangfix USE_GITHUB= yes USE_PYTHON= autoplist distutils +PYDISTUTILS_BUILDARGS+= --without-tests +PYDISTUTILS_INSTALLARGS+= --install-data=${ETCDIR} USE_RC_SUBR= fail2ban -NO_ARCH= yes - SHEBANG_FILES= config/filter.d/ignorecommands/apache-fakegooglebot SHEBANG_LANG= fail2ban-python +NO_ARCH= yes SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} -PYDISTUTILS_BUILDARGS+= --without-tests -PYDISTUTILS_INSTALLARGS+= --install-data=${ETCDIR} - -PORTDOCS= README.md DEVELOP +PORTDOCS= DEVELOP README.md -OPTIONS_DEFINE= DOCS INOTIFY -OPTIONS_DEFAULT=INOTIFY +OPTIONS_DEFINE= DOCS INOTIFY +OPTIONS_DEFAULT= INOTIFY -INOTIFY_DESC= Support for (lib)inotify to monitor filesystem changes +INOTIFY_DESC= Support for (lib)inotify to monitor filesystem changes INOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyinotify>=0.8.3:devel/py-pyinotify@${PY_FLAVOR} @@ -41,13 +39,11 @@ FILES= ${WRKSRC}/bin/fail2ban-client \ ${WRKSRC}/fail2ban/client/fail2bancmdline.py \ ${WRKSRC}/fail2ban/client/fail2banregex.py \ ${WRKSRC}/man/fail2ban-client.1 \ - ${WRKSRC}/man/fail2ban-client.h2m \ - ${WRKSRC}/setup.py + ${WRKSRC}/man/fail2ban-client.h2m ${WRKSRC}/setup.py MAN_FILES= ${WRKSRC}/man/fail2ban-client.1 \ ${WRKSRC}/man/fail2ban-client.h2m \ - ${WRKSRC}/man/fail2ban-regex.1 \ - ${WRKSRC}/man/fail2ban-server.1 \ + ${WRKSRC}/man/fail2ban-regex.1 ${WRKSRC}/man/fail2ban-server.1 \ ${WRKSRC}/man/fail2ban.1 FAIL2BAN_DBDIR= /var/db/${PORTNAME} diff --git a/security/py-fail2ban/files/patch-CVE-2021-32749 b/security/py-fail2ban/files/patch-CVE-2021-32749 new file mode 100644 index 000000000000..cdea27c37f8a --- /dev/null +++ b/security/py-fail2ban/files/patch-CVE-2021-32749 @@ -0,0 +1,158 @@ +From 410a6ce5c80dd981c22752da034f2529b5eee844 Mon Sep 17 00:00:00 2001 +From: sebres +Date: Mon, 21 Jun 2021 17:12:53 +0200 +Subject: [PATCH] fixed possible RCE vulnerability, unset escape variable + (default tilde) stops consider "~" char after new-line as composing escape + sequence + +--- + config/action.d/complain.conf | 2 +- + config/action.d/dshield.conf | 2 +- + config/action.d/mail-buffered.conf | 8 ++++---- + config/action.d/mail-whois-lines.conf | 2 +- + config/action.d/mail-whois.conf | 6 +++--- + config/action.d/mail.conf | 6 +++--- + 6 files changed, 13 insertions(+), 13 deletions(-) + +diff --git config/action.d/complain.conf config/action.d/complain.conf +index 3a5f882c..4d73b058 100644 +--- config/action.d/complain.conf ++++ config/action.d/complain.conf +@@ -102,7 +102,7 @@ logpath = /dev/null + # Notes.: Your system mail command. Is passed 2 args: subject and recipient + # Values: CMD + # +-mailcmd = mail -s ++mailcmd = mail -E 'set escape' -s + + # Option: mailargs + # Notes.: Additional arguments to mail command. e.g. for standard Unix mail: +diff --git config/action.d/dshield.conf config/action.d/dshield.conf +index c128bef3..3d5a7a53 100644 +--- config/action.d/dshield.conf ++++ config/action.d/dshield.conf +@@ -179,7 +179,7 @@ tcpflags = + # Notes.: Your system mail command. Is passed 2 args: subject and recipient + # Values: CMD + # +-mailcmd = mail -s ++mailcmd = mail -E 'set escape' -s + + # Option: mailargs + # Notes.: Additional arguments to mail command. e.g. for standard Unix mail: +diff --git config/action.d/mail-buffered.conf config/action.d/mail-buffered.conf +index 325f185b..79b84104 100644 +--- config/action.d/mail-buffered.conf ++++ config/action.d/mail-buffered.conf +@@ -17,7 +17,7 @@ actionstart = printf %%b "Hi,\n + The jail has been started successfully.\n + Output will be buffered until lines are available.\n + Regards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : started on " ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : started on " + + # Option: actionstop + # Notes.: command executed at the stop of jail (or at the end of Fail2Ban) +@@ -28,13 +28,13 @@ actionstop = if [ -f ]; then + These hosts have been banned by Fail2Ban.\n + `cat ` + Regards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : Summary from " ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : Summary from " + rm + fi + printf %%b "Hi,\n + The jail has been stopped.\n + Regards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : stopped on " ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : stopped on " + + # Option: actioncheck + # Notes.: command executed once before each actionban command +@@ -55,7 +55,7 @@ actionban = printf %%b "`date`: ( failures)\n" >> + These hosts have been banned by Fail2Ban.\n + `cat ` + \nRegards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : Summary" ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : Summary" + rm + fi + +diff --git config/action.d/mail-whois-lines.conf config/action.d/mail-whois-lines.conf +index 3a3e56b2..d2818cb9 100644 +--- config/action.d/mail-whois-lines.conf ++++ config/action.d/mail-whois-lines.conf +@@ -72,7 +72,7 @@ actionunban = + # Notes.: Your system mail command. Is passed 2 args: subject and recipient + # Values: CMD + # +-mailcmd = mail -s ++mailcmd = mail -E 'set escape' -s + + # Default name of the chain + # +diff --git config/action.d/mail-whois.conf config/action.d/mail-whois.conf +index 7fea34c4..ab33b616 100644 +--- config/action.d/mail-whois.conf ++++ config/action.d/mail-whois.conf +@@ -20,7 +20,7 @@ norestored = 1 + actionstart = printf %%b "Hi,\n + The jail has been started successfully.\n + Regards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : started on " ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : started on " + + # Option: actionstop + # Notes.: command executed at the stop of jail (or at the end of Fail2Ban) +@@ -29,7 +29,7 @@ actionstart = printf %%b "Hi,\n + actionstop = printf %%b "Hi,\n + The jail has been stopped.\n + Regards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : stopped on " ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : stopped on " + + # Option: actioncheck + # Notes.: command executed once before each actionban command +@@ -49,7 +49,7 @@ actionban = printf %%b "Hi,\n + Here is more information about :\n + `%(_whois_command)s`\n + Regards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : banned from " ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : banned from " + + # Option: actionunban + # Notes.: command executed when unbanning an IP. Take care that the +diff --git config/action.d/mail.conf config/action.d/mail.conf +index 5d8c0e15..f4838ddc 100644 +--- config/action.d/mail.conf ++++ config/action.d/mail.conf +@@ -16,7 +16,7 @@ norestored = 1 + actionstart = printf %%b "Hi,\n + The jail has been started successfully.\n + Regards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : started on " ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : started on " + + # Option: actionstop + # Notes.: command executed at the stop of jail (or at the end of Fail2Ban) +@@ -25,7 +25,7 @@ actionstart = printf %%b "Hi,\n + actionstop = printf %%b "Hi,\n + The jail has been stopped.\n + Regards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : stopped on " ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : stopped on " + + # Option: actioncheck + # Notes.: command executed once before each actionban command +@@ -43,7 +43,7 @@ actionban = printf %%b "Hi,\n + The IP has just been banned by Fail2Ban after + attempts against .\n + Regards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : banned from " ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : banned from " + + # Option: actionunban + # Notes.: command executed when unbanning an IP. Take care that the +-- +2.33.1 + From nobody Wed Oct 27 16:01:37 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 CD2BE18264A6; Wed, 27 Oct 2021 16:01:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HfYN15PN9z3jDG; Wed, 27 Oct 2021 16:01:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 990C312E4F; Wed, 27 Oct 2021 16:01:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19RG1bZj037526; Wed, 27 Oct 2021 16:01:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19RG1bSm037525; Wed, 27 Oct 2021 16:01:37 GMT (envelope-from git) Date: Wed, 27 Oct 2021 16:01:37 GMT Message-Id: <202110271601.19RG1bSm037525@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: 8c44014b13dd - 2021Q4 - devel/stlink: Fix build on 32 bit platforms 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: 8c44014b13ddb0392fab868ed5822e11ea3af0f4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=8c44014b13ddb0392fab868ed5822e11ea3af0f4 commit 8c44014b13ddb0392fab868ed5822e11ea3af0f4 Author: Robert Clausecker AuthorDate: 2021-08-22 16:54:30 +0000 Commit: Yasuhiro Kimura CommitDate: 2021-10-27 16:00:19 +0000 devel/stlink: Fix build on 32 bit platforms * Remove settings of optimization from cmake/modules/c_flags.cmake as per section 13.9 of Porter's Handbook * Switch to DISTVERSION * Pet portclippy * Reformat Makefile with portfmt PR: 257708 Approved by: maitainer timeout (> 1 month) Differential Revision: https://reviews.freebsd.org/D32545 (cherry picked from commit b6534ecd950cf32e1b76733d34a2ec929b690704) --- devel/stlink/Makefile | 31 +++++++++----------- devel/stlink/files/patch-CMakeLists.txt | 8 +++-- .../files/patch-cmake_modules_c__flags.cmake | 18 ++++++++++++ .../files/patch-doc_dev_pkg-config_CMakeLists.txt | 6 ++-- devel/stlink/files/patch-doc_man_CMakeLists.txt | 6 ++-- devel/stlink/files/patch-src_common.c | 34 ++++++++++++++++++++++ 6 files changed, 77 insertions(+), 26 deletions(-) diff --git a/devel/stlink/Makefile b/devel/stlink/Makefile index 868b83d36d58..0b2d52ff20d5 100644 --- a/devel/stlink/Makefile +++ b/devel/stlink/Makefile @@ -1,7 +1,6 @@ PORTNAME= stlink -PORTVERSION= 1.7.0 +DISTVERSION= 1.7.0 DISTVERSIONPREFIX= v -PORTREVISION= 0 CATEGORIES= devel MAINTAINER= lev@FreeBSD.org @@ -9,27 +8,25 @@ COMMENT= STM32 ST-Link JTAG variant tools LICENSE= BSD3CLAUSE -OPTIONS_DEFINE= GTK3 DOCS -OPTIONS_SUB= yes -GTK3_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-pacth-turn-off-gtk -GTK3_USES= gnome -GTK3_USE= GNOME=gtk30 - -USE_GITHUB= yes -GH_ACCOUNT= stlink-org - USES= cmake pkgconfig USE_CSTD= c99 +USE_GITHUB= yes +GH_ACCOUNT= stlink-org USE_LDCONFIG= yes -PORTDOCS= README.md ${ALLDOCS} +PORTDOCS= ${ALLDOCS} README.md ALLDOCS= compiling.md dev/developer.txt devices_boards.md \ - flashloaders.md release.md tutorial.md \ - version_support.md - -FLASHLOADERS= cleanroom.md linker.ld Makefile stm32f0.s stm32f4.s \ - stm32f4lv.s stm32f7.s stm32f7lv.s stm32l4.s stm32lx.s \ + flashloaders.md release.md tutorial.md version_support.md + +FLASHLOADERS= cleanroom.md linker.ld Makefile stm32f0.s stm32f4.s stm32f4lv.s \ + stm32f7.s stm32f7lv.s stm32l4.s stm32lx.s + +OPTIONS_DEFINE= DOCS GTK3 +OPTIONS_SUB= yes +GTK3_USES= gnome +GTK3_USE= GNOME=gtk30 +GTK3_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-pacth-turn-off-gtk .include diff --git a/devel/stlink/files/patch-CMakeLists.txt b/devel/stlink/files/patch-CMakeLists.txt index c17726682dc9..c8461f37f41b 100644 --- a/devel/stlink/files/patch-CMakeLists.txt +++ b/devel/stlink/files/patch-CMakeLists.txt @@ -1,8 +1,10 @@ ---- CMakeLists.txt.orig 2021-07-13 15:04:41.612208000 +0300 -+++ CMakeLists.txt 2021-07-13 15:06:16.763751332 +0300 -@@ -299,4 +299,5 @@ +--- CMakeLists.txt.orig 2021-09-15 09:54:35 UTC ++++ CMakeLists.txt +@@ -298,6 +298,7 @@ endif () + # add_subdirectory(src/stlink-gui) # contains subordinate CMakeLists to build GUI add_subdirectory(tests) # contains subordinate CMakeLists to build test executables add_subdirectory(cmake/packaging) # contains subordinate CMakeLists to build packages +add_subdirectory(doc/dev/pkg-config) # contains subordinate CMakeLists to build pkg-config descriptor option(STLINK_GENERATE_MANPAGES "Generate manpages with pandoc" OFF) + add_subdirectory(doc/man) # contains subordinate CMakeLists to generate manpages diff --git a/devel/stlink/files/patch-cmake_modules_c__flags.cmake b/devel/stlink/files/patch-cmake_modules_c__flags.cmake new file mode 100644 index 000000000000..064de12f7844 --- /dev/null +++ b/devel/stlink/files/patch-cmake_modules_c__flags.cmake @@ -0,0 +1,18 @@ +Work around upstream bug #1175 and make the build more robust +against minor platform differences. -Werror should not be +provided in release builds. + +--- cmake/modules/c_flags.cmake.orig 2021-04-24 22:24:02 UTC ++++ cmake/modules/c_flags.cmake +@@ -44,11 +44,3 @@ endif () + if (NOT (WIN32 OR (EXISTS "/etc/debian_version" AND MINGW))) + add_cflag_if_supported("-fPIC") + endif () +- +-if (${CMAKE_BUILD_TYPE} MATCHES "Debug") +- add_cflag_if_supported("-ggdb") +- add_cflag_if_supported("-O0") +-else () +- add_cflag_if_supported("-O2") +- add_cflag_if_supported("-Werror") +-endif () diff --git a/devel/stlink/files/patch-doc_dev_pkg-config_CMakeLists.txt b/devel/stlink/files/patch-doc_dev_pkg-config_CMakeLists.txt index 42e007c084e4..1bb3871c36ef 100644 --- a/devel/stlink/files/patch-doc_dev_pkg-config_CMakeLists.txt +++ b/devel/stlink/files/patch-doc_dev_pkg-config_CMakeLists.txt @@ -1,6 +1,6 @@ ---- doc/dev/pkg-config/CMakeLists.txt.orig 2021-04-25 01:24:02.000000000 +0300 -+++ doc/dev/pkg-config/CMakeLists.txt 2021-07-13 15:09:25.486974252 +0300 -@@ -11,5 +11,5 @@ +--- doc/dev/pkg-config/CMakeLists.txt.orig 2021-04-24 22:24:02 UTC ++++ doc/dev/pkg-config/CMakeLists.txt +@@ -11,5 +11,5 @@ configure_file( install( FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" diff --git a/devel/stlink/files/patch-doc_man_CMakeLists.txt b/devel/stlink/files/patch-doc_man_CMakeLists.txt index fe262daea6fd..5d758bec75dd 100644 --- a/devel/stlink/files/patch-doc_man_CMakeLists.txt +++ b/devel/stlink/files/patch-doc_man_CMakeLists.txt @@ -1,6 +1,6 @@ ---- doc/man/CMakeLists.txt.orig 2021-07-13 15:08:26.986789558 +0300 -+++ doc/man/CMakeLists.txt 2021-04-25 01:24:02.000000000 +0300 -@@ -30,7 +30,7 @@ +--- doc/man/CMakeLists.txt.orig 2021-04-24 22:24:02 UTC ++++ doc/man/CMakeLists.txt +@@ -30,7 +30,7 @@ foreach (manpage ${MANPAGES}) endif () if (f AND NOT WIN32) diff --git a/devel/stlink/files/patch-src_common.c b/devel/stlink/files/patch-src_common.c new file mode 100644 index 000000000000..28597bb71049 --- /dev/null +++ b/devel/stlink/files/patch-src_common.c @@ -0,0 +1,34 @@ +Partial application of upstream commit c8fc656, closing +upstream bug #985 and #1175 and fixing the build on 32 +bit platforms. + +https://github.com/stlink-org/stlink/commit/c8fc6561fead79ad49c09d82bab864745086792c +https://github.com/stlink-org/stlink/issues/985 +https://github.com/stlink-org/stlink/issues/1175 + +--- src/common.c.orig 2021-04-24 22:24:02 UTC ++++ src/common.c +@@ -1,4 +1,5 @@ + #define DEBUG_FLASH 0 ++#include + #include + #include + #include +@@ -2205,7 +2206,7 @@ static int map_file(mapped_file_t *mf, const char *pat + + if (sizeof(st.st_size) != sizeof(size_t)) { + // on 32 bit systems, check if there is an overflow +- if (st.st_size > (off_t)INT32_MAX) { ++ if (st.st_size > (off_t)SSIZE_MAX) { + fprintf(stderr, "mmap() size_t overflow for file %s\n", path); + goto on_error; + } +@@ -2219,7 +2220,7 @@ static int map_file(mapped_file_t *mf, const char *pat + goto on_error; + } + +- mf->len = st.st_size; ++ mf->len = (size_t)st.st_size; + error = 0; // success + + on_error: From nobody Wed Oct 27 16:01:38 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 EE31018262F4; Wed, 27 Oct 2021 16:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HfYN26Fgwz3jDK; Wed, 27 Oct 2021 16:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B7CDE13407; Wed, 27 Oct 2021 16:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19RG1cVR037550; Wed, 27 Oct 2021 16:01:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19RG1c76037549; Wed, 27 Oct 2021 16:01:38 GMT (envelope-from git) Date: Wed, 27 Oct 2021 16:01:38 GMT Message-Id: <202110271601.19RG1c76037549@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: 89091e4b0e3a - 2021Q4 - misc/pdmenu: update to 1.3.6 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: 89091e4b0e3a6ef4a843a11a253b47d619e3588f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=89091e4b0e3a6ef4a843a11a253b47d619e3588f commit 89091e4b0e3a6ef4a843a11a253b47d619e3588f Author: Robert Clausecker AuthorDate: 2021-09-30 14:43:55 +0000 Commit: Yasuhiro Kimura CommitDate: 2021-10-27 16:00:31 +0000 misc/pdmenu: update to 1.3.6 * Pass maintainership to submitter * Switch to new upstream * Fix build with FreeBSD 13 or later (-fno-common) * Add NLS option ChangeLog: http://joeyh.name/code/pdmenu/news/version_1.3.5/ (1.3.5) ChangeLog: http://joeyh.name/code/pdmenu/news/version_1.3.6/ (1.3.6) PR: 258809 MFH: 2021Q4 Differential Revision: https://reviews.freebsd.org/D32662 (cherry picked from commit c32385406c3a5169b3e6dba473767e24168c8703) --- misc/pdmenu/Makefile | 16 ++++++---------- misc/pdmenu/distinfo | 5 +++-- misc/pdmenu/pkg-plist | 10 +++++----- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile index 3064077ca586..0fe2e389bc83 100644 --- a/misc/pdmenu/Makefile +++ b/misc/pdmenu/Makefile @@ -1,24 +1,17 @@ # Created by: Neil Blakey-Milner PORTNAME= pdmenu -PORTVERSION= 1.3.4 -PORTREVISION= 1 +DISTVERSION= 1.3.6 CATEGORIES= misc -MASTER_SITES= DEBIAN -DISTNAME= ${PORTNAME}_${PORTVERSION} +MASTER_SITES= https://git.kitenet.net/index.cgi/pdmenu.git/snapshot/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= fuz@fuz.su COMMENT= Simple console menu program LICENSE= GPLv2 -BROKEN_FreeBSD_13= ld: error: duplicate symbol: BG -BROKEN_FreeBSD_14= ld: error: duplicate symbol: BG - LIB_DEPENDS= libslang.so:devel/libslang2 -WRKSRC= ${WRKDIR}/${PORTNAME} - USES= gettext gmake ncurses shebangfix SHEBANG_FILES= examples/showdir.pl GNU_CONFIGURE= yes @@ -30,6 +23,9 @@ CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lncurses -lintl +OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes + post-patch: @${REINPLACE_CMD} -e \ '/^LANGS/s|=.*$$|= da es fr ru| ; \ diff --git a/misc/pdmenu/distinfo b/misc/pdmenu/distinfo index 128e67b12b72..6ce2b8586d86 100644 --- a/misc/pdmenu/distinfo +++ b/misc/pdmenu/distinfo @@ -1,2 +1,3 @@ -SHA256 (pdmenu_1.3.4.tar.gz) = 302aa81b8868133ff5a0f3e3e897f71d425bc628c0d7439addb623f12c277bea -SIZE (pdmenu_1.3.4.tar.gz) = 161002 +TIMESTAMP = 1633012422 +SHA256 (pdmenu-1.3.6.tar.gz) = dedd2a4a5719278b5e49041161990c2f20b5909818837542aaca01819f2c14eb +SIZE (pdmenu-1.3.6.tar.gz) = 160265 diff --git a/misc/pdmenu/pkg-plist b/misc/pdmenu/pkg-plist index 05ead91aa25d..57d698afc878 100644 --- a/misc/pdmenu/pkg-plist +++ b/misc/pdmenu/pkg-plist @@ -1,10 +1,10 @@ -bin/pdmenu +bin/pdmenu @sample etc/pdmenurc.sample man/man1/pdmenu.1.gz man/man5/pdmenurc.5.gz -share/locale/da/LC_MESSAGES/pdmenu.mo -share/locale/es/LC_MESSAGES/pdmenu.mo -share/locale/fr/LC_MESSAGES/pdmenu.mo -share/locale/ru/LC_MESSAGES/pdmenu.mo +%%NLS%%share/locale/da/LC_MESSAGES/pdmenu.mo +%%NLS%%share/locale/es/LC_MESSAGES/pdmenu.mo +%%NLS%%share/locale/fr/LC_MESSAGES/pdmenu.mo +%%NLS%%share/locale/ru/LC_MESSAGES/pdmenu.mo %%DATADIR%%/editdir.pl %%DATADIR%%/showdir.pl From nobody Wed Oct 27 16:01:39 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 979161826587; Wed, 27 Oct 2021 16:01:40 +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 4HfYN40x0hz3jDQ; Wed, 27 Oct 2021 16:01:40 +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 DE65B1348C; Wed, 27 Oct 2021 16:01:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19RG1dVS037579; Wed, 27 Oct 2021 16:01:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19RG1dYE037578; Wed, 27 Oct 2021 16:01:39 GMT (envelope-from git) Date: Wed, 27 Oct 2021 16:01:39 GMT Message-Id: <202110271601.19RG1dYE037578@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: 82a0987e8517 - 2021Q4 - net-mgmt/sdig: Fix build with -fno-common 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: 82a0987e8517e98e339ab648bc76fefefc517390 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=82a0987e8517e98e339ab648bc76fefefc517390 commit 82a0987e8517e98e339ab648bc76fefefc517390 Author: Robert Clausecker AuthorDate: 2021-10-08 14:38:45 +0000 Commit: Yasuhiro Kimura CommitDate: 2021-10-27 16:00:35 +0000 net-mgmt/sdig: Fix build with -fno-common * Add license information * Reformat Makefile with portfmt PR: 259006 Approved by: maintainer timeout (> 2 weeks) Differential Revision: https://reviews.freebsd.org/D32661 (cherry picked from commit 3436c34cf6a6663dce899fe2d33ffdf3abf841f0) --- net-mgmt/sdig/Makefile | 13 ++++++++----- net-mgmt/sdig/files/patch-sdig.conf | 6 +++--- net-mgmt/sdig/files/patch-sdig.conf.5 | 8 ++++---- net-mgmt/sdig/files/patch-src-output.c | 4 ++-- net-mgmt/sdig/files/patch-src_sdig.h | 17 +++++++++++++++++ 5 files changed, 34 insertions(+), 14 deletions(-) diff --git a/net-mgmt/sdig/Makefile b/net-mgmt/sdig/Makefile index 06ad83875039..ef669d20bc97 100644 --- a/net-mgmt/sdig/Makefile +++ b/net-mgmt/sdig/Makefile @@ -2,7 +2,7 @@ PORTNAME= sdig PORTVERSION= 0.45 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= SF \ ZI @@ -10,16 +10,19 @@ MASTER_SITES= SF \ MAINTAINER= zi@FreeBSD.org COMMENT= Translate IP/DNS/WINS/MAC address into port description -BROKEN_FreeBSD_13= ld: error: duplicate symbol: result -BROKEN_FreeBSD_14= ld: error: duplicate symbol: result +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp -USES= gmake +USES= autoreconf gmake GNU_CONFIGURE= yes CFLAGS+= -D_WANT_SEMUN -PLIST_FILES= bin/sdig etc/sdig.conf etc/mactable man/man5/sdig.conf.5.gz \ +PLIST_FILES= bin/sdig \ + etc/mactable \ + etc/sdig.conf \ + man/man5/sdig.conf.5.gz \ man/man8/sdig.8.gz post-patch: diff --git a/net-mgmt/sdig/files/patch-sdig.conf b/net-mgmt/sdig/files/patch-sdig.conf index 3782e5499972..49334e2ea236 100644 --- a/net-mgmt/sdig/files/patch-sdig.conf +++ b/net-mgmt/sdig/files/patch-sdig.conf @@ -1,5 +1,5 @@ ---- sdig.conf.orig 2011-05-30 17:18:03.000000000 -0400 -+++ sdig.conf 2011-05-30 17:18:25.000000000 -0400 +--- sdig.conf.orig 2010-07-12 19:57:40 UTC ++++ sdig.conf @@ -55,7 +55,7 @@ # # Usual path is /usr/local/samba/bin @@ -9,7 +9,7 @@ # --------------------------------------------------------------------------- # MACTABLE -@@ -68,7 +68,7 @@ +@@ -68,7 +68,7 @@ NMBLOOKUP /usr/local/samba/bin/nmblookup # rarely changes. If you want to use this feature, get it from the # main web site: http://www.exploits.org/sdig/ diff --git a/net-mgmt/sdig/files/patch-sdig.conf.5 b/net-mgmt/sdig/files/patch-sdig.conf.5 index 2073ff093fbf..beb095ad5889 100644 --- a/net-mgmt/sdig/files/patch-sdig.conf.5 +++ b/net-mgmt/sdig/files/patch-sdig.conf.5 @@ -1,6 +1,6 @@ ---- sdig.conf.5.orig 2011-05-30 17:21:10.000000000 -0400 -+++ sdig.conf.5 2011-05-30 17:21:34.000000000 -0400 -@@ -109,7 +109,7 @@ +--- sdig.conf.5.orig 2010-07-27 06:55:33 UTC ++++ sdig.conf.5 +@@ -109,7 +109,7 @@ Specify the path to Samba's nmblookup binary. This mi This program is optional, and is provided to augment DNS lookups in environments laden with Windows machines. @@ -9,7 +9,7 @@ .IP "MACTABLE \fIpath\fR" -@@ -122,7 +122,7 @@ +@@ -122,7 +122,7 @@ This file is rather large and rarely changes, so it's source distribution. You can get it on the main sdig web site - http://www.exploits.org/sdig/ diff --git a/net-mgmt/sdig/files/patch-src-output.c b/net-mgmt/sdig/files/patch-src-output.c index 89cb8574c16a..db8e759c9c46 100644 --- a/net-mgmt/sdig/files/patch-src-output.c +++ b/net-mgmt/sdig/files/patch-src-output.c @@ -1,5 +1,5 @@ ---- src/output.c.orig 2011-05-30 16:52:55.000000000 -0400 -+++ src/output.c 2011-05-30 16:53:21.000000000 -0400 +--- src/output.c.orig 2010-07-27 07:31:03 UTC ++++ src/output.c @@ -22,11 +22,6 @@ #ifdef SDIG_USE_SEMS diff --git a/net-mgmt/sdig/files/patch-src_sdig.h b/net-mgmt/sdig/files/patch-src_sdig.h new file mode 100644 index 000000000000..53fb5f69aff2 --- /dev/null +++ b/net-mgmt/sdig/files/patch-src_sdig.h @@ -0,0 +1,17 @@ +--- src/sdig.h.orig 2021-10-08 14:08:41 UTC ++++ src/sdig.h +@@ -42,14 +42,6 @@ typedef struct { + void *next; + } pdtype; + +-/* holds the results of a matched port */ +-struct result { +- stype s; +- char *ifIdx; +- char *ifAlias; +- char *ifName; +-} result; +- + /* + * global data + */ From nobody Wed Oct 27 19:26: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 7403A1810CC7; Wed, 27 Oct 2021 19:26:49 +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 4Hfdwn2qXtz3Pld; Wed, 27 Oct 2021 19:26: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 31EC91608B; Wed, 27 Oct 2021 19:26: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 19RJQnth003750; Wed, 27 Oct 2021 19:26:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19RJQnLY003749; Wed, 27 Oct 2021 19:26:49 GMT (envelope-from git) Date: Wed, 27 Oct 2021 19:26:49 GMT Message-Id: <202110271926.19RJQnLY003749@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Tijl Coosemans Subject: git: 78b01411ebc0 - 2021Q4 - security/sssd: Fix installation with automake 1.16.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: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 78b01411ebc078d12fc4fa01db49d00f7e36a526 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=78b01411ebc078d12fc4fa01db49d00f7e36a526 commit 78b01411ebc078d12fc4fa01db49d00f7e36a526 Author: Tijl Coosemans AuthorDate: 2021-10-09 13:16:12 +0000 Commit: Tijl Coosemans CommitDate: 2021-10-27 19:26:27 +0000 security/sssd: Fix installation with automake 1.16.4 Patch the configure script so it evaluates a variable that uses PYTHON_PREFIX (since automake 1.16.4) before PYTHON_PREFIX is unset. PR: 258898 Approved by: maintainer timeout (2 weeks) (cherry picked from commit b07a361a29711f26c51b24b433662baa37648194) --- security/sssd/files/patch-configure.ac | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/security/sssd/files/patch-configure.ac b/security/sssd/files/patch-configure.ac index 26284c2f63d5..4139f9c873e5 100644 --- a/security/sssd/files/patch-configure.ac +++ b/security/sssd/files/patch-configure.ac @@ -1,8 +1,6 @@ -diff --git configure.ac configure.ac -index 9df463d9c..17d0d9ea7 100644 ---- configure.ac +--- configure.ac.orig 2020-03-17 13:31:28 UTC +++ configure.ac -@@ -44,8 +44,6 @@ AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes]) +@@ -44,8 +44,6 @@ AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = y AC_CHECK_HEADERS(stdint.h dlfcn.h) AC_CONFIG_HEADER(config.h) @@ -11,3 +9,14 @@ index 9df463d9c..17d0d9ea7 100644 m4_include([src/build_macros.m4]) BUILD_WITH_SHARED_BUILD_DIR +@@ -356,8 +354,8 @@ them please use argument --without-python3-bindings wh + AM_CHECK_PYTHON_HEADERS([], + AC_MSG_ERROR([Could not find python3 headers])) + +- AC_SUBST([py3execdir], [$pyexecdir]) +- AC_SUBST([python3dir], [$pythondir]) ++ AC_SUBST([py3execdir], [$(eval echo $pyexecdir)]) ++ AC_SUBST([python3dir], [$(eval echo $pythondir)]) + AC_SUBST([PYTHON3_CFLAGS], [$PYTHON_CFLAGS]) + AC_SUBST([PYTHON3_LIBS], [$PYTHON_LIBS]) + AC_SUBST([PYTHON3_INCLUDES], [$PYTHON_INCLUDES]) From nobody Wed Oct 27 19:36: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 9F6BE1816D4B; Wed, 27 Oct 2021 19:36: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 4Hff7y47Rjz3jmt; Wed, 27 Oct 2021 19:36: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 6DC36162B6; Wed, 27 Oct 2021 19:36: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 19RJaU9L017596; Wed, 27 Oct 2021 19:36:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19RJaU8o017595; Wed, 27 Oct 2021 19:36:30 GMT (envelope-from git) Date: Wed, 27 Oct 2021 19:36:30 GMT Message-Id: <202110271936.19RJaU8o017595@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kirill Ponomarev Subject: git: 2d5f9d13dbb7 - 2021Q4 - sysutils/cbsd: update to 13.0.17 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: krion X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 2d5f9d13dbb72dd89045996886ccddc69c06f319 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=2d5f9d13dbb72dd89045996886ccddc69c06f319 commit 2d5f9d13dbb72dd89045996886ccddc69c06f319 Author: Kirill Ponomarev AuthorDate: 2021-10-27 19:35:40 +0000 Commit: Kirill Ponomarev CommitDate: 2021-10-27 19:36:27 +0000 sysutils/cbsd: update to 13.0.17 (cherry picked from commit 3cc7affdd5cc24a54c8d8bed7938087679454983) --- sysutils/cbsd/Makefile | 2 +- sysutils/cbsd/distinfo | 6 +++--- sysutils/cbsd/pkg-plist | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index ba2ec63f0b45..67631b1c4666 100644 --- a/sysutils/cbsd/Makefile +++ b/sysutils/cbsd/Makefile @@ -1,5 +1,5 @@ PORTNAME= cbsd -DISTVERSION= 13.0.16 +DISTVERSION= 13.0.17 CATEGORIES= sysutils MAINTAINER= olevole@olevole.ru diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo index e050af0fe048..ac1d28ee0e2a 100644 --- a/sysutils/cbsd/distinfo +++ b/sysutils/cbsd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634253673 -SHA256 (cbsd-cbsd-13.0.16_GH0.tar.gz) = 61abc2ed7685a93c39a410bdca2c96d4f033312c5ed062a2c2ffa9cf9fe73e2a -SIZE (cbsd-cbsd-13.0.16_GH0.tar.gz) = 5418622 +TIMESTAMP = 1635362838 +SHA256 (cbsd-cbsd-13.0.17_GH0.tar.gz) = 3e04dd8c80a1e6e7d917160e5e1d5d13765df403b620f7e5238b9b390ec21e35 +SIZE (cbsd-cbsd-13.0.17_GH0.tar.gz) = 5422174 diff --git a/sysutils/cbsd/pkg-plist b/sysutils/cbsd/pkg-plist index 2655fe73c4c1..ea8656bceab6 100644 --- a/sysutils/cbsd/pkg-plist +++ b/sysutils/cbsd/pkg-plist @@ -7,7 +7,6 @@ bin/cbsd @mode man/man8/cbsd.8.gz libexec/bsdconfig/cbsd -cbsd/.github/FUNDING.yml cbsd/.gitignore cbsd/.ssh/config cbsd/bin/cbsdsftp @@ -739,6 +738,7 @@ cbsd/subr/bhyve.subr cbsd/subr/bsdconfig.subr cbsd/subr/build.subr cbsd/subr/carp.subr +cbsd/subr/cbsdbootstrap.subr cbsd/subr/cbsdfile.subr cbsd/subr/cbsdinit.subr cbsd/subr/dialog.subr @@ -778,7 +778,6 @@ cbsd/subr/time.subr cbsd/subr/tools.subr cbsd/subr/TrueOS.subr cbsd/subr/universe.subr -cbsd/subr/upgrade.subr cbsd/subr/virtual.subr cbsd/subr/virtualbox.subr cbsd/subr/vnet.subr From nobody Thu Oct 28 00:58: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 CAC83182CDA9; Thu, 28 Oct 2021 00:58:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HfnHn5M0Rz4msn; Thu, 28 Oct 2021 00:58:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 982191A606; Thu, 28 Oct 2021 00:58: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 19S0wjnh043285; Thu, 28 Oct 2021 00:58:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19S0wjx8043284; Thu, 28 Oct 2021 00:58:45 GMT (envelope-from git) Date: Thu, 28 Oct 2021 00:58:45 GMT Message-Id: <202110280058.19S0wjx8043284@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: fd73fc6e3c70 - 2021Q4 - emulators/yuzu: update to s20211026 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: fd73fc6e3c707b1172b666d3aea2be4acd95d657 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd73fc6e3c707b1172b666d3aea2be4acd95d657 commit fd73fc6e3c707b1172b666d3aea2be4acd95d657 Author: Jan Beich AuthorDate: 2021-10-27 02:15:45 +0000 Commit: Jan Beich CommitDate: 2021-10-28 00:58:39 +0000 emulators/yuzu: update to s20211026 Changes: https://github.com/yuzu-emu/yuzu/compare/63ed7d9af...40c8a8c62 (cherry picked from commit 49560e3c1c6638cb166ef3ddbd83ba6cf4b83538) --- 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 6936dbff9aa3..090cc8a236c2 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,5 +1,5 @@ PORTNAME= yuzu -PORTVERSION= s20211025 +PORTVERSION= s20211026 PORTREVISION?= 0 CATEGORIES= emulators @@ -33,7 +33,7 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \ USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= 63ed7d9af +GH_TAGNAME= 40c8a8c62 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 7f608b872403..bb457e930a55 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1635167869 -SHA256 (yuzu-emu-yuzu-s20211025-63ed7d9af_GH0.tar.gz) = 9668b422a0efcb36ab71116348631572934dd5e4cfc02800f7a266c1dff51d24 -SIZE (yuzu-emu-yuzu-s20211025-63ed7d9af_GH0.tar.gz) = 4270610 +TIMESTAMP = 1635300945 +SHA256 (yuzu-emu-yuzu-s20211026-40c8a8c62_GH0.tar.gz) = f2a8148a24d33108f21ba9d9063aa643f43fd7d859758fd4216ad537cde0d4ee +SIZE (yuzu-emu-yuzu-s20211026-40c8a8c62_GH0.tar.gz) = 4270706 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 Oct 28 06:36:56 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 47C10182A2AF; Thu, 28 Oct 2021 06:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hfwp117sjz3sDB; Thu, 28 Oct 2021 06:36:57 +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 07A1C1EEA9; Thu, 28 Oct 2021 06:36:57 +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 19S6auq5096803; Thu, 28 Oct 2021 06:36:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19S6auU6096802; Thu, 28 Oct 2021 06:36:56 GMT (envelope-from git) Date: Thu, 28 Oct 2021 06:36:56 GMT Message-Id: <202110280636.19S6auU6096802@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mathieu Arnold Subject: git: e9bd5d3360e6 - 2021Q4 - dns/bind911: update to 9.11.36 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: mat X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: e9bd5d3360e6bf3231432d074b95afede503c504 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=e9bd5d3360e6bf3231432d074b95afede503c504 commit e9bd5d3360e6bf3231432d074b95afede503c504 Author: Mathieu Arnold AuthorDate: 2021-10-28 06:16:46 +0000 Commit: Mathieu Arnold CommitDate: 2021-10-28 06:36:11 +0000 dns/bind911: update to 9.11.36 MFH: 2021Q4 Security: CVE-2021-25219 (cherry picked from commit b9bbd21cc84bb74418740be410cdd309d9c276c1) --- dns/bind911/Makefile | 2 +- dns/bind911/distinfo | 6 +++--- dns/bind911/files/patch-configure | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile index 597cda4b01f5..52c3483588ba 100644 --- a/dns/bind911/Makefile +++ b/dns/bind911/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools USES= cpe libedit pkgconfig # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.11.35 +ISCVERSION= 9.11.36 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} diff --git a/dns/bind911/distinfo b/dns/bind911/distinfo index e632a7c458fc..5af44adcefb6 100644 --- a/dns/bind911/distinfo +++ b/dns/bind911/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629962750 -SHA256 (bind-9.11.35.tar.gz) = 1c882705827b6aafa45d917ae3b20eccccc8d5df3c4477df44b04382e6c47562 -SIZE (bind-9.11.35.tar.gz) = 8308926 +TIMESTAMP = 1635400901 +SHA256 (bind-9.11.36.tar.gz) = c953fcb6703b395aaa53e65ff8b2869b69a5303dd60507cba2201305e1811681 +SIZE (bind-9.11.36.tar.gz) = 8313276 diff --git a/dns/bind911/files/patch-configure b/dns/bind911/files/patch-configure index 86334b22b29a..4c0a1ea036fd 100644 --- a/dns/bind911/files/patch-configure +++ b/dns/bind911/files/patch-configure @@ -3,9 +3,9 @@ - Make sure only json-c is detected. - Cleanup the BDB discovery code to find more recent versions. ---- configure.orig 2021-07-09 08:55:20 UTC +--- configure.orig 2021-10-11 19:35:49 UTC +++ configure -@@ -15744,27 +15744,9 @@ done +@@ -15691,27 +15691,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ @@ -35,7 +35,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5 $as_echo_n "checking linking as $TRY_LIBS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -15807,47 +15789,7 @@ $as_echo "no" >&6; } ;; +@@ -15754,47 +15736,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac @@ -84,7 +84,7 @@ DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -18722,7 +18664,7 @@ case "$use_libjson" in +@@ -18669,7 +18611,7 @@ case "$use_libjson" in auto|yes) for d in /usr /usr/local /opt/local do @@ -93,7 +93,7 @@ then if test ${d} != /usr then -@@ -18730,29 +18672,16 @@ case "$use_libjson" in +@@ -18677,29 +18619,16 @@ case "$use_libjson" in LIBS="$LIBS -L${d}/lib" fi have_libjson="yes" @@ -124,7 +124,7 @@ have_libjson_c="yes" else as_fn_error $? "$use_libjson/include/json{,-c}/json.h not found." "$LINENO" 5 -@@ -25019,7 +24948,7 @@ $as_echo "" >&6; } +@@ -24966,7 +24895,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). From nobody Thu Oct 28 06:36: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 AAF1D182A391; Thu, 28 Oct 2021 06:36: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 4Hfwp23M4vz3sJy; Thu, 28 Oct 2021 06:36: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 391FC1F013; Thu, 28 Oct 2021 06:36: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 19S6awH7096834; Thu, 28 Oct 2021 06:36:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19S6awFm096833; Thu, 28 Oct 2021 06:36:58 GMT (envelope-from git) Date: Thu, 28 Oct 2021 06:36:58 GMT Message-Id: <202110280636.19S6awFm096833@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mathieu Arnold Subject: git: 5390428a5160 - 2021Q4 - dns/bind916: update to 9.16.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: mat X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 5390428a516077ae48fd9e077f730f156be0ab8e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=5390428a516077ae48fd9e077f730f156be0ab8e commit 5390428a516077ae48fd9e077f730f156be0ab8e Author: Mathieu Arnold AuthorDate: 2021-10-28 06:17:58 +0000 Commit: Mathieu Arnold CommitDate: 2021-10-28 06:36:39 +0000 dns/bind916: update to 9.16.22 MFH: 2021Q4 Security: CVE-2021-25219 (cherry picked from commit 43b84549fb478bdf8cbd77db6f2ca6b84ba22c72) --- dns/bind916/Makefile | 2 +- dns/bind916/distinfo | 6 +++--- dns/bind916/files/extrapatch-bind-min-override-ttl | 12 ++++++------ dns/bind916/files/patch-configure | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dns/bind916/Makefile b/dns/bind916/Makefile index 3265d09cd51d..d94b6a22822a 100644 --- a/dns/bind916/Makefile +++ b/dns/bind916/Makefile @@ -40,7 +40,7 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools USES= compiler:c11 cpe libedit pkgconfig ssl tar:xz # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.16.21 +ISCVERSION= 9.16.22 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} diff --git a/dns/bind916/distinfo b/dns/bind916/distinfo index ce029531078a..3c1f2bc303a4 100644 --- a/dns/bind916/distinfo +++ b/dns/bind916/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1632745650 -SHA256 (bind-9.16.21.tar.xz) = 65da5fd4fb80b7d0d7452876f81fd6d67cdcee54a5e3c1d65610334665dfa815 -SIZE (bind-9.16.21.tar.xz) = 5057816 +TIMESTAMP = 1635400990 +SHA256 (bind-9.16.22.tar.xz) = 65e7b2af6479db346e2fc99bcfb6ec3240066468e09dbec575ebc7c57d994061 +SIZE (bind-9.16.22.tar.xz) = 5059000 diff --git a/dns/bind916/files/extrapatch-bind-min-override-ttl b/dns/bind916/files/extrapatch-bind-min-override-ttl index e1f06078adc4..8a588257cc20 100644 --- a/dns/bind916/files/extrapatch-bind-min-override-ttl +++ b/dns/bind916/files/extrapatch-bind-min-override-ttl @@ -1,6 +1,6 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2021-09-07 09:37:05 UTC +--- bin/named/config.c.orig 2021-10-13 10:56:16 UTC +++ bin/named/config.c @@ -180,6 +180,7 @@ options {\n\ notify-source *;\n\ @@ -10,9 +10,9 @@ Add the override-cache-ttl feature. parental-source *;\n\ parental-source-v6 *;\n\ provide-ixfr true;\n\ ---- bin/named/server.c.orig 2021-09-07 09:37:05 UTC +--- bin/named/server.c.orig 2021-10-13 10:56:16 UTC +++ bin/named/server.c -@@ -4411,6 +4411,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4413,6 +4413,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } obj = NULL; @@ -24,7 +24,7 @@ Add the override-cache-ttl feature. result = named_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asduration(obj); ---- lib/dns/include/dns/view.h.orig 2021-09-07 09:37:05 UTC +--- lib/dns/include/dns/view.h.orig 2021-10-13 10:56:16 UTC +++ lib/dns/include/dns/view.h @@ -152,6 +152,7 @@ struct dns_view { bool requestnsid; @@ -34,7 +34,7 @@ Add the override-cache-ttl feature. dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2021-09-07 09:37:05 UTC +--- lib/dns/resolver.c.orig 2021-10-13 10:56:16 UTC +++ lib/dns/resolver.c @@ -6476,6 +6476,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes } @@ -49,7 +49,7 @@ Add the override-cache-ttl feature. * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2021-09-07 09:37:05 UTC +--- lib/isccfg/namedconf.c.orig 2021-10-13 10:56:16 UTC +++ lib/isccfg/namedconf.c @@ -2048,6 +2048,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ diff --git a/dns/bind916/files/patch-configure b/dns/bind916/files/patch-configure index de6888343d83..62f59c6713da 100644 --- a/dns/bind916/files/patch-configure +++ b/dns/bind916/files/patch-configure @@ -1,8 +1,8 @@ Fixup gssapi and db detection. ---- configure.orig 2021-06-08 10:45:10 UTC +--- configure.orig 2021-10-13 10:56:16 UTC +++ configure -@@ -17758,27 +17758,9 @@ done +@@ -17760,27 +17760,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ @@ -32,7 +32,7 @@ Fixup gssapi and db detection. { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5 $as_echo_n "checking linking as $TRY_LIBS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -17821,47 +17803,7 @@ $as_echo "no" >&6; } ;; +@@ -17823,47 +17805,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac @@ -81,7 +81,7 @@ Fixup gssapi and db detection. DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -23262,7 +23204,7 @@ $as_echo "" >&6; } +@@ -23264,7 +23206,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). From nobody Thu Oct 28 07:01: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 05507183242F; Thu, 28 Oct 2021 07:01: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 4HfxLL6lLLz4S37; Thu, 28 Oct 2021 07:01: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 BD53C1F6C0; Thu, 28 Oct 2021 07:01: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 19S71Uol036349; Thu, 28 Oct 2021 07:01:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19S71UU4036348; Thu, 28 Oct 2021 07:01:30 GMT (envelope-from git) Date: Thu, 28 Oct 2021 07:01:30 GMT Message-Id: <202110280701.19S71UU4036348@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: 58922eb0e9f1 - 2021Q4 - editors/kakoune: Update to 2021.10.28 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: 58922eb0e9f198953968a744004549957dfaed05 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=58922eb0e9f198953968a744004549957dfaed05 commit 58922eb0e9f198953968a744004549957dfaed05 Author: Tobias Kortkamp AuthorDate: 2021-10-28 05:58:34 +0000 Commit: Tobias Kortkamp CommitDate: 2021-10-28 07:01:11 +0000 editors/kakoune: Update to 2021.10.28 Changes: https://github.com/mawww/kakoune/releases/tag/v2021.10.28 (cherry picked from commit a6c927396b1f5991267d879508d56214c250a408) --- editors/kakoune/Makefile | 2 +- editors/kakoune/distinfo | 6 +++--- editors/kakoune/files/patch-src_main.cc | 17 ----------------- editors/kakoune/pkg-plist | 4 +++- 4 files changed, 7 insertions(+), 22 deletions(-) diff --git a/editors/kakoune/Makefile b/editors/kakoune/Makefile index d327200edff7..ab9c7f606441 100644 --- a/editors/kakoune/Makefile +++ b/editors/kakoune/Makefile @@ -1,5 +1,5 @@ PORTNAME= kakoune -DISTVERSION= 2021.08.28 +DISTVERSION= 2021.10.28 CATEGORIES= editors MASTER_SITES= https://github.com/mawww/kakoune/releases/download/v${DISTVERSION}/ diff --git a/editors/kakoune/distinfo b/editors/kakoune/distinfo index 7def67f8db58..0eeb99a33f92 100644 --- a/editors/kakoune/distinfo +++ b/editors/kakoune/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1630157133 -SHA256 (kakoune-2021.08.28.tar.bz2) = 6f6ed7dfd8c5723210dbd848708acf03af4b847016fd3ede96b2a89ad32276cb -SIZE (kakoune-2021.08.28.tar.bz2) = 535791 +TIMESTAMP = 1635400713 +SHA256 (kakoune-2021.10.28.tar.bz2) = 2f4c93871dc31f6281712281a7119928b1d6d6f300dded84b2d3ce0ab27f2126 +SIZE (kakoune-2021.10.28.tar.bz2) = 537860 diff --git a/editors/kakoune/files/patch-src_main.cc b/editors/kakoune/files/patch-src_main.cc deleted file mode 100644 index 0c4fd9b6f327..000000000000 --- a/editors/kakoune/files/patch-src_main.cc +++ /dev/null @@ -1,17 +0,0 @@ ---- src/main.cc.orig 2021-10-25 11:31:24 UTC -+++ src/main.cc -@@ -1249,8 +1249,12 @@ int main(int argc, char* argv[]) - } - - #if defined(__ELF__) --asm(R"( --.pushsection ".debug_gdb_scripts", "MS",@progbits,1 -+#ifdef __arm__ -+# define PROGBITS "%progbits" -+#else -+# define PROGBITS "@progbits" -+#endif -+asm(".pushsection \".debug_gdb_scripts\", \"MS\"," PROGBITS ",1" R"( - .byte 4 - .ascii "kakoune-inline-gdb.py\n" - .ascii "import os.path\n" diff --git a/editors/kakoune/pkg-plist b/editors/kakoune/pkg-plist index 82dee1642186..7966fce08031 100644 --- a/editors/kakoune/pkg-plist +++ b/editors/kakoune/pkg-plist @@ -7,7 +7,8 @@ libexec/kak/kak %%DATADIR%%/colors/desertex.kak %%DATADIR%%/colors/github.kak %%DATADIR%%/colors/greyscale.kak -%%DATADIR%%/colors/gruvbox.kak +%%DATADIR%%/colors/gruvbox-dark.kak +%%DATADIR%%/colors/gruvbox-light.kak %%DATADIR%%/colors/kaleidoscope-dark.kak %%DATADIR%%/colors/kaleidoscope-light.kak %%DATADIR%%/colors/lucius.kak @@ -63,6 +64,7 @@ libexec/kak/kak %%DATADIR%%/rc/filetype/dockerfile.kak %%DATADIR%%/rc/filetype/elixir.kak %%DATADIR%%/rc/filetype/elm.kak +%%DATADIR%%/rc/filetype/erlang.kak %%DATADIR%%/rc/filetype/eruby.kak %%DATADIR%%/rc/filetype/etc.kak %%DATADIR%%/rc/filetype/exherbo.kak From nobody Thu Oct 28 19:23: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 06A4C182EF4C; Thu, 28 Oct 2021 19:23:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HgFpN6ps6z3G7w; Thu, 28 Oct 2021 19:23: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 CA58914B7; Thu, 28 Oct 2021 19:23: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 19SJNOEI022611; Thu, 28 Oct 2021 19:23:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19SJNOZR022610; Thu, 28 Oct 2021 19:23:24 GMT (envelope-from git) Date: Thu, 28 Oct 2021 19:23:24 GMT Message-Id: <202110281923.19SJNOZR022610@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Torsten Zuehlsdorff Subject: git: 1e7e355c7ec9 - 2021Q4 - lang/php73: Upgrade from 7.3.31 to 7.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: tz X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 1e7e355c7ec983b0fc23edb36b32098c369507c8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by tz: URL: https://cgit.FreeBSD.org/ports/commit/?id=1e7e355c7ec983b0fc23edb36b32098c369507c8 commit 1e7e355c7ec983b0fc23edb36b32098c369507c8 Author: Torsten Zuehlsdorff AuthorDate: 2021-10-28 19:21:58 +0000 Commit: Torsten Zuehlsdorff CommitDate: 2021-10-28 19:23:17 +0000 lang/php73: Upgrade from 7.3.31 to 7.3.32 Changelog: FPM: Fixed bug #81026 (PHP-FPM oob R/W in root process leading to privilege escalation). (CVE-2021-21703) (cherry picked from commit 0bf9dc15d494b093da4ab53cb55b343511fedfe9) --- lang/php73/Makefile | 2 +- lang/php73/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/php73/Makefile b/lang/php73/Makefile index 8a4594fa8210..073c4ea1d613 100644 --- a/lang/php73/Makefile +++ b/lang/php73/Makefile @@ -1,5 +1,5 @@ PORTNAME= php73 -DISTVERSION= 7.3.31 +DISTVERSION= 7.3.32 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions diff --git a/lang/php73/distinfo b/lang/php73/distinfo index 94c20f71be1b..3a980d1240c7 100644 --- a/lang/php73/distinfo +++ b/lang/php73/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1632774611 -SHA256 (php-7.3.31.tar.xz) = d1aa8f44595d01ac061ff340354d95e146d6152f70e799b44d6b8654fb45cbcc -SIZE (php-7.3.31.tar.xz) = 12142912 +TIMESTAMP = 1635444786 +SHA256 (php-7.3.32.tar.xz) = 94effa250b80f031e77fbd98b6950c441157a2a8f9e076ee68e02f5b0b7a3fd9 +SIZE (php-7.3.32.tar.xz) = 12142436 From nobody Thu Oct 28 21:37: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 0D476181E604; Thu, 28 Oct 2021 21:37: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 4HgJn36vptz4fSl; Thu, 28 Oct 2021 21:37: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 C948F31BF; Thu, 28 Oct 2021 21:37: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 19SLbROl096744; Thu, 28 Oct 2021 21:37:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19SLbRki096743; Thu, 28 Oct 2021 21:37:27 GMT (envelope-from git) Date: Thu, 28 Oct 2021 21:37:27 GMT Message-Id: <202110282137.19SLbRki096743@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bryan Drewery Subject: git: 470de1bf5ed4 - 2021Q4 - ports-mgmt/poudriere-devel: Update to 3.3.0-1019-gef4526594 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: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 470de1bf5ed4bb7188141fd2a06a706d2a05e22f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=470de1bf5ed4bb7188141fd2a06a706d2a05e22f commit 470de1bf5ed4bb7188141fd2a06a706d2a05e22f Author: Bryan Drewery AuthorDate: 2021-10-16 03:44:56 +0000 Commit: Bryan Drewery CommitDate: 2021-10-28 21:36:35 +0000 ports-mgmt/poudriere-devel: Update to 3.3.0-1019-gef4526594 Changes: - Store pool dir in logs/.poudriere.pkg_pool% - bulk: Add -NN to avoid committing packages. - distclean: Don't delete DISTFILES_CACHE if it is empty - distclean: Fix deleting from a corrupted list - distclean is known to not properly recurse deps. - crashed_build/skipping: Show flavor of packages - Package Fetch: Fix handling for remote pkg version check - Package Fetch: Handle lost packages failure better for PKG_SUFX transition. - bulk: Auto rename *.txz to *.pkg if needed - Default DELETE_UNQUEUED_PACKAGES to no and document. - image: Fix firmware images - zsh: Add bulk -b option description for zsh completion file and remove trailing spaces - clock: Fix formatting to be more portable --- ports-mgmt/poudriere-devel/Makefile | 6 +++--- ports-mgmt/poudriere-devel/distinfo | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile index 84b5a7228f61..5529928f576d 100644 --- a/ports-mgmt/poudriere-devel/Makefile +++ b/ports-mgmt/poudriere-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= poudriere -DISTVERSION= 3.3.99.20210907 -PORTREVISION= 1 +DISTVERSION= 3.3.99.20211015 +PORTREVISION= 0 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ @@ -16,7 +16,7 @@ CONFLICTS_INSTALL= poudriere-[0-9]* USE_GITHUB= yes GH_ACCOUNT= freebsd -GH_TAGNAME= 3.3.0-967-g764941e90 +GH_TAGNAME= 3.3.0-1019-gef4526594 GNU_CONFIGURE= yes ETCDIR= ${PREFIX}/etc/poudriere.d diff --git a/ports-mgmt/poudriere-devel/distinfo b/ports-mgmt/poudriere-devel/distinfo index 0c25d0f901ad..512e898c7e40 100644 --- a/ports-mgmt/poudriere-devel/distinfo +++ b/ports-mgmt/poudriere-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1631047835 -SHA256 (freebsd-poudriere-3.3.99.20210907-3.3.0-967-g764941e90_GH0.tar.gz) = cebfe7143ad0c79230a76ee05b6ac4563d25d91eba7ae27ec8c6359f5a206ac9 -SIZE (freebsd-poudriere-3.3.99.20210907-3.3.0-967-g764941e90_GH0.tar.gz) = 4200468 +TIMESTAMP = 1634355830 +SHA256 (freebsd-poudriere-3.3.99.20211015-3.3.0-1019-gef4526594_GH0.tar.gz) = d0730ac21cbe1220733c56dcd2be4c380bcd5f5c15ea64453ecfa98823773845 +SIZE (freebsd-poudriere-3.3.99.20211015-3.3.0-1019-gef4526594_GH0.tar.gz) = 4202010 From nobody Thu Oct 28 21:37: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 4BECA181E331; Thu, 28 Oct 2021 21:37: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 4HgJn50rKsz4fCq; Thu, 28 Oct 2021 21:37: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 E3C2D2E28; Thu, 28 Oct 2021 21:37: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 19SLbSsO096772; Thu, 28 Oct 2021 21:37:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19SLbSEG096771; Thu, 28 Oct 2021 21:37:28 GMT (envelope-from git) Date: Thu, 28 Oct 2021 21:37:28 GMT Message-Id: <202110282137.19SLbSEG096771@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bryan Drewery Subject: git: 48fdb60bb351 - 2021Q4 - ports-mgmt/poudriere-devel: Update to 3.3.0-1020-g59a87677c 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: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 48fdb60bb351c93edbc9581c6fb04a66c5f62438 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=48fdb60bb351c93edbc9581c6fb04a66c5f62438 commit 48fdb60bb351c93edbc9581c6fb04a66c5f62438 Author: Bryan Drewery AuthorDate: 2021-10-17 19:24:45 +0000 Commit: Bryan Drewery CommitDate: 2021-10-28 21:36:36 +0000 ports-mgmt/poudriere-devel: Update to 3.3.0-1020-g59a87677c Changes: - Fixes va_args build error on non-amd64 (cherry picked from commit 14e5e1370ddb6594b29bfa3b5c8948205621fdf1) --- ports-mgmt/poudriere-devel/Makefile | 4 ++-- ports-mgmt/poudriere-devel/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile index 5529928f576d..e76bb33e4155 100644 --- a/ports-mgmt/poudriere-devel/Makefile +++ b/ports-mgmt/poudriere-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= poudriere -DISTVERSION= 3.3.99.20211015 +DISTVERSION= 3.3.99.20211017 PORTREVISION= 0 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ @@ -16,7 +16,7 @@ CONFLICTS_INSTALL= poudriere-[0-9]* USE_GITHUB= yes GH_ACCOUNT= freebsd -GH_TAGNAME= 3.3.0-1019-gef4526594 +GH_TAGNAME= 3.3.0-1020-g59a87677c GNU_CONFIGURE= yes ETCDIR= ${PREFIX}/etc/poudriere.d diff --git a/ports-mgmt/poudriere-devel/distinfo b/ports-mgmt/poudriere-devel/distinfo index 512e898c7e40..1d3659a36cef 100644 --- a/ports-mgmt/poudriere-devel/distinfo +++ b/ports-mgmt/poudriere-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634355830 -SHA256 (freebsd-poudriere-3.3.99.20211015-3.3.0-1019-gef4526594_GH0.tar.gz) = d0730ac21cbe1220733c56dcd2be4c380bcd5f5c15ea64453ecfa98823773845 -SIZE (freebsd-poudriere-3.3.99.20211015-3.3.0-1019-gef4526594_GH0.tar.gz) = 4202010 +TIMESTAMP = 1634498636 +SHA256 (freebsd-poudriere-3.3.99.20211017-3.3.0-1020-g59a87677c_GH0.tar.gz) = 46b0f69c0760a7d9a13decf7db46b09b5485e4292e9769d3f17c3da6367ebbd7 +SIZE (freebsd-poudriere-3.3.99.20211017-3.3.0-1020-g59a87677c_GH0.tar.gz) = 4202004 From nobody Thu Oct 28 21:37: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 8D65B181E5A9; Thu, 28 Oct 2021 21:37: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 4HgJn63RSnz4fWF; Thu, 28 Oct 2021 21:37: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 1864D2E29; Thu, 28 Oct 2021 21:37: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 19SLbUuF096799; Thu, 28 Oct 2021 21:37:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19SLbUXp096798; Thu, 28 Oct 2021 21:37:30 GMT (envelope-from git) Date: Thu, 28 Oct 2021 21:37:30 GMT Message-Id: <202110282137.19SLbUXp096798@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bryan Drewery Subject: git: 8c3cdd69f680 - 2021Q4 - ports-mgmt/poudriere-devel: Update to 3.3.0-1022-g964cf327f 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: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 8c3cdd69f680ef84ea4e2a155fc5ec959ab8d22f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=8c3cdd69f680ef84ea4e2a155fc5ec959ab8d22f commit 8c3cdd69f680ef84ea4e2a155fc5ec959ab8d22f Author: Bryan Drewery AuthorDate: 2021-10-17 21:52:01 +0000 Commit: Bryan Drewery CommitDate: 2021-10-28 21:36:36 +0000 ports-mgmt/poudriere-devel: Update to 3.3.0-1022-g964cf327f Changes: - Fix interactive mode failing on 'pkg update' - Fix non-root CCACHE usage to be able to read /root/.ccache (cherry picked from commit 4116dc2f1f6385b42fb668badb6b4c1cbb195f9d) --- ports-mgmt/poudriere-devel/Makefile | 4 ++-- ports-mgmt/poudriere-devel/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile index e76bb33e4155..6de028ab3b22 100644 --- a/ports-mgmt/poudriere-devel/Makefile +++ b/ports-mgmt/poudriere-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= poudriere DISTVERSION= 3.3.99.20211017 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ @@ -16,7 +16,7 @@ CONFLICTS_INSTALL= poudriere-[0-9]* USE_GITHUB= yes GH_ACCOUNT= freebsd -GH_TAGNAME= 3.3.0-1020-g59a87677c +GH_TAGNAME= 3.3.0-1022-g964cf327f GNU_CONFIGURE= yes ETCDIR= ${PREFIX}/etc/poudriere.d diff --git a/ports-mgmt/poudriere-devel/distinfo b/ports-mgmt/poudriere-devel/distinfo index 1d3659a36cef..7b390063111f 100644 --- a/ports-mgmt/poudriere-devel/distinfo +++ b/ports-mgmt/poudriere-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634498636 -SHA256 (freebsd-poudriere-3.3.99.20211017-3.3.0-1020-g59a87677c_GH0.tar.gz) = 46b0f69c0760a7d9a13decf7db46b09b5485e4292e9769d3f17c3da6367ebbd7 -SIZE (freebsd-poudriere-3.3.99.20211017-3.3.0-1020-g59a87677c_GH0.tar.gz) = 4202004 +TIMESTAMP = 1634507497 +SHA256 (freebsd-poudriere-3.3.99.20211017-3.3.0-1022-g964cf327f_GH0.tar.gz) = 66ba3f23cf65818f712def9da735559f6e90390fa30b986a19175d5a39574fd2 +SIZE (freebsd-poudriere-3.3.99.20211017-3.3.0-1022-g964cf327f_GH0.tar.gz) = 4202149 From nobody Thu Oct 28 21:37: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 2C8B0181E5AB; Thu, 28 Oct 2021 21:37: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 4HgJn74Yynz4fR7; Thu, 28 Oct 2021 21:37: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 3817F2DDD; Thu, 28 Oct 2021 21:37: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 19SLbVA9096823; Thu, 28 Oct 2021 21:37:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19SLbV8G096822; Thu, 28 Oct 2021 21:37:31 GMT (envelope-from git) Date: Thu, 28 Oct 2021 21:37:31 GMT Message-Id: <202110282137.19SLbV8G096822@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bryan Drewery Subject: git: 604c4de998e9 - 2021Q4 - ports-mgmt/poudriere-devel: Really fix non-amd64 build 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: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 604c4de998e9b806b63d0995707e9ccf38aa088f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=604c4de998e9b806b63d0995707e9ccf38aa088f commit 604c4de998e9b806b63d0995707e9ccf38aa088f Author: Bryan Drewery AuthorDate: 2021-10-18 22:26:18 +0000 Commit: Bryan Drewery CommitDate: 2021-10-28 21:36:37 +0000 ports-mgmt/poudriere-devel: Really fix non-amd64 build (cherry picked from commit f3b8c0953312c6dc0975a2733631537dd057e96a) --- ports-mgmt/poudriere-devel/Makefile | 4 ++-- ports-mgmt/poudriere-devel/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile index 6de028ab3b22..bb04a983810d 100644 --- a/ports-mgmt/poudriere-devel/Makefile +++ b/ports-mgmt/poudriere-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= poudriere DISTVERSION= 3.3.99.20211017 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ @@ -16,7 +16,7 @@ CONFLICTS_INSTALL= poudriere-[0-9]* USE_GITHUB= yes GH_ACCOUNT= freebsd -GH_TAGNAME= 3.3.0-1022-g964cf327f +GH_TAGNAME= 3.3.0-1023-g0070a55f9 GNU_CONFIGURE= yes ETCDIR= ${PREFIX}/etc/poudriere.d diff --git a/ports-mgmt/poudriere-devel/distinfo b/ports-mgmt/poudriere-devel/distinfo index 7b390063111f..a796c8ae353e 100644 --- a/ports-mgmt/poudriere-devel/distinfo +++ b/ports-mgmt/poudriere-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634507497 -SHA256 (freebsd-poudriere-3.3.99.20211017-3.3.0-1022-g964cf327f_GH0.tar.gz) = 66ba3f23cf65818f712def9da735559f6e90390fa30b986a19175d5a39574fd2 -SIZE (freebsd-poudriere-3.3.99.20211017-3.3.0-1022-g964cf327f_GH0.tar.gz) = 4202149 +TIMESTAMP = 1634595920 +SHA256 (freebsd-poudriere-3.3.99.20211017-3.3.0-1023-g0070a55f9_GH0.tar.gz) = 99d0fe10c14adfe4f9b48931ca9d3d5748a808bb8bf02eb7a53290c9cfb167ca +SIZE (freebsd-poudriere-3.3.99.20211017-3.3.0-1023-g0070a55f9_GH0.tar.gz) = 4202074 From nobody Fri Oct 29 00:35:57 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 69688181E732; Fri, 29 Oct 2021 00:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HgNl11cSQz4TkC; Fri, 29 Oct 2021 00:35:57 +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 18C7B589D; Fri, 29 Oct 2021 00:35:57 +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 19T0Zv8F036343; Fri, 29 Oct 2021 00:35:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19T0ZvtC036342; Fri, 29 Oct 2021 00:35:57 GMT (envelope-from git) Date: Fri, 29 Oct 2021 00:35:57 GMT Message-Id: <202110290035.19T0ZvtC036342@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: cdce85a3fcde - 2021Q4 - misc/freebsd-release-manifests: Add MANIFEST files for 12.3-BETA2. 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: cdce85a3fcde2416e9b903ff4dd5f16ea73d9d10 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by gjb: URL: https://cgit.FreeBSD.org/ports/commit/?id=cdce85a3fcde2416e9b903ff4dd5f16ea73d9d10 commit cdce85a3fcde2416e9b903ff4dd5f16ea73d9d10 Author: Glen Barber AuthorDate: 2021-10-29 00:34:27 +0000 Commit: Glen Barber CommitDate: 2021-10-29 00:35:42 +0000 misc/freebsd-release-manifests: Add MANIFEST files for 12.3-BETA2. Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit d82adac7e3b6023aa8282ae5d1d29eb26cc6a7ca) --- misc/freebsd-release-manifests/Makefile | 2 +- .../files/MANIFESTS/amd64-amd64-12.3-BETA2 | 9 +++++++++ .../files/MANIFESTS/arm64-aarch64-12.3-BETA2 | 7 +++++++ .../files/MANIFESTS/i386-i386-12.3-BETA2 | 7 +++++++ .../files/MANIFESTS/powerpc-powerpc-12.3-BETA2 | 7 +++++++ .../files/MANIFESTS/powerpc-powerpc64-12.3-BETA2 | 9 +++++++++ .../files/MANIFESTS/powerpc-powerpcspe-12.3-BETA2 | 7 +++++++ .../files/MANIFESTS/sparc64-sparc64-12.3-BETA2 | 7 +++++++ misc/freebsd-release-manifests/pkg-plist | 7 +++++++ 9 files changed, 61 insertions(+), 1 deletion(-) diff --git a/misc/freebsd-release-manifests/Makefile b/misc/freebsd-release-manifests/Makefile index c58ab3adb7b9..8abb079282cf 100644 --- a/misc/freebsd-release-manifests/Makefile +++ b/misc/freebsd-release-manifests/Makefile @@ -1,5 +1,5 @@ PORTNAME= freebsd-release-manifests -DISTVERSION= 20211022 +DISTVERSION= 20211029 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 new file mode 100644 index 000000000000..2793e8cbc501 --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-12.3-BETA2 @@ -0,0 +1,9 @@ +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/arm64-aarch64-12.3-BETA2 b/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-12.3-BETA2 new file mode 100644 index 000000000000..e4f472c983e1 --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-12.3-BETA2 @@ -0,0 +1,7 @@ +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/i386-i386-12.3-BETA2 b/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-12.3-BETA2 new file mode 100644 index 000000000000..e956d95c9bda --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-12.3-BETA2 @@ -0,0 +1,7 @@ +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/powerpc-powerpc-12.3-BETA2 b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-12.3-BETA2 new file mode 100644 index 000000000000..e6570128c934 --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-12.3-BETA2 @@ -0,0 +1,7 @@ +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-powerpc64-12.3-BETA2 b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-12.3-BETA2 new file mode 100644 index 000000000000..d061d9dd5458 --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-12.3-BETA2 @@ -0,0 +1,9 @@ +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-powerpcspe-12.3-BETA2 b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpcspe-12.3-BETA2 new file mode 100644 index 000000000000..ae583928c0da --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpcspe-12.3-BETA2 @@ -0,0 +1,7 @@ +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/sparc64-sparc64-12.3-BETA2 b/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-12.3-BETA2 new file mode 100644 index 000000000000..357652e38c6f --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-12.3-BETA2 @@ -0,0 +1,7 @@ +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/pkg-plist b/misc/freebsd-release-manifests/pkg-plist index c17616484e40..725f14f27b0b 100644 --- a/misc/freebsd-release-manifests/pkg-plist +++ b/misc/freebsd-release-manifests/pkg-plist @@ -20,3 +20,10 @@ %%DATADIR%%/MANIFESTS/powerpc-powerpc64-12.3-BETA1 %%DATADIR%%/MANIFESTS/powerpc-powerpcspe-12.3-BETA1 %%DATADIR%%/MANIFESTS/sparc64-sparc64-12.3-BETA1 +%%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 From nobody Fri Oct 29 09:22: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 A1D1E181D3E9; Fri, 29 Oct 2021 09:22: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 4HgcQV47LBz4ksc; Fri, 29 Oct 2021 09:22: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 6E596144E8; Fri, 29 Oct 2021 09:22: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 19T9MQvq041688; Fri, 29 Oct 2021 09:22:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19T9MQsX041687; Fri, 29 Oct 2021 09:22:26 GMT (envelope-from git) Date: Fri, 29 Oct 2021 09:22:26 GMT Message-Id: <202110290922.19T9MQsX041687@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: a3e7eff05bc2 - 2021Q4 - www/firefox: update to 94.0 (rc3) 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: a3e7eff05bc204176fea0f5c5ade9062f5058e9b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=a3e7eff05bc204176fea0f5c5ade9062f5058e9b commit a3e7eff05bc204176fea0f5c5ade9062f5058e9b Author: Christoph Moench-Tegeder AuthorDate: 2021-10-29 09:20:00 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2021-10-29 09:22:10 +0000 www/firefox: update to 94.0 (rc3) Release Notes (soon): https://www.mozilla.org/en-US/firefox/94.0/releasenotes/ (cherry picked from commit f2b9a177fa65d8010c60d9dd2803a4b4bb9bcec8) --- www/firefox/Makefile | 3 ++- www/firefox/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 268b6b40f1e0..36d784c09a09 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,10 +2,11 @@ PORTNAME= firefox DISTVERSION= 94.0 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org diff --git a/www/firefox/distinfo b/www/firefox/distinfo index bb261fd8eda0..b2881cfd0dfb 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635270996 -SHA256 (firefox-94.0.source.tar.xz) = b5e1a5f6068f16992bb516d01875f3f04acd90f53ad5b7a11a6a5a66ff999f09 -SIZE (firefox-94.0.source.tar.xz) = 380022264 +TIMESTAMP = 1635448874 +SHA256 (firefox-94.0.source.tar.xz) = b7bb8c5fcc74a74e9d2b55d1e9415b891305fe86520fb854cec25024d7e5de67 +SIZE (firefox-94.0.source.tar.xz) = 379590880 From nobody Fri Oct 29 19:44: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 DE6961821692; Fri, 29 Oct 2021 19:44: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 4HgtDp5qb6z3vlq; Fri, 29 Oct 2021 19:44: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 A7B661CC53; Fri, 29 Oct 2021 19:44: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 19TJiwF4070210; Fri, 29 Oct 2021 19:44:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19TJiw20070209; Fri, 29 Oct 2021 19:44:58 GMT (envelope-from git) Date: Fri, 29 Oct 2021 19:44:58 GMT Message-Id: <202110291944.19TJiw20070209@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: fd6f8123f039 - 2021Q4 - security/tor-devel: Update 0.4.7.1-alpha -> 0.4.7.2-alpha 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: fd6f8123f03955e88dc7e73e3c4e9973e59bbecd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd6f8123f03955e88dc7e73e3c4e9973e59bbecd commit fd6f8123f03955e88dc7e73e3c4e9973e59bbecd Author: Neel Chauhan AuthorDate: 2021-10-29 19:37:36 +0000 Commit: Yuri Victorovich CommitDate: 2021-10-29 19:42:31 +0000 security/tor-devel: Update 0.4.7.1-alpha -> 0.4.7.2-alpha Changelog: https://gitweb.torproject.org/tor.git/plain/ChangeLog?h=tor-0.4.7.2-alpha PR: 259531 (cherry picked from commit a58a309a102b6d2994437149e4c198bae330c5e1) --- security/tor-devel/Makefile | 2 +- security/tor-devel/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile index 3f89f0576cd8..98e9d0394a55 100644 --- a/security/tor-devel/Makefile +++ b/security/tor-devel/Makefile @@ -1,7 +1,7 @@ # Created by: peter.thoenen@yahoo.com PORTNAME= tor -DISTVERSION= 0.4.7.1-alpha +DISTVERSION= 0.4.7.2-alpha CATEGORIES= security net MASTER_SITES= TOR PKGNAMESUFFIX= -devel diff --git a/security/tor-devel/distinfo b/security/tor-devel/distinfo index f7e041862309..68f70af6a053 100644 --- a/security/tor-devel/distinfo +++ b/security/tor-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633060443 -SHA256 (tor-0.4.7.1-alpha.tar.gz) = ccd5e7449fcf40d3fd56b12dc36b049221314005ff71ed20a4d7490e34604eae -SIZE (tor-0.4.7.1-alpha.tar.gz) = 7837114 +TIMESTAMP = 1635524945 +SHA256 (tor-0.4.7.2-alpha.tar.gz) = 9f6fff2f38949bef59144d69bc4b8604c68516a6308ca6c4b5ab583c266a3f08 +SIZE (tor-0.4.7.2-alpha.tar.gz) = 7821412 From nobody Fri Oct 29 19:44:59 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 5919E182135A; Fri, 29 Oct 2021 19:45:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HgtDq6zfgz3w4x; Fri, 29 Oct 2021 19:44:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CCF641CF2F; Fri, 29 Oct 2021 19:44:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19TJixb9070241; Fri, 29 Oct 2021 19:44:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19TJixkt070240; Fri, 29 Oct 2021 19:44:59 GMT (envelope-from git) Date: Fri, 29 Oct 2021 19:44:59 GMT Message-Id: <202110291944.19TJixkt070240@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: 26669118d268 - 2021Q4 - security/tor: Update 0.4.6.7 -> 0.4.6.8 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: 26669118d268e1caf991e909a3d4e883072629cf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=26669118d268e1caf991e909a3d4e883072629cf commit 26669118d268e1caf991e909a3d4e883072629cf Author: Yuri Victorovich AuthorDate: 2021-10-29 19:39:29 +0000 Commit: Yuri Victorovich CommitDate: 2021-10-29 19:42:32 +0000 security/tor: Update 0.4.6.7 -> 0.4.6.8 Changelog: https://gitweb.torproject.org/tor.git/plain/ChangeLog?h=tor-0.4.6.8 (cherry picked from commit 0c3ad9597bc1a27a3e712b4efeb1aa5dc1af772f) --- security/tor/Makefile | 2 +- security/tor/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/security/tor/Makefile b/security/tor/Makefile index 00ca5857f57f..51810be98af9 100644 --- a/security/tor/Makefile +++ b/security/tor/Makefile @@ -1,7 +1,7 @@ # Created by: peter.thoenen@yahoo.com PORTNAME= tor -DISTVERSION= 0.4.6.7 +DISTVERSION= 0.4.6.8 CATEGORIES= security net MASTER_SITES= TOR diff --git a/security/tor/distinfo b/security/tor/distinfo index 14931dad22fe..d5e672a73eb2 100644 --- a/security/tor/distinfo +++ b/security/tor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629151675 -SHA256 (tor-0.4.6.7.tar.gz) = ff665ce121b2952110bd98b9c8741b5593bf6c01ac09033ad848ed92c2510f9a -SIZE (tor-0.4.6.7.tar.gz) = 7790727 +TIMESTAMP = 1635536034 +SHA256 (tor-0.4.6.8.tar.gz) = 15ce1a37b4cc175b07761e00acdcfa2c08f0d23d6c3ab9c97c464bd38cc5476a +SIZE (tor-0.4.6.8.tar.gz) = 7796485 From nobody Sat Oct 30 00:43:51 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 47F8A1839E7B; Sat, 30 Oct 2021 00:43: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 4Hh0sh0vDZz3JDy; Sat, 30 Oct 2021 00:43: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 F37A220F1B; Sat, 30 Oct 2021 00:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19U0hpZ4071377; Sat, 30 Oct 2021 00:43:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19U0hpVa071376; Sat, 30 Oct 2021 00:43:51 GMT (envelope-from git) Date: Sat, 30 Oct 2021 00:43:51 GMT Message-Id: <202110300043.19U0hpVa071376@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: 1ee85294d802 - 2021Q4 - graphics/jpeg-xl: update to 0.6.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: 1ee85294d802aadcd5125765494a7b8c264c2803 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ee85294d802aadcd5125765494a7b8c264c2803 commit 1ee85294d802aadcd5125765494a7b8c264c2803 Author: Jan Beich AuthorDate: 2021-10-29 22:05:36 +0000 Commit: Jan Beich CommitDate: 2021-10-30 00:43:40 +0000 graphics/jpeg-xl: update to 0.6.1 Changes: https://github.com/libjxl/libjxl/releases/tag/v0.6.1 Reported by: GitHub (watch releases) Security: CVE-2021-22563 CVE-2021-22564 (cherry picked from commit a0210022876b25217caf13c642912f71c2ceb6cb) --- graphics/libjxl/Makefile | 2 +- graphics/libjxl/distinfo | 6 +++--- graphics/libjxl/pkg-plist | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/graphics/libjxl/Makefile b/graphics/libjxl/Makefile index c97c50002dcd..3bebe3248d4b 100644 --- a/graphics/libjxl/Makefile +++ b/graphics/libjxl/Makefile @@ -1,6 +1,6 @@ PORTNAME= libjxl DISTVERSIONPREFIX= v -DISTVERSION= 0.6 +DISTVERSION= 0.6.1 CATEGORIES= graphics PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/graphics/libjxl/distinfo b/graphics/libjxl/distinfo index 19a6b350e947..e8589da7cf24 100644 --- a/graphics/libjxl/distinfo +++ b/graphics/libjxl/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1633370564 -SHA256 (libjxl-libjxl-v0.6_GH0.tar.gz) = 89584e20c6e537d8d65d286fd6ae48d5d6abb087ca89f3207238d8d7e6ced4dc -SIZE (libjxl-libjxl-v0.6_GH0.tar.gz) = 16953410 +TIMESTAMP = 1635545136 +SHA256 (libjxl-libjxl-v0.6.1_GH0.tar.gz) = ccbd5a729d730152303be399f033b905e608309d5802d77a61a95faa092592c5 +SIZE (libjxl-libjxl-v0.6.1_GH0.tar.gz) = 16953185 SHA256 (barmco-skcms-6437475_GH0.tar.gz) = 6818ea7aa053a964d1795d6d1d3c5e2aad5d30dff9817c8e604e324ef643ec01 SIZE (barmco-skcms-6437475_GH0.tar.gz) = 9200034 SHA256 (google-highway-0.12.2-4-ge239774_GH0.tar.gz) = 27ae8a40f82874cb30bd62ef8f5567cc27838ee258ed0af47745685a15b23a8e diff --git a/graphics/libjxl/pkg-plist b/graphics/libjxl/pkg-plist index 44b9d8552846..0bef6b83e6bd 100644 --- a/graphics/libjxl/pkg-plist +++ b/graphics/libjxl/pkg-plist @@ -21,12 +21,12 @@ include/jxl/types.h lib/libjxl.a lib/libjxl.so lib/libjxl.so.0.6 -lib/libjxl.so.0.6.0 +lib/libjxl.so.0.6.1 lib/libjxl_dec.a lib/libjxl_threads.a lib/libjxl_threads.so lib/libjxl_threads.so.0.6 -lib/libjxl_threads.so.0.6.0 +lib/libjxl_threads.so.0.6.1 libdata/pkgconfig/libjxl.pc libdata/pkgconfig/libjxl_threads.pc %%GIMP%%libexec/gimp/2.2/plug-ins/file-jxl/file-jxl From nobody Sat Oct 30 00:43: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 7F534183A1B3; Sat, 30 Oct 2021 00:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hh0sj2fL4z3J6c; Sat, 30 Oct 2021 00:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2659820DE6; Sat, 30 Oct 2021 00:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19U0hrEN071401; Sat, 30 Oct 2021 00:43:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19U0hruo071400; Sat, 30 Oct 2021 00:43:53 GMT (envelope-from git) Date: Sat, 30 Oct 2021 00:43:53 GMT Message-Id: <202110300043.19U0hruo071400@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: f99a1f703656 - 2021Q4 - emulators/yuzu: update to s20211029 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: f99a1f7036567497433f80ae38d3f55cf9f93261 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f99a1f7036567497433f80ae38d3f55cf9f93261 commit f99a1f7036567497433f80ae38d3f55cf9f93261 Author: Jan Beich AuthorDate: 2021-10-29 22:12:53 +0000 Commit: Jan Beich CommitDate: 2021-10-30 00:43:44 +0000 emulators/yuzu: update to s20211029 Changes: https://github.com/yuzu-emu/yuzu/compare/40c8a8c62...c1b199bd2 (cherry picked from commit af8109c9d69115dddb499b48dbb8c7534205e007) --- 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 090cc8a236c2..5c70d9046af3 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,5 +1,5 @@ PORTNAME= yuzu -PORTVERSION= s20211026 +PORTVERSION= s20211029 PORTREVISION?= 0 CATEGORIES= emulators @@ -33,7 +33,7 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \ USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= 40c8a8c62 +GH_TAGNAME= c1b199bd2 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 bb457e930a55..1ebbebd0cfeb 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1635300945 -SHA256 (yuzu-emu-yuzu-s20211026-40c8a8c62_GH0.tar.gz) = f2a8148a24d33108f21ba9d9063aa643f43fd7d859758fd4216ad537cde0d4ee -SIZE (yuzu-emu-yuzu-s20211026-40c8a8c62_GH0.tar.gz) = 4270706 +TIMESTAMP = 1635545573 +SHA256 (yuzu-emu-yuzu-s20211029-c1b199bd2_GH0.tar.gz) = 6432b9a15296232617fcf574512bfde49070a3e939f38b31d12ed02c292d1c7f +SIZE (yuzu-emu-yuzu-s20211029-c1b199bd2_GH0.tar.gz) = 4270889 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 Oct 30 02:46:12 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 111771822C89; Sat, 30 Oct 2021 02:46: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 4Hh3Zr6v81z4Z09; Sat, 30 Oct 2021 02:46: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 CC71E225D1; Sat, 30 Oct 2021 02:46: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 19U2kCG1030650; Sat, 30 Oct 2021 02:46:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19U2kCLG030649; Sat, 30 Oct 2021 02:46:12 GMT (envelope-from git) Date: Sat, 30 Oct 2021 02:46:12 GMT Message-Id: <202110300246.19U2kCLG030649@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: 917e3a5bdddd - 2021Q4 - graphics/vkd3d: explicitly disable doxygen documentation 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: 917e3a5bdddd853d6f5eeb14ebb1ece7267fdbf3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=917e3a5bdddd853d6f5eeb14ebb1ece7267fdbf3 commit 917e3a5bdddd853d6f5eeb14ebb1ece7267fdbf3 Author: VVD AuthorDate: 2021-09-29 13:21:39 +0000 Commit: Jan Beich CommitDate: 2021-10-30 02:46:07 +0000 graphics/vkd3d: explicitly disable doxygen documentation $ pkg install doxygen $ make [...] !pdfTeX error: /usr/local/bin/pdflatex (file 8r.enc): cannot open encoding file ==> Fatal error occurred, no output PDF file produced! mv: rename refman.pdf to ../vkd3d.pdf: No such file or directory gmake[1]: *** [Makefile:2082: doc/vkd3d.pdf] Error 1 $ pkg provides 8r.enc Name : tex-dvipsk-5.995_2 Desc : Convert a TeX DVI file to PostScript Repo : FreeBSD Filename: usr/local/share/texmf-dist/fonts/enc/dvips/txfonts/tx8r.enc usr/local/share/texmf-dist/fonts/enc/dvips/context/q-8r.enc usr/local/share/texmf-dist/fonts/enc/dvips/base/8r.enc (cherry picked from commit 00e34776185e3272e8af411e5c54e0934dabac5b) --- graphics/vkd3d/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphics/vkd3d/Makefile b/graphics/vkd3d/Makefile index 34e1aaad721f..45d99ab4ac7d 100644 --- a/graphics/vkd3d/Makefile +++ b/graphics/vkd3d/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers USES= gmake libtool localbase pkgconfig tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-spirv-tools +CONFIGURE_ARGS= --disable-doxygen-doc --with-spirv-tools TEST_TARGET= check # XXX Move to a separate port (a la graphics/vulkan-headers) and maybe make From nobody Sat Oct 30 02:46: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 51745182297B; Sat, 30 Oct 2021 02:46: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 4Hh3Zt1Hkkz4Yn1; Sat, 30 Oct 2021 02:46: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 F15882263F; Sat, 30 Oct 2021 02:46: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 19U2kDHP030674; Sat, 30 Oct 2021 02:46:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19U2kDna030673; Sat, 30 Oct 2021 02:46:13 GMT (envelope-from git) Date: Sat, 30 Oct 2021 02:46:13 GMT Message-Id: <202110300246.19U2kDna030673@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: b1a8e908da76 - 2021Q4 - devel/basu: unbreak build with LLD 13 (devel/llvm13 or -CURRENT) 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: b1a8e908da76d6f35eef7486f0a30b637cf879b2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1a8e908da76d6f35eef7486f0a30b637cf879b2 commit b1a8e908da76d6f35eef7486f0a30b637cf879b2 Author: Evgeniy Khramtsov AuthorDate: 2021-10-09 15:37:45 +0000 Commit: Jan Beich CommitDate: 2021-10-30 02:46:08 +0000 devel/basu: unbreak build with LLD 13 (devel/llvm13 or -CURRENT) ld: error: undefined symbol: __start_BUS_ERROR_MAP >>> referenced by bus-error.c >>> libsystemd_static.a.p/sd-bus_bus-error.c.o:(bus_error_name_to_errno) in archive src/libsystemd/libsystemd_static.a ld: error: undefined symbol: __stop_BUS_ERROR_MAP >>> referenced by bus-error.c >>> libsystemd_static.a.p/sd-bus_bus-error.c.o:(bus_error_name_to_errno) in archive src/libsystemd/libsystemd_static.a >>> referenced by bus-error.c >>> libsystemd_static.a.p/sd-bus_bus-error.c.o:(bus_error_name_to_errno) in archive src/libsystemd/libsystemd_static.a cc: error: linker command failed with exit code 1 (use -v to see invocation) PR: 258812 Obtained from: https://github.com/systemd/systemd/commit/945317a4b69d (cherry picked from commit ffe546db80d95396051300a693d07acdcda457a3) --- devel/basu/files/patch-lld13 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/devel/basu/files/patch-lld13 b/devel/basu/files/patch-lld13 new file mode 100644 index 000000000000..fde89d2ea9ac --- /dev/null +++ b/devel/basu/files/patch-lld13 @@ -0,0 +1,23 @@ +https://lists.sr.ht/~emersion/public-inbox/%3CCANvPQf_5qOdfbe4Tk029yVB6BHipmYfQnuuCVoTUv3N%3D2f8jfw%40mail.gmail.com%3E +https://github.com/systemd/systemd/commit/945317a4b69d33752c9513bb8994fe8d5a786ea6 + +--- src/libsystemd/sd-bus/bus-error.h.orig 2021-01-06 13:56:51 UTC ++++ src/libsystemd/sd-bus/bus-error.h +@@ -28,11 +28,17 @@ int bus_error_set_errnofv(sd_bus_error *e, int error, + * the bus error table, and BUS_ERROR_MAP_ELF_USE has to be used at + * least once per compilation unit (i.e. per library), to ensure that + * the error map is really added to the final binary. ++ * ++ * In addition, set the retain attribute so that the section cannot be ++ * discarded by ld --gc-sections -z start-stop-gc. Older compilers would ++ * warn for the unknown attribute, so just disable -Wattributes. + */ + + #define BUS_ERROR_MAP_ELF_REGISTER \ ++ _Pragma("GCC diagnostic ignored \"-Wattributes\"") \ + __attribute__ ((__section__("BUS_ERROR_MAP"))) \ + __attribute__ ((__used__)) \ ++ __attribute__ ((retain)) \ + __attribute__ ((aligned(8))) + + #define BUS_ERROR_MAP_ELF_USE(errors) \ From nobody Sat Oct 30 08:49:56 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 6956318237A5; Sat, 30 Oct 2021 08:49: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 4HhCfX2bSZz3h4G; Sat, 30 Oct 2021 08:49: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 344122772A; Sat, 30 Oct 2021 08:49: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 19U8nuc5010937; Sat, 30 Oct 2021 08:49:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19U8nuSA010936; Sat, 30 Oct 2021 08:49:56 GMT (envelope-from git) Date: Sat, 30 Oct 2021 08:49:56 GMT Message-Id: <202110300849.19U8nuSA010936@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: 12907c571e8b - 2021Q4 - sysutils/bsdisks: Refresh distinfo. 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: 12907c571e8b0fa7578388610412d992ff0003a5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=12907c571e8b0fa7578388610412d992ff0003a5 commit 12907c571e8b0fa7578388610412d992ff0003a5 Author: Gleb Popov AuthorDate: 2021-10-30 08:46:01 +0000 Commit: Gleb Popov CommitDate: 2021-10-30 08:49:40 +0000 sysutils/bsdisks: Refresh distinfo. Something happened upstream and the resulting distfile is now of different size. PR: 259546 (cherry picked from commit 8724cef00af2e26b168a864167e7984be938546d) --- sysutils/bsdisks/distinfo | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sysutils/bsdisks/distinfo b/sysutils/bsdisks/distinfo index b398844fe272..4f9e2b87c558 100644 --- a/sysutils/bsdisks/distinfo +++ b/sysutils/bsdisks/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1622461141 -SHA256 (bsdutils-bsdisks-e1d6cc627e5371f26a3350f19e19f0d1d017b1f2_GL0.tar.gz) = ce8c364d91c3f2bb6c312da6047e2006cbb47b63ffd0f10d333cbeb2261861af -SIZE (bsdutils-bsdisks-e1d6cc627e5371f26a3350f19e19f0d1d017b1f2_GL0.tar.gz) = 109764 +TIMESTAMP = 1635582996 +SHA256 (bsdutils-bsdisks-e1d6cc627e5371f26a3350f19e19f0d1d017b1f2_GL0.tar.gz) = ad71a3921b69ab47b629df828371367af179f71c1b33d368f6d419916eb1e759 +SIZE (bsdutils-bsdisks-e1d6cc627e5371f26a3350f19e19f0d1d017b1f2_GL0.tar.gz) = 109757 From nobody Sat Oct 30 14:14:18 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 C90981832144; Sat, 30 Oct 2021 14:14:18 +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 4HhLrp5GKvz4WjV; Sat, 30 Oct 2021 14:14:18 +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 94ECF3FD4; Sat, 30 Oct 2021 14:14:18 +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 19UEEI1H049848; Sat, 30 Oct 2021 14:14:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19UEEIRR049847; Sat, 30 Oct 2021 14:14:18 GMT (envelope-from git) Date: Sat, 30 Oct 2021 14:14:18 GMT Message-Id: <202110301414.19UEEIRR049847@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Tobias C. Berner" Subject: git: 69d25555f33e - 2021Q4 - net/freerdp: update to 2.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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 69d25555f33e662fd5131e5279ee74733844f845 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=69d25555f33e662fd5131e5279ee74733844f845 commit 69d25555f33e662fd5131e5279ee74733844f845 Author: VVD AuthorDate: 2021-10-30 13:43:09 +0000 Commit: Tobias C. Berner CommitDate: 2021-10-30 14:13:59 +0000 net/freerdp: update to 2.4.1 Noteworthy changes: * Refactored RPC gateway parsing code * OpenSSL 3.0 compatibility fixes * USB redirection: fixed transfer lengths Fixed issues: * #7363: Length checks in ConvertUTF8toUTF16 * #7349: Added checks for bitmap width and heigth values Important notes: * CVE-2021-41159: Improper client input validation for gateway connections allows to overwrite memory * CVE-2021-41160: Improper region checks in all clients allow out of bound write to memory PR: 259386 (cherry picked from commit a698098ee923a4a9a41e0d34938b6a95633bf278) --- net/freerdp/Makefile | 4 ++-- net/freerdp/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile index 6385ece4b099..08dda79dbb4e 100644 --- a/net/freerdp/Makefile +++ b/net/freerdp/Makefile @@ -1,9 +1,9 @@ # Created by: Alexander Logvinov PORTNAME= freerdp -DISTVERSION= 2.4.0 +DISTVERSION= 2.4.1 CATEGORIES= net comms -MASTER_SITES= https://pub.freerdp.com/releases/ \ +MASTER_SITES= https://pub.freerdp.com/releases/ \ https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/ MAINTAINER= vvd@unislabs.com diff --git a/net/freerdp/distinfo b/net/freerdp/distinfo index 31eb352960c8..74fe2f3f0874 100644 --- a/net/freerdp/distinfo +++ b/net/freerdp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629080374 -SHA256 (freerdp-2.4.0.tar.gz) = 10ec9b06d74182b354ae288c8e621d94c0fb189b0c3b14a59867ab4c414c08b5 -SIZE (freerdp-2.4.0.tar.gz) = 7244549 +TIMESTAMP = 1635018112 +SHA256 (freerdp-2.4.1.tar.gz) = ef75c87926643a0d0041f6556e343ac037380d4260c64885e7cdd20da0147edf +SIZE (freerdp-2.4.1.tar.gz) = 7300797 From nobody Sat Oct 30 14:23:33 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 65747183732C; Sat, 30 Oct 2021 14:23:34 +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 4HhM3T6Lzyz4bVD; Sat, 30 Oct 2021 14:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9711936E7; Sat, 30 Oct 2021 14:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19UENXhI063338; Sat, 30 Oct 2021 14:23:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19UENXXx063337; Sat, 30 Oct 2021 14:23:33 GMT (envelope-from git) Date: Sat, 30 Oct 2021 14:23:33 GMT Message-Id: <202110301423.19UENXXx063337@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Marc Fonvieille Subject: git: 71d69b5fb367 - 2021Q4 - misc/freebsd-doc-all: Update to ra4827f6f64 from FreeBSD docset 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: blackend X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 71d69b5fb367faaafc6731be7927eb291cf2cadc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by blackend (doc committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=71d69b5fb367faaafc6731be7927eb291cf2cadc commit 71d69b5fb367faaafc6731be7927eb291cf2cadc Author: Marc Fonvieille AuthorDate: 2021-10-03 15:14:58 +0000 Commit: Marc Fonvieille CommitDate: 2021-10-30 14:23:10 +0000 misc/freebsd-doc-all: Update to ra4827f6f64 from FreeBSD docset Approved by: doceng (implicit) (cherry picked from commit a10f21cbae209a6fbafcdf4d60c2c1e125c137ec) --- misc/freebsd-doc-all/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile index 1c80381cb71c..fc31569183fe 100644 --- a/misc/freebsd-doc-all/Makefile +++ b/misc/freebsd-doc-all/Makefile @@ -1,7 +1,7 @@ # Created by: Marc Fonvieille PORTNAME= freebsd-doc-all -PORTVERSION= 20210125 +PORTVERSION= 20210918 PORTEPOCH= 1 CATEGORIES= misc docs From nobody Sat Oct 30 14:25: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 8B212181851B; Sat, 30 Oct 2021 14:25:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HhM5M3FQ8z4c7w; Sat, 30 Oct 2021 14:25:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 45383442C; Sat, 30 Oct 2021 14:25:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19UEPBF2063577; Sat, 30 Oct 2021 14:25:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19UEPBkL063576; Sat, 30 Oct 2021 14:25:11 GMT (envelope-from git) Date: Sat, 30 Oct 2021 14:25:11 GMT Message-Id: <202110301425.19UEPBkL063576@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Marc Fonvieille Subject: git: 561ff2526763 - 2021Q4 - misc/freebsd-doc-*: Update to 63971d4 revision from the FreeBSD docset 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: blackend X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 561ff252676387014e429c315985bc6c4202628a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by blackend (doc committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=561ff252676387014e429c315985bc6c4202628a commit 561ff252676387014e429c315985bc6c4202628a Author: Marc Fonvieille AuthorDate: 2021-10-29 19:30:11 +0000 Commit: Marc Fonvieille CommitDate: 2021-10-30 14:24:22 +0000 misc/freebsd-doc-*: Update to 63971d4 revision from the FreeBSD docset 63971d4 revision is also 12.3-R version (cherry picked from commit 8cad98d7eb135f13529d97f0139cd02a1b6d4df2) --- misc/freebsd-doc-all/Makefile | 2 +- misc/freebsd-doc-bn/Makefile | 2 +- misc/freebsd-doc-en/Makefile | 2 +- misc/freebsd-doc-en/distinfo | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile index fc31569183fe..403b89c24326 100644 --- a/misc/freebsd-doc-all/Makefile +++ b/misc/freebsd-doc-all/Makefile @@ -1,7 +1,7 @@ # Created by: Marc Fonvieille PORTNAME= freebsd-doc-all -PORTVERSION= 20210918 +PORTVERSION= 20211029 PORTEPOCH= 1 CATEGORIES= misc docs diff --git a/misc/freebsd-doc-bn/Makefile b/misc/freebsd-doc-bn/Makefile index 6694acdf845b..20b605151624 100644 --- a/misc/freebsd-doc-bn/Makefile +++ b/misc/freebsd-doc-bn/Makefile @@ -9,6 +9,6 @@ COMMENT= Bengali translation of the FreeBSD Documentation Project MASTERDIR= ${.CURDIR}/../freebsd-doc-en PLIST= ${.CURDIR}/pkg-plist -DOCLANG= bd +DOCLANG= bn-bd .include "${MASTERDIR}/Makefile" diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile index 3f9a050e5b7b..fafdde5689bc 100644 --- a/misc/freebsd-doc-en/Makefile +++ b/misc/freebsd-doc-en/Makefile @@ -1,7 +1,7 @@ # Created by: Marc Fonvieille PORTNAME= freebsd-doc -PORTVERSION= 20210918 +PORTVERSION= 20211029 PORTEPOCH= 1 CATEGORIES= misc docs MASTER_SITES= LOCAL/blackend diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo index 3b6fda08d18f..8d939eb27f87 100644 --- a/misc/freebsd-doc-en/distinfo +++ b/misc/freebsd-doc-en/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1632054605 -SHA256 (freebsd-doc-20210918.tar.gz) = 22b64fa63ba27d0d13406fb52cb914ec9826d20b54412cefee6184d85958fca5 -SIZE (freebsd-doc-20210918.tar.gz) = 92993187 +TIMESTAMP = 1635522068 +SHA256 (freebsd-doc-20211029.tar.gz) = ea769f49a224981e387f290dfd6b124811f1c185eac943d46d009255dab926d4 +SIZE (freebsd-doc-20211029.tar.gz) = 93429740 From nobody Sun Oct 31 00:10: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 E00E6182BA93; Sun, 31 Oct 2021 00:10: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 4Hhc4c5N61z4pXl; Sun, 31 Oct 2021 00:10: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 96AF7140A4; Sun, 31 Oct 2021 00:10: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 19V0AOPd042714; Sun, 31 Oct 2021 00:10:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V0AOsO042713; Sun, 31 Oct 2021 00:10:24 GMT (envelope-from git) Date: Sun, 31 Oct 2021 00:10:24 GMT Message-Id: <202110310010.19V0AOsO042713@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: 0e366f2b757f - 2021Q4 - emulators/yuzu: update to s20211030 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: 0e366f2b757f2a3c03ce80179750dcb8e683d806 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0e366f2b757f2a3c03ce80179750dcb8e683d806 commit 0e366f2b757f2a3c03ce80179750dcb8e683d806 Author: Jan Beich AuthorDate: 2021-10-30 14:45:58 +0000 Commit: Jan Beich CommitDate: 2021-10-31 00:10:21 +0000 emulators/yuzu: update to s20211030 Changes: https://github.com/yuzu-emu/yuzu/compare/c1b199bd2...7aa0d97ee (cherry picked from commit 0fd49f136afa11c60d94d2b3b4436daee9ad0575) --- emulators/yuzu/Makefile | 6 +++--- emulators/yuzu/distinfo | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 5c70d9046af3..896f36d6be90 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,10 +1,10 @@ PORTNAME= yuzu -PORTVERSION= s20211029 +PORTVERSION= s20211030 PORTREVISION?= 0 CATEGORIES= emulators PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 0acf96796cae.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6598 mainline-merge +PATCHFILES+= 1b9d4938b417.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6598 mainline-merge MAINTAINER= jbeich@FreeBSD.org COMMENT= Nintendo Switch emulator/debugger @@ -33,7 +33,7 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \ USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= c1b199bd2 +GH_TAGNAME= 7aa0d97ee 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 1ebbebd0cfeb..1a033902d1eb 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1635545573 -SHA256 (yuzu-emu-yuzu-s20211029-c1b199bd2_GH0.tar.gz) = 6432b9a15296232617fcf574512bfde49070a3e939f38b31d12ed02c292d1c7f -SIZE (yuzu-emu-yuzu-s20211029-c1b199bd2_GH0.tar.gz) = 4270889 +TIMESTAMP = 1635605158 +SHA256 (yuzu-emu-yuzu-s20211030-7aa0d97ee_GH0.tar.gz) = ecdd8c136c46ec4213bc9001fd79b01d91f1ee089e44b1dc1805f74cecf97b22 +SIZE (yuzu-emu-yuzu-s20211030-7aa0d97ee_GH0.tar.gz) = 4271249 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 @@ -25,5 +25,5 @@ SHA256 (kinetiknz-cubeb-cubeb-0.2-1298-g8d53747_GH0.tar.gz) = b5cd93de1ca5c98105 SIZE (kinetiknz-cubeb-cubeb-0.2-1298-g8d53747_GH0.tar.gz) = 218055 SHA256 (yhirose-cpp-httplib-v0.9.0-5-g9648f95_GH0.tar.gz) = a37315dd30f20845cb1823ef70b075ee6150c16f2979fb63cb56332ca9d293f4 SIZE (yhirose-cpp-httplib-v0.9.0-5-g9648f95_GH0.tar.gz) = 577183 -SHA256 (0acf96796cae.patch) = ca713feca740ef8e56fa40de822a83d49cca6d1128eb7945860fb28975bd0c17 -SIZE (0acf96796cae.patch) = 4650 +SHA256 (1b9d4938b417.patch) = 9fa66883f08feaa77cf5a1cb9a631cbc08fbbf4cbfb299010d3955e700038e45 +SIZE (1b9d4938b417.patch) = 4650 From nobody Sun Oct 31 00:10: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 83E27182BAA4; Sun, 31 Oct 2021 00:10: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 4Hhc4f0KGwz4pb0; Sun, 31 Oct 2021 00:10: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 B948313FBC; Sun, 31 Oct 2021 00:10: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 19V0APl7042738; Sun, 31 Oct 2021 00:10:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V0AP0D042737; Sun, 31 Oct 2021 00:10:25 GMT (envelope-from git) Date: Sun, 31 Oct 2021 00:10:25 GMT Message-Id: <202110310010.19V0AP0D042737@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: 3ab4f13772b0 - 2021Q4 - x11-wm/river: update to s20211030 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: 3ab4f13772b015f75c378837b8b1df5324762009 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=3ab4f13772b015f75c378837b8b1df5324762009 commit 3ab4f13772b015f75c378837b8b1df5324762009 Author: Jan Beich AuthorDate: 2021-10-30 18:40:35 +0000 Commit: Jan Beich CommitDate: 2021-10-31 00:10:22 +0000 x11-wm/river: update to s20211030 Changes: https://github.com/ifreund/river/compare/e447e1b...8134b81 (cherry picked from commit 6acb2bcf406d50287eaa4409da0336264b96cb4c) --- x11-wm/river/Makefile | 4 ++-- x11-wm/river/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile index bd47e0bcfde3..a2c84f0bfd21 100644 --- a/x11-wm/river/Makefile +++ b/x11-wm/river/Makefile @@ -1,5 +1,5 @@ PORTNAME= river -PORTVERSION= s20211020 +PORTVERSION= s20211030 CATEGORIES= x11-wm MAINTAINER= jbeich@FreeBSD.org @@ -21,7 +21,7 @@ USES= pkgconfig xorg USE_GITHUB= yes USE_XORG= pixman GH_ACCOUNT= ifreund -GH_TAGNAME= e447e1b +GH_TAGNAME= 8134b81 GH_TUPLE= ifreund:zig-pixman:88520f2:zig_pixman/deps/zig-pixman \ ifreund:zig-wayland:a8e1efc:zig_wayland/deps/zig-wayland \ ifreund:zig-xkbcommon:10cdca6:zig_xkbcommon/deps/zig-xkbcommon \ diff --git a/x11-wm/river/distinfo b/x11-wm/river/distinfo index a8ded6d6079a..62b01df6bdfd 100644 --- a/x11-wm/river/distinfo +++ b/x11-wm/river/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1634737250 -SHA256 (ifreund-river-s20211020-e447e1b_GH0.tar.gz) = 082986c466f8dd7407b9a253dc28f7d5b748fada1fe1433148c0d0b19901c9af -SIZE (ifreund-river-s20211020-e447e1b_GH0.tar.gz) = 120920 +TIMESTAMP = 1635619235 +SHA256 (ifreund-river-s20211030-8134b81_GH0.tar.gz) = 2711e9ab223151af89e2b8874055d8d52600c36ae7068d2c8bf5ef5ffa798cc6 +SIZE (ifreund-river-s20211030-8134b81_GH0.tar.gz) = 121171 SHA256 (ifreund-zig-pixman-88520f2_GH0.tar.gz) = 8c5538c3f150870c8c898578365c3c909b0b1a7170d61b728eaf47b973338be3 SIZE (ifreund-zig-pixman-88520f2_GH0.tar.gz) = 7158 SHA256 (ifreund-zig-wayland-a8e1efc_GH0.tar.gz) = 6320eb68e6cdf0f44720423c39db6dc831c64511b03ad9543654d284282f869e From nobody Sun Oct 31 00:26:08 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 D149718323BE; Sun, 31 Oct 2021 00:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HhcQm5WJMz4tv8; Sun, 31 Oct 2021 00:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9D5A51456B; Sun, 31 Oct 2021 00:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19V0Q8w2061027; Sun, 31 Oct 2021 00:26:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V0Q8Dp061026; Sun, 31 Oct 2021 00:26:08 GMT (envelope-from git) Date: Sun, 31 Oct 2021 00:26:08 GMT Message-Id: <202110310026.19V0Q8Dp061026@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: a68f43c40c5a - 2021Q4 - www/flexget: update to 3.1.141 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: a68f43c40c5aa3ca760b8df8b9d1825078cf28ba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=a68f43c40c5aa3ca760b8df8b9d1825078cf28ba commit a68f43c40c5aa3ca760b8df8b9d1825078cf28ba Author: Jan Beich AuthorDate: 2021-10-20 15:19:47 +0000 Commit: Jan Beich CommitDate: 2021-10-31 00:22:21 +0000 www/flexget: update to 3.1.141 Changes: https://github.com/Flexget/Flexget/compare/v3.1.140...v3.1.141 Reported by: Repology (cherry picked from commit 741e66f42418725c0f47f7383666f4f5d3277ca6) --- www/flexget/Makefile | 11 +++++----- www/flexget/distinfo | 8 ++++--- www/flexget/files/patch-requirements.txt | 37 ++++++++++++++++---------------- 3 files changed, 30 insertions(+), 26 deletions(-) diff --git a/www/flexget/Makefile b/www/flexget/Makefile index c3b99e0f9d0d..beb2a809d373 100644 --- a/www/flexget/Makefile +++ b/www/flexget/Makefile @@ -1,8 +1,11 @@ PORTNAME= flexget DISTVERSIONPREFIX= v -PORTVERSION= 3.1.140 +PORTVERSION= 3.1.141 CATEGORIES= www +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 1565bf2b2c79.patch:-p1 # https://github.com/Flexget/Flexget/issues/3205 + MAINTAINER= jbeich@FreeBSD.org COMMENT= Multipurpose automation tool for all of your media @@ -20,16 +23,14 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy13>=1.3.10:databases/py-sqlalchemy ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.4.7:devel/py-pyparsing@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=4.2:devel/py-yaml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}progressbar>=2.5:misc/py-progressbar@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}guessit>=3.2.0:multimedia/py-guessit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pynzb>0:news/py-pynzb@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zxcvbn>0:security/py-zxcvbn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plumbum>=1.2:sysutils/py-plumbum@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.8.0:sysutils/py-psutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}colorclass>=2.2.0:textproc/py-colorclass@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.2:textproc/py-feedparser@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rich>=9.0.0:textproc/py-rich@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rss2gen>0:textproc/py-rss2gen@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}terminaltables>=3.1.0:textproc/py-terminaltables@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.7.0:www/py-cherrypy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Flask>=0.7:www/py-flask@${PY_FLAVOR} \ @@ -37,7 +38,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy13>=1.3.10:databases/py-sqlalchemy ${PYTHON_PKGNAMEPREFIX}Flask-Cors>=2.1.2:www/py-flask-cors@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Flask-Login>=0.4.0:www/py-flask-login@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Flask-RESTful>=0.3.3:www/py-flask-restful@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}flask-restx>=0.5.0:www/py-flask-restx@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}flask-restx>=0.5.1:www/py-flask-restx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5lib>=0.11:www/py-html5lib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.20.0:www/py-requests@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.3:devel/py-pytest@${PY_FLAVOR} \ diff --git a/www/flexget/distinfo b/www/flexget/distinfo index d453523a033c..b9948bd41ea1 100644 --- a/www/flexget/distinfo +++ b/www/flexget/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1634570444 -SHA256 (flexget-Flexget-v3.1.140_GH0.tar.gz) = 150ce3f6777f6a2b4ce155bed055201b08f1f4ef1014c6549dca7e210fb7dc12 -SIZE (flexget-Flexget-v3.1.140_GH0.tar.gz) = 7347152 +TIMESTAMP = 1634743187 +SHA256 (flexget-Flexget-v3.1.141_GH0.tar.gz) = 75319729896950847e422d650011020a484d5b2968d1dc259fab61f000a7cc6a +SIZE (flexget-Flexget-v3.1.141_GH0.tar.gz) = 7344928 +SHA256 (1565bf2b2c79.patch) = c7e4acff2741ddc8233841dae28ec2e3287f40948178e971835119d4a6ba3512 +SIZE (1565bf2b2c79.patch) = 5567 diff --git a/www/flexget/files/patch-requirements.txt b/www/flexget/files/patch-requirements.txt index 7d009ab85e9d..7812bbbd2c9d 100644 --- a/www/flexget/files/patch-requirements.txt +++ b/www/flexget/files/patch-requirements.txt @@ -1,30 +1,31 @@ ---- requirements.txt.orig 2021-08-10 15:20:13 UTC +--- requirements.txt.orig 2021-10-20 15:19:47 UTC +++ requirements.txt -@@ -12,22 +12,22 @@ jinja2~=3.0 - requests>=2.20.0 - python-dateutil - jsonschema>=2.0 +@@ -1,10 +1,10 @@ + apscheduler>=3.2.0 + beautifulsoup4>=4.5 # Beautifulsoup 4.5+ is required to support different versions of html5lib + feedparser>=6.0.2 -guessit==3.2.0 +guessit>=3.2.0 - rebulk>=2.0.0 - apscheduler>=3.2.0 - terminaltables>=3.1.0 - colorclass>=2.2.0 + html5lib>=0.11 + jinja2~=3.0 +-jsonschema>=2.0, <4.0 # jsonschema 4.0 requires python 3.7+ We can switch to that when we drop 3.6 support ++jsonschema>=2.0 loguru>=0.4.1 + more-itertools + psutil>=5.8.0 +@@ -18,12 +18,12 @@ rich>=9.0.0 + rpyc~=5.0 + sqlalchemy >=1.3.10, <1.999 # WebUI Requirements -cherrypy>=18.0.0 +cherrypy>=3.7.0 - flask>=0.7 - flask-restful>=0.3.3 --flask-restx==0.5.0 -+flask-restx>=0.5.0 flask-compress>=1.2.1 - flask-login>=0.4.0 flask-cors>=2.1.2 + flask-login>=0.4.0 + flask-restful>=0.3.3 +-flask-restx==0.5.1 ++flask-restx>=0.5.1 + flask>=0.7 pyparsing>=2.4.7 -zxcvbn-python --progressbar==2.5 +zxcvbn -+progressbar>=2.5 - more-itertools - psutil>=5.8.0 From nobody Sun Oct 31 00:26: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 2CD921832351; Sun, 31 Oct 2021 00:26: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 4HhcQp018Gz4tvB; Sun, 31 Oct 2021 00:26: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 CD5AE1456C; Sun, 31 Oct 2021 00:26: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 19V0Q96N061051; Sun, 31 Oct 2021 00:26:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V0Q9LH061050; Sun, 31 Oct 2021 00:26:09 GMT (envelope-from git) Date: Sun, 31 Oct 2021 00:26:09 GMT Message-Id: <202110310026.19V0Q9LH061050@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: a929b721d976 - 2021Q4 - www/flexget: update to 3.1.142 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: a929b721d976427e43e1cda2ea4edb743d71702e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=a929b721d976427e43e1cda2ea4edb743d71702e commit a929b721d976427e43e1cda2ea4edb743d71702e Author: Jan Beich AuthorDate: 2021-10-20 20:12:07 +0000 Commit: Jan Beich CommitDate: 2021-10-31 00:22:22 +0000 www/flexget: update to 3.1.142 Changes: https://github.com/Flexget/Flexget/compare/v3.1.141...v3.1.142 Reported by: Repology (cherry picked from commit 0c631e628d84f25227219074966ca524209d9eb2) --- www/flexget/Makefile | 5 +---- www/flexget/distinfo | 8 +++----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/www/flexget/Makefile b/www/flexget/Makefile index beb2a809d373..61f09ff7da87 100644 --- a/www/flexget/Makefile +++ b/www/flexget/Makefile @@ -1,11 +1,8 @@ PORTNAME= flexget DISTVERSIONPREFIX= v -PORTVERSION= 3.1.141 +PORTVERSION= 3.1.142 CATEGORIES= www -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 1565bf2b2c79.patch:-p1 # https://github.com/Flexget/Flexget/issues/3205 - MAINTAINER= jbeich@FreeBSD.org COMMENT= Multipurpose automation tool for all of your media diff --git a/www/flexget/distinfo b/www/flexget/distinfo index b9948bd41ea1..39bb940dd413 100644 --- a/www/flexget/distinfo +++ b/www/flexget/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1634743187 -SHA256 (flexget-Flexget-v3.1.141_GH0.tar.gz) = 75319729896950847e422d650011020a484d5b2968d1dc259fab61f000a7cc6a -SIZE (flexget-Flexget-v3.1.141_GH0.tar.gz) = 7344928 -SHA256 (1565bf2b2c79.patch) = c7e4acff2741ddc8233841dae28ec2e3287f40948178e971835119d4a6ba3512 -SIZE (1565bf2b2c79.patch) = 5567 +TIMESTAMP = 1634760727 +SHA256 (flexget-Flexget-v3.1.142_GH0.tar.gz) = 2672d38045229935c652277edd90a5983986cb98479187a82f2d285865c44be3 +SIZE (flexget-Flexget-v3.1.142_GH0.tar.gz) = 7344812 From nobody Sun Oct 31 00:26: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 13D981832449; Sun, 31 Oct 2021 00:26: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 4HhcQq3qh9z4txq; Sun, 31 Oct 2021 00:26:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E1CD114433; Sun, 31 Oct 2021 00:26: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 19V0QAZP061075; Sun, 31 Oct 2021 00:26:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V0QAlg061074; Sun, 31 Oct 2021 00:26:10 GMT (envelope-from git) Date: Sun, 31 Oct 2021 00:26:10 GMT Message-Id: <202110310026.19V0QAlg061074@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: 9beb07c09ba9 - 2021Q4 - www/flexget: update to 3.1.143 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: 9beb07c09ba9120b1ed0896a24730a218c2cf1de Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=9beb07c09ba9120b1ed0896a24730a218c2cf1de commit 9beb07c09ba9120b1ed0896a24730a218c2cf1de Author: Jan Beich AuthorDate: 2021-10-21 15:43:51 +0000 Commit: Jan Beich CommitDate: 2021-10-31 00:22:22 +0000 www/flexget: update to 3.1.143 Changes: https://github.com/Flexget/Flexget/compare/v3.1.142...v3.1.143 Reported by: Repology (cherry picked from commit 71eec293e343ccd02551ad163f2532b8f2de2fef) --- www/flexget/Makefile | 2 +- www/flexget/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/flexget/Makefile b/www/flexget/Makefile index 61f09ff7da87..b7f8763d2c52 100644 --- a/www/flexget/Makefile +++ b/www/flexget/Makefile @@ -1,6 +1,6 @@ PORTNAME= flexget DISTVERSIONPREFIX= v -PORTVERSION= 3.1.142 +PORTVERSION= 3.1.143 CATEGORIES= www MAINTAINER= jbeich@FreeBSD.org diff --git a/www/flexget/distinfo b/www/flexget/distinfo index 39bb940dd413..df4fa520ed77 100644 --- a/www/flexget/distinfo +++ b/www/flexget/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634760727 -SHA256 (flexget-Flexget-v3.1.142_GH0.tar.gz) = 2672d38045229935c652277edd90a5983986cb98479187a82f2d285865c44be3 -SIZE (flexget-Flexget-v3.1.142_GH0.tar.gz) = 7344812 +TIMESTAMP = 1634831031 +SHA256 (flexget-Flexget-v3.1.143_GH0.tar.gz) = a120de35b7df704d5d4b7e20fe6e5aa74c7f2d35e1905f3f594f7354ac40beb8 +SIZE (flexget-Flexget-v3.1.143_GH0.tar.gz) = 7344845 From nobody Sun Oct 31 00:26: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 7D9D118323DB; Sun, 31 Oct 2021 00:26: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 4HhcQs22sCz4vG7; Sun, 31 Oct 2021 00:26: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 11BC61458C; Sun, 31 Oct 2021 00:26: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 19V0QBRa061103; Sun, 31 Oct 2021 00:26:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V0QBtO061102; Sun, 31 Oct 2021 00:26:11 GMT (envelope-from git) Date: Sun, 31 Oct 2021 00:26:11 GMT Message-Id: <202110310026.19V0QBtO061102@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: 52449a6551cc - 2021Q4 - www/flexget: update to 3.1.144 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: 52449a6551cc6efbb92bb9d1ea90d81d3aa25c49 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=52449a6551cc6efbb92bb9d1ea90d81d3aa25c49 commit 52449a6551cc6efbb92bb9d1ea90d81d3aa25c49 Author: Jan Beich AuthorDate: 2021-10-22 15:19:23 +0000 Commit: Jan Beich CommitDate: 2021-10-31 00:22:23 +0000 www/flexget: update to 3.1.144 Changes: https://github.com/Flexget/Flexget/compare/v3.1.143...v3.1.144 Reported by: Repology (cherry picked from commit d4463ade7741f4f8426ab2e8c0193e18b8e68afa) --- www/flexget/Makefile | 2 +- www/flexget/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/flexget/Makefile b/www/flexget/Makefile index b7f8763d2c52..3ee50adc9c48 100644 --- a/www/flexget/Makefile +++ b/www/flexget/Makefile @@ -1,6 +1,6 @@ PORTNAME= flexget DISTVERSIONPREFIX= v -PORTVERSION= 3.1.143 +PORTVERSION= 3.1.144 CATEGORIES= www MAINTAINER= jbeich@FreeBSD.org diff --git a/www/flexget/distinfo b/www/flexget/distinfo index df4fa520ed77..582373ff5d29 100644 --- a/www/flexget/distinfo +++ b/www/flexget/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634831031 -SHA256 (flexget-Flexget-v3.1.143_GH0.tar.gz) = a120de35b7df704d5d4b7e20fe6e5aa74c7f2d35e1905f3f594f7354ac40beb8 -SIZE (flexget-Flexget-v3.1.143_GH0.tar.gz) = 7344845 +TIMESTAMP = 1634915963 +SHA256 (flexget-Flexget-v3.1.144_GH0.tar.gz) = 9f38287c3d7fd424077fe4a7e56ec107c07c99faf62bfa0e9874ef628ff925b8 +SIZE (flexget-Flexget-v3.1.144_GH0.tar.gz) = 7344790 From nobody Sun Oct 31 00:26: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 6541F18325B1; Sun, 31 Oct 2021 00:26: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 4HhcQs6hCtz4v7g; Sun, 31 Oct 2021 00:26: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 2EF2D14434; Sun, 31 Oct 2021 00:26: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 19V0QDam061130; Sun, 31 Oct 2021 00:26:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V0QDEf061129; Sun, 31 Oct 2021 00:26:13 GMT (envelope-from git) Date: Sun, 31 Oct 2021 00:26:13 GMT Message-Id: <202110310026.19V0QDEf061129@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: 80734deb80fd - 2021Q4 - www/flexget: update to 3.1.145 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: 80734deb80fdd8a11a18b83f91aae745cc9060a2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=80734deb80fdd8a11a18b83f91aae745cc9060a2 commit 80734deb80fdd8a11a18b83f91aae745cc9060a2 Author: Jan Beich AuthorDate: 2021-10-23 15:14:24 +0000 Commit: Jan Beich CommitDate: 2021-10-31 00:22:23 +0000 www/flexget: update to 3.1.145 Changes: https://github.com/Flexget/Flexget/compare/v3.1.144...v3.1.145 Reported by: Repology (cherry picked from commit 3a456a58a6a1b3dd8f677918c8ce28c35131f759) --- www/flexget/Makefile | 2 +- www/flexget/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/flexget/Makefile b/www/flexget/Makefile index 3ee50adc9c48..5bad5bc9521b 100644 --- a/www/flexget/Makefile +++ b/www/flexget/Makefile @@ -1,6 +1,6 @@ PORTNAME= flexget DISTVERSIONPREFIX= v -PORTVERSION= 3.1.144 +PORTVERSION= 3.1.145 CATEGORIES= www MAINTAINER= jbeich@FreeBSD.org diff --git a/www/flexget/distinfo b/www/flexget/distinfo index 582373ff5d29..da829bb8f149 100644 --- a/www/flexget/distinfo +++ b/www/flexget/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634915963 -SHA256 (flexget-Flexget-v3.1.144_GH0.tar.gz) = 9f38287c3d7fd424077fe4a7e56ec107c07c99faf62bfa0e9874ef628ff925b8 -SIZE (flexget-Flexget-v3.1.144_GH0.tar.gz) = 7344790 +TIMESTAMP = 1635002064 +SHA256 (flexget-Flexget-v3.1.145_GH0.tar.gz) = d5ab4998282e756f2ca769126ea47cbb85ffbeeadfbd8f93f3a1811d844f0c4e +SIZE (flexget-Flexget-v3.1.145_GH0.tar.gz) = 7347573 From nobody Sun Oct 31 00:26: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 00DD718324DD; Sun, 31 Oct 2021 00:26: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 4HhcQv60MYz4vGL; Sun, 31 Oct 2021 00:26: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 7C50614435; Sun, 31 Oct 2021 00:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19V0QFZh061178; Sun, 31 Oct 2021 00:26:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V0QF1n061177; Sun, 31 Oct 2021 00:26:15 GMT (envelope-from git) Date: Sun, 31 Oct 2021 00:26:15 GMT Message-Id: <202110310026.19V0QF1n061177@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: b6653694ade9 - 2021Q4 - www/flexget: update to 3.1.147 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: b6653694ade996fe20fdb00ffff512bb98ec7221 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b6653694ade996fe20fdb00ffff512bb98ec7221 commit b6653694ade996fe20fdb00ffff512bb98ec7221 Author: Jan Beich AuthorDate: 2021-10-26 15:20:32 +0000 Commit: Jan Beich CommitDate: 2021-10-31 00:22:24 +0000 www/flexget: update to 3.1.147 Changes: https://github.com/Flexget/Flexget/compare/v3.1.146...v3.1.147 Reported by: Repology (cherry picked from commit d57477791a7a16ffb19750a94620b4f4ea53fe19) --- www/flexget/Makefile | 2 +- www/flexget/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/flexget/Makefile b/www/flexget/Makefile index d6a0858d9c9e..f3f3d5817e2e 100644 --- a/www/flexget/Makefile +++ b/www/flexget/Makefile @@ -1,6 +1,6 @@ PORTNAME= flexget DISTVERSIONPREFIX= v -PORTVERSION= 3.1.146 +PORTVERSION= 3.1.147 CATEGORIES= www MAINTAINER= jbeich@FreeBSD.org diff --git a/www/flexget/distinfo b/www/flexget/distinfo index c32e74c5e5cc..c7e3b3bce47c 100644 --- a/www/flexget/distinfo +++ b/www/flexget/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635175061 -SHA256 (flexget-Flexget-v3.1.146_GH0.tar.gz) = c10247d5807cb4116c7d9268e06fdbc9d5c24df41be5e912e288825b18f2c5bb -SIZE (flexget-Flexget-v3.1.146_GH0.tar.gz) = 7347586 +TIMESTAMP = 1635261632 +SHA256 (flexget-Flexget-v3.1.147_GH0.tar.gz) = 1d47fba54d17556c8f45da451c5ef4841560d4b706423143d4e682b166e2d09a +SIZE (flexget-Flexget-v3.1.147_GH0.tar.gz) = 7348315 From nobody Sun Oct 31 00:26: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 B843A183256D; Sun, 31 Oct 2021 00:26: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 4HhcQt3y9mz4vB4; Sun, 31 Oct 2021 00:26: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 527D91458D; Sun, 31 Oct 2021 00:26: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 19V0QEAs061154; Sun, 31 Oct 2021 00:26:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V0QE6t061153; Sun, 31 Oct 2021 00:26:14 GMT (envelope-from git) Date: Sun, 31 Oct 2021 00:26:14 GMT Message-Id: <202110310026.19V0QE6t061153@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: cda059e94224 - 2021Q4 - www/flexget: update to 3.1.146 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: cda059e942241cdd614f0bf23204ecf2bc24e9e6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=cda059e942241cdd614f0bf23204ecf2bc24e9e6 commit cda059e942241cdd614f0bf23204ecf2bc24e9e6 Author: Jan Beich AuthorDate: 2021-10-25 15:17:41 +0000 Commit: Jan Beich CommitDate: 2021-10-31 00:22:24 +0000 www/flexget: update to 3.1.146 Changes: https://github.com/Flexget/Flexget/compare/v3.1.145...v3.1.146 Reported by: Repology (cherry picked from commit 4df0bd8681a3be937bdbc2bfccde9d1cfe67e8d5) --- www/flexget/Makefile | 2 +- www/flexget/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/flexget/Makefile b/www/flexget/Makefile index 5bad5bc9521b..d6a0858d9c9e 100644 --- a/www/flexget/Makefile +++ b/www/flexget/Makefile @@ -1,6 +1,6 @@ PORTNAME= flexget DISTVERSIONPREFIX= v -PORTVERSION= 3.1.145 +PORTVERSION= 3.1.146 CATEGORIES= www MAINTAINER= jbeich@FreeBSD.org diff --git a/www/flexget/distinfo b/www/flexget/distinfo index da829bb8f149..c32e74c5e5cc 100644 --- a/www/flexget/distinfo +++ b/www/flexget/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635002064 -SHA256 (flexget-Flexget-v3.1.145_GH0.tar.gz) = d5ab4998282e756f2ca769126ea47cbb85ffbeeadfbd8f93f3a1811d844f0c4e -SIZE (flexget-Flexget-v3.1.145_GH0.tar.gz) = 7347573 +TIMESTAMP = 1635175061 +SHA256 (flexget-Flexget-v3.1.146_GH0.tar.gz) = c10247d5807cb4116c7d9268e06fdbc9d5c24df41be5e912e288825b18f2c5bb +SIZE (flexget-Flexget-v3.1.146_GH0.tar.gz) = 7347586 From nobody Sun Oct 31 00:26: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 111901832983; Sun, 31 Oct 2021 00:26:18 +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 4HhcQx6dxgz4vBN; Sun, 31 Oct 2021 00:26:17 +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 9FB6C1404A; Sun, 31 Oct 2021 00:26: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 19V0QGDb061202; Sun, 31 Oct 2021 00:26:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V0QG13061201; Sun, 31 Oct 2021 00:26:16 GMT (envelope-from git) Date: Sun, 31 Oct 2021 00:26:16 GMT Message-Id: <202110310026.19V0QG13061201@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: 0d78cec866d6 - 2021Q4 - www/flexget: update to 3.1.148 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: 0d78cec866d6a6804a32da050da2c01b6060aa02 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0d78cec866d6a6804a32da050da2c01b6060aa02 commit 0d78cec866d6a6804a32da050da2c01b6060aa02 Author: Jan Beich AuthorDate: 2021-10-27 15:20:26 +0000 Commit: Jan Beich CommitDate: 2021-10-31 00:22:25 +0000 www/flexget: update to 3.1.148 Changes: https://github.com/Flexget/Flexget/compare/v3.1.147...v3.1.148 Reported by: Repology (cherry picked from commit fd19677ef336862ced3fcbbc17829e94b2a65cb3) --- www/flexget/Makefile | 2 +- www/flexget/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/flexget/Makefile b/www/flexget/Makefile index f3f3d5817e2e..43e22a71a080 100644 --- a/www/flexget/Makefile +++ b/www/flexget/Makefile @@ -1,6 +1,6 @@ PORTNAME= flexget DISTVERSIONPREFIX= v -PORTVERSION= 3.1.147 +PORTVERSION= 3.1.148 CATEGORIES= www MAINTAINER= jbeich@FreeBSD.org diff --git a/www/flexget/distinfo b/www/flexget/distinfo index c7e3b3bce47c..a4a05a8c5b00 100644 --- a/www/flexget/distinfo +++ b/www/flexget/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635261632 -SHA256 (flexget-Flexget-v3.1.147_GH0.tar.gz) = 1d47fba54d17556c8f45da451c5ef4841560d4b706423143d4e682b166e2d09a -SIZE (flexget-Flexget-v3.1.147_GH0.tar.gz) = 7348315 +TIMESTAMP = 1635348026 +SHA256 (flexget-Flexget-v3.1.148_GH0.tar.gz) = 3b2d3d141c2d5a75705bcc8e0ea9aa543bbab8b4df2c582299a78577767118a9 +SIZE (flexget-Flexget-v3.1.148_GH0.tar.gz) = 7348493 From nobody Sun Oct 31 00:26:17 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 7CD131832851; Sun, 31 Oct 2021 00:26: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 4HhcQy6yjzz4v0p; Sun, 31 Oct 2021 00:26:18 +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 BDDAB141E0; Sun, 31 Oct 2021 00:26:17 +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 19V0QH6k061228; Sun, 31 Oct 2021 00:26:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V0QHme061227; Sun, 31 Oct 2021 00:26:17 GMT (envelope-from git) Date: Sun, 31 Oct 2021 00:26:17 GMT Message-Id: <202110310026.19V0QHme061227@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: 095bbba72b61 - 2021Q4 - www/flexget: update to 3.1.149 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: 095bbba72b612bec1308a24da023b559a378e7fa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=095bbba72b612bec1308a24da023b559a378e7fa commit 095bbba72b612bec1308a24da023b559a378e7fa Author: Jan Beich AuthorDate: 2021-10-30 15:14:37 +0000 Commit: Jan Beich CommitDate: 2021-10-31 00:22:25 +0000 www/flexget: update to 3.1.149 Changes: https://github.com/Flexget/Flexget/compare/v3.1.148...v3.1.149 Reported by: Repology (cherry picked from commit 56f7ab9ce22f130acff133978b094c3da9a3cf04) --- www/flexget/Makefile | 2 +- www/flexget/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/flexget/Makefile b/www/flexget/Makefile index 43e22a71a080..b9e919978c8e 100644 --- a/www/flexget/Makefile +++ b/www/flexget/Makefile @@ -1,6 +1,6 @@ PORTNAME= flexget DISTVERSIONPREFIX= v -PORTVERSION= 3.1.148 +PORTVERSION= 3.1.149 CATEGORIES= www MAINTAINER= jbeich@FreeBSD.org diff --git a/www/flexget/distinfo b/www/flexget/distinfo index a4a05a8c5b00..3238a5506e54 100644 --- a/www/flexget/distinfo +++ b/www/flexget/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635348026 -SHA256 (flexget-Flexget-v3.1.148_GH0.tar.gz) = 3b2d3d141c2d5a75705bcc8e0ea9aa543bbab8b4df2c582299a78577767118a9 -SIZE (flexget-Flexget-v3.1.148_GH0.tar.gz) = 7348493 +TIMESTAMP = 1635606877 +SHA256 (flexget-Flexget-v3.1.149_GH0.tar.gz) = 1be852455e271baec89c37b05f4ab0bf93efd7aa7ecfbf3e2db0c018e433c277 +SIZE (flexget-Flexget-v3.1.149_GH0.tar.gz) = 7348463 From nobody Sun Oct 31 00:36:00 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 53B27183810F; Sun, 31 Oct 2021 00:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hhcf81qbrz3Fbn; Sun, 31 Oct 2021 00:36:00 +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 2074B14804; Sun, 31 Oct 2021 00:36:00 +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 19V0a09W074472; Sun, 31 Oct 2021 00:36:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V0a0CS074471; Sun, 31 Oct 2021 00:36:00 GMT (envelope-from git) Date: Sun, 31 Oct 2021 00:36:00 GMT Message-Id: <202110310036.19V0a0CS074471@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: 46a233c8075b - 2021Q4 - devel/sdl12-compat: update to s20211015 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: 46a233c8075b5cdc19f38642f0a41013a5254ff5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=46a233c8075b5cdc19f38642f0a41013a5254ff5 commit 46a233c8075b5cdc19f38642f0a41013a5254ff5 Author: Jan Beich AuthorDate: 2021-10-15 15:56:40 +0000 Commit: Jan Beich CommitDate: 2021-10-31 00:34:35 +0000 devel/sdl12-compat: update to s20211015 Changes: https://github.com/libsdl-org/sdl12-compat/compare/c6cfc8f...36a09e4 (cherry picked from commit 0cd2c1649ff2687ae07d4a482cabdeb80e3be65c) --- 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 cc7e7075d9b7..e389e78b9096 100644 --- a/devel/sdl12-compat/Makefile +++ b/devel/sdl12-compat/Makefile @@ -1,5 +1,5 @@ PORTNAME= sdl12-compat -PORTVERSION= s20210926 +PORTVERSION= s20211015 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= c6cfc8f +GH_TAGNAME= 36a09e4 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 d5c6c2ee233d..053f34b3a2e9 100644 --- a/devel/sdl12-compat/distinfo +++ b/devel/sdl12-compat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1632667086 -SHA256 (libsdl-org-sdl12-compat-s20210926-c6cfc8f_GH0.tar.gz) = 5165f7af8f425e6a74f0dbce98268ad26d90344a5558bb117e224b8ddb1efeca -SIZE (libsdl-org-sdl12-compat-s20210926-c6cfc8f_GH0.tar.gz) = 410709 +TIMESTAMP = 1634313400 +SHA256 (libsdl-org-sdl12-compat-s20211015-36a09e4_GH0.tar.gz) = 87c8f63312538e92533642acbb62a4dd0d3ddd714e08320fafaf16773604bd71 +SIZE (libsdl-org-sdl12-compat-s20211015-36a09e4_GH0.tar.gz) = 410713 From nobody Sun Oct 31 00:36:01 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 003E31837EEA; Sun, 31 Oct 2021 00:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hhcf949M4z3Fqj; Sun, 31 Oct 2021 00:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 38FA814805; Sun, 31 Oct 2021 00:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19V0a1O8074499; Sun, 31 Oct 2021 00:36:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V0a1JY074498; Sun, 31 Oct 2021 00:36:01 GMT (envelope-from git) Date: Sun, 31 Oct 2021 00:36:01 GMT Message-Id: <202110310036.19V0a1JY074498@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: 2024b0ca76db - 2021Q4 - multimedia/celluloid-devel: update to 0.21.89 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: 2024b0ca76dbbdb89d0dd85fb084c12f2b926f8b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=2024b0ca76dbbdb89d0dd85fb084c12f2b926f8b commit 2024b0ca76dbbdb89d0dd85fb084c12f2b926f8b Author: Jan Beich AuthorDate: 2021-10-31 00:29:18 +0000 Commit: Jan Beich CommitDate: 2021-10-31 00:34:40 +0000 multimedia/celluloid-devel: update to 0.21.89 Changes: https://github.com/celluloid-player/celluloid/8226647...8c1c442 (cherry picked from commit 8be16b20fcfd128addca000588ebc8f6970247db) --- multimedia/celluloid-devel/Makefile | 4 ++-- multimedia/celluloid-devel/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/multimedia/celluloid-devel/Makefile b/multimedia/celluloid-devel/Makefile index de036c48363d..5f8bd2643793 100644 --- a/multimedia/celluloid-devel/Makefile +++ b/multimedia/celluloid-devel/Makefile @@ -1,5 +1,5 @@ -DISTVERSION= 0.21-86 # git rev-list --count v0.21.. -DISTVERSIONSUFFIX= -g8226647 +DISTVERSION= 0.21-89 # git rev-list --count v0.21.. +DISTVERSIONSUFFIX= -g8c1c442 PKGNAMESUFFIX= -devel MASTERDIR= ${.CURDIR}/../celluloid diff --git a/multimedia/celluloid-devel/distinfo b/multimedia/celluloid-devel/distinfo index a2e9d5d02d91..77b9add81ae6 100644 --- a/multimedia/celluloid-devel/distinfo +++ b/multimedia/celluloid-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633881722 -SHA256 (celluloid-player-celluloid-v0.21-86-g8226647_GH0.tar.gz) = f1f5c9395e692fb8abf2225f631a6ac74751ce71f8e31807a6e0000d7f06a9d7 -SIZE (celluloid-player-celluloid-v0.21-86-g8226647_GH0.tar.gz) = 477081 +TIMESTAMP = 1635640158 +SHA256 (celluloid-player-celluloid-v0.21-89-g8c1c442_GH0.tar.gz) = 6aee31b129e6a34ae226106b30887d16a92ba8ed6bf5d9050f1e213ecb087de7 +SIZE (celluloid-player-celluloid-v0.21-89-g8c1c442_GH0.tar.gz) = 477122 From nobody Sun Oct 31 00:41:36 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 8D2291839EB9; Sun, 31 Oct 2021 00:41:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hhcmc3MPfz3GkM; Sun, 31 Oct 2021 00:41:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 51C651478F; Sun, 31 Oct 2021 00:41:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19V0faLN084019; Sun, 31 Oct 2021 00:41:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V0faI6084018; Sun, 31 Oct 2021 00:41:36 GMT (envelope-from git) Date: Sun, 31 Oct 2021 00:41:36 GMT Message-Id: <202110310041.19V0faI6084018@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: 8077e69cb96d - 2021Q4 - devel/aml: update to 0.2.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: 8077e69cb96d598ccded462f324dfc9102b7b11f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=8077e69cb96d598ccded462f324dfc9102b7b11f commit 8077e69cb96d598ccded462f324dfc9102b7b11f Author: Jan Beich AuthorDate: 2021-10-16 13:26:42 +0000 Commit: Jan Beich CommitDate: 2021-10-31 00:38:16 +0000 devel/aml: update to 0.2.1 Changes: https://github.com/any1/aml/releases/tag/v0.2.1 (cherry picked from commit faf2cff4034ad7da8c161d21eabee811fd3e585c) --- devel/aml/Makefile | 2 +- devel/aml/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/aml/Makefile b/devel/aml/Makefile index 1535fc4eddcf..b20cedebf7a0 100644 --- a/devel/aml/Makefile +++ b/devel/aml/Makefile @@ -1,6 +1,6 @@ PORTNAME= aml DISTVERSIONPREFIX= v -DISTVERSION= 0.2.0 +DISTVERSION= 0.2.1 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org diff --git a/devel/aml/distinfo b/devel/aml/distinfo index 6bce9518a293..ef4042d31296 100644 --- a/devel/aml/distinfo +++ b/devel/aml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609418238 -SHA256 (any1-aml-v0.2.0_GH0.tar.gz) = aec6b9e8d0cdccd2b8e800b997ad2743caf528b106899d8ba906308dab498042 -SIZE (any1-aml-v0.2.0_GH0.tar.gz) = 20358 +TIMESTAMP = 1634390802 +SHA256 (any1-aml-v0.2.1_GH0.tar.gz) = c5af3f690b64a7f4dc7141b11f23a4bef190a921f9d71ce70ce0698b5ec58eb0 +SIZE (any1-aml-v0.2.1_GH0.tar.gz) = 20413 From nobody Sun Oct 31 00:58: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 AD9EF183F35C; Sun, 31 Oct 2021 00:58: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 4Hhd7k4b9Jz3KwG; Sun, 31 Oct 2021 00:58: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 7997D14B9E; Sun, 31 Oct 2021 00:58: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 19V0wAB7000948; Sun, 31 Oct 2021 00:58:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V0wAoq000947; Sun, 31 Oct 2021 00:58:10 GMT (envelope-from git) Date: Sun, 31 Oct 2021 00:58:10 GMT Message-Id: <202110310058.19V0wAoq000947@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: 1904bfecb1f6 - 2021Q4 - x11/libxcvt: update to 0.1.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: 1904bfecb1f6d685b20894529e92fd51728ba191 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1904bfecb1f6d685b20894529e92fd51728ba191 commit 1904bfecb1f6d685b20894529e92fd51728ba191 Author: Jan Beich AuthorDate: 2021-10-27 08:48:16 +0000 Commit: Jan Beich CommitDate: 2021-10-31 00:48:29 +0000 x11/libxcvt: update to 0.1.1 Changes: https://gitlab.freedesktop.org/xorg/lib/libxcvt/compare/libxcvt-0.1.0...libxcvt-0.1.1 Reported by: Repology (cherry picked from commit 5511ce907110f4f11fd37c3db337edb4ae8f475b) --- x11/libxcvt/Makefile | 4 ++-- x11/libxcvt/distinfo | 6 +++--- x11/libxcvt/pkg-plist | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/x11/libxcvt/Makefile b/x11/libxcvt/Makefile index feafd7b89bba..104cd35d84cf 100644 --- a/x11/libxcvt/Makefile +++ b/x11/libxcvt/Makefile @@ -1,6 +1,6 @@ PORTNAME= libxcvt DISTVERSIONPREFIX= ${PORTNAME}- -DISTVERSION= 0.1.0 +DISTVERSION= 0.1.1 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org @@ -13,6 +13,6 @@ USES= meson USE_GITLAB= yes GL_SITE= https://gitlab.freedesktop.org GL_ACCOUNT= xorg/lib -GL_COMMIT= 93c1eef3e325f292aa5b3bb137bea778e449bf1e +GL_COMMIT= 6fe840b9295cfdc41bd734586c5b8756f6af6f9b .include diff --git a/x11/libxcvt/distinfo b/x11/libxcvt/distinfo index 483a27ee4261..32c912920369 100644 --- a/x11/libxcvt/distinfo +++ b/x11/libxcvt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1625706079 -SHA256 (xorg/lib-libxcvt-93c1eef3e325f292aa5b3bb137bea778e449bf1e_GL0.tar.gz) = 88be864a4f4d19abc6c21b8d41ae0b252219cd9fe55c45b458c567ecb3b6422c -SIZE (xorg/lib-libxcvt-93c1eef3e325f292aa5b3bb137bea778e449bf1e_GL0.tar.gz) = 8442 +TIMESTAMP = 1635324496 +SHA256 (xorg/lib-libxcvt-6fe840b9295cfdc41bd734586c5b8756f6af6f9b_GL0.tar.gz) = c566825fa5d76eaa53c7dc2a27e2f0a72235cb919eab1f86d5b56219f2e5fdf3 +SIZE (xorg/lib-libxcvt-6fe840b9295cfdc41bd734586c5b8756f6af6f9b_GL0.tar.gz) = 10229 diff --git a/x11/libxcvt/pkg-plist b/x11/libxcvt/pkg-plist index 20384f802cbe..357e32e5ae6a 100644 --- a/x11/libxcvt/pkg-plist +++ b/x11/libxcvt/pkg-plist @@ -2,5 +2,7 @@ include/libxcvt/libxcvt.h include/libxcvt/libxcvt_mode.h lib/libxcvt.so +lib/libxcvt.so.0 +lib/libxcvt.so.0.1.1 libdata/pkgconfig/libxcvt.pc @comment man/man1/cvt.1.gz From nobody Sun Oct 31 00:58: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 E9AC0183F365; Sun, 31 Oct 2021 00:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hhd7l5GJVz3L5j; Sun, 31 Oct 2021 00:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9502A14A10; Sun, 31 Oct 2021 00:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19V0wB5N000972; Sun, 31 Oct 2021 00:58:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V0wBXa000971; Sun, 31 Oct 2021 00:58:11 GMT (envelope-from git) Date: Sun, 31 Oct 2021 00:58:11 GMT Message-Id: <202110310058.19V0wBXa000971@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: 969aaabb78de - 2021Q4 - x11-servers/xwayland-devel: update to 21.0.99.1.104 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: 969aaabb78de6d2510b92dea15b79d95255b2cfb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=969aaabb78de6d2510b92dea15b79d95255b2cfb commit 969aaabb78de6d2510b92dea15b79d95255b2cfb Author: Jan Beich AuthorDate: 2021-10-14 10:35:43 +0000 Commit: Jan Beich CommitDate: 2021-10-31 00:48:29 +0000 x11-servers/xwayland-devel: update to 21.0.99.1.104 Changes: https://gitlab.freedesktop.org/xorg/xserver/-/compare/f9f705bf3...ca1dfdc9a (cherry picked from commit 1d53da2ec9202433958605924c3093dabd82a007) --- x11-servers/xwayland-devel/Makefile | 4 ++-- x11-servers/xwayland-devel/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index b642321d47dc..df23261f973c 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -1,7 +1,7 @@ PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- -DISTVERSION= 21.0.99.1-102 -DISTVERSIONSUFFIX= -gf9f705bf3 +DISTVERSION= 21.0.99.1-104 +DISTVERSIONSUFFIX= -gca1dfdc9a CATEGORIES= x11-servers PKGNAMESUFFIX= -devel diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo index 44a4d077a399..6da4499fabfb 100644 --- a/x11-servers/xwayland-devel/distinfo +++ b/x11-servers/xwayland-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1633687151 -SHA256 (freedesktop-xorg-xserver-xorg-server-21.0.99.1-102-gf9f705bf3_GH0.tar.gz) = eb53e1bbf6d4ec7a8da4937c8d7c1ee8ff200a91abe09be02889b3835f4ee261 -SIZE (freedesktop-xorg-xserver-xorg-server-21.0.99.1-102-gf9f705bf3_GH0.tar.gz) = 5515834 +TIMESTAMP = 1634207743 +SHA256 (freedesktop-xorg-xserver-xorg-server-21.0.99.1-104-gca1dfdc9a_GH0.tar.gz) = a1229d84c3233de5b7d14d5010d75e1501c7cfa28af33d5fc2f5a48cadefe1eb +SIZE (freedesktop-xorg-xserver-xorg-server-21.0.99.1-104-gca1dfdc9a_GH0.tar.gz) = 5516218 SHA256 (freedesktop-xorg-xorgproto-xorgproto-2021.4.99.2_GH0.tar.gz) = ea68fe40cf55247538fd3f0f891ef0ba229b541b56e0874b7efed60688228638 SIZE (freedesktop-xorg-xorgproto-xorgproto-2021.4.99.2_GH0.tar.gz) = 981510 SHA256 (231720f8b212.patch) = 50b5ff308e26982ad41f8203303e0c44d3751a2009dc66337c370a1b022f4c0d From nobody Sun Oct 31 00:58:12 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 790CB183F36E; Sun, 31 Oct 2021 00:58: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 4Hhd7n12HWz3KwW; Sun, 31 Oct 2021 00:58: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 C5B8314C0A; Sun, 31 Oct 2021 00:58: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 19V0wCpe000996; Sun, 31 Oct 2021 00:58:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V0wC5K000995; Sun, 31 Oct 2021 00:58:12 GMT (envelope-from git) Date: Sun, 31 Oct 2021 00:58:12 GMT Message-Id: <202110310058.19V0wC5K000995@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: 72cefeb53cc3 - 2021Q4 - x11-servers/xwayland-devel: update to 21.0.99.1.106 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: 72cefeb53cc3336770718c8ae123fd286c0ae699 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=72cefeb53cc3336770718c8ae123fd286c0ae699 commit 72cefeb53cc3336770718c8ae123fd286c0ae699 Author: Jan Beich AuthorDate: 2021-10-20 08:01:06 +0000 Commit: Jan Beich CommitDate: 2021-10-31 00:48:29 +0000 x11-servers/xwayland-devel: update to 21.0.99.1.106 Changes: https://gitlab.freedesktop.org/xorg/xserver/-/compare/ca1dfdc9a...35c5664fd (cherry picked from commit ed76629711ecb1339e1ed5818e8ef240864b77ea) --- x11-servers/xwayland-devel/Makefile | 4 ++-- x11-servers/xwayland-devel/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index df23261f973c..c8f10a8618ba 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -1,7 +1,7 @@ PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- -DISTVERSION= 21.0.99.1-104 -DISTVERSIONSUFFIX= -gca1dfdc9a +DISTVERSION= 21.0.99.1-106 +DISTVERSIONSUFFIX= -g35c5664fd CATEGORIES= x11-servers PKGNAMESUFFIX= -devel diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo index 6da4499fabfb..e21e1546ace9 100644 --- a/x11-servers/xwayland-devel/distinfo +++ b/x11-servers/xwayland-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1634207743 -SHA256 (freedesktop-xorg-xserver-xorg-server-21.0.99.1-104-gca1dfdc9a_GH0.tar.gz) = a1229d84c3233de5b7d14d5010d75e1501c7cfa28af33d5fc2f5a48cadefe1eb -SIZE (freedesktop-xorg-xserver-xorg-server-21.0.99.1-104-gca1dfdc9a_GH0.tar.gz) = 5516218 +TIMESTAMP = 1634716866 +SHA256 (freedesktop-xorg-xserver-xorg-server-21.0.99.1-106-g35c5664fd_GH0.tar.gz) = 16a6f32a30efe583eb6ca8d69242971bbae5d05c6c85464a6bd3f26364bc8d51 +SIZE (freedesktop-xorg-xserver-xorg-server-21.0.99.1-106-g35c5664fd_GH0.tar.gz) = 5515488 SHA256 (freedesktop-xorg-xorgproto-xorgproto-2021.4.99.2_GH0.tar.gz) = ea68fe40cf55247538fd3f0f891ef0ba229b541b56e0874b7efed60688228638 SIZE (freedesktop-xorg-xorgproto-xorgproto-2021.4.99.2_GH0.tar.gz) = 981510 SHA256 (231720f8b212.patch) = 50b5ff308e26982ad41f8203303e0c44d3751a2009dc66337c370a1b022f4c0d From nobody Sun Oct 31 00:58: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 01F3D183F379; Sun, 31 Oct 2021 00:58: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 4Hhd7p395Mz3L2T; Sun, 31 Oct 2021 00:58: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 E2B0814A11; Sun, 31 Oct 2021 00:58: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 19V0wDdq001027; Sun, 31 Oct 2021 00:58:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V0wDqw001026; Sun, 31 Oct 2021 00:58:13 GMT (envelope-from git) Date: Sun, 31 Oct 2021 00:58:13 GMT Message-Id: <202110310058.19V0wDqw001026@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: 5819edc42a83 - 2021Q4 - x11-servers/xwayland-devel: update to 21.0.99.1.111 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: 5819edc42a8325b27bb0aa0939924f994d2b77b6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=5819edc42a8325b27bb0aa0939924f994d2b77b6 commit 5819edc42a8325b27bb0aa0939924f994d2b77b6 Author: Jan Beich AuthorDate: 2021-10-25 12:05:42 +0000 Commit: Jan Beich CommitDate: 2021-10-31 00:48:29 +0000 x11-servers/xwayland-devel: update to 21.0.99.1.111 Changes: https://gitlab.freedesktop.org/xorg/xserver/-/compare/35c5664fd...c93c2e771 (cherry picked from commit 7813478650429733c1d5304b693aa6c483a3f524) --- x11-servers/xwayland-devel/Makefile | 4 ++-- x11-servers/xwayland-devel/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index c8f10a8618ba..601575778db4 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -1,7 +1,7 @@ PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- -DISTVERSION= 21.0.99.1-106 -DISTVERSIONSUFFIX= -g35c5664fd +DISTVERSION= 21.0.99.1-111 +DISTVERSIONSUFFIX= -gc93c2e771 CATEGORIES= x11-servers PKGNAMESUFFIX= -devel diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo index e21e1546ace9..a7e50e219356 100644 --- a/x11-servers/xwayland-devel/distinfo +++ b/x11-servers/xwayland-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1634716866 -SHA256 (freedesktop-xorg-xserver-xorg-server-21.0.99.1-106-g35c5664fd_GH0.tar.gz) = 16a6f32a30efe583eb6ca8d69242971bbae5d05c6c85464a6bd3f26364bc8d51 -SIZE (freedesktop-xorg-xserver-xorg-server-21.0.99.1-106-g35c5664fd_GH0.tar.gz) = 5515488 +TIMESTAMP = 1635163542 +SHA256 (freedesktop-xorg-xserver-xorg-server-21.0.99.1-111-gc93c2e771_GH0.tar.gz) = bab3ebdc4712a7db92dd3f50a3a6585b77d0bb7cb253802086e6d14f1d56d5ac +SIZE (freedesktop-xorg-xserver-xorg-server-21.0.99.1-111-gc93c2e771_GH0.tar.gz) = 5516253 SHA256 (freedesktop-xorg-xorgproto-xorgproto-2021.4.99.2_GH0.tar.gz) = ea68fe40cf55247538fd3f0f891ef0ba229b541b56e0874b7efed60688228638 SIZE (freedesktop-xorg-xorgproto-xorgproto-2021.4.99.2_GH0.tar.gz) = 981510 SHA256 (231720f8b212.patch) = 50b5ff308e26982ad41f8203303e0c44d3751a2009dc66337c370a1b022f4c0d From nobody Sun Oct 31 02:46:17 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 0F9F318263C5; Sun, 31 Oct 2021 02:46:18 +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 4HhgXT72wKz4bBh; Sun, 31 Oct 2021 02:46:17 +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 D181A161C5; Sun, 31 Oct 2021 02:46:17 +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 19V2kHe4047028; Sun, 31 Oct 2021 02:46:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V2kHT6047027; Sun, 31 Oct 2021 02:46:17 GMT (envelope-from git) Date: Sun, 31 Oct 2021 02:46:17 GMT Message-Id: <202110310246.19V2kHT6047027@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: 1cd8dc16bf18 - 2021Q4 - multimedia/gmp-api: update to 92 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: 1cd8dc16bf18b606188017b6e7debfde93293440 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1cd8dc16bf18b606188017b6e7debfde93293440 commit 1cd8dc16bf18b606188017b6e7debfde93293440 Author: Jan Beich AuthorDate: 2021-10-12 20:10:41 +0000 Commit: Jan Beich CommitDate: 2021-10-31 02:46:11 +0000 multimedia/gmp-api: update to 92 - Only gmp-storage.h is under Apache-2.0 license - Simplify description as the API hasn't really changed for years Changes: https://github.com/mozilla/gmp-api/compare/e393575...Firefox92 Reported by: portscout (cherry picked from commit c04c764498b8da55bb8ad3628ec6c9c25901baf8) --- multimedia/gmp-api/Makefile | 9 +++++---- multimedia/gmp-api/distinfo | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/multimedia/gmp-api/Makefile b/multimedia/gmp-api/Makefile index c5e9e66a5f89..638dcea3eb3d 100644 --- a/multimedia/gmp-api/Makefile +++ b/multimedia/gmp-api/Makefile @@ -1,15 +1,16 @@ PORTNAME= gmp-api -DISTVERSION= 58 # from config/milestone.txt of mozilla-central commit +DISTVERSIONPREFIX= Firefox +DISTVERSION= 92 CATEGORIES= multimedia MAINTAINER= gecko@FreeBSD.org -COMMENT= Gecko Media Plugins API from mozilla-release +COMMENT= Gecko Media Plugins API extracted from Firefox -LICENSE= APACHE20 +LICENSE= APACHE20 BSD3CLAUSE +LICENSE_COMB= multi USE_GITHUB= yes GH_ACCOUNT= mozilla -GH_TAGNAME= e393575 NO_BUILD= yes NO_ARCH= yes diff --git a/multimedia/gmp-api/distinfo b/multimedia/gmp-api/distinfo index 67f0fe90b0d7..0c853ebaae7b 100644 --- a/multimedia/gmp-api/distinfo +++ b/multimedia/gmp-api/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554062094 -SHA256 (mozilla-gmp-api-58-e393575_GH0.tar.gz) = dc1906854a24df5bacf8f7eae0a190d6ed7d1af2a3722a06bb2e4bcd037fa49a -SIZE (mozilla-gmp-api-58-e393575_GH0.tar.gz) = 10435 +TIMESTAMP = 1634069441 +SHA256 (mozilla-gmp-api-Firefox92_GH0.tar.gz) = 21fb6a8628b2cdcee2a34801d68a27dfecaa76d882843ebc4ee24c9249d45ff6 +SIZE (mozilla-gmp-api-Firefox92_GH0.tar.gz) = 10466 From nobody Sun Oct 31 04:35: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 1F98A182795F; Sun, 31 Oct 2021 04:35:47 +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 4Hhjyq0HJFz3Hbm; Sun, 31 Oct 2021 04:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DE6E717A1D; Sun, 31 Oct 2021 04:35: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 19V4ZkOP094170; Sun, 31 Oct 2021 04:35:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19V4Zkj2094169; Sun, 31 Oct 2021 04:35:46 GMT (envelope-from git) Date: Sun, 31 Oct 2021 04:35:46 GMT Message-Id: <202110310435.19V4Zkj2094169@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: 01223a9c0d50 - 2021Q4 - net/dhcpcd: Fix build when TOP environment viriable is set 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: 01223a9c0d50f4a263beacb400770ae1085d111d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=01223a9c0d50f4a263beacb400770ae1085d111d commit 01223a9c0d50f4a263beacb400770ae1085d111d Author: Dries Michiels AuthorDate: 2021-10-31 04:21:37 +0000 Commit: Yasuhiro Kimura CommitDate: 2021-10-31 04:35:13 +0000 net/dhcpcd: Fix build when TOP environment viriable is set PR: 253270 Reported by: Volodymyr Kostyrko (cherry picked from commit 9e078ab7b7515a325c0ce7b6089e638e8ce0e63c) --- net/dhcpcd/Makefile | 1 + net/dhcpcd/files/patch-hooks_Makefile | 8 ++++++++ net/dhcpcd/files/patch-src_Makefile | 11 +++++++++++ net/dhcpcd/files/patch-src_dev_Makefile | 8 ++++++++ net/dhcpcd/files/patch-tests_crypt_Makefile | 8 ++++++++ net/dhcpcd/files/patch-tests_eloop-bench_Makefile | 8 ++++++++ 6 files changed, 44 insertions(+) diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile index 45222564301b..744e540e21ca 100644 --- a/net/dhcpcd/Makefile +++ b/net/dhcpcd/Makefile @@ -2,6 +2,7 @@ PORTNAME= dhcpcd PORTVERSION= 9.4.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://roy.marples.name/downloads/dhcpcd/ \ https://cflags.cc/roy/dhcpcd/ diff --git a/net/dhcpcd/files/patch-hooks_Makefile b/net/dhcpcd/files/patch-hooks_Makefile new file mode 100644 index 000000000000..7416f5dbe6ca --- /dev/null +++ b/net/dhcpcd/files/patch-hooks_Makefile @@ -0,0 +1,8 @@ +--- hooks/Makefile.orig 2020-12-28 12:59:20 UTC ++++ hooks/Makefile +@@ -1,4 +1,4 @@ +-TOP?= ../ ++TOP= ../ + include ${TOP}/iconfig.mk + + PROG= dhcpcd-run-hooks diff --git a/net/dhcpcd/files/patch-src_Makefile b/net/dhcpcd/files/patch-src_Makefile new file mode 100644 index 000000000000..35217a33629b --- /dev/null +++ b/net/dhcpcd/files/patch-src_Makefile @@ -0,0 +1,11 @@ +--- src/Makefile.orig 2021-09-10 17:26:01 UTC ++++ src/Makefile +@@ -8,7 +8,7 @@ SRCS+= dhcp-common.c script.c + CFLAGS?= -O2 + SUBDIRS+= ${MKDIRS} + +-TOP?= .. ++TOP= .. + include ${TOP}/iconfig.mk + + CSTD?= c99 diff --git a/net/dhcpcd/files/patch-src_dev_Makefile b/net/dhcpcd/files/patch-src_dev_Makefile new file mode 100644 index 000000000000..a171fdc5358c --- /dev/null +++ b/net/dhcpcd/files/patch-src_dev_Makefile @@ -0,0 +1,8 @@ +--- src/dev/Makefile.orig 2020-12-28 12:59:20 UTC ++++ src/dev/Makefile +@@ -1,4 +1,4 @@ +-TOP?= ../../ ++TOP= ../../ + include ${TOP}/Makefile.inc + include ${TOP}/config.mk + diff --git a/net/dhcpcd/files/patch-tests_crypt_Makefile b/net/dhcpcd/files/patch-tests_crypt_Makefile new file mode 100644 index 000000000000..1f19ccea56b9 --- /dev/null +++ b/net/dhcpcd/files/patch-tests_crypt_Makefile @@ -0,0 +1,8 @@ +--- tests/crypt/Makefile.orig 2020-12-28 12:59:20 UTC ++++ tests/crypt/Makefile +@@ -1,4 +1,4 @@ +-TOP?= ../.. ++TOP= ../.. + include ${TOP}/iconfig.mk + + PROG= run-test diff --git a/net/dhcpcd/files/patch-tests_eloop-bench_Makefile b/net/dhcpcd/files/patch-tests_eloop-bench_Makefile new file mode 100644 index 000000000000..7e5cb9ac750a --- /dev/null +++ b/net/dhcpcd/files/patch-tests_eloop-bench_Makefile @@ -0,0 +1,8 @@ +--- tests/eloop-bench/Makefile.orig 2020-12-28 12:59:20 UTC ++++ tests/eloop-bench/Makefile +@@ -1,4 +1,4 @@ +-TOP?= ../.. ++TOP= ../.. + include ${TOP}/iconfig.mk + + PROG= eloop-bench From nobody Sun Oct 31 11:40: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 DEBBA182E142; Sun, 31 Oct 2021 11:40:49 +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 4HhvPF3xRWz3DQY; Sun, 31 Oct 2021 11:40: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 571721D600; Sun, 31 Oct 2021 11:40: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 19VBen7A062826; Sun, 31 Oct 2021 11:40:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19VBenID062825; Sun, 31 Oct 2021 11:40:49 GMT (envelope-from git) Date: Sun, 31 Oct 2021 11:40:49 GMT Message-Id: <202110311140.19VBenID062825@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: 0241af1ae392 - 2021Q4 - multimedia/vdr-plugin-xineliboutput: Fix build 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: 0241af1ae392e8eda6f6d9566b91ac5f55bc3d83 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=0241af1ae392e8eda6f6d9566b91ac5f55bc3d83 commit 0241af1ae392e8eda6f6d9566b91ac5f55bc3d83 Author: Stefan Ehmann AuthorDate: 2021-10-31 11:03:43 +0000 Commit: Yasuhiro Kimura CommitDate: 2021-10-31 11:40:36 +0000 multimedia/vdr-plugin-xineliboutput: Fix build * Add NLS option * Pet portclippy * Re-fromat Makefile with portfmt PR: 256818 Approved by: portmgr (blanket: unmaintained port) MFH: 2021Q4 (cherry picked from commit 2da8e962e30a8dd2f5caa825036cfec2ee867a7d) --- multimedia/vdr-plugin-xineliboutput/Makefile | 41 +++--- .../vdr-plugin-xineliboutput/files/patch-c++11 | 163 +++++++++++++++++++++ .../vdr-plugin-xineliboutput/files/patch-configure | 28 +++- 3 files changed, 208 insertions(+), 24 deletions(-) diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile index 40432273f576..1ac930de9025 100644 --- a/multimedia/vdr-plugin-xineliboutput/Makefile +++ b/multimedia/vdr-plugin-xineliboutput/Makefile @@ -14,33 +14,36 @@ COMMENT= Video Disk Recorder - xineliboutput plugin/viewer LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= does not build: invalid suffix on literal; C++11 requires a space between literal and identifier - -LIB_DEPENDS= libxine.so:multimedia/libxine \ - libavutil.so:multimedia/ffmpeg \ +LIB_DEPENDS= libavutil.so:multimedia/ffmpeg \ libdbus-glib-1.so:devel/dbus-glib \ - libvdpau.so:multimedia/libvdpau + libvdpau.so:multimedia/libvdpau \ + libxine.so:multimedia/libxine -PATCH_STRIP= -p1 USES= compiler:c++11-lang gl pkgconfig tar:bzip2 xorg +USE_GL= gl glu glut USE_XORG= xrandr xrender + HAS_CONFIGURE= yes -CONFIGURE_ARGS= --cc="${CC}" --cxx="${CXX}" --add-cflags=-I${VDRDIR} -USE_GL= gl glu glut -WRKSRC= ${WRKDIR}/vdr-${PLUGIN} -XINE_PLUGINSDIR=lib/xine/plugins/2.9 +CONFIGURE_ARGS= --add-cflags=-I${VDRDIR} \ + --cc="${CC}" \ + --cxx="${CXX}" -PORTDOCS= README HISTORY -PORTEXAMPLES= xine +PATCH_STRIP= -p1 + +WRKSRC= ${WRKDIR}/vdr-${PLUGIN} +XINE_PLUGINSDIR= lib/xine/plugins/2.9 PLIST_SUB= XINE_PLUGINSDIR=${XINE_PLUGINSDIR} +PORTDOCS= HISTORY README +PORTEXAMPLES= xine -OPTIONS_DEFINE= LIBBLURAY LIBEXTRACTOR EXAMPLES DOCS +OPTIONS_DEFINE= DOCS EXAMPLES LIBBLURAY LIBEXTRACTOR NLS +OPTIONS_SUB= yes -LIBEXTRACTOR_LIB_DEPENDS= libextractor.so:textproc/libextractor -LIBEXTRACTOR_CONFIGURE_ENABLE= libextractor LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray LIBBLURAY_CONFIGURE_ENABLE= libbluray +LIBEXTRACTOR_LIB_DEPENDS= libextractor.so:textproc/libextractor +LIBEXTRACTOR_CONFIGURE_ENABLE= libextractor .include "${.CURDIR}/../vdr/Makefile.plugins" @@ -57,12 +60,12 @@ post-install: post-install-pluginlocales ${INSTALL_DATA} ${WRKSRC}/examples/allowed_hosts.conf \ ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/allowed_hosts.conf.sample -post-install-EXAMPLES-on: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/xine - ${INSTALL_DATA} ${FILESDIR}/keymap ${STAGEDIR}${EXAMPLESDIR}/xine - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) +post-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/xine + ${INSTALL_DATA} ${FILESDIR}/keymap ${STAGEDIR}${EXAMPLESDIR}/xine + .include diff --git a/multimedia/vdr-plugin-xineliboutput/files/patch-c++11 b/multimedia/vdr-plugin-xineliboutput/files/patch-c++11 new file mode 100644 index 000000000000..ca242e5d3553 --- /dev/null +++ b/multimedia/vdr-plugin-xineliboutput/files/patch-c++11 @@ -0,0 +1,163 @@ +diff -ruN vdr-xineliboutput.orig/device.c vdr-xineliboutput/device.c +--- vdr-xineliboutput.orig/device.c 2012-05-11 09:37:27.000000000 +0200 ++++ vdr-xineliboutput/device.c 2021-08-30 10:52:36.560762000 +0200 +@@ -967,7 +967,7 @@ + #ifdef LOG_TRICKSPEED + if(PictureType != NO_PICTURE && PES_HAS_PTS(buf)) { + int64_t pts = pes_get_pts(buf, length); +- LOGMSG(" TrickSpeed: frame %s pts %"PRId64, picture_type_str[PictureType], pts); ++ LOGMSG(" TrickSpeed: frame %s pts %" PRId64, picture_type_str[PictureType], pts); + } + #endif + +@@ -1019,11 +1019,11 @@ + if(m_TrickSpeedPts == 0) { + m_TrickSpeedMode |= trs_NoAudio; + m_TrickSpeedPts = pts; +- LOGTRICKSPEED(" Seen video pts = %"PRId64, pts); ++ LOGTRICKSPEED(" Seen video pts = %" PRId64, pts); + } else { + if(pts < m_TrickSpeedPts) { + /* -> playing fast backwards */ +- LOGTRICKSPEED(" Detected fast backward mode. last %"PRId64" now %"PRId64, ++ LOGTRICKSPEED(" Detected fast backward mode. last %" PRId64 " now %" PRId64, + m_TrickSpeedPts, pts); + //if(!(m_TrickSpeedMode & trs_PTS_recalc)) + // ForEach(m_clients, &cXinelibThread::Clear); +@@ -1051,7 +1051,7 @@ + if(m_TrickSpeedPts == 0) + m_TrickSpeedPts = pts; + +- LOGTRICKSPEED(" pts %"PRId64" -> %"PRId64" (diff %"PRId64") %"PRId64"", pts, ++ LOGTRICKSPEED(" pts %" PRId64 " -> %" PRId64 " (diff %" PRId64 ") %" PRId64 "", pts, + m_TrickSpeedPts + 40*12*90, m_TrickSpeedPts + 40*12*90 - pts, + (m_TrickSpeedPts + 40*12*90)^0x80000000); + pts = m_TrickSpeedPts = m_TrickSpeedPts + 40*12*90; /* 12 frames * 40ms -> pts units */ +diff -ruN vdr-xineliboutput.orig/tools/ts.c vdr-xineliboutput/tools/ts.c +--- vdr-xineliboutput.orig/tools/ts.c 2012-05-11 09:37:27.000000000 +0200 ++++ vdr-xineliboutput/tools/ts.c 2021-08-30 10:54:49.676758000 +0200 +@@ -545,7 +545,7 @@ + + #ifdef LOG_PCR + uint epcr = ((pkt[10] & 0x1) << 8) | pkt[11]; +- LOGPCR("ts_get_pcr: PCR: %"PRId64", EPCR: %u", pcr, epcr); ++ LOGPCR("ts_get_pcr: PCR: %" PRId64 ", EPCR: %u", pcr, epcr); + #endif + + *ppcr = pcr; +diff -ruN vdr-xineliboutput.orig/xine/BluRay/decode_spuhdmv.c vdr-xineliboutput/xine/BluRay/decode_spuhdmv.c +--- vdr-xineliboutput.orig/xine/BluRay/decode_spuhdmv.c 2012-05-11 09:37:27.000000000 +0200 ++++ vdr-xineliboutput/xine/BluRay/decode_spuhdmv.c 2021-08-30 10:50:45.900369000 +0200 +@@ -925,7 +925,7 @@ + + static void decode_segment(spuhdmv_decoder_t *this) + { +- XINE_HDMV_TRACE("*** new segment, pts %010"PRId64": 0x%02x (%8d bytes)\n", ++ XINE_HDMV_TRACE("*** new segment, pts %010" PRId64 ": 0x%02x (%8d bytes)\n", + this->pts, this->buf->segment_type, this->buf->segment_len); + + switch (segbuf_segment_type(this->buf)) { +diff -ruN vdr-xineliboutput.orig/xine/BluRay/input_bluray.c vdr-xineliboutput/xine/BluRay/input_bluray.c +--- vdr-xineliboutput.orig/xine/BluRay/input_bluray.c 2012-05-11 09:37:27.000000000 +0200 ++++ vdr-xineliboutput/xine/BluRay/input_bluray.c 2021-08-30 10:54:23.289681000 +0200 +@@ -568,7 +568,7 @@ + + #ifdef LOG + int ms = this->title_info->duration / INT64_C(90); +- lprintf("Opened title %d. Length %"PRId64" bytes / %02d:%02d:%02d.%03d\n", ++ lprintf("Opened title %d. Length %" PRId64 " bytes / %02d:%02d:%02d.%03d\n", + this->current_title_idx, bd_get_title_size(this->bdh), + ms / 3600000, (ms % 3600000 / 60000), (ms % 60000) / 1000, ms % 1000); + #endif +diff -ruN vdr-xineliboutput.orig/xine/adjustable_scr.c vdr-xineliboutput/xine/adjustable_scr.c +--- vdr-xineliboutput.orig/xine/adjustable_scr.c 2012-05-11 09:37:27.000000000 +0200 ++++ vdr-xineliboutput/xine/adjustable_scr.c 2021-08-30 10:50:17.820989000 +0200 +@@ -274,13 +274,13 @@ + set_pivot( this ); + this->buffering = 1; + this->buffering_start_time = time_ms(); +- LOGMSG("start buffering at %"PRId64, this->cur_pts); ++ LOGMSG("start buffering at %" PRId64, this->cur_pts); + } + } else { + if (this->buffering) { + set_pivot( this ); + this->buffering = 0; +- LOGMSG("stop buffering at %"PRId64" (buffering took %"PRIu64" ms)", ++ LOGMSG("stop buffering at %" PRId64 " (buffering took %" PRIu64 " ms)", + this->cur_pts, elapsed(this->buffering_start_time)); + } + } +diff -ruN vdr-xineliboutput.orig/xine/demux_xvdr.c vdr-xineliboutput/xine/demux_xvdr.c +--- vdr-xineliboutput.orig/xine/demux_xvdr.c 2012-05-11 09:37:27.000000000 +0200 ++++ vdr-xineliboutput/xine/demux_xvdr.c 2021-08-30 10:51:33.112992000 +0200 +@@ -227,7 +227,7 @@ + int still_mode = (int)this->stream->metronom->get_option(this->stream->metronom, XVDR_METRONOM_STILL_MODE); + int trick_speed = (int)this->stream->metronom->get_option(this->stream->metronom, XVDR_METRONOM_TRICK_SPEED); + if (still_mode > 0 || trick_speed > 0) { +- LOGMSG("Skipping new pts %"PRId64" (still=%d trickspeed=%d)", buf->pts, still_mode, trick_speed); ++ LOGMSG("Skipping new pts %" PRId64 " (still=%d trickspeed=%d)", buf->pts, still_mode, trick_speed); + return; + } + } +@@ -239,7 +239,7 @@ + + if (this->send_newpts || (this->last_pts[video] && abs(diff)>WRAP_THRESHOLD)) { + +- LOGVERBOSE("New PTS: %"PRId64" (%s)", buf->pts, video ? "VIDEO" : "AUDIO"); ++ LOGVERBOSE("New PTS: %" PRId64 " (%s)", buf->pts, video ? "VIDEO" : "AUDIO"); + + if (this->buf_flag_seek) { + _x_demux_control_newpts(this->stream, buf->pts, BUF_FLAG_SEEK); +diff -ruN vdr-xineliboutput.orig/xine/vo_lastpts.c vdr-xineliboutput/xine/vo_lastpts.c +--- vdr-xineliboutput.orig/xine/vo_lastpts.c 2012-05-11 09:37:27.000000000 +0200 ++++ vdr-xineliboutput/xine/vo_lastpts.c 2021-08-30 10:55:43.802524000 +0200 +@@ -83,7 +83,7 @@ + if (this->xvdr_metronom) { + ASSERT_RET(this->xvdr_metronom->set_option, return); + +- LOGVERBOSE("last pts %"PRId64, vo_img->pts); ++ LOGVERBOSE("last pts %" PRId64, vo_img->pts); + + this->xvdr_metronom->set_option(this->xvdr_metronom, XVDR_METRONOM_LAST_VO_PTS, vo_img->pts); + } +diff -ruN vdr-xineliboutput.orig/xine/xvdr_metronom.c vdr-xineliboutput/xine/xvdr_metronom.c +--- vdr-xineliboutput.orig/xine/xvdr_metronom.c 2012-05-11 09:37:27.000000000 +0200 ++++ vdr-xineliboutput/xine/xvdr_metronom.c 2021-08-30 10:57:30.121628000 +0200 +@@ -37,11 +37,11 @@ + int64_t dv = this->vid_pts - this->disc_pts; + int64_t d_min = min64(da, dv); + LOGMSG(" stream A-V diff %d ms", (int)(this->vid_pts - this->aud_pts)/90); +- LOGMSG(" reported stream start at pts %"PRId64, this->disc_pts); +- LOGMSG(" output fifo end at: audio %"PRId64" video %"PRId64, this->aud_pts, this->vid_pts); +- LOGMSG(" dA %"PRId64" dV %"PRId64, da, dv); ++ LOGMSG(" reported stream start at pts %" PRId64, this->disc_pts); ++ LOGMSG(" output fifo end at: audio %" PRId64 " video %" PRId64, this->aud_pts, this->vid_pts); ++ LOGMSG(" dA %" PRId64 " dV %" PRId64, da, dv); + if (d_min < 0 && d_min > -10*90000) { +- LOGMSG(" *** output is late %"PRId64" ticks (%"PRId64" ms) ***", d_min, -d_min/90); ++ LOGMSG(" *** output is late %" PRId64 " ticks (%" PRId64 " ms) ***", d_min, -d_min/90); + this->scr->jump(this->scr, d_min); + } + this->buffering = 0; +diff -ruN vdr-xineliboutput.orig/xine_input_vdr.c vdr-xineliboutput/xine_input_vdr.c +--- vdr-xineliboutput.orig/xine_input_vdr.c 2012-05-11 09:37:27.000000000 +0200 ++++ vdr-xineliboutput/xine_input_vdr.c 2021-08-30 10:56:35.415173000 +0200 +@@ -3963,7 +3963,7 @@ + } + + if (this->discard_index != this->curpos) { +- LOGMSG("wait_stream_sync: discard_index %"PRIu64" != curpos %"PRIu64" ! (diff %"PRId64")", ++ LOGMSG("wait_stream_sync: discard_index %"PRIu64" != curpos %"PRIu64" ! (diff %" PRId64 ")", + this->discard_index, this->curpos, (int64_t)(this->discard_index - this->curpos)); + } + +@@ -3983,7 +3983,7 @@ + errno = EINTR; + } + else if (counter <= 0) { +- LOGMSG("wait_stream_sync: Timed out ! diff %"PRId64, ++ LOGMSG("wait_stream_sync: Timed out ! diff %" PRId64, + (int64_t)(this->discard_index - this->discard_index_ds)); + errno = EAGAIN; + } diff --git a/multimedia/vdr-plugin-xineliboutput/files/patch-configure b/multimedia/vdr-plugin-xineliboutput/files/patch-configure index a3be2592e1d6..5051156c313e 100644 --- a/multimedia/vdr-plugin-xineliboutput/files/patch-configure +++ b/multimedia/vdr-plugin-xineliboutput/files/patch-configure @@ -1,6 +1,23 @@ ---- a/configure -+++ a/configure -@@ -349,11 +349,14 @@ test_pkgconfig +diff -ruN b/configure a/configure +--- b/configure 2012-05-11 09:37:27.000000000 +0200 ++++ a/configure 2021-08-31 08:43:00.871579000 +0200 +@@ -234,6 +234,7 @@ + xrender + xshape + opengl ++ glx + pthread + dlfcn + vdpau +@@ -333,6 +334,7 @@ + disabled x11 && disable dbus-glib-1 xshm xrender xshape opengl xdpms xinerama vdpau + disabled vdr && disable libextractor libcap libbluray + disabled dlfcn && disable opengl ++ disabled glx && disable opengl + disabled pthread && disable opengl + disabled xrender && disable xshape xshm + } +@@ -349,11 +351,14 @@ [ $debug = yes ] && \ test_library X11 do_error "none.h" "-lnolib" @@ -20,7 +37,7 @@ if enabled libxine; then -@@ -365,24 +368,40 @@ if enabled libxine; then +@@ -365,24 +370,41 @@ fi log " $XINEPLUGINDIR" @@ -56,7 +73,8 @@ +# test_library X11 xinerama "X11/extensions/Xinerama.h" "-lXinerama" "XineramaQueryScreens(0,0)" + test_library X11 xinerama "X11/extensions/Xinerama.h" "-lXinerama" "XineramaQueryScreens(0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" +# test_library X11 opengl "GL/glx.h" "-lGL -lGLU" "glXQueryVersion(0,0,0)" -+ test_library X11 opengl "GL/glx.h" "-lGL -lGLU" "glXQueryVersion(0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" ++ test_library X11 opengl "GL/gl.h" "-lGL -LGLU" "glTexCoord2f(0.0,0.0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" ++ test_library X11 glx "GL/glx.h" "-lGLX" "glXQueryVersion(0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" +# test_library none vdpau "vdpau/vdpau_x11.h" "-lvdpau" "vdp_device_create_x11(0,0,0,0)" + test_library none vdpau "vdpau/vdpau_x11.h" "-lvdpau" "vdp_device_create_x11(0,0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" +# test_library X11 dbus-glib-1 \ From nobody Sun Oct 31 18:01:42 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 1249D181FDC2; Sun, 31 Oct 2021 18:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hj3rk6zznz4n2x; Sun, 31 Oct 2021 18:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D075422594; Sun, 31 Oct 2021 18:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19VI1g11072460; Sun, 31 Oct 2021 18:01:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19VI1gcp072459; Sun, 31 Oct 2021 18:01:42 GMT (envelope-from git) Date: Sun, 31 Oct 2021 18:01:42 GMT Message-Id: <202110311801.19VI1gcp072459@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: d8f07bd5aa92 - 2021Q4 - archivers/nfpm: Update 2.6.0 -> 2.7.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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: d8f07bd5aa92cde330fb71b44826469ebb1a3976 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=d8f07bd5aa92cde330fb71b44826469ebb1a3976 commit d8f07bd5aa92cde330fb71b44826469ebb1a3976 Author: Yuri Victorovich AuthorDate: 2021-10-18 16:30:45 +0000 Commit: Yuri Victorovich CommitDate: 2021-10-31 18:01:35 +0000 archivers/nfpm: Update 2.6.0 -> 2.7.1 Reported by: portscout (cherry picked from commit e6b9ebac9ebb06ae964e1680fcdb6f2bdf6b35ee) --- archivers/nfpm/Makefile | 61 +------------------------ archivers/nfpm/distinfo | 116 +++--------------------------------------------- 2 files changed, 7 insertions(+), 170 deletions(-) diff --git a/archivers/nfpm/Makefile b/archivers/nfpm/Makefile index a5f72643f9ed..e0e1cf4d2b80 100644 --- a/archivers/nfpm/Makefile +++ b/archivers/nfpm/Makefile @@ -1,6 +1,6 @@ PORTNAME= nfpm DISTVERSIONPREFIX= v -DISTVERSION= 2.6.0 +DISTVERSION= 2.7.1 CATEGORIES= archivers MAINTAINER= yuri@FreeBSD.org @@ -11,64 +11,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md USES= go:modules -USE_GITHUB= yes -GH_ACCOUNT= goreleaser -GH_TUPLE= \ - AlekSi:pointer:v1.1.0:aleksi_pointer/vendor/github.com/AlekSi/pointer \ - Masterminds:goutils:v1.1.1:masterminds_goutils/vendor/github.com/Masterminds/goutils \ - Masterminds:semver:v1.5.0:masterminds_semver/vendor/github.com/Masterminds/semver \ - Masterminds:semver:v3.1.1:masterminds_semver_v3/vendor/github.com/Masterminds/semver/v3 \ - Masterminds:sprig:v2.22.0:masterminds_sprig/vendor/github.com/Masterminds/sprig \ - Microsoft:go-winio:v0.4.16:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \ - ProtonMail:go-crypto:c05353c2d58c:protonmail_go_crypto/vendor/github.com/ProtonMail/go-crypto \ - ProtonMail:go-mime:9b5a4261663a:protonmail_go_mime/vendor/github.com/ProtonMail/go-mime \ - ProtonMail:gopenpgp:v2.2.0:protonmail_gopenpgp_v2/vendor/github.com/ProtonMail/gopenpgp/v2 \ - alecthomas:jsonschema:edb03dcab7bc:alecthomas_jsonschema/vendor/github.com/alecthomas/jsonschema \ - blakesmith:ar:809d4375e1fb:blakesmith_ar/vendor/github.com/blakesmith/ar \ - cavaliercoder:go-cpio:925f9528c45e:cavaliercoder_go_cpio/vendor/github.com/cavaliercoder/go-cpio \ - cpuguy83:go-md2man:v2.0.0:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \ - davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ - emirpasic:gods:v1.12.0:emirpasic_gods/vendor/github.com/emirpasic/gods \ - go-git:gcfg:v1.5.0:go_git_gcfg/vendor/github.com/go-git/gcfg \ - go-git:go-billy:v5.1.0:go_git_go_billy_v5/vendor/github.com/go-git/go-billy/v5 \ - go-git:go-git:v5.3.0:go_git_go_git_v5/vendor/github.com/go-git/go-git/v5 \ - go-warnings:warnings:v0.1.2:go_warnings_warnings/vendor/gopkg.in/warnings.v0 \ - go-yaml:yaml:496545a6307b:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \ - go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ - gobwas:glob:v0.2.3:gobwas_glob/vendor/github.com/gobwas/glob \ - golang:crypto:0c34fe9e7dc2:golang_crypto/vendor/golang.org/x/crypto \ - golang:net:afb366fc7cd1:golang_net/vendor/golang.org/x/net \ - golang:sys:977fb7262007:golang_sys/vendor/golang.org/x/sys \ - golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \ - google:rpmpack:e20c988a6f5a:google_rpmpack/vendor/github.com/google/rpmpack \ - google:uuid:v1.2.0:google_uuid/vendor/github.com/google/uuid \ - goreleaser:chglog:v0.1.2:goreleaser_chglog/vendor/github.com/goreleaser/chglog \ - goreleaser:fileglob:v1.2.0:goreleaser_fileglob/vendor/github.com/goreleaser/fileglob \ - huandu:xstrings:v1.3.2:huandu_xstrings/vendor/github.com/huandu/xstrings \ - iancoleman:orderedmap:ac98e3ecb4b0:iancoleman_orderedmap/vendor/github.com/iancoleman/orderedmap \ - imdario:mergo:v0.3.12:imdario_mergo/vendor/github.com/imdario/mergo \ - inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \ - jbenet:go-context:d14ea06fba99:jbenet_go_context/vendor/github.com/jbenet/go-context \ - kevinburke:ssh_config:v1.1.0:kevinburke_ssh_config/vendor/github.com/kevinburke/ssh_config \ - konsorten:go-windows-terminal-sequences:v1.0.1:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \ - mitchellh:copystructure:v1.1.2:mitchellh_copystructure/vendor/github.com/mitchellh/copystructure \ - mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \ - mitchellh:reflectwalk:v1.0.1:mitchellh_reflectwalk/vendor/github.com/mitchellh/reflectwalk \ - op:go-logging:970db520ece7:op_go_logging/vendor/github.com/op/go-logging \ - pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \ - pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ - russross:blackfriday:v2.0.1:russross_blackfriday_v2/vendor/github.com/russross/blackfriday/v2 \ - sassoftware:go-rpmutils:a8f1baeba37b:sassoftware_go_rpmutils/vendor/github.com/sassoftware/go-rpmutils \ - sergi:go-diff:v1.2.0:sergi_go_diff/vendor/github.com/sergi/go-diff \ - shurcooL:sanitized_anchor_name:v1.0.0:shurcool_sanitized_anchor_name/vendor/github.com/shurcooL/sanitized_anchor_name \ - sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ - spf13:cobra:v1.2.1:spf13_cobra/vendor/github.com/spf13/cobra \ - spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \ - stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \ - ulikunitz:xz:v0.5.9:ulikunitz_xz/vendor/github.com/ulikunitz/xz \ - xanzy:ssh-agent:v0.3.0:xanzy_ssh_agent/vendor/github.com/xanzy/ssh-agent \ - xi2:xz:48954b6210f8:xi2_xz/vendor/github.com/xi2/xz - +GO_MODULE= github.com/goreleaser/nfpm/v2 GO_TARGET= ./cmd/${PORTNAME} PLIST_FILES= bin/${PORTNAME} diff --git a/archivers/nfpm/distinfo b/archivers/nfpm/distinfo index 7db44c1f6cfc..f9c8e0364e85 100644 --- a/archivers/nfpm/distinfo +++ b/archivers/nfpm/distinfo @@ -1,111 +1,5 @@ -TIMESTAMP = 1626055102 -SHA256 (goreleaser-nfpm-v2.6.0_GH0.tar.gz) = d5d4433e4a2767f990bec48845dd8f04839ea13989271a67674821737713af91 -SIZE (goreleaser-nfpm-v2.6.0_GH0.tar.gz) = 439609 -SHA256 (AlekSi-pointer-v1.1.0_GH0.tar.gz) = 47f59b547999f8dc6f2fdd347cdd0351e31e1a9260190b0cfb61d5dd7db87a8d -SIZE (AlekSi-pointer-v1.1.0_GH0.tar.gz) = 4664 -SHA256 (Masterminds-goutils-v1.1.1_GH0.tar.gz) = 6eed023c54f386a71f360e19d34f7a43e640ac44dfc39c22ad4afd7ae04aaa3d -SIZE (Masterminds-goutils-v1.1.1_GH0.tar.gz) = 14847 -SHA256 (Masterminds-semver-v1.5.0_GH0.tar.gz) = c9140eddfb03dc862f826e7761561260b9a840afa7519cc0919e89a43b5be5ba -SIZE (Masterminds-semver-v1.5.0_GH0.tar.gz) = 21188 -SHA256 (Masterminds-semver-v3.1.1_GH0.tar.gz) = d029a39800f201d5b95ec5dbf653e5b20aab757783a6876be1b3017d1c4a444f -SIZE (Masterminds-semver-v3.1.1_GH0.tar.gz) = 24506 -SHA256 (Masterminds-sprig-v2.22.0_GH0.tar.gz) = c6d0f6e2a3b2aecc888b62c15defcccf16a44e7435c47c7f158b98946c5ee970 -SIZE (Masterminds-sprig-v2.22.0_GH0.tar.gz) = 42051 -SHA256 (Microsoft-go-winio-v0.4.16_GH0.tar.gz) = 0cb82f4cdba942af6b545695d694e91b9d9d56bd38555c81744235d7c6f6485d -SIZE (Microsoft-go-winio-v0.4.16_GH0.tar.gz) = 85568 -SHA256 (ProtonMail-go-crypto-c05353c2d58c_GH0.tar.gz) = f6c1f45da1f7947b5484e5debc7777da11d6afdd0812374e329c384cb045fcd7 -SIZE (ProtonMail-go-crypto-c05353c2d58c_GH0.tar.gz) = 308315 -SHA256 (ProtonMail-go-mime-9b5a4261663a_GH0.tar.gz) = f7fb44da2af17aa8b58f14a126b7326cc49d0c03f358cebac52ba4fc753dd1f7 -SIZE (ProtonMail-go-mime-9b5a4261663a_GH0.tar.gz) = 23814 -SHA256 (ProtonMail-gopenpgp-v2.2.0_GH0.tar.gz) = abb0048ead57b9fcfe244a24ce2b201ea6208b5153fec7a7bedd18fdbe3cee6d -SIZE (ProtonMail-gopenpgp-v2.2.0_GH0.tar.gz) = 122146 -SHA256 (alecthomas-jsonschema-edb03dcab7bc_GH0.tar.gz) = 5f2bdd45f4f51e3cf36bf98908149b184780b6298e06a856f50210303ee9b038 -SIZE (alecthomas-jsonschema-edb03dcab7bc_GH0.tar.gz) = 14459 -SHA256 (blakesmith-ar-809d4375e1fb_GH0.tar.gz) = f9bff34f7f0b3c8d650868b1e69ca6798244c3e43d2eaecf3196426f904b8c72 -SIZE (blakesmith-ar-809d4375e1fb_GH0.tar.gz) = 4069 -SHA256 (cavaliercoder-go-cpio-925f9528c45e_GH0.tar.gz) = 4bc9671c60f37d7e863f3dd4c20a8c93601a49b8c6cb26217cb356086f02cd0a -SIZE (cavaliercoder-go-cpio-925f9528c45e_GH0.tar.gz) = 9103 -SHA256 (cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 50537880d42fc28b9c2e9aaa36b137349d43cc73d46436a499f8c928cd2fc576 -SIZE (cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 52021 -SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e -SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 -SHA256 (emirpasic-gods-v1.12.0_GH0.tar.gz) = 889d06b5f88db9e2dae19a799a35324c4f59305aa5e966dcdb4b637e70607ff9 -SIZE (emirpasic-gods-v1.12.0_GH0.tar.gz) = 76825 -SHA256 (go-git-gcfg-v1.5.0_GH0.tar.gz) = 662e46a93aba5ffe383e55597ce5749447e5c8e9409b1452f5790bfd6e1f8a11 -SIZE (go-git-gcfg-v1.5.0_GH0.tar.gz) = 28522 -SHA256 (go-git-go-billy-v5.1.0_GH0.tar.gz) = cb6a3e04b76af02af0aefad91b1e07007c27fba48b3a08ca8e87768e8ea272f5 -SIZE (go-git-go-billy-v5.1.0_GH0.tar.gz) = 28217 -SHA256 (go-git-go-git-v5.3.0_GH0.tar.gz) = 8f97b5e63d2d331f7502ab2d5d8874d41ab06c80c6052a61445df26764e51e42 -SIZE (go-git-go-git-v5.3.0_GH0.tar.gz) = 465156 -SHA256 (go-warnings-warnings-v0.1.2_GH0.tar.gz) = 4712c4ceae321433d8c1d9ebc6afd154d7932c849129ded48b1c4a51c21275e8 -SIZE (go-warnings-warnings-v0.1.2_GH0.tar.gz) = 3769 -SHA256 (go-yaml-yaml-496545a6307b_GH0.tar.gz) = ed0e11dc14bbbd4127031d7e8b9e58dad885e2c44a16359d2f64b71d1d1f692a -SIZE (go-yaml-yaml-496545a6307b_GH0.tar.gz) = 90156 -SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0 -SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209 -SHA256 (gobwas-glob-v0.2.3_GH0.tar.gz) = 325026fc78bcebcf31151b6e060f4e1c3321b04ded3dab63b63610b323c10850 -SIZE (gobwas-glob-v0.2.3_GH0.tar.gz) = 25962 -SHA256 (golang-crypto-0c34fe9e7dc2_GH0.tar.gz) = deab6194c4b5d5ceefa40e8c7fc82a4288ff6e8577cdbde406e781c62624f491 -SIZE (golang-crypto-0c34fe9e7dc2_GH0.tar.gz) = 1726075 -SHA256 (golang-net-afb366fc7cd1_GH0.tar.gz) = 897c59e6bb8851550cdaa131e1d0c51502f537194de846918f532c463a4518ca -SIZE (golang-net-afb366fc7cd1_GH0.tar.gz) = 1249394 -SHA256 (golang-sys-977fb7262007_GH0.tar.gz) = 11c4dfe83ceae6376054cc95e8f1b303a29985fc407c87cf9e360fd64d7937ce -SIZE (golang-sys-977fb7262007_GH0.tar.gz) = 1192386 -SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760 -SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095 -SHA256 (google-rpmpack-e20c988a6f5a_GH0.tar.gz) = e7808dd0ac8d20198a1d1b882b2e7568fed592e31097a010b836d9d187df5237 -SIZE (google-rpmpack-e20c988a6f5a_GH0.tar.gz) = 24201 -SHA256 (google-uuid-v1.2.0_GH0.tar.gz) = 53ba896ce398435b3ba4f9375f5d4908b09c79daaa54ecd4e5000b7bef984380 -SIZE (google-uuid-v1.2.0_GH0.tar.gz) = 14158 -SHA256 (goreleaser-chglog-v0.1.2_GH0.tar.gz) = 55bb398d554daa00a875c2cbeceb35459387e62dfd023ae220af60ddfdb42fb9 -SIZE (goreleaser-chglog-v0.1.2_GH0.tar.gz) = 52610 -SHA256 (goreleaser-fileglob-v1.2.0_GH0.tar.gz) = 713a10345093f6ae3cbc0d703c73abc4bafb75724579e7ae9747a245e9bc0bbd -SIZE (goreleaser-fileglob-v1.2.0_GH0.tar.gz) = 9569 -SHA256 (huandu-xstrings-v1.3.2_GH0.tar.gz) = 89eed037724f4a2e85da5217faa6d73ae317d066e0e5fd79670a142b83f5eb1b -SIZE (huandu-xstrings-v1.3.2_GH0.tar.gz) = 17911 -SHA256 (iancoleman-orderedmap-ac98e3ecb4b0_GH0.tar.gz) = 22c48471185f1458ad79ab0eb6ecf59dda6cc03bec72cde893bbec9df48b167f -SIZE (iancoleman-orderedmap-ac98e3ecb4b0_GH0.tar.gz) = 5897 -SHA256 (imdario-mergo-v0.3.12_GH0.tar.gz) = f0ad95fe47f1a9c15545fe3e8abf4364b8163a0f872ce25d6f6ae85e7c885302 -SIZE (imdario-mergo-v0.3.12_GH0.tar.gz) = 22319 -SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6 -SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290 -SHA256 (jbenet-go-context-d14ea06fba99_GH0.tar.gz) = b5a5c4fe8d73dea7dc838f1c428c5fff0db9b50a2c014208a2761de4e94fa5ba -SIZE (jbenet-go-context-d14ea06fba99_GH0.tar.gz) = 5945 -SHA256 (kevinburke-ssh_config-v1.1.0_GH0.tar.gz) = a88b03ef5077abe2ad25e7c2cd34800099575712444d71612e0553dd317ac118 -SIZE (kevinburke-ssh_config-v1.1.0_GH0.tar.gz) = 19004 -SHA256 (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = e36c5a5de388bf72db3037b47f025b09e574be8d0bc74b3e44c960cba0880e87 -SIZE (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = 1909 -SHA256 (mitchellh-copystructure-v1.1.2_GH0.tar.gz) = 0d262d2f212b4b04717700607d50daaa62f37127bcfc238a81bb5548ae9a98f0 -SIZE (mitchellh-copystructure-v1.1.2_GH0.tar.gz) = 9699 -SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600 -SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362 -SHA256 (mitchellh-reflectwalk-v1.0.1_GH0.tar.gz) = c81ed165d0250541655304973d5379a61e00ef074c471b6a6be2c38b204a2afd -SIZE (mitchellh-reflectwalk-v1.0.1_GH0.tar.gz) = 6449 -SHA256 (op-go-logging-970db520ece7_GH0.tar.gz) = 452d16dda814a779824097f74dc712c533f84591d9b397175b216f131ad22f17 -SIZE (op-go-logging-970db520ece7_GH0.tar.gz) = 37181 -SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608 -SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415 -SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda -SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398 -SHA256 (russross-blackfriday-v2.0.1_GH0.tar.gz) = 5a0f38a36b6f3b2d59b72d713451a895a4d3a4406b3533882483782e37797cff -SIZE (russross-blackfriday-v2.0.1_GH0.tar.gz) = 79613 -SHA256 (sassoftware-go-rpmutils-a8f1baeba37b_GH0.tar.gz) = 98c301bbb47f29e4685bfaafd31509ac9230fda0828938119715fcf0b5ebbbda -SIZE (sassoftware-go-rpmutils-a8f1baeba37b_GH0.tar.gz) = 27447 -SHA256 (sergi-go-diff-v1.2.0_GH0.tar.gz) = 39590cae996778b7ffdd8eb9e8fc791117f16562dbef37f9c41b2f3ebb8f518b -SIZE (sergi-go-diff-v1.2.0_GH0.tar.gz) = 1333585 -SHA256 (shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 7e11964980f9b8595c17bc8970f0174621afe464920e38df7f8d77e45058388f -SIZE (shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 2143 -SHA256 (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 67f2ddf467b7e63d2d2529d227946a331e245aeef7e2e4521ae82647b5ef84d9 -SIZE (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 41373 -SHA256 (spf13-cobra-v1.2.1_GH0.tar.gz) = 382d414ff7b8f421ae07d32d5a17161718b45bdd00de86dc107a34e639857794 -SIZE (spf13-cobra-v1.2.1_GH0.tar.gz) = 161312 -SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808 -SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796 -SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5aa2beb58ef7a94530d7724b5739a8d6 -SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073 -SHA256 (ulikunitz-xz-v0.5.9_GH0.tar.gz) = c508703c9c021658170146f5904b1e67dff5ce8c86be4e8e3e041213cf0b68ef -SIZE (ulikunitz-xz-v0.5.9_GH0.tar.gz) = 477991 -SHA256 (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 7ce80a93d0fdbeb6760f97d6d166d11c215b809e50f0a80c78b8730c61582858 -SIZE (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 8421 -SHA256 (xi2-xz-48954b6210f8_GH0.tar.gz) = 1ef05b11f53098ab157f5848bdf2f585a38af0db15822ea0691e7f51587a4ce3 -SIZE (xi2-xz-48954b6210f8_GH0.tar.gz) = 1135342 +TIMESTAMP = 1634574414 +SHA256 (go/archivers_nfpm/nfpm-v2.7.1/v2.7.1.mod) = e825e55067ef11bd65a1db5ccb2873913db35443eae9a19260bb445fbd19bb8e +SIZE (go/archivers_nfpm/nfpm-v2.7.1/v2.7.1.mod) = 2904 +SHA256 (go/archivers_nfpm/nfpm-v2.7.1/v2.7.1.zip) = 26fe7b8d75d7976158a447ae1c64b90c34014e31304d6c3c9d6f1b66416c7e7a +SIZE (go/archivers_nfpm/nfpm-v2.7.1/v2.7.1.zip) = 504084 From nobody Sun Oct 31 21:29: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 D52781814F13; Sun, 31 Oct 2021 21:29: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 4Hj8T25dpWz4wLD; Sun, 31 Oct 2021 21:29: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 A146C24D34; Sun, 31 Oct 2021 21:29: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 19VLTwH8039624; Sun, 31 Oct 2021 21:29:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19VLTwRt039623; Sun, 31 Oct 2021 21:29:58 GMT (envelope-from git) Date: Sun, 31 Oct 2021 21:29:58 GMT Message-Id: <202110312129.19VLTwRt039623@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: fd8c82b8e2f6 - 2021Q4 - databases/go-pgweb: Add rc.d script 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: fd8c82b8e2f62e02385f9f024b453653b224c716 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd8c82b8e2f62e02385f9f024b453653b224c716 commit fd8c82b8e2f62e02385f9f024b453653b224c716 Author: Daniel Morante AuthorDate: 2021-10-31 21:11:51 +0000 Commit: Yasuhiro Kimura CommitDate: 2021-10-31 21:29:29 +0000 databases/go-pgweb: Add rc.d script * Pass maintainership to submitter * Pet portclippy * Re-format Makefile with portfmt PR: 257074 Approved by: portmgr (blanket: unmaintained port) MFH: 2021Q4 (cherry picked from commit 990c482dfe4354a5ab7b6e0c8c5437f55511fcef) --- databases/go-pgweb/Makefile | 14 ++++++++- databases/go-pgweb/files/pgweb.in | 50 +++++++++++++++++++++++++++++++++ databases/go-pgweb/files/pkg-message.in | 22 +++++++++++++++ 3 files changed, 85 insertions(+), 1 deletion(-) diff --git a/databases/go-pgweb/Makefile b/databases/go-pgweb/Makefile index b8113f84e8a0..6e751f9fe1f8 100644 --- a/databases/go-pgweb/Makefile +++ b/databases/go-pgweb/Makefile @@ -1,10 +1,11 @@ PORTNAME= pgweb DISTVERSIONPREFIX= v DISTVERSION= 0.11.7 +PORTREVISION= 1 CATEGORIES= databases www PKGNAMEPREFIX= go- -MAINTAINER= ports@FreeBSD.org +MAINTAINER= daniel@morante.net COMMENT= Web-based database browser for PostgreSQL LICENSE= MIT @@ -12,7 +13,18 @@ LICENSE= MIT USES= go USE_GITHUB= yes GH_ACCOUNT= sosedoff +USE_RC_SUBR= ${PORTNAME} + GO_PKGNAME= github.com/sosedoff/pgweb + +SUB_FILES+= pkg-message +SUB_LIST+= PGWEBGROUP=${GROUPS} \ + PGWEBUSER=${USERS} \ + PORTNAME=${PORTNAME} + PLIST_FILES= bin/pgweb +USERS= www +GROUPS= www + .include diff --git a/databases/go-pgweb/files/pgweb.in b/databases/go-pgweb/files/pgweb.in new file mode 100644 index 000000000000..e945d0de9c26 --- /dev/null +++ b/databases/go-pgweb/files/pgweb.in @@ -0,0 +1,50 @@ +#!/bin/sh +# +# +# PROVIDE: %%PORTNAME%% +# REQUIRE: NETWORKING +# KEYWORD: +# +# Add the following lines to /etc/rc.conf to enable %%PORTNAME%%: +# %%PORTNAME%%_enable="YES" +# +# %%PORTNAME%%_enable (bool): Set to YES to enable %%PORTNAME%% +# Default: NO +# %%PORTNAME%%_bind (str): HTTP server host +# Default: localhost +# %%PORTNAME%%_listen (str): HTTP server listen port +# Default: 8081 +# %%PORTNAME%%_user (str): %%PORTNAME%% daemon user +# Default: %%PGWEBUSER%% +# %%PORTNAME%%_group (str): %%PORTNAME%% daemon group +# Default: %%PGWEBGROUP%% + +. /etc/rc.subr + +name="%%PORTNAME%%" +rcvar="%%PORTNAME%%_enable" +load_rc_config $name + +: ${%%PORTNAME%%_user:="www"} +: ${%%PORTNAME%%_group:="www"} +: ${%%PORTNAME%%_enable:="NO"} +: ${%%PORTNAME%%_bind:="localhost"} +: ${%%PORTNAME%%_flags=""} +: ${%%PORTNAME%%_facility:="daemon"} +: ${%%PORTNAME%%_priority:="debug"} +: ${%%PORTNAME%%_listen:="8081"} + +procname="%%PREFIX%%/bin/${name}" +pidfile="/var/run/${name}.pid" +start_precmd="${name}_precmd" +command=/usr/sbin/daemon +command_args="-S -l ${%%PORTNAME%%_facility} -s ${%%PORTNAME%%_priority} -T ${name} -t ${name} -p ${pidfile} \ + ${procname} --bind=${%%PORTNAME%%_bind} --listen=${%%PORTNAME%%_listen} ${%%PORTNAME%%_flags}" + +%%PORTNAME%%_precmd() +{ + install -o ${%%PORTNAME%%_user} /dev/null ${pidfile} +} + +run_rc_command "$1" + diff --git a/databases/go-pgweb/files/pkg-message.in b/databases/go-pgweb/files/pkg-message.in new file mode 100644 index 000000000000..c391e85d3cd2 --- /dev/null +++ b/databases/go-pgweb/files/pkg-message.in @@ -0,0 +1,22 @@ +[ +{ type: install + message: <