diff options
102 files changed, 748 insertions, 2202 deletions
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 37a2a48b9a55..3ceacc7c115d 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -633,7 +633,7 @@ _PYTHONPKGLIST= ${WRKDIR}/.PLIST.pymodtmp # cryptography* support . if ${PYCRYPTOGRAPHY_DEFAULT} == rust -CRYPTOGRAPHY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=45.0.7,1<47,1:security/py-cryptography@${PY_FLAVOR} +CRYPTOGRAPHY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=44.0.3,1:security/py-cryptography@${PY_FLAVOR} . else CRYPTOGRAPHY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography-legacy>=3.4.8_3,1:security/py-cryptography-legacy@${PY_FLAVOR} . endif diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 6c780d5628ff..cf5e79d53f37 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -5331,7 +5331,9 @@ show-warnings: @${ECHO_MSG} "${m}" | ${FMT_80} @${ECHO_MSG} . endfor +. if ${WARNING_WAIT} != 0 @sleep ${WARNING_WAIT} +. endif . endif . if defined(ERROR) @@ -5357,7 +5359,7 @@ show-dev-warnings: . endfor . if defined(DEV_WARNING_FATAL) @${FALSE} -. else +. elif ${DEV_WARNING_WAIT} != 0 @sleep ${DEV_WARNING_WAIT} . endif . endif diff --git a/astro/kosmorro/pkg-plist b/astro/kosmorro/pkg-plist index 622ff2754c3a..464632e033a2 100644 --- a/astro/kosmorro/pkg-plist +++ b/astro/kosmorro/pkg-plist @@ -1,7 +1,7 @@ bin/kosmorro %%PYTHON_SITELIBDIR%%/CHANGELOG.md %%PYTHON_SITELIBDIR%%/kosmorro-%%VE%%.dist-info/entry_points.txt -%%PYTHON_SITELIBDIR%%/kosmorro-%%VE%%.dist-info/LICENSE.md +%%PYTHON_SITELIBDIR%%/kosmorro-%%VE%%.dist-info/licenses/LICENSE.md %%PYTHON_SITELIBDIR%%/kosmorro-%%VE%%.dist-info/METADATA %%PYTHON_SITELIBDIR%%/kosmorro-%%VE%%.dist-info/RECORD %%PYTHON_SITELIBDIR%%/kosmorro-%%VE%%.dist-info/WHEEL diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile index ef9b896de476..bf13347ee040 100644 --- a/audio/baresip/Makefile +++ b/audio/baresip/Makefile @@ -1,6 +1,7 @@ PORTNAME= baresip DISTVERSIONPREFIX= v DISTVERSION= 4.2.0 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= zarychtam@plan-b.pwste.edu.pl @@ -17,52 +18,46 @@ default_CONFLICTS_INSTALL= barsip-nox11 nox11_PKGNAMESUFFIX= -nox11 nox11_CONFLICTS_INSTALL= baresip -USES= cmake pkgconfig ssl +USES= cmake localbase:ldflags pkgconfig ssl USE_GITHUB= yes GH_ACCOUNT= baresip PORTDOCS= CONTRIBUTING.md ChangeLog THANKS -OPTIONS_DEFINE= ALSA AV1 AVCODEC AVFILTER AVFORMAT CTRL_DBUS DOCS \ - EXAMPLES G711 G722 G726 GST GTK3 JACK MQTT OPUS OPUS_MS \ - PLC PORTAUDIO PULSEAUDIO SDL SNAPSHOT SNDFILE SWSCALE \ - V4L2 VPX X11 -OPTIONS_DEFAULT= ALSA AV1 AVCODEC AVFILTER AVFORMAT CTRL_DBUS G711 G722 \ - G726 GST GTK3 OPUS PLC PORTAUDIO SDL SNAPSHOT SNDFILE \ - SWSCALE V4L2 VPX X11 +OPTIONS_DEFINE= ALSA AV1 AVCODEC AVFILTER AVFORMAT CODEC2 DBUS DOCS \ + EVDEV EXAMPLES G711 G722 G726 GSTREAMER GTK3 JACK MQTT \ + OPUS PIPEWIRE PLC PORTAUDIO PULSEAUDIO SDL SNAPSHOT \ + SNDFILE SNDIO SWSCALE V4L VPX WEBRTC_AEC X11 +OPTIONS_DEFAULT= ALSA AV1 AVCODEC AVFILTER AVFORMAT CODEC2 DBUS EVDEV \ + G711 G722 G726 GSTREAMER GTK3 OPUS PLC PORTAUDIO SDL \ + SNAPSHOT SNDFILE SWSCALE V4L VPX WEBRTC_AEC X11 .if ${FLAVOR:U} == nox11 COMMENT+= (without X11 and video calls) -OPTIONS_EXCLUDE= AV1 AVCODEC AVFILTER AVFORMAT CTRL_DBUS GST GTK3 SDL \ - SNAPSHOT SWSCALE V4L2 VPX X11 +OPTIONS_EXCLUDE= AV1 AVCODEC AVFILTER AVFORMAT CODEC2 DBUS EVDEV \ + GSTREAMER GTK3 SDL SNAPSHOT SWSCALE V4L VPX WEBRTC_AEC \ + X11 .endif OPTIONS_SUB= yes -ALSA_DESC= ALSA audio driver -AV1_DESC= AV1 Video Codec -AVCODEC_DESC= Video codecs using libavcodec -AVFILTER_DESC= Video filter using libavfilter -AVFORMAT_DESC= libavformat media-source -CTRL_DBUS_DESC= [broken] DBUS interface for baresip -G711_DESC= G.711 audio codec -G722_DESC= G.722 audio codec -G726_DESC= G.726 audio codec -GST_DESC= Gstreamer audio module -JACK_DESC= JACK audio module -MQTT_DESC= Message Queue Telemetry Transport (MQTT) client -OPUS_MS_DESC= Opus Multistream audio codec -PLC_DESC= Packet Loss Concealment -SDL_DESC= libSDL2 video output -SNAPSHOT_DESC= Snapshot video module -SNDFILE_DESC= sndfile wav dumper -SWSCALE_DESC= Video filter for scaling and pixel conversion -V4L2_DESC= Video4Linux2 module -VPX_DESC= VP8/VP9 video codecs -X11_DESC= X11 video output +AV1_DESC= AV1 Video Codec +AVCODEC_DESC= Video codecs using libavcodec +AVFILTER_DESC= Video filter using libavfilter +AVFORMAT_DESC= libavformat media-source +CODEC2_DESC= Codec2 low-bitrate speech codec +EVDEV_DESC= evdev input support +G711_DESC= G.711 audio codec +G722_DESC= G.722 audio codec +G726_DESC= G.726 audio codec +MQTT_DESC= Message Queue Telemetry Transport (MQTT) client +PLC_DESC= Packet Loss Concealment +SNAPSHOT_DESC= Snapshot video module +SWSCALE_DESC= Video filter for scaling and pixel conversion +WEBRTC_AEC_DESC= WebRTC Acoustic Echo Cancellation -_MODULES_LIST= account aubridge auconv aufile auresamp ausine cons contact \ - ctrl_tcp debug_cmd dtls_srtp echo fakevideo httpd httpreq ice \ - l16 menu mixausrc mixminus mwi natpmp netroam pcp presence \ - rtcpsummary selfview serreg srtp stdio stun syslog turn uuid \ - vidbridge vidinfo vumeter +_MODULES_LIST= account aubridge auconv aufile augain auresamp ausine cons \ + contact ctrl_tcp debug_cmd dtls_srtp echo fakevideo httpd \ + httpreq ice in_band_dtmf l16 menu mixausrc mixminus mwi natpmp \ + netroam pcp presence rtcpsummary selfview serreg srtp stdio \ + stun syslog turn uuid vidbridge vidinfo vumeter ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_VARS= _MODULES_LIST+=alsa @@ -75,14 +70,21 @@ AVFILTER_LIB_DEPENDS= libavfilter.so:multimedia/ffmpeg AVFILTER_VARS= _MODULES_LIST+=avfilter AVFORMAT_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg AVFORMAT_VARS= _MODULES_LIST+=avformat +CODEC2_LIB_DEPENDS= libcodec2.so:audio/codec2 +CODEC2_VARS= _MODULES_LIST+=codec2 +DBUS_USES= gnome +DBUS_VARS= _MODULES_LIST+=ctrl_dbus \ + USE_GNOME+=glib20 +EVDEV_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto +EVDEV_VARS= _MODULES_LIST+=evdev G711_LIB_DEPENDS= libspandsp.so:comms/spandsp G711_VARS= _MODULES_LIST+=g711 G722_LIB_DEPENDS= libspandsp.so:comms/spandsp G722_VARS= _MODULES_LIST+=g722 G726_LIB_DEPENDS= libspandsp.so:comms/spandsp G726_VARS= _MODULES_LIST+=g726 -GST_USES= gnome gstreamer:1 -GST_VARS= _MODULES_LIST+=gst \ +GSTREAMER_USES= gnome gstreamer:1 +GSTREAMER_VARS= _MODULES_LIST+=gst \ USE_GNOME+=glib20 GTK3_USES= gnome GTK3_VARS= _MODULES_LIST+=gtk \ @@ -92,9 +94,9 @@ JACK_VARS= _MODULES_LIST+=jack MQTT_LIB_DEPENDS= libmosquitto.so:net/mosquitto MQTT_VARS= _MODULES_LIST+=mqtt OPUS_LIB_DEPENDS= libopus.so:audio/opus -OPUS_VARS= _MODULES_LIST+=opus -OPUS_MS_LIB_DEPENDS= libopus.so:audio/opus -OPUS_MS_VARS= _MODULES_LIST+=opus_multistream +OPUS_VARS= _MODULES_LIST+="opus opus_multistream" +PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire +PIPEWIRE_VARS= _MODULES_LIST+=pipewire PLC_LIB_DEPENDS= libspandsp.so:comms/spandsp PLC_VARS= _MODULES_LIST+=plc PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio @@ -109,13 +111,17 @@ SNAPSHOT_LIB_DEPENDS= libpng16.so:graphics/png SNAPSHOT_VARS= _MODULES_LIST+=snapshot SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile SNDFILE_VARS= _MODULES_LIST+=sndfile +SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio +SNDIO_VARS= _MODULES_LIST+=sndio SWSCALE_LIB_DEPENDS= libswscale.so:multimedia/ffmpeg SWSCALE_VARS= _MODULES_LIST+=swscale -V4L2_BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat -V4L2_LIB_DEPENDS= libv4l1.so:multimedia/libv4l -V4L2_VARS= _MODULES_LIST+=v4l2 +V4L_BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat +V4L_LIB_DEPENDS= libv4l1.so:multimedia/libv4l +V4L_VARS= _MODULES_LIST+=v4l2 VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx VPX_VARS= _MODULES_LIST+="vp8 vp9" +WEBRTC_AEC_LIB_DEPENDS= libwebrtc-audio-processing-1.so:audio/webrtc-audio-processing +WEBRTC_AEC_VARS= _MODULES_LIST+=webrtc_aec X11_USES= xorg X11_VARS= _MODULES_LIST+=x11 \ USE_XORG="x11 ice sm xext" @@ -123,8 +129,7 @@ X11_VARS= _MODULES_LIST+=x11 \ .include <bsd.port.options.mk> CMAKE_ARGS+= -DMODULES="$(_MODULES_LIST:ts;)" \ - -DRE_INCLUDE_DIR:STRING="${LOCALBASE}/include/re" \ - -DREM_INCLUDE_DIR:STRING="${LOCALBASE}/include/rem" + -DWEBRTC_AEC_INCLUDE_DIRS:STRING="${LOCALBASE}/include/webrtc-audio-processing-1" post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' \ diff --git a/audio/baresip/files/patch-modules_sndio_CMakeLists.txt b/audio/baresip/files/patch-modules_sndio_CMakeLists.txt new file mode 100644 index 000000000000..bdb88a88422e --- /dev/null +++ b/audio/baresip/files/patch-modules_sndio_CMakeLists.txt @@ -0,0 +1,10 @@ +--- modules/sndio/CMakeLists.txt.orig 2025-10-14 10:55:26 UTC ++++ modules/sndio/CMakeLists.txt +@@ -1,6 +1,6 @@ project(sndio) + project(sndio) + +-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") ++if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD|FreeBSD") + return() + endif() + diff --git a/audio/baresip/pkg-plist b/audio/baresip/pkg-plist index 23c8bc72fd46..26b768540a56 100644 --- a/audio/baresip/pkg-plist +++ b/audio/baresip/pkg-plist @@ -5,28 +5,32 @@ lib/baresip/modules/account.so lib/baresip/modules/aubridge.so lib/baresip/modules/auconv.so lib/baresip/modules/aufile.so +lib/baresip/modules/augain.so lib/baresip/modules/auresamp.so lib/baresip/modules/ausine.so %%AV1%%lib/baresip/modules/av1.so %%AVCODEC%%lib/baresip/modules/avcodec.so %%AVFILTER%%lib/baresip/modules/avfilter.so %%AVFORMAT%%lib/baresip/modules/avformat.so +%%CODEC2%%lib/baresip/modules/codec2.so lib/baresip/modules/cons.so lib/baresip/modules/contact.so -@comment %%CTRL_DBUS%%lib/baresip/modules/ctrl_dbus.so +%%DBUS%%lib/baresip/modules/ctrl_dbus.so lib/baresip/modules/ctrl_tcp.so lib/baresip/modules/debug_cmd.so lib/baresip/modules/dtls_srtp.so lib/baresip/modules/echo.so +%%EVDEV%%lib/baresip/modules/evdev.so lib/baresip/modules/fakevideo.so %%G711%%lib/baresip/modules/g711.so %%G722%%lib/baresip/modules/g722.so %%G726%%lib/baresip/modules/g726.so -%%GST%%lib/baresip/modules/gst.so +%%GSTREAMER%%lib/baresip/modules/gst.so %%GTK3%%lib/baresip/modules/gtk.so lib/baresip/modules/httpd.so lib/baresip/modules/httpreq.so lib/baresip/modules/ice.so +lib/baresip/modules/in_band_dtmf.so %%JACK%%lib/baresip/modules/jack.so lib/baresip/modules/l16.so lib/baresip/modules/menu.so @@ -37,7 +41,8 @@ lib/baresip/modules/mwi.so lib/baresip/modules/natpmp.so lib/baresip/modules/netroam.so %%OPUS%%lib/baresip/modules/opus.so -%%OPUS_MS%%lib/baresip/modules/opus_multistream.so +%%OPUS%%lib/baresip/modules/opus_multistream.so +%%PIPEWIRE%%lib/baresip/modules/pipewire.so lib/baresip/modules/pcp.so %%PLC%%lib/baresip/modules/plc.so %%PORTAUDIO%%lib/baresip/modules/portaudio.so @@ -49,6 +54,7 @@ lib/baresip/modules/selfview.so lib/baresip/modules/serreg.so %%SNAPSHOT%%lib/baresip/modules/snapshot.so %%SNDFILE%%lib/baresip/modules/sndfile.so +%%SNDIO%%lib/baresip/modules/sndio.so lib/baresip/modules/srtp.so lib/baresip/modules/stdio.so lib/baresip/modules/stun.so @@ -56,12 +62,13 @@ lib/baresip/modules/stun.so lib/baresip/modules/syslog.so lib/baresip/modules/turn.so lib/baresip/modules/uuid.so -%%V4L2%%lib/baresip/modules/v4l2.so +%%V4L%%lib/baresip/modules/v4l2.so lib/baresip/modules/vidbridge.so lib/baresip/modules/vidinfo.so %%VPX%%lib/baresip/modules/vp8.so %%VPX%%lib/baresip/modules/vp9.so lib/baresip/modules/vumeter.so +%%WEBRTC_AEC%%lib/baresip/modules/webrtc_aec.so %%X11%%lib/baresip/modules/x11.so lib/libbaresip.so lib/libbaresip.so.22 diff --git a/cad/k40-whisperer/Makefile b/cad/k40-whisperer/Makefile index 33da3eede4b5..8b93a07254a8 100644 --- a/cad/k40-whisperer/Makefile +++ b/cad/k40-whisperer/Makefile @@ -1,11 +1,10 @@ PORTNAME= k40-whisperer -DISTVERSION= 0.59 -PORTREVISION= 3 +DISTVERSION= 0.70 CATEGORIES= cad python -MASTER_SITES= http://www.scorchworks.com/K40whisperer/ +MASTER_SITES= https://www.scorchworks.com/K40whisperer/ DISTNAME= K40_Whisperer-${DISTVERSION}_src -MAINTAINER= ports@FreeBSD.org +MAINTAINER= alven@FreeBSD.org COMMENT= GUI control software for the stock K40 laser cutter controller WWW= https://www.scorchworks.com/K40whisperer/k40whisperer.html @@ -13,10 +12,11 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/gpl-3.0.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyusb>0:devel/py-pyusb@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyusb>0:devel/py-pyusb@${PY_FLAVOR} USES= python:run shebangfix zip + SHEBANG_FILES= *.py DESKTOP_ENTRIES= "K40 Whisperer" \ @@ -30,9 +30,11 @@ NO_BUILD= yes SUB_FILES= ${_WHISPERER_COMMAND} pkg-message SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \ WHISPERER_COMMAND=${_WHISPERER_COMMAND} + PLIST_SUB= WHISPERER_COMMAND=${_WHISPERER_COMMAND} OPTIONS_DEFINE= DOCS +OPTIONS_SUB= yes _DOCS= Change_Log.txt README_Linux.txt README_MacOS.md _NON_DATA_FILES= ${_DOCS} ${LICENSE_FILE:S,${WRKSRC}/,,} build_exe.bat \ @@ -41,10 +43,11 @@ _WHISPERER_COMMAND= ${PORTNAME} do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${_WHISPERER_COMMAND} ${STAGEDIR}${PREFIX}/bin - @${MKDIR} ${STAGEDIR}${DATADIR} - (cd ${WRKSRC} && ${COPYTREE_SHARE} . \ - ${STAGEDIR}${DATADIR} "${_NON_DATA_FILES:S,^,! -name &,}") - @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} . \ + ${STAGEDIR}${DATADIR} "${_NON_DATA_FILES:S,^,! -name &,}" + +do-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${_DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/cad/k40-whisperer/distinfo b/cad/k40-whisperer/distinfo index 3154b22c9676..41c8625432e9 100644 --- a/cad/k40-whisperer/distinfo +++ b/cad/k40-whisperer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642969006 -SHA256 (K40_Whisperer-0.59_src.zip) = b005d96e45d5cffcf7cf3680a77b5fc49429fc928acfd3be5db7ae5351759c47 -SIZE (K40_Whisperer-0.59_src.zip) = 202288 +TIMESTAMP = 1760826757 +SHA256 (K40_Whisperer-0.70_src.zip) = 43e0395081f0cad42f391d61d2c9cb427edbcd10c9fcb895b42d1409335d45da +SIZE (K40_Whisperer-0.70_src.zip) = 207089 diff --git a/cad/k40-whisperer/pkg-plist b/cad/k40-whisperer/pkg-plist index 55d4ad0e741f..582578814114 100644 --- a/cad/k40-whisperer/pkg-plist +++ b/cad/k40-whisperer/pkg-plist @@ -1,7 +1,7 @@ bin/%%WHISPERER_COMMAND%% -%%PORTDOCS%%%%DOCSDIR%%/Change_Log.txt -%%PORTDOCS%%%%DOCSDIR%%/README_Linux.txt -%%PORTDOCS%%%%DOCSDIR%%/README_MacOS.md +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Change_Log.txt +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/README_Linux.txt +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/README_MacOS.md %%DATADIR%%/LaserSpeed.py %%DATADIR%%/bezmisc.py %%DATADIR%%/convex_hull.py diff --git a/cad/nvc/Makefile b/cad/nvc/Makefile index beac46c9805d..7c163fcd154d 100644 --- a/cad/nvc/Makefile +++ b/cad/nvc/Makefile @@ -1,5 +1,5 @@ PORTNAME= nvc -DISTVERSION= 1.18.0 +DISTVERSION= 1.18.1 CATEGORIES= cad MASTER_SITES= https://www.nickg.me.uk/files/ @@ -19,7 +19,8 @@ ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= compilation fails: jit-code.c:858:42: error: use of undeclared identifier 'veneer' BUILD_DEPENDS= llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION} -LIB_DEPENDS= libffi.so:devel/libffi \ +LIB_DEPENDS= libcapstone.so:devel/capstone \ + libffi.so:devel/libffi \ libzstd.so:archivers/zstd RUN_DEPENDS= bash:shells/bash \ llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION} diff --git a/cad/nvc/distinfo b/cad/nvc/distinfo index cf5e62d65585..9e5e7fecfeb7 100644 --- a/cad/nvc/distinfo +++ b/cad/nvc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1759533077 -SHA256 (nvc-1.18.0.tar.gz) = 02c0aaac59f7277f3151f9ddb7052928b7b7e89c1f77ae2b1c47d55988c64588 -SIZE (nvc-1.18.0.tar.gz) = 2597518 +TIMESTAMP = 1760851919 +SHA256 (nvc-1.18.1.tar.gz) = dcb2cb651ee13df384a47c55a596842106f6cca9492f192729e566648817e321 +SIZE (nvc-1.18.1.tar.gz) = 2599248 diff --git a/databases/cego/Makefile b/databases/cego/Makefile index 5ca5b0c3d321..c8a12b3c1e1b 100644 --- a/databases/cego/Makefile +++ b/databases/cego/Makefile @@ -1,5 +1,5 @@ PORTNAME= cego -PORTVERSION= 2.52.30 +PORTVERSION= 2.52.31 CATEGORIES= databases MASTER_SITES= http://www.lemke-it.com/ diff --git a/databases/cego/distinfo b/databases/cego/distinfo index b883f7583166..664171cb6a67 100644 --- a/databases/cego/distinfo +++ b/databases/cego/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1759172310 -SHA256 (cego-2.52.30.tar.gz) = 815e91fca07377ffb1cd704679924a84c9eb20154d19a0a0a135f6af149cfd94 -SIZE (cego-2.52.30.tar.gz) = 3313298 +TIMESTAMP = 1760888196 +SHA256 (cego-2.52.31.tar.gz) = 42c41d8cbffe74b780f3a3ba1afa5f90464955c77eb71da7ce156d048e2ba391 +SIZE (cego-2.52.31.tar.gz) = 3313371 diff --git a/databases/py-snowddl/Makefile b/databases/py-snowddl/Makefile index e05f53b54b63..ab4bbbab443d 100644 --- a/databases/py-snowddl/Makefile +++ b/databases/py-snowddl/Makefile @@ -23,6 +23,6 @@ NO_ARCH= yes PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=4.18<5:devel/py-jsonschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydantic2>=2.4<3:devel/py-pydantic2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=6.0<7:devel/py-pyyaml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}snowflake-connector-python>=3.0<4:databases/py-snowflake-connector-python@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}snowflake-connector-python>=3.0:databases/py-snowflake-connector-python@${PY_FLAVOR} .include <bsd.port.mk> diff --git a/databases/py-snowflake-connector-python/Makefile b/databases/py-snowflake-connector-python/Makefile index d6693a8d8b05..9e5531eae8cd 100644 --- a/databases/py-snowflake-connector-python/Makefile +++ b/databases/py-snowflake-connector-python/Makefile @@ -1,10 +1,9 @@ PORTNAME= snowflake-connector-python -DISTVERSION= 3.12.3 -PORTREVISION= 1 -DISTNAME= snowflake_connector_python-${DISTVERSION} +DISTVERSION= 4.0.0 CATEGORIES= databases python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +DISTNAME= snowflake_connector_python-${DISTVERSION} MAINTAINER= pat@patmaddox.com COMMENT= Snowflake Connector for Python @@ -12,9 +11,11 @@ WWW= https://github.com/snowflakedb/snowflake-connector-python LICENSE= APACHE20 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=40.6.0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asn1crypto>0.24.0<2.0.0:devel/py-asn1crypto@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cffi>=1.9<2:devel/py-cffi@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}openssl>=16.2.0:security/py-openssl@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>=22.0.0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyjwt<3.0:www/py-pyjwt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests<3.0:www/py-requests@${PY_FLAVOR} \ @@ -29,12 +30,16 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asn1crypto>0.24.0<2.0.0:devel/py-asn1crypto@ ${PYTHON_PKGNAMEPREFIX}tomlkit>0:textproc/py-tomlkit@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist concurrent cryptography cython3 distutils +USE_PYTHON= autoplist concurrent cryptography cython3 pep517 .include <bsd.port.pre.mk> .if ${PYTHON_REL} < 31000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1<2:net/py-urllib3@${PY_FLAVOR} .endif +post-install: + ${STRIP_CMD} \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/snowflake/connector/nanoarrow_arrow_iterator.cpython-${PYTHON_SUFFIX}.so + .include <bsd.port.post.mk> diff --git a/databases/py-snowflake-connector-python/distinfo b/databases/py-snowflake-connector-python/distinfo index 72d97770d52e..57026579ebb8 100644 --- a/databases/py-snowflake-connector-python/distinfo +++ b/databases/py-snowflake-connector-python/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1733302256 -SHA256 (snowflake_connector_python-3.12.3.tar.gz) = 02873c7f7a3b10322e28dddc2be6907f8ab8ecad93d6d6af14c77c2f53091b88 -SIZE (snowflake_connector_python-3.12.3.tar.gz) = 742358 +TIMESTAMP = 1760767754 +SHA256 (snowflake_connector_python-4.0.0.tar.gz) = 4b10a865c4a5e1fa60c365c7fe41e0433605e6e5edc824e8730a9038f330b3a6 +SIZE (snowflake_connector_python-4.0.0.tar.gz) = 813937 diff --git a/deskutils/stirling-pdf/Makefile b/deskutils/stirling-pdf/Makefile index 10bc0a7410d0..a7ff77710298 100644 --- a/deskutils/stirling-pdf/Makefile +++ b/deskutils/stirling-pdf/Makefile @@ -1,5 +1,5 @@ PORTNAME= stirling-pdf -PORTVERSION= 1.4.0 +PORTVERSION= 1.5.0 CATEGORIES= deskutils java MASTER_SITES= https://files.stirlingpdf.com/v${PORTVERSION}/ DISTNAME= Stirling-PDF-with-login diff --git a/deskutils/stirling-pdf/distinfo b/deskutils/stirling-pdf/distinfo index 9eb76d4dd36b..8a25b071d2f8 100644 --- a/deskutils/stirling-pdf/distinfo +++ b/deskutils/stirling-pdf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1760250582 -SHA256 (stirling-pdf/1.4.0/Stirling-PDF-with-login.jar) = d81584a8f4a81fd3c855158f83e1b510bd8eefdba78b2001fc3945c0b226dd45 -SIZE (stirling-pdf/1.4.0/Stirling-PDF-with-login.jar) = 153283343 +TIMESTAMP = 1760884812 +SHA256 (stirling-pdf/1.5.0/Stirling-PDF-with-login.jar) = 784c7d281264d6246240616b17352bb1ac41737b23ce7abff29d63d1975e5637 +SIZE (stirling-pdf/1.5.0/Stirling-PDF-with-login.jar) = 153327665 diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile index 5af82e5902d3..58b27eed953b 100644 --- a/devel/boehm-gc/Makefile +++ b/devel/boehm-gc/Makefile @@ -1,5 +1,5 @@ PORTNAME= gc -DISTVERSION= 8.2.8 +DISTVERSION= 8.2.10 CATEGORIES= devel MASTER_SITES= https://www.hboehm.info/gc/gc_source/ \ https://github.com/bdwgc/bdwgc/releases/download/v${PORTVERSION}/ @@ -57,7 +57,7 @@ PLIST_FILES= ${CORDLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.a,} \ ${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.a,} \ ${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \ ${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \ - ${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.5.4,} \ + ${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.5.5,} \ ${GCTBALIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.a,} \ ${GCTBALIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \ ${GCTBALIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \ @@ -104,7 +104,7 @@ post-install: ${STAGEDIR}${PREFIX}/include/gc . endif ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcord-${GC_VARIANT}.so.1.5.1 - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgc-${GC_VARIANT}.so.1.5.4 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgc-${GC_VARIANT}.so.1.5.5 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgccpp-${GC_VARIANT}.so.1.5.0 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgctba-${GC_VARIANT}.so.1.5.0 diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo index 779ff58d6fc9..f4649f8f663e 100644 --- a/devel/boehm-gc/distinfo +++ b/devel/boehm-gc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725951870 -SHA256 (gc-8.2.8.tar.gz) = 7649020621cb26325e1fb5c8742590d92fb48ce5c259b502faf7d9fb5dabb160 -SIZE (gc-8.2.8.tar.gz) = 1219553 +TIMESTAMP = 1760849699 +SHA256 (gc-8.2.10.tar.gz) = 832cf4f7cf676b59582ed3b1bbd90a8d0e0ddbc3b11cb3b2096c5177ce39cc47 +SIZE (gc-8.2.10.tar.gz) = 1229219 diff --git a/devel/boehm-gc/pkg-plist b/devel/boehm-gc/pkg-plist index 46f1ca14e254..da3501f29101 100644 --- a/devel/boehm-gc/pkg-plist +++ b/devel/boehm-gc/pkg-plist @@ -24,7 +24,7 @@ lib/libcord.so.1.5.1 lib/libgc.a lib/libgc.so lib/libgc.so.1 -lib/libgc.so.1.5.4 +lib/libgc.so.1.5.5 lib/libgccpp.a lib/libgccpp.so lib/libgccpp.so.1 diff --git a/filesystems/zerofs/Makefile b/filesystems/zerofs/Makefile index e789888398cf..4564c0431652 100644 --- a/filesystems/zerofs/Makefile +++ b/filesystems/zerofs/Makefile @@ -1,7 +1,6 @@ PORTNAME= zerofs DISTVERSIONPREFIX= v -DISTVERSION= 0.15.2 -PORTREVISION= 1 +DISTVERSION= 0.16.2 CATEGORIES= filesystems sysutils MAINTAINER= stephan@lichtenauer.co.za diff --git a/filesystems/zerofs/Makefile.crates b/filesystems/zerofs/Makefile.crates index 2738ca6ed5dc..e8bf06fd58be 100644 --- a/filesystems/zerofs/Makefile.crates +++ b/filesystems/zerofs/Makefile.crates @@ -165,7 +165,6 @@ CARGO_CRATES= addr2line-0.24.2 \ js-sys-0.3.77 \ lazy_static-1.5.0 \ libc-0.2.175 \ - libmimalloc-sys-0.1.43 \ libredox-0.1.9 \ linux-raw-sys-0.4.15 \ linux-raw-sys-0.9.4 \ @@ -183,7 +182,6 @@ CARGO_CRATES= addr2line-0.24.2 \ md-5-0.10.6 \ memchr-2.7.5 \ memoffset-0.9.1 \ - mimalloc-0.1.47 \ miniz_oxide-0.8.9 \ mio-1.0.4 \ mixtrics-0.1.0 \ @@ -287,7 +285,7 @@ CARGO_CRATES= addr2line-0.24.2 \ signal-hook-registry-1.4.6 \ siphasher-1.0.1 \ slab-0.4.11 \ - slatedb-0.8.1 \ + slatedb-0.8.2 \ smallvec-1.15.1 \ socket2-0.5.10 \ socket2-0.6.0 \ @@ -308,6 +306,8 @@ CARGO_CRATES= addr2line-0.24.2 \ thiserror-impl-1.0.69 \ thiserror-impl-2.0.14 \ thread_local-1.1.9 \ + tikv-jemalloc-sys-0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7 \ + tikv-jemallocator-0.6.0 \ time-0.3.41 \ time-core-0.1.4 \ tinystr-0.8.1 \ @@ -407,7 +407,7 @@ CARGO_CRATES= addr2line-0.24.2 \ zerocopy-derive-0.8.26 \ zerofrom-0.1.6 \ zerofrom-derive-0.1.6 \ - zerofs_nfsserve-0.14.0 \ + zerofs_nfsserve-0.15.0 \ zeroize-1.8.1 \ zerotrie-0.2.2 \ zerovec-0.11.4 \ diff --git a/filesystems/zerofs/distinfo b/filesystems/zerofs/distinfo index e7e869c33cb8..1390330f798b 100644 --- a/filesystems/zerofs/distinfo +++ b/filesystems/zerofs/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1757258826 +TIMESTAMP = 1760465574 SHA256 (rust/crates/addr2line-0.24.2.crate) = dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1 SIZE (rust/crates/addr2line-0.24.2.crate) = 39015 SHA256 (rust/crates/adler2-2.0.1.crate) = 320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa @@ -333,8 +333,6 @@ SHA256 (rust/crates/lazy_static-1.5.0.crate) = bbd2bcb4c963f2ddae06a2efc7e9f3591 SIZE (rust/crates/lazy_static-1.5.0.crate) = 14025 SHA256 (rust/crates/libc-0.2.175.crate) = 6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543 SIZE (rust/crates/libc-0.2.175.crate) = 788728 -SHA256 (rust/crates/libmimalloc-sys-0.1.43.crate) = bf88cd67e9de251c1781dbe2f641a1a3ad66eaae831b8a2c38fbdc5ddae16d4d -SIZE (rust/crates/libmimalloc-sys-0.1.43.crate) = 226498 SHA256 (rust/crates/libredox-0.1.9.crate) = 391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3 SIZE (rust/crates/libredox-0.1.9.crate) = 7281 SHA256 (rust/crates/linux-raw-sys-0.4.15.crate) = d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab @@ -369,8 +367,6 @@ SHA256 (rust/crates/memchr-2.7.5.crate) = 32a282da65faaf38286cf3be983213fcf1d2e2 SIZE (rust/crates/memchr-2.7.5.crate) = 97603 SHA256 (rust/crates/memoffset-0.9.1.crate) = 488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a SIZE (rust/crates/memoffset-0.9.1.crate) = 9032 -SHA256 (rust/crates/mimalloc-0.1.47.crate) = b1791cbe101e95af5764f06f20f6760521f7158f69dbf9d6baf941ee1bf6bc40 -SIZE (rust/crates/mimalloc-0.1.47.crate) = 4594 SHA256 (rust/crates/miniz_oxide-0.8.9.crate) = 1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316 SIZE (rust/crates/miniz_oxide-0.8.9.crate) = 67132 SHA256 (rust/crates/mio-1.0.4.crate) = 78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c @@ -577,8 +573,8 @@ SHA256 (rust/crates/siphasher-1.0.1.crate) = 56199f7ddabf13fe5074ce809e7d3f42b42 SIZE (rust/crates/siphasher-1.0.1.crate) = 10351 SHA256 (rust/crates/slab-0.4.11.crate) = 7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589 SIZE (rust/crates/slab-0.4.11.crate) = 18549 -SHA256 (rust/crates/slatedb-0.8.1.crate) = 6471ce0d2b99d80e36ce1439951a30a5e9ef751f3b8c4bd384611927384ee03d -SIZE (rust/crates/slatedb-0.8.1.crate) = 317374 +SHA256 (rust/crates/slatedb-0.8.2.crate) = 1929df128f27789722644d8e9a68eaddec2e656ed8bac2a088159c8cce423590 +SIZE (rust/crates/slatedb-0.8.2.crate) = 321188 SHA256 (rust/crates/smallvec-1.15.1.crate) = 67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03 SIZE (rust/crates/smallvec-1.15.1.crate) = 38116 SHA256 (rust/crates/socket2-0.5.10.crate) = e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678 @@ -619,6 +615,10 @@ SHA256 (rust/crates/thiserror-impl-2.0.14.crate) = cc5b44b4ab9c2fdd0e0512e6bece8 SIZE (rust/crates/thiserror-impl-2.0.14.crate) = 21219 SHA256 (rust/crates/thread_local-1.1.9.crate) = f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185 SIZE (rust/crates/thread_local-1.1.9.crate) = 19315 +SHA256 (rust/crates/tikv-jemalloc-sys-0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7.crate) = cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d +SIZE (rust/crates/tikv-jemalloc-sys-0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7.crate) = 897133 +SHA256 (rust/crates/tikv-jemallocator-0.6.0.crate) = 4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865 +SIZE (rust/crates/tikv-jemallocator-0.6.0.crate) = 13700 SHA256 (rust/crates/time-0.3.41.crate) = 8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40 SIZE (rust/crates/time-0.3.41.crate) = 138369 SHA256 (rust/crates/time-core-0.1.4.crate) = c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c @@ -817,8 +817,8 @@ SHA256 (rust/crates/zerofrom-0.1.6.crate) = 50cc42e0333e05660c3587f3bf9d0478688e SIZE (rust/crates/zerofrom-0.1.6.crate) = 5669 SHA256 (rust/crates/zerofrom-derive-0.1.6.crate) = d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502 SIZE (rust/crates/zerofrom-derive-0.1.6.crate) = 8305 -SHA256 (rust/crates/zerofs_nfsserve-0.14.0.crate) = 53a9c182c0ff391960f9a033ba2e49c418315a8e72e402ddaa9aa8c25c084526 -SIZE (rust/crates/zerofs_nfsserve-0.14.0.crate) = 43966 +SHA256 (rust/crates/zerofs_nfsserve-0.15.0.crate) = 0a1a98071b31b9687c05411a75df5a55a7a76c5af85cb3bb04de5efef26755c7 +SIZE (rust/crates/zerofs_nfsserve-0.15.0.crate) = 43826 SHA256 (rust/crates/zeroize-1.8.1.crate) = ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde SIZE (rust/crates/zeroize-1.8.1.crate) = 20029 SHA256 (rust/crates/zerotrie-0.2.2.crate) = 36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595 @@ -833,5 +833,5 @@ SHA256 (rust/crates/zstd-safe-7.2.4.crate) = 8f49c4d5f0abb602a93fb8736af2a4f4dd9 SIZE (rust/crates/zstd-safe-7.2.4.crate) = 29350 SHA256 (rust/crates/zstd-sys-2.0.15+zstd.1.5.7.crate) = eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237 SIZE (rust/crates/zstd-sys-2.0.15+zstd.1.5.7.crate) = 774847 -SHA256 (Barre-ZeroFS-v0.15.2_GH0.tar.gz) = 982042e4887b348605ed2aad428b254e7abc66d108ac41bc66625b726585b3e7 -SIZE (Barre-ZeroFS-v0.15.2_GH0.tar.gz) = 459110 +SHA256 (Barre-ZeroFS-v0.16.2_GH0.tar.gz) = 617a04ad2914b742b49b1f22d9d2a2e07ec59f3cedbdf5848cc67c2902641a92 +SIZE (Barre-ZeroFS-v0.16.2_GH0.tar.gz) = 463693 diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index 7b866483c31a..bed8e440d0bf 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -1,6 +1,6 @@ PORTNAME= cimg DISTVERSIONPREFIX= v. -DISTVERSION= 3.6.2 +DISTVERSION= 3.6.3 PORTEPOCH= 3 CATEGORIES= graphics devel diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo index a0fba8eddaa8..bae94f40d62d 100644 --- a/graphics/cimg/distinfo +++ b/graphics/cimg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1759493205 -SHA256 (GreycLab-CImg-v.3.6.2_GH0.tar.gz) = e4ec8c103015903d5e66bc4d1cd39fb19e9d2f535c45917587668abc74226147 -SIZE (GreycLab-CImg-v.3.6.2_GH0.tar.gz) = 12680285 +TIMESTAMP = 1760881812 +SHA256 (GreycLab-CImg-v.3.6.3_GH0.tar.gz) = 6dd5aabbf1edf56f39d09cdb9d361dd526db0b9c0991f7bf8b1b2b489fa043ae +SIZE (GreycLab-CImg-v.3.6.3_GH0.tar.gz) = 12682908 diff --git a/graphics/nvidia-drm-kmod-devel/Makefile b/graphics/nvidia-drm-kmod-devel/Makefile index e7ca7d175af8..06a7f00dc9e9 100644 --- a/graphics/nvidia-drm-kmod-devel/Makefile +++ b/graphics/nvidia-drm-kmod-devel/Makefile @@ -1,6 +1,6 @@ DISTVERSION?= 580.95.05 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 0 +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../nvidia-drm-kmod PKGNAMESUFFIX= -devel diff --git a/graphics/nvidia-drm-kmod/Makefile b/graphics/nvidia-drm-kmod/Makefile index e809c1cf411b..79871a1d2404 100644 --- a/graphics/nvidia-drm-kmod/Makefile +++ b/graphics/nvidia-drm-kmod/Makefile @@ -1,6 +1,6 @@ PORTNAME= nvidia-drm-kmod DISTVERSION?= ${NVIDIA_DISTVERSION} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= graphics kld MAINTAINER= x11@FreeBSD.org @@ -19,6 +19,8 @@ IGNORE= not supported on anything but FreeBSD (missing linuxkpi function RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-510-kmod${PKGNAMESUFFIX} . elif ${OSVERSION} >= 1400097 && (${ARCH} == i386 || ${ARCH} == aarch64) RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-510-kmod${PKGNAMESUFFIX} +. elif ${OSVERSION} >= 1500031 && ${ARCH} == amd64 +RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-66-kmod${PKGNAMESUFFIX} . elif ${OSVERSION} >= 1400508 RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-61-kmod${PKGNAMESUFFIX} . endif diff --git a/mail/py-offlineimap3/Makefile b/mail/py-offlineimap3/Makefile index 8f89e12ca98c..7304ae0a6aed 100644 --- a/mail/py-offlineimap3/Makefile +++ b/mail/py-offlineimap3/Makefile @@ -1,7 +1,6 @@ PORTNAME= offlineimap3 DISTVERSIONPREFIX= v -DISTVERSION= 8.0.0-70 -PORTREVISION= 1 +DISTVERSION= 8.0.0-78 DISTVERSIONSUFFIX= -g${GH_TAGNAME} CATEGORIES= mail python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,14 +12,10 @@ WWW= https://github.com/OfflineIMAP/offlineimap3 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -# setup.py requires these during build time. Possible move to setup/install_requires: -# https://github.com/OfflineIMAP/offlineimap3/issues/110 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}distro>=0:sysutils/py-distro@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}imaplib2>=3.5:mail/py-imaplib2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}rfc6555>=0:mail/py-rfc6555@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=2020.6.20:security/py-certifi@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}distro>=0:sysutils/py-distro@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}imaplib2>=3.5:mail/py-imaplib2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}distro>=0:sysutils/py-distro@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}imaplib2>=3.5:mail/py-imaplib2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rfc6555>=0:mail/py-rfc6555@${PY_FLAVOR} \ @@ -33,9 +28,10 @@ USES= python # https://github.com/OfflineIMAP/offlineimap3/issues/111 USE_GITHUB= yes GH_ACCOUNT= OfflineIMAP -GH_TAGNAME= 93f358dee9d7cf800d11679ee4e9c61abfc0c5f6 +GH_TAGNAME= db347452273bb0f1b1a8ea952f6fb46cf95fedbf USE_PYTHON= autoplist concurrent distutils pytest +TEST_ARGS= "-k not TestBasicFunctions or test_01_MappedImap" CONFLICTS_INSTALL= mail/py-offlineimap @@ -49,7 +45,9 @@ OPTIONS_DEFAULT= KEYRING MANPAGES KEYRING_DESC= GNOME keyring support -COMMON_BUILD_DEPENDS= a2x:textproc/asciidoc \ +COMMON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rfc6555>=0:mail/py-rfc6555@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ + a2x:textproc/asciidoc \ gmake:devel/gmake DOCS_BUILD_DEPENDS= ${COMMON_BUILD_DEPENDS} \ diff --git a/mail/py-offlineimap3/distinfo b/mail/py-offlineimap3/distinfo index dc778f115eb7..72a531bf6f22 100644 --- a/mail/py-offlineimap3/distinfo +++ b/mail/py-offlineimap3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1724613974 -SHA256 (OfflineIMAP-offlineimap3-v8.0.0-70-g93f358dee9d7cf800d11679ee4e9c61abfc0c5f6-93f358dee9d7cf800d11679ee4e9c61abfc0c5f6_GH0.tar.gz) = 4bf5ab02923d9b7de186ed5f54e2ec267d4541be47833c079cc7495cfaeeea4e -SIZE (OfflineIMAP-offlineimap3-v8.0.0-70-g93f358dee9d7cf800d11679ee4e9c61abfc0c5f6-93f358dee9d7cf800d11679ee4e9c61abfc0c5f6_GH0.tar.gz) = 705645 +TIMESTAMP = 1760295184 +SHA256 (OfflineIMAP-offlineimap3-v8.0.0-78-gdb347452273bb0f1b1a8ea952f6fb46cf95fedbf-db347452273bb0f1b1a8ea952f6fb46cf95fedbf_GH0.tar.gz) = 0f44eee350bff1ff232426f192defcdfc01bcaf5aa5beb310aa232ef7370362d +SIZE (OfflineIMAP-offlineimap3-v8.0.0-78-gdb347452273bb0f1b1a8ea952f6fb46cf95fedbf-db347452273bb0f1b1a8ea952f6fb46cf95fedbf_GH0.tar.gz) = 706499 diff --git a/mail/py-offlineimap3/files/patch-test_tests_test__01__basic.py b/mail/py-offlineimap3/files/patch-test_tests_test__01__basic.py deleted file mode 100644 index 615492c8fe8d..000000000000 --- a/mail/py-offlineimap3/files/patch-test_tests_test__01__basic.py +++ /dev/null @@ -1,59 +0,0 @@ ---- test/tests/test_01_basic.py.orig 2022-03-04 03:43:46 UTC -+++ test/tests/test_01_basic.py -@@ -17,6 +17,8 @@ import unittest - import logging - from test.OLItest import OLITestLib - -+import pytest -+ - # Things need to be setup first, usually setup.py initializes everything. - # but if e.g. called from command line, we take care of default values here: - if not OLITestLib.cred_file: -@@ -47,6 +49,7 @@ class TestBasicFunctions(unittest.TestCase): - def tearDown(self): - OLITestLib.delete_remote_testfolders() - -+ @pytest.mark.skip(reason="skpping test needs remote auth") - def test_01_olistartup(self): - """Tests if OLI can be invoked without exceptions - -@@ -60,6 +63,7 @@ class TestBasicFunctions(unittest.TestCase): - "mails, but sync led to {0} folders and {1} mails" - .format(boxes, mails)) - -+ @pytest.mark.skip(reason="skpping test needs remote auth") - def test_02_createdir(self): - """Create local 'OLItest 1', sync""" - OLITestLib.delete_maildir('') # Delete all local maildir folders -@@ -71,6 +75,7 @@ class TestBasicFunctions(unittest.TestCase): - "mails, but sync led to {0} folders and {1} mails" - .format(boxes, mails)) - -+ @pytest.mark.skip(reason="skpping test needs remote auth") - def test_03_createdir_quote(self): - """Create local 'OLItest "1"' maildir, sync - -@@ -87,6 +92,7 @@ class TestBasicFunctions(unittest.TestCase): - "mails, but sync led to {0} folders and {1} mails" - .format(boxes, mails)) - -+ @pytest.mark.skip(reason="skpping test needs remote auth") - def test_04_nametransmismatch(self): - """Create mismatching remote and local nametrans rules - -@@ -108,6 +114,7 @@ class TestBasicFunctions(unittest.TestCase): - # Write out default config file again - OLITestLib.write_config_file() - -+ @pytest.mark.skip(reason="skpping test needs remote auth") - def test_05_createmail(self): - """Create mail in OLItest 1, sync, wipe folder sync - -@@ -133,6 +140,7 @@ class TestBasicFunctions(unittest.TestCase): - "assigned the IMAP's UID number, but {0} messages had no valid ID " - .format(len([None for x in uids if x is None]))) - -+ @pytest.mark.skip(reason="skpping test needs remote auth") - def test_06_createfolders(self): - """Test if createfolders works as expected - diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile index 7e5cd224148c..88774d14c777 100644 --- a/mail/sqwebmail/Makefile +++ b/mail/sqwebmail/Makefile @@ -1,12 +1,11 @@ PORTNAME= sqwebmail -PORTVERSION= 6.2.4 -PORTREVISION= 1 +PORTVERSION= 6.3.0 CATEGORIES= mail www MASTER_SITES= SF/courier/webmail/${PORTVERSION} MAINTAINER= oliver@FreeBSD.org COMMENT= CGI Webmail client for Maildirs -WWW= https://inter7.com/sqwebmail/ +WWW= https://www.courier-mta.org/sqwebmail/ LICENSE= GPLv3 @@ -59,7 +58,7 @@ MAILGRP?= courier # # End of user variables -USES= compiler:c++11-lang gettext gmake iconv perl5 tar:bzip2 pkgconfig +USES= compiler:c++17-lang gettext gmake iconv perl5 tar:bzip2 pkgconfig USE_RC_SUBR= sqwebmail-sqwebmaild GNU_CONFIGURE= yes diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo index 1f83e5e25456..046a1b9b4299 100644 --- a/mail/sqwebmail/distinfo +++ b/mail/sqwebmail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697149887 -SHA256 (sqwebmail-6.2.4.tar.bz2) = 0e9fe042413b64e81aea3abeea180648e7b0a71912ca37b0c7d30cb0d0299942 -SIZE (sqwebmail-6.2.4.tar.bz2) = 3748078 +TIMESTAMP = 1760884299 +SHA256 (sqwebmail-6.3.0.tar.bz2) = e6548e4c974024f02b629d8a5090af3c7000faf2d52b28b87b11d48ae3a61be3 +SIZE (sqwebmail-6.3.0.tar.bz2) = 4087972 diff --git a/mail/sqwebmail/files/patch-Makefile.in b/mail/sqwebmail/files/patch-Makefile.in index 18a54190064a..4e691ae3b813 100644 --- a/mail/sqwebmail/files/patch-Makefile.in +++ b/mail/sqwebmail/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2023-08-28 12:32:30 UTC +--- Makefile.in.orig 2025-10-14 23:45:13 UTC +++ Makefile.in -@@ -404,13 +404,13 @@ EXTRA_DIST = INSTALL.html README NEWS README.html READ +@@ -413,13 +413,13 @@ scriptbin_SCRIPTS = \ packaging/debian/sqwebmail-apache2.lintian-overrides scriptbindir = $(sbindir) scriptbin_SCRIPTS = \ @@ -16,7 +16,7 @@ WWW = $$HOME/www/hostrocket/courier-mta.org @HAVE_HTMLPAGES_TRUE@NEWS_SOURCE = html/index.html -@@ -1068,11 +1068,11 @@ reformime: libs/rfc2045/reformime +@@ -1071,11 +1071,11 @@ makemime: libs/rfc2045/makemime makemime: libs/rfc2045/makemime cp libs/rfc2045/makemime . diff --git a/mail/sqwebmail/files/patch-libs_rfc2045_rfc2045.h b/mail/sqwebmail/files/patch-libs_rfc2045_rfc2045.h new file mode 100644 index 000000000000..36c6fd96cfb4 --- /dev/null +++ b/mail/sqwebmail/files/patch-libs_rfc2045_rfc2045.h @@ -0,0 +1,11 @@ +--- libs/rfc2045/rfc2045.h.orig 2025-10-06 09:00:04 UTC ++++ libs/rfc2045/rfc2045.h +@@ -3224,7 +3224,7 @@ void rfc822::mime_decoder<out_iter, src_type>::decode( + + if (decode_header) + { +- typename rfc2045::entity::line_iter<crlf>::headers< ++ typename rfc2045::entity::line_iter<crlf>::template headers< + src_type> parser{e, src }; + + parser.name_lc=header_name_lc; diff --git a/mail/sqwebmail/files/patch-libs_rfc2045_testsuitecpp.C b/mail/sqwebmail/files/patch-libs_rfc2045_testsuitecpp.C new file mode 100644 index 000000000000..5d1494f61819 --- /dev/null +++ b/mail/sqwebmail/files/patch-libs_rfc2045_testsuitecpp.C @@ -0,0 +1,11 @@ +--- libs/rfc2045/testsuitecpp.C.orig 2025-10-04 09:00:12 UTC ++++ libs/rfc2045/testsuitecpp.C +@@ -19,7 +19,7 @@ void testrfc2045line_iter_testset(int &testnum, test_t + auto b=s.begin(); + auto e=s.end(); + +- typename rfc2045::entity::line_iter<crlf>::iter< ++ typename rfc2045::entity::line_iter<crlf>::template iter< + std::string_view::iterator, + std::string_view::iterator + > diff --git a/mail/sqwebmail/files/patch-libs_rfc2045_testsuitecpp2.C b/mail/sqwebmail/files/patch-libs_rfc2045_testsuitecpp2.C new file mode 100644 index 000000000000..bd49c3117802 --- /dev/null +++ b/mail/sqwebmail/files/patch-libs_rfc2045_testsuitecpp2.C @@ -0,0 +1,29 @@ +--- libs/rfc2045/testsuitecpp2.C.orig 2025-09-10 09:00:12 UTC ++++ libs/rfc2045/testsuitecpp2.C +@@ -217,7 +217,7 @@ void test3() + auto b=std::istreambuf_iterator<char>{ss}; + auto e=std::istreambuf_iterator<char>{}; + +- typename rfc2045::entity::line_iter<crlf>::iter< ++ typename rfc2045::entity::line_iter<crlf>::template iter< + std::istreambuf_iterator<char>, + std::istreambuf_iterator<char> + > iter{b, e}; +@@ -310,7 +310,7 @@ void test4() + auto b=std::istreambuf_iterator<char>{ss}; + auto e=std::istreambuf_iterator<char>{}; + +- typename rfc2045::entity::line_iter<crlf>::iter< ++ typename rfc2045::entity::line_iter<crlf>::template iter< + std::istreambuf_iterator<char>, + std::istreambuf_iterator<char> + > iter{b, e}; +@@ -488,7 +488,7 @@ void test5() + auto b=std::istreambuf_iterator<char>{ss}; + auto e=std::istreambuf_iterator<char>{}; + +- typename rfc2045::entity::line_iter<crlf>::iter< ++ typename rfc2045::entity::line_iter<crlf>::template iter< + std::istreambuf_iterator<char>, + std::istreambuf_iterator<char> + > iter{b, e}; diff --git a/math/libsemigroups/Makefile b/math/libsemigroups/Makefile index 9300f0d48ca3..f0135293bb34 100644 --- a/math/libsemigroups/Makefile +++ b/math/libsemigroups/Makefile @@ -1,5 +1,5 @@ PORTNAME= libsemigroups -PORTVERSION= 3.1.3 +PORTVERSION= 3.2.0 DISTVERSIONPREFIX= v CATEGORIES= math diff --git a/math/libsemigroups/distinfo b/math/libsemigroups/distinfo index eb0d7fb689fd..9d69f807e767 100644 --- a/math/libsemigroups/distinfo +++ b/math/libsemigroups/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1756982852 -SHA256 (libsemigroups-libsemigroups-v3.1.3_GH0.tar.gz) = a751b879a97b259821e0d19f39d3d394efc8ecd12647cdcb267d39b6d6a8a31d -SIZE (libsemigroups-libsemigroups-v3.1.3_GH0.tar.gz) = 6155171 +TIMESTAMP = 1760883166 +SHA256 (libsemigroups-libsemigroups-v3.2.0_GH0.tar.gz) = 5482c4275f822768fd92b47ec292ecf9b0cdcae5712101cde659a83c05032f7d +SIZE (libsemigroups-libsemigroups-v3.2.0_GH0.tar.gz) = 6566714 diff --git a/math/libsemigroups/files/patch-third__party_backward-cpp_backward.hpp b/math/libsemigroups/files/patch-third__party_backward-cpp_backward.hpp deleted file mode 100644 index b0e39b58f333..000000000000 --- a/math/libsemigroups/files/patch-third__party_backward-cpp_backward.hpp +++ /dev/null @@ -1,239 +0,0 @@ ---- third_party/backward-cpp/backward.hpp.orig 2025-04-01 12:04:08 UTC -+++ third_party/backward-cpp/backward.hpp -@@ -52,6 +52,9 @@ - // #define BACKWARD_SYSTEM_DARWIN - // - specialization for Mac OS X 10.5 and later. - // -+// #define BACKWARD_SYSTEM_FREEBSD -+// - specialization for FreeBSD. -+// - // #define BACKWARD_SYSTEM_WINDOWS - // - specialization for Windows (Clang 9 and MSVC2017) - // -@@ -60,6 +63,7 @@ - // - #if defined(BACKWARD_SYSTEM_LINUX) - #elif defined(BACKWARD_SYSTEM_DARWIN) -+#elif defined(BACKWARD_SYSTEM_FREEBSD) - #elif defined(BACKWARD_SYSTEM_UNKNOWN) - #elif defined(BACKWARD_SYSTEM_WINDOWS) - #else -@@ -67,12 +71,18 @@ - #define BACKWARD_SYSTEM_LINUX - #elif defined(__APPLE__) - #define BACKWARD_SYSTEM_DARWIN -+#elif defined(__FreeBSD__) -+#define BACKWARD_SYSTEM_FREEBSD - #elif defined(_WIN32) - #define BACKWARD_SYSTEM_WINDOWS - #else - #define BACKWARD_SYSTEM_UNKNOWN - #endif - #endif -+#if defined(__FreeBSD__) -+#include <pthread_np.h> -+#include <sys/ucontext.h> -+#endif - - #define NOINLINE __attribute__((noinline)) - -@@ -263,7 +273,7 @@ - - #endif // defined(BACKWARD_SYSTEM_LINUX) - --#if defined(BACKWARD_SYSTEM_DARWIN) -+#if defined(BACKWARD_SYSTEM_DARWIN) || defined(BACKWARD_SYSTEM_FREEBSD) - // On Darwin, backtrace can back-trace or "walk" the stack using the following - // libraries: - // -@@ -329,7 +339,7 @@ - || (BACKWARD_HAS_BACKTRACE_SYMBOL == 1) - #include <execinfo.h> - #endif --#endif // defined(BACKWARD_SYSTEM_DARWIN) -+#endif // defined(BACKWARD_SYSTEM_DARWIN) || defined(BACKWARD_SYSTEM_FREEBSD) - - #if defined(BACKWARD_SYSTEM_WINDOWS) - -@@ -462,6 +472,7 @@ namespace backward { - struct linux_tag; // seems that I cannot call that "linux" because the name - // is already defined... so I am adding _tag everywhere. - struct darwin_tag; -+ struct freebsd_tag; - struct windows_tag; - struct unknown_tag; - -@@ -469,6 +480,8 @@ namespace backward { - typedef linux_tag current_tag; - #elif defined(BACKWARD_SYSTEM_DARWIN) - typedef darwin_tag current_tag; -+#elif defined(BACKWARD_SYSTEM_FREEBSD) -+ typedef freebsd_tag current_tag; - #elif defined(BACKWARD_SYSTEM_WINDOWS) - typedef windows_tag current_tag; - #elif defined(BACKWARD_SYSTEM_UNKNOWN) -@@ -496,7 +509,7 @@ namespace backward { - #else - #error "You shall not pass, until you know what you want." - #endif --#elif defined(BACKWARD_SYSTEM_DARWIN) -+#elif defined(BACKWARD_SYSTEM_DARWIN) || defined(BACKWARD_SYSTEM_FREEBSD) - struct backtrace_symbol; - - #if BACKWARD_HAS_BACKTRACE_SYMBOL == 1 -@@ -654,7 +667,7 @@ namespace backward { - } - }; - --#if defined(BACKWARD_SYSTEM_LINUX) || defined(BACKWARD_SYSTEM_DARWIN) -+#if defined(BACKWARD_SYSTEM_LINUX) || defined(BACKWARD_SYSTEM_DARWIN) || defined(BACKWARD_SYSTEM_FREEBSD) - - template <> - struct demangler_impl<system_tag::current_tag> { -@@ -678,7 +691,7 @@ namespace backward { - size_t _demangle_buffer_length; - }; - --#endif // BACKWARD_SYSTEM_LINUX || BACKWARD_SYSTEM_DARWIN -+#endif // BACKWARD_SYSTEM_LINUX || BACKWARD_SYSTEM_DARWIN || defined(BACKWARD_SYSTEM_FREEBSD) - - struct demangler : public demangler_impl<system_tag::current_tag> {}; - -@@ -812,7 +825,7 @@ namespace backward { - // I like to keep little secret sometimes. - _thread_id = 0; - } --#elif defined(BACKWARD_SYSTEM_DARWIN) -+#elif defined(BACKWARD_SYSTEM_DARWIN) || defined(BACKWARD_SYSTEM_FREEBSD) - _thread_id = reinterpret_cast<size_t>(pthread_self()); - if (pthread_main_np() == 1) { - // If the thread is the main one, let's hide that. -@@ -1097,6 +1110,36 @@ namespace backward { - } - _stacktrace[index] = reinterpret_cast<void*>(ctx.data[16]); - ++index; -+#elif defined(__FreeBSD__) && defined(__x86_64__) -+ unw_getcontext(&ctx); -+ ctx.data[0] = uctx->uc_mcontext.mc_rax; -+ ctx.data[1] = uctx->uc_mcontext.mc_rbx; -+ ctx.data[2] = uctx->uc_mcontext.mc_rcx; -+ ctx.data[3] = uctx->uc_mcontext.mc_rdx; -+ ctx.data[4] = uctx->uc_mcontext.mc_rdi; -+ ctx.data[5] = uctx->uc_mcontext.mc_rsi; -+ ctx.data[6] = uctx->uc_mcontext.mc_rbp; -+ ctx.data[7] = uctx->uc_mcontext.mc_rsp; -+ ctx.data[8] = uctx->uc_mcontext.mc_r8; -+ ctx.data[9] = uctx->uc_mcontext.mc_r9; -+ ctx.data[10] = uctx->uc_mcontext.mc_r10; -+ ctx.data[11] = uctx->uc_mcontext.mc_r11; -+ ctx.data[12] = uctx->uc_mcontext.mc_r12; -+ ctx.data[13] = uctx->uc_mcontext.mc_r13; -+ ctx.data[14] = uctx->uc_mcontext.mc_r14; -+ ctx.data[15] = uctx->uc_mcontext.mc_r15; -+ ctx.data[16] = uctx->uc_mcontext.mc_rip; -+ -+ // If the IP is the same as the crash address we have a bad function -+ // dereference The caller's address is pointed to by %rsp, so we -+ // dereference that value and set it to be the next frame's IP. -+ if (uctx->uc_mcontext.mc_rip -+ == reinterpret_cast<__uint64_t>(error_addr())) { -+ ctx.data[16] -+ = *reinterpret_cast<__uint64_t*>(uctx->uc_mcontext.mc_rsp); -+ } -+ _stacktrace[index] = reinterpret_cast<void*>(ctx.data[16]); -+ ++index; - #elif defined(__APPLE__) - unw_getcontext(&ctx); - // TODO: Convert the ucontext_t to libunwind's unw_context_t like -@@ -1108,6 +1151,17 @@ namespace backward { - _stacktrace[index] - = reinterpret_cast<void*>(ctx.uc_mcontext->__ss.__eip); - ++index; -+#elif defined(__FreeBSD__) -+ unw_getcontext(&ctx); -+ // TODO: Convert the ucontext_t to libunwind's unw_context_t like -+ // we do in 64 bits -+ if (ctx.uc_mcontext.mc_eip -+ == reinterpret_cast<greg_t>(error_addr())) { -+ ctx.uc_mcontext.mc_eip = ctx.uc_mcontext.mc_esp; -+ } -+ _stacktrace[index] -+ = reinterpret_cast<void*>(ctx.uc_mcontext.mc_eip); -+ ++index; - #endif - } - -@@ -3659,7 +3713,7 @@ namespace backward { - - #endif // BACKWARD_SYSTEM_LINUX - --#ifdef BACKWARD_SYSTEM_DARWIN -+#if defined(BACKWARD_SYSTEM_DARWIN) || defined(BACKWARD_SYSTEM_FREEBSD) - - template <typename STACKTRACE_TAG> - class TraceResolverDarwinImpl; -@@ -3739,10 +3793,14 @@ namespace backward { - }; - - template <> -+#ifdef BACKWARD_SYSTEM_DARWIN - class TraceResolverImpl<system_tag::darwin_tag> -+#else // BACKWARD_SYSTEM_FREEBSD -+ class TraceResolverImpl<system_tag::freebsd_tag> -+#endif - : public TraceResolverDarwinImpl<trace_resolver_tag::current> {}; - --#endif // BACKWARD_SYSTEM_DARWIN -+#endif // BACKWARD_SYSTEM_DARWIN || BACKWARD_SYSTEM_FREEBSD - - #ifdef BACKWARD_SYSTEM_WINDOWS - -@@ -4408,7 +4466,7 @@ namespace backward { - - /*************** SIGNALS HANDLING ***************/ - --#if defined(BACKWARD_SYSTEM_LINUX) || defined(BACKWARD_SYSTEM_DARWIN) -+#if defined(BACKWARD_SYSTEM_LINUX) || defined(BACKWARD_SYSTEM_DARWIN) || defined(BACKWARD_SYSTEM_FREEBSD) - - class SignalHandling { - public: -@@ -4426,7 +4484,7 @@ namespace backward { - SIGTRAP, // Trace/breakpoint trap - SIGXCPU, // CPU time limit exceeded (4.2BSD) - SIGXFSZ, // File size limit exceeded (4.2BSD) --#if defined(BACKWARD_SYSTEM_DARWIN) -+#if defined(BACKWARD_SYSTEM_DARWIN) || defined(BACKWARD_SYSTEM_FREEBSD) - SIGEMT, // emulation instruction executed - #endif - }; -@@ -4496,6 +4554,8 @@ namespace backward { - #elif defined(__aarch64__) - #if defined(__APPLE__) - error_addr = reinterpret_cast<void*>(uctx->uc_mcontext->__ss.__pc); -+#elif defined(__FreeBSD__) -+ error_addr = reinterpret_cast<void*>(uctx->uc_mcontext.mc_pc); - #else - error_addr = reinterpret_cast<void*>(uctx->uc_mcontext.pc); - #endif -@@ -4511,8 +4571,12 @@ namespace backward { - error_addr = reinterpret_cast<void*>(uctx->uc_mcontext.psw.addr); - #elif defined(__APPLE__) && defined(__x86_64__) - error_addr = reinterpret_cast<void*>(uctx->uc_mcontext->__ss.__rip); -+#elif defined(__FreeBSD__) && defined(__x86_64__) -+ error_addr = reinterpret_cast<void*>(uctx->uc_mcontext.mc_rip); - #elif defined(__APPLE__) - error_addr = reinterpret_cast<void*>(uctx->uc_mcontext->__ss.__eip); -+#elif defined(__FreeBSD__) -+ error_addr = reinterpret_cast<void*>(uctx->uc_mcontext.mc_eip); - #else - #warning ":/ sorry, ain't know no nothing none not of your architecture!" - #endif -@@ -4555,7 +4619,7 @@ namespace backward { - } - }; - --#endif // BACKWARD_SYSTEM_LINUX || BACKWARD_SYSTEM_DARWIN -+#endif // BACKWARD_SYSTEM_LINUX || BACKWARD_SYSTEM_DARWIN || BACKWARD_SYSTEM_FREEBSD - - #ifdef BACKWARD_SYSTEM_WINDOWS - diff --git a/math/libsemigroups/pkg-plist b/math/libsemigroups/pkg-plist index 00dfb889c2c6..567387722742 100644 --- a/math/libsemigroups/pkg-plist +++ b/math/libsemigroups/pkg-plist @@ -4,7 +4,6 @@ include/libsemigroups/action.tpp include/libsemigroups/adapters.hpp include/libsemigroups/aho-corasick.hpp include/libsemigroups/aho-corasick.tpp -include/libsemigroups/backward-cpp/backward.hpp include/libsemigroups/bipart.hpp include/libsemigroups/bitset.hpp include/libsemigroups/bmat-adapters.hpp diff --git a/math/planarity/Makefile b/math/planarity/Makefile index fb45b5ab332c..cdb075d92bb3 100644 --- a/math/planarity/Makefile +++ b/math/planarity/Makefile @@ -1,5 +1,5 @@ PORTNAME= planarity -PORTVERSION= 4.0.0.0 +PORTVERSION= 4.0.1.0 DISTVERSIONPREFIX= Version_ CATEGORIES= math diff --git a/math/planarity/distinfo b/math/planarity/distinfo index 9a109e5dcf0b..0dd77114742e 100644 --- a/math/planarity/distinfo +++ b/math/planarity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743935056 -SHA256 (graph-algorithms-edge-addition-planarity-suite-Version_4.0.0.0_GH0.tar.gz) = 1efcb06eaec42830de5d35ff664f7580f16dff131dbfc24f627460547b3401d5 -SIZE (graph-algorithms-edge-addition-planarity-suite-Version_4.0.0.0_GH0.tar.gz) = 272107 +TIMESTAMP = 1760882656 +SHA256 (graph-algorithms-edge-addition-planarity-suite-Version_4.0.1.0_GH0.tar.gz) = 94a6738cf4e5aaa912f0dd47b0b9b6a8022eccb9d668bd1d7d3de2fc920ec129 +SIZE (graph-algorithms-edge-addition-planarity-suite-Version_4.0.1.0_GH0.tar.gz) = 281365 diff --git a/math/planarity/pkg-plist b/math/planarity/pkg-plist index 4fd23e4587d3..f97fa90f5ebb 100644 --- a/math/planarity/pkg-plist +++ b/math/planarity/pkg-plist @@ -29,7 +29,7 @@ include/planarity/graphLib.h lib/libplanarity.a lib/libplanarity.so lib/libplanarity.so.2 -lib/libplanarity.so.2.0.0 +lib/libplanarity.so.2.1.0 libdata/pkgconfig/libplanarity.pc %%PORTDOCS%%%%DOCSDIR%%/LICENSE.TXT %%PORTDOCS%%%%DOCSDIR%%/README.md @@ -37,6 +37,12 @@ libdata/pkgconfig/libplanarity.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/K10.g6.0-based.AdjList.out.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/K10.g6.0-based.AdjList.out.txt.0-based.G6.out.g6 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/K10.g6.0-based.AdjMat.out.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/K23-minus-edge.AdjList.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/K23.AdjList.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/K33-minus-edge.AdjList.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/K33.AdjList.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/K4-minus-edge.AdjList.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/K4.AdjList.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/N5-all.g6 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/N5-all.g6.0-based.AdjList.out.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/N5-all.g6.0-based.AdjMat.out.txt diff --git a/misc/crush/Makefile b/misc/crush/Makefile index 960e74cf0252..10a8f08e615f 100644 --- a/misc/crush/Makefile +++ b/misc/crush/Makefile @@ -1,6 +1,6 @@ PORTNAME= crush DISTVERSIONPREFIX= v -DISTVERSION= 0.11.1 +DISTVERSION= 0.11.2 CATEGORIES= misc devel MAINTAINER= tagattie@FreeBSD.org diff --git a/misc/crush/distinfo b/misc/crush/distinfo index c74b37620eb9..df1f27aa911f 100644 --- a/misc/crush/distinfo +++ b/misc/crush/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1760537032 -SHA256 (go/misc_crush/crush-v0.11.1/v0.11.1.mod) = 3726515ee279e2c17845581dc346de2360b8476b9ebdc8093c125b032bf14894 -SIZE (go/misc_crush/crush-v0.11.1/v0.11.1.mod) = 8056 -SHA256 (go/misc_crush/crush-v0.11.1/v0.11.1.zip) = 5655a9ed02ddfa438bebe64ea57cbabe5495206b11fd3ce4bd0b93a31c95f554 -SIZE (go/misc_crush/crush-v0.11.1/v0.11.1.zip) = 765493 +TIMESTAMP = 1760873555 +SHA256 (go/misc_crush/crush-v0.11.2/v0.11.2.mod) = 379291fb7cf056c80ee8f50c943388030fc6249e8f6e182ee3ca13275cf60ee7 +SIZE (go/misc_crush/crush-v0.11.2/v0.11.2.mod) = 8103 +SHA256 (go/misc_crush/crush-v0.11.2/v0.11.2.zip) = 46e73774ea5841e134f0d84b41022e588b977b37b90b1ee1d79f9a7ec199005a +SIZE (go/misc_crush/crush-v0.11.2/v0.11.2.zip) = 767595 diff --git a/misc/llama-cpp/Makefile b/misc/llama-cpp/Makefile index 463389d10d70..c9edf8ce40bf 100644 --- a/misc/llama-cpp/Makefile +++ b/misc/llama-cpp/Makefile @@ -1,6 +1,6 @@ PORTNAME= llama-cpp DISTVERSIONPREFIX= b -DISTVERSION= 6374 +DISTVERSION= 6795 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org @@ -24,6 +24,7 @@ GH_TUPLE= nomic-ai:kompute:4565194:kompute/kompute SHEBANG_GLOB= *.py CMAKE_ON= BUILD_SHARED_LIBS + #LLAMA_USE_SYSTEM_GGML CMAKE_OFF= GGML_NATIVE \ FREEBSD_ALLOW_ADVANCED_CPU_FEATURES \ LLAMA_BUILD_TESTS diff --git a/misc/llama-cpp/distinfo b/misc/llama-cpp/distinfo index ac00c83b7dba..fa0a53824637 100644 --- a/misc/llama-cpp/distinfo +++ b/misc/llama-cpp/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1756957718 -SHA256 (ggerganov-llama.cpp-b6374_GH0.tar.gz) = fe4392f8331a13fcd6ccf5fa4a7e9a79d58958394ef62bf8df6d214208619ed5 -SIZE (ggerganov-llama.cpp-b6374_GH0.tar.gz) = 25632053 +TIMESTAMP = 1760833602 +SHA256 (ggerganov-llama.cpp-b6795_GH0.tar.gz) = b037e5ecc5876e8c01c6b0a3010103b43d4883c3b1bc93fa60f09a751f256133 +SIZE (ggerganov-llama.cpp-b6795_GH0.tar.gz) = 25970813 SHA256 (nomic-ai-kompute-4565194_GH0.tar.gz) = 95b52d2f0514c5201c7838348a9c3c9e60902ea3c6c9aa862193a212150b2bfc SIZE (nomic-ai-kompute-4565194_GH0.tar.gz) = 13540496 diff --git a/misc/llama-cpp/files/patch-ggml_src_CMakeLists.txt b/misc/llama-cpp/files/patch-ggml_src_CMakeLists.txt deleted file mode 100644 index 8135824e1b8b..000000000000 --- a/misc/llama-cpp/files/patch-ggml_src_CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -- workaround for https://github.com/ggerganov/llama.cpp/issues/11095 - ---- ggml/src/CMakeLists.txt.orig 2025-01-06 00:37:35 UTC -+++ ggml/src/CMakeLists.txt -@@ -152,15 +152,6 @@ endif() - # posix_memalign came in POSIX.1-2001 / SUSv3 - # M_PI is an XSI extension since POSIX.1-2001 / SUSv3, came in XPG1 (1985) - --# Somehow in OpenBSD whenever POSIX conformance is specified --# some string functions rely on locale_t availability, --# which was introduced in POSIX.1-2008, forcing us to go higher --if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD") -- add_compile_definitions(_XOPEN_SOURCE=700) --else() -- add_compile_definitions(_XOPEN_SOURCE=600) --endif() -- - # Data types, macros and functions related to controlling CPU affinity and - # some memory allocation are available on Linux through GNU extensions in libc - if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Android") diff --git a/misc/llama-cpp/pkg-plist b/misc/llama-cpp/pkg-plist index 9c53359aabc9..678dd2ed6420 100644 --- a/misc/llama-cpp/pkg-plist +++ b/misc/llama-cpp/pkg-plist @@ -14,7 +14,6 @@ bin/convert_hf_to_gguf.py %%EXAMPLES%%bin/llama-gguf %%EXAMPLES%%bin/llama-gguf-hash %%EXAMPLES%%bin/llama-gguf-split -%%EXAMPLES%%bin/llama-gritlm %%EXAMPLES%%bin/llama-imatrix %%EXAMPLES%%bin/llama-logits %%EXAMPLES%%bin/llama-lookahead diff --git a/net-im/purple-discord/Makefile b/net-im/purple-discord/Makefile index 0074f1844efb..5789e2e2a9d5 100644 --- a/net-im/purple-discord/Makefile +++ b/net-im/purple-discord/Makefile @@ -1,5 +1,5 @@ PORTNAME= purple-discord -DISTVERSION= g20250810 +DISTVERSION= g20251012 CATEGORIES= net-im MAINTAINER= atanubiswas484@gmail.com @@ -15,12 +15,11 @@ LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \ libpurple.so:net-im/libpurple \ libqrencode.so:graphics/libqrencode -USES= dos2unix gettext-runtime gettext-tools gmake gnome \ - magick:build pkgconfig +USES= dos2unix gettext gmake gnome magick:build pkgconfig DOS2UNIX_FILES= Makefile USE_GITHUB= yes GH_ACCOUNT= EionRobb -GH_TAGNAME= nightly-e39f97e59c446d6af5d2ef2ef259391867fd95e4 +GH_TAGNAME= nightly-f60596c3e6a22f819ad408232257dca1757a8519 USE_GNOME= glib20 post-install: diff --git a/net-im/purple-discord/distinfo b/net-im/purple-discord/distinfo index 3a88f516d961..ece81834628d 100644 --- a/net-im/purple-discord/distinfo +++ b/net-im/purple-discord/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1754854194 -SHA256 (EionRobb-purple-discord-g20250810-nightly-e39f97e59c446d6af5d2ef2ef259391867fd95e4_GH0.tar.gz) = 1055eefae377d55674ad26ac2f515a3203329990e58c5385e66431bbf39e4c9a -SIZE (EionRobb-purple-discord-g20250810-nightly-e39f97e59c446d6af5d2ef2ef259391867fd95e4_GH0.tar.gz) = 142205 +TIMESTAMP = 1760876252 +SHA256 (EionRobb-purple-discord-g20251012-nightly-f60596c3e6a22f819ad408232257dca1757a8519_GH0.tar.gz) = d902b18413266e66b61d219729de438b15dc7358e4d0e2ac49d9c9e451e3deda +SIZE (EionRobb-purple-discord-g20251012-nightly-f60596c3e6a22f819ad408232257dca1757a8519_GH0.tar.gz) = 142971 diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile index 6d361eafaeb6..61e62d5ac0b1 100644 --- a/ports-mgmt/poudriere/Makefile +++ b/ports-mgmt/poudriere/Makefile @@ -1,5 +1,5 @@ PORTNAME= poudriere -DISTVERSION= 3.4.3 +DISTVERSION= 3.4.4 PORTREVISION= 0 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ diff --git a/ports-mgmt/poudriere/distinfo b/ports-mgmt/poudriere/distinfo index 5cac30b9461c..c55fe281cdd2 100644 --- a/ports-mgmt/poudriere/distinfo +++ b/ports-mgmt/poudriere/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1753378018 -SHA256 (freebsd-poudriere-3.4.3_GH0.tar.gz) = 45051f021fd108f28af1e03293048ee323c261dd33ba460d82d0cb41a2f5b79d -SIZE (freebsd-poudriere-3.4.3_GH0.tar.gz) = 4575477 +TIMESTAMP = 1760889168 +SHA256 (freebsd-poudriere-3.4.4_GH0.tar.gz) = 2a9680033012ffa278321821a2e75ceefeb493baadb103390e31272e96a44c8f +SIZE (freebsd-poudriere-3.4.4_GH0.tar.gz) = 4576630 diff --git a/security/lego/Makefile b/security/lego/Makefile index 808aa37ad2a6..6ba0cbb685bf 100644 --- a/security/lego/Makefile +++ b/security/lego/Makefile @@ -1,7 +1,6 @@ PORTNAME= lego DISTVERSIONPREFIX= v -DISTVERSION= 4.26.0 -PORTREVISION= 2 +DISTVERSION= 4.27.0 CATEGORIES= security MAINTAINER= matt@matthoran.com diff --git a/security/lego/distinfo b/security/lego/distinfo index 33c9158bf88b..61e1e053a607 100644 --- a/security/lego/distinfo +++ b/security/lego/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1757982174 -SHA256 (go/security_lego/lego-v4.26.0/v4.26.0.mod) = 7beedcefda490a8f0f99f5057d3da951e2dfebcf325fec1053a247ba7e43d0ef -SIZE (go/security_lego/lego-v4.26.0/v4.26.0.mod) = 10962 -SHA256 (go/security_lego/lego-v4.26.0/v4.26.0.zip) = 3f2287156a729865a5b49d92f6f9890da69fd1d482c164e9f45795334fa37989 -SIZE (go/security_lego/lego-v4.26.0/v4.26.0.zip) = 1600833 +TIMESTAMP = 1760846644 +SHA256 (go/security_lego/lego-v4.27.0/v4.27.0.mod) = cecadfa0296e7454a6091949ae4a9b97494ab54d298e070da9b61b4d95c8a1f2 +SIZE (go/security_lego/lego-v4.27.0/v4.27.0.mod) = 11015 +SHA256 (go/security_lego/lego-v4.27.0/v4.27.0.zip) = c397e8c08ab816854ac9facf79479edd0624e175b1ef65275795004e17d8f515 +SIZE (go/security_lego/lego-v4.27.0/v4.27.0.zip) = 1654875 diff --git a/security/osv-scanner/Makefile b/security/osv-scanner/Makefile index 2141caa8f196..1f12da707e5a 100644 --- a/security/osv-scanner/Makefile +++ b/security/osv-scanner/Makefile @@ -1,7 +1,6 @@ PORTNAME= osv-scanner DISTVERSIONPREFIX= v -DISTVERSION= 2.2.2 -PORTREVISION= 2 +DISTVERSION= 2.2.3 CATEGORIES= security MAINTAINER= dutra@FreeBSD.org @@ -14,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:1.24,modules,run _BUILD_VERSION= ${DISTVERSION} -_BUILD_COMMIT= 04a8728 +_BUILD_COMMIT= a66ef4b _BUILD_DATE= $$(date +%Y-%m-%d) GO_MODULE= github.com/google/${PORTNAME}/v2 diff --git a/security/osv-scanner/distinfo b/security/osv-scanner/distinfo index 1a2041a4e6ed..c12006834dff 100644 --- a/security/osv-scanner/distinfo +++ b/security/osv-scanner/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1757786339 -SHA256 (go/security_osv-scanner/osv-scanner-v2.2.2/v2.2.2.mod) = d54389929750cc4839c89a8f2083a8d735c105d2aac0a3d90cdfb9a5e8fc998f -SIZE (go/security_osv-scanner/osv-scanner-v2.2.2/v2.2.2.mod) = 9801 -SHA256 (go/security_osv-scanner/osv-scanner-v2.2.2/v2.2.2.zip) = 5dbba62ae3d7fec8f1d61d3cb011b54f8b994ac6b7aa9a33a3f9bee0abf0a70a -SIZE (go/security_osv-scanner/osv-scanner-v2.2.2/v2.2.2.zip) = 12527375 +TIMESTAMP = 1760884223 +SHA256 (go/security_osv-scanner/osv-scanner-v2.2.3/v2.2.3.mod) = cd9251730017cdc7b5b3140a7401820db51b5f26be66e4a88ed7be699de48270 +SIZE (go/security_osv-scanner/osv-scanner-v2.2.3/v2.2.3.mod) = 9925 +SHA256 (go/security_osv-scanner/osv-scanner-v2.2.3/v2.2.3.zip) = a4e129563cd6b6daf79a9f2e736f61bb1a01c719e0adf5b2a9e62c7d42dea5dd +SIZE (go/security_osv-scanner/osv-scanner-v2.2.3/v2.2.3.zip) = 12620788 diff --git a/security/sequoia-chameleon-gnupg/Makefile.crates b/security/sequoia-chameleon-gnupg/Makefile.crates index e3dde225d52d..688411394b06 100644 --- a/security/sequoia-chameleon-gnupg/Makefile.crates +++ b/security/sequoia-chameleon-gnupg/Makefile.crates @@ -220,10 +220,10 @@ CARGO_CRATES= addr2line-0.24.2 \ opaque-debug-0.3.1 \ openpgp-cert-d-0.3.4 \ openssh-keys-0.6.4 \ - openssl-0.10.73 \ + openssl-0.10.74 \ openssl-macros-0.1.1 \ openssl-probe-0.1.6 \ - openssl-sys-0.9.109 \ + openssl-sys-0.9.110 \ option-ext-0.2.0 \ parking_lot-0.12.3 \ parking_lot_core-0.9.10 \ diff --git a/security/sequoia-chameleon-gnupg/distinfo b/security/sequoia-chameleon-gnupg/distinfo index f6ee191a5176..6e900ff6b60b 100644 --- a/security/sequoia-chameleon-gnupg/distinfo +++ b/security/sequoia-chameleon-gnupg/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1749443849 +TIMESTAMP = 1760869516 SHA256 (rust/crates/addr2line-0.24.2.crate) = dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1 SIZE (rust/crates/addr2line-0.24.2.crate) = 39015 SHA256 (rust/crates/adler2-2.0.0.crate) = 512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627 @@ -443,14 +443,14 @@ SHA256 (rust/crates/openpgp-cert-d-0.3.4.crate) = d3dd47b0b6df1022ca8a9a06791261 SIZE (rust/crates/openpgp-cert-d-0.3.4.crate) = 32033 SHA256 (rust/crates/openssh-keys-0.6.4.crate) = abb830a82898b2ac17c9620ddce839ac3b34b9cb8a1a037cbdbfb9841c756c3e SIZE (rust/crates/openssh-keys-0.6.4.crate) = 22213 -SHA256 (rust/crates/openssl-0.10.73.crate) = 8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8 -SIZE (rust/crates/openssl-0.10.73.crate) = 283994 +SHA256 (rust/crates/openssl-0.10.74.crate) = 24ad14dd45412269e1a30f52ad8f0664f0f4f4a89ee8fe28c3b3527021ebb654 +SIZE (rust/crates/openssl-0.10.74.crate) = 285425 SHA256 (rust/crates/openssl-macros-0.1.1.crate) = a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c SIZE (rust/crates/openssl-macros-0.1.1.crate) = 5601 SHA256 (rust/crates/openssl-probe-0.1.6.crate) = d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e SIZE (rust/crates/openssl-probe-0.1.6.crate) = 8128 -SHA256 (rust/crates/openssl-sys-0.9.109.crate) = 90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571 -SIZE (rust/crates/openssl-sys-0.9.109.crate) = 78247 +SHA256 (rust/crates/openssl-sys-0.9.110.crate) = 0a9f0075ba3c21b09f8e8b2026584b1d18d49388648f2fbbf3c97ea8deced8e2 +SIZE (rust/crates/openssl-sys-0.9.110.crate) = 80412 SHA256 (rust/crates/option-ext-0.2.0.crate) = 04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d SIZE (rust/crates/option-ext-0.2.0.crate) = 7345 SHA256 (rust/crates/parking_lot-0.12.3.crate) = f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27 diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index d7821765d699..dcf88a4b70db 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -1,5 +1,5 @@ PORTNAME= stunnel -DISTVERSION= 5.75 +DISTVERSION= 5.76 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= https://www.stunnel.org/downloads/archive/5.x/ \ diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo index 476e706b3102..c492d2481db0 100644 --- a/security/stunnel/distinfo +++ b/security/stunnel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1752001963 -SHA256 (stunnel-5.75.tar.gz) = 0c1ef0ed85240974dccb94fe74fb92d6383474c7c0d10e8796d1f781a3ba5683 -SIZE (stunnel-5.75.tar.gz) = 921591 +TIMESTAMP = 1760885143 +SHA256 (stunnel-5.76.tar.gz) = cda37eb4d0fb1e129718ed27ad77b5735e899394ce040bb2be28bbb937fd79e1 +SIZE (stunnel-5.76.tar.gz) = 925880 diff --git a/security/vuxml/vuln/2025.xml b/security/vuxml/vuln/2025.xml index 6af76ff19af5..5fd38a9b701f 100644 --- a/security/vuxml/vuln/2025.xml +++ b/security/vuxml/vuln/2025.xml @@ -1,3 +1,219 @@ + <vuln vid="4355ce42-ad06-11f0-b2aa-b42e991fc52e"> + <topic>Mozilla -- XSS in sites without content-type header</topic> + <affects> + <package> + <name>firefox</name> + <range><lt>144.0.0,2</lt></range> + </package> + <package> + <name>firefox-esr</name> + <range><lt>140.4.0</lt></range> + </package> + <package> + <name>thunderbird</name> + <range><lt>144.0.0</lt></range> + </package> + </affects> + <description> + <body xmlns="http://www.w3.org/1999/xhtml"> + <p>security@mozilla.org reports:</p> + <blockquote cite="https://bugzilla.mozilla.org/show_bug.cgi?id=1979536"> + <p>A malicious page could have used the type attribute of an OBJECT + tag to override the default browser behavior when encountering a + web resource served without a content-type. This could have + contributed to an XSS on a site that unsafely serves files without + a content-type header.</p> + </blockquote> + </body> + </description> + <references> + <cvename>CVE-2025-11712</cvename> + <url>https://nvd.nist.gov/vuln/detail/CVE-2025-11712</url> + </references> + <dates> + <discovery>2025-10-14</discovery> + <entry>2025-10-19</entry> + </dates> + </vuln> + + <vuln vid="fff839db-ad04-11f0-b2aa-b42e991fc52e"> + <topic>Mozilla -- JavaScript Object property overriding</topic> + <affects> + <package> + <name>firefox</name> + <range><lt>144.0.0,2</lt></range> + </package> + <package> + <name>firefox-esr</name> + <range><lt>140.4.0</lt></range> + </package> + <package> + <name>thunderbird</name> + <range><lt>144.0.0</lt></range> + </package> + </affects> + <description> + <body xmlns="http://www.w3.org/1999/xhtml"> + <p>security@mozilla.org reports:</p> + <blockquote cite="https://bugzilla.mozilla.org/show_bug.cgi?id=1989978"> + <p>There was a way to change the value of JavaScript Object + properties that were supposed to be non-writeable.</p> + </blockquote> + </body> + </description> + <references> + <cvename>CVE-2025-11711</cvename> + <url>https://nvd.nist.gov/vuln/detail/CVE-2025-11711</url> + </references> + <dates> + <discovery>2025-10-14</discovery> + <entry>2025-10-19</entry> + </dates> + </vuln> + + <vuln vid="f7047dfc-ad02-11f0-b2aa-b42e991fc52e"> + <topic>Mozilla -- Memory disclosure</topic> + <affects> + <package> + <name>firefox</name> + <range><lt>144.0.0,2</lt></range> + </package> + <package> + <name>firefox-esr</name> + <range><lt>140.4.0</lt></range> + </package> + <package> + <name>thunderbird</name> + <range><lt>144.0.0</lt></range> + </package> + </affects> + <description> + <body xmlns="http://www.w3.org/1999/xhtml"> + <p>security@mozilla.org reports:</p> + <blockquote cite="https://bugzilla.mozilla.org/show_bug.cgi?id=1989899"> + <p>A compromised web process using malicious IPC messages + could have caused the privileged browser process to reveal + blocks of its memory to the compromised process.</p> + </blockquote> + </body> + </description> + <references> + <cvename>CVE-2025-11710</cvename> + <url>https://nvd.nist.gov/vuln/detail/CVE-2025-11710</url> + </references> + <dates> + <discovery>2025-10-14</discovery> + <entry>2025-10-19</entry> + </dates> + </vuln> + + <vuln vid="b760c618-ad02-11f0-b2aa-b42e991fc52e"> + <topic>Mozilla -- Out-of-bounds reads and writes</topic> + <affects> + <package> + <name>firefox</name> + <range><lt>144.0.0,2</lt></range> + </package> + <package> + <name>firefox-esr</name> + <range><lt>140.4.0</lt></range> + </package> + <package> + <name>thunderbird</name> + <range><lt>144.0.0</lt></range> + </package> + </affects> + <description> + <body xmlns="http://www.w3.org/1999/xhtml"> + <p>security@mozilla.org reports:</p> + <blockquote cite="https://bugzilla.mozilla.org/show_bug.cgi?id=1989127"> + <p>A compromised web process was able to trigger out of + bounds reads and writes in a more privileged process using + manipulated WebGL textures.</p> + </blockquote> + </body> + </description> + <references> + <cvename>CVE-2025-11709</cvename> + <url>https://nvd.nist.gov/vuln/detail/CVE-2025-11709</url> + </references> + <dates> + <discovery>2025-10-14</discovery> + <entry>2025-10-19</entry> + </dates> + </vuln> + + <vuln vid="85c17eb8-ad02-11f0-b2aa-b42e991fc52e"> + <topic>Mozilla -- Use-after-free</topic> + <affects> + <package> + <name>firefox</name> + <range><lt>144.0.0,2</lt></range> + </package> + <package> + <name>firefox-esr</name> + <range><lt>140.4.0</lt></range> + </package> + <package> + <name>thunderbird</name> + <range><lt>144.0.0</lt></range> + </package> + </affects> + <description> + <body xmlns="http://www.w3.org/1999/xhtml"> + <p>security@mozilla.org reports:</p> + <blockquote cite="https://bugzilla.mozilla.org/show_bug.cgi?id=1988931"> + <p>Use-after-free in MediaTrackGraphImpl::GetInstance()</p> + </blockquote> + </body> + </description> + <references> + <cvename>CVE-2025-11708</cvename> + <url>https://nvd.nist.gov/vuln/detail/CVE-2025-11708</url> + </references> + <dates> + <discovery>2025-10-14</discovery> + <entry>2025-10-19</entry> + </dates> + </vuln> + + <vuln vid="247bc43f-ad02-11f0-b2aa-b42e991fc52e"> + <topic>Mozilla -- Memory safety bugs</topic> + <affects> + <package> + <name>firefox</name> + <range><lt>144.0.0,2</lt></range> + </package> + <package> + <name>firefox-esr</name> + <range><lt>140.4</lt></range> + </package> + <package> + <name>thunderbird</name> + <range><lt>144.0.0</lt></range> + </package> + </affects> + <description> + <body xmlns="http://www.w3.org/1999/xhtml"> + <p>security@mozilla.org reports:</p> + <blockquote cite="https://bugzilla.mozilla.org/buglist.cgi?bug_id=1973699%2C1989945%2C1990970%2C1991040%2C1992113"> + <p>Memory safety bugs. Some of these bugs showed evidence of + memory corruption and we presume that with enough effort + some of these could have been exploited to run arbitrary + code.</p> + </blockquote> + </body> + </description> + <references> + <cvename>CVE-2025-11714</cvename> + <url>https://nvd.nist.gov/vuln/detail/CVE-2025-11714</url> + </references> + <dates> + <discovery>2025-10-14</discovery> + <entry>2025-10-19</entry> + </dates> + </vuln> + <vuln vid="20840621-ab82-11f0-b961-b42e991fc52e"> <topic>Mozilla -- Memory safety bugs</topic> <affects> @@ -18,12 +234,10 @@ <body xmlns="http://www.w3.org/1999/xhtml"> <p>security@mozilla.org reports:</p> <blockquote cite="https://bugzilla.mozilla.org/buglist.cgi?bug_id=1983838%2C1987624%2C1988244%2C1988912%2C1989734%2C1990085%2C1991899"> - <p>Memory safety bugs present in Firefox ESR 140.3, Thunderbird ESR - 140.3, Firefox 143 and Thunderbird 143. Some of these bugs showed - evidence of memory corruption and we presume that with enough effort - some of these could have been exploited to run arbitrary code. This - vulnerability affects Firefox < 144, Firefox ESR < 140.4, - Thunderbird < 144, and Thunderbird < 140.4.</p> + <p>Memory safety bugs. Some of these bugs showed evidence of + memory corruption and we presume that with enough effort + some of these could have been exploited to run arbitrary + code.</p> </blockquote> </body> </description> diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile index 756ddedf803e..dd14f6ab1477 100644 --- a/shells/bash-completion/Makefile +++ b/shells/bash-completion/Makefile @@ -16,9 +16,6 @@ TEST_DEPENDS= runtest:misc/dejagnu \ USES= autoreconf gmake pathfix tar:xz -.if ${ARCH} == riscv64 -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar -.endif GNU_CONFIGURE= yes NO_ARCH= yes @@ -43,6 +40,12 @@ BASH_STATIC_RUN_DEPENDS=bash:shells/bash-static FREEBSD_RUN_DEPENDS= bash-completion-freebsd>=0:shells/bash-completion-freebsd ZFS_RUN_DEPENDS= bash-completion-zfs>=0:shells/bash-completion-zfs +.include <bsd.port.options.mk> + +.if ${ARCH} == riscv64 +EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar +.endif + post-configure: @${REINPLACE_CMD} \ -e 's|/etc/ssl/openssl.cnf|${PREFIX}& &|g' \ diff --git a/shells/schemesh/Makefile b/shells/schemesh/Makefile index 8c905c9157fa..6a228111fbd0 100644 --- a/shells/schemesh/Makefile +++ b/shells/schemesh/Makefile @@ -1,7 +1,6 @@ PORTNAME= schemesh DISTVERSIONPREFIX= v -DISTVERSION= 0.9.1 -PORTREVISION= 1 +DISTVERSION= 0.9.2 CATEGORIES= shells MAINTAINER= ashish@FreeBSD.org diff --git a/shells/schemesh/distinfo b/shells/schemesh/distinfo index 53ccdb7e806d..75b33a24c651 100644 --- a/shells/schemesh/distinfo +++ b/shells/schemesh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1746817901 -SHA256 (cosmos72-schemesh-v0.9.1_GH0.tar.gz) = a71ec0e75cc9dbbb919659ec23b6d24780b19de88b5e4a873144af816bd94c25 -SIZE (cosmos72-schemesh-v0.9.1_GH0.tar.gz) = 364008 +TIMESTAMP = 1760882709 +SHA256 (cosmos72-schemesh-v0.9.2_GH0.tar.gz) = a3b10a7428ee7d07ef465f8bbdf7797de67022ef7d83eeb92bc805046eaff946 +SIZE (cosmos72-schemesh-v0.9.2_GH0.tar.gz) = 372487 diff --git a/sysutils/cloud-nuke/Makefile b/sysutils/cloud-nuke/Makefile index 49f44ea06c57..b80771b2f2a0 100644 --- a/sysutils/cloud-nuke/Makefile +++ b/sysutils/cloud-nuke/Makefile @@ -1,6 +1,6 @@ PORTNAME= cloud-nuke DISTVERSIONPREFIX= v -DISTVERSION= 0.42.0 +DISTVERSION= 0.43.0 CATEGORIES= sysutils MAINTAINER= dutra@FreeBSD.org diff --git a/sysutils/cloud-nuke/distinfo b/sysutils/cloud-nuke/distinfo index f2f0d07dbfd6..b3383edd6899 100644 --- a/sysutils/cloud-nuke/distinfo +++ b/sysutils/cloud-nuke/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1755095727 -SHA256 (go/sysutils_cloud-nuke/cloud-nuke-v0.42.0/v0.42.0.mod) = bb2548aed285c0722b7b613407502fb54437d23d49e05209c8b06af8e9ed2d06 -SIZE (go/sysutils_cloud-nuke/cloud-nuke-v0.42.0/v0.42.0.mod) = 7297 -SHA256 (go/sysutils_cloud-nuke/cloud-nuke-v0.42.0/v0.42.0.zip) = bdd7d0d135e343ca02abeda6a782cee0a6a253439da5d81a48011a1e978ba7c4 -SIZE (go/sysutils_cloud-nuke/cloud-nuke-v0.42.0/v0.42.0.zip) = 567311 +TIMESTAMP = 1760887013 +SHA256 (go/sysutils_cloud-nuke/cloud-nuke-v0.43.0/v0.43.0.mod) = cd95fbc82f351a8ba7da31a327ca88555fb30917070f49b843dfb86223f39d9f +SIZE (go/sysutils_cloud-nuke/cloud-nuke-v0.43.0/v0.43.0.mod) = 7419 +SHA256 (go/sysutils_cloud-nuke/cloud-nuke-v0.43.0/v0.43.0.zip) = a4467934cf2558af219531976bd70bb06e49f2205e863f69f7e18aed9c48f425 +SIZE (go/sysutils_cloud-nuke/cloud-nuke-v0.43.0/v0.43.0.zip) = 592876 diff --git a/sysutils/elephant/Makefile b/sysutils/elephant/Makefile index ebd602a9a4ae..9506c76f8797 100644 --- a/sysutils/elephant/Makefile +++ b/sysutils/elephant/Makefile @@ -1,7 +1,6 @@ PORTNAME= elephant DISTVERSIONPREFIX= v -DISTVERSION= 2.1.8 -PORTREVISION= 2 +DISTVERSION= 2.2.5 CATEGORIES= sysutils MAINTAINER= tagattie@FreeBSD.org @@ -14,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= aarch64 armv7 i386 NOT_FOR_ARCHS_REASON= -buildmode=plugin not supported on these architectures -USES= go:1.25,modules +USES= go:modules GO_MODULE= github.com/abenz1267/elephant/v2 GO_TARGET= ./cmd/elephant @@ -65,7 +64,8 @@ WEBSEARCH_PLIST_FILES= etc/xdg/elephant/providers/websearch.so ENABLED_PROVIDERS= ${SELECTED_OPTIONS:NDOCS:tl} post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|; \ + s|/run/user|/var&|' \ ${GO_WRKSRC}/vendor/github.com/adrg/xdg/paths_unix.go post-build: diff --git a/sysutils/elephant/distinfo b/sysutils/elephant/distinfo index 40e71e8fc093..607bddf16aaf 100644 --- a/sysutils/elephant/distinfo +++ b/sysutils/elephant/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1760429024 -SHA256 (go/sysutils_elephant/elephant-v2.1.8/v2.1.8.mod) = 14a4b55d5d6ccd87e99494525a571abd0c17a79c426f3caeba09bd1dc3f08448 -SIZE (go/sysutils_elephant/elephant-v2.1.8/v2.1.8.mod) = 994 -SHA256 (go/sysutils_elephant/elephant-v2.1.8/v2.1.8.zip) = 8682dcd8bef3294bd5f22b13680e45d1a7ea6dedad8df39a4873b310f204e061 -SIZE (go/sysutils_elephant/elephant-v2.1.8/v2.1.8.zip) = 7135212 +TIMESTAMP = 1760870611 +SHA256 (go/sysutils_elephant/elephant-v2.2.5/v2.2.5.mod) = b058902528d9d2e309cc203e7666eb905798ce4540ffd767910d85a4c1b68824 +SIZE (go/sysutils_elephant/elephant-v2.2.5/v2.2.5.mod) = 994 +SHA256 (go/sysutils_elephant/elephant-v2.2.5/v2.2.5.zip) = 5ac7bc745950c41998c67ed83ed80e47cd0457ae7cba01e9754200bad7414735 +SIZE (go/sysutils_elephant/elephant-v2.2.5/v2.2.5.zip) = 7135910 diff --git a/sysutils/elephant/files/patch-vendor_github.com_adrg_xdg_paths__unix.go b/sysutils/elephant/files/patch-vendor_github.com_adrg_xdg_paths__unix.go index bee2e9cd1b8c..68edda2d05a5 100644 --- a/sysutils/elephant/files/patch-vendor_github.com_adrg_xdg_paths__unix.go +++ b/sysutils/elephant/files/patch-vendor_github.com_adrg_xdg_paths__unix.go @@ -1,11 +1,11 @@ ---- vendor/github.com/adrg/xdg/paths_unix.go.orig 2025-10-15 14:39:48 UTC +--- vendor/github.com/adrg/xdg/paths_unix.go.orig 2025-10-19 10:43:42 UTC +++ vendor/github.com/adrg/xdg/paths_unix.go @@ -21,7 +21,7 @@ func initBaseDirs(home string) { baseDirs.dataHome = pathutil.EnvPath(envDataHome, filepath.Join(home, ".local", "share")) baseDirs.data = pathutil.EnvPathList(envDataDirs, "/usr/local/share", "/usr/share") baseDirs.configHome = pathutil.EnvPath(envConfigHome, filepath.Join(home, ".config")) - baseDirs.config = pathutil.EnvPathList(envConfigDirs, "/etc/xdg") -+ baseDirs.config = pathutil.EnvPathList(envConfigDirs, "%%LOCALBASE%%/etc/xdg", "/etc/xdg") ++ baseDirs.config = pathutil.EnvPathList(envConfigDirs, "/usr/local/etc/xdg", "/etc/xdg") baseDirs.stateHome = pathutil.EnvPath(envStateHome, filepath.Join(home, ".local", "state")) baseDirs.cacheHome = pathutil.EnvPath(envCacheHome, filepath.Join(home, ".cache")) baseDirs.runtime = pathutil.EnvPath(envRuntimeDir, filepath.Join("/run/user", strconv.Itoa(os.Getuid()))) diff --git a/sysutils/glow/Makefile b/sysutils/glow/Makefile index ddea782744a7..2c6ab18877ed 100644 --- a/sysutils/glow/Makefile +++ b/sysutils/glow/Makefile @@ -1,10 +1,9 @@ PORTNAME= glow DISTVERSIONPREFIX= v -DISTVERSION= 1.5.1 -PORTREVISION= 19 +DISTVERSION= 2.1.1 CATEGORIES= sysutils -MAINTAINER= lcook@FreeBSD.org +MAINTAINER= dutra@FreeBSD.org COMMENT= Render markdown on the CLI, with pizzazz! WWW= https://github.com/charmbracelet/glow @@ -14,9 +13,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules _BUILD_VERSION= ${DISTVERSION} -_BUILD_SHA= ad21129 +_BUILD_SHA= d37e988 -GO_MODULE= github.com/charmbracelet/${PORTNAME} +GO_MODULE= github.com/charmbracelet/${PORTNAME}/v2 GO_BUILDFLAGS= -ldflags "\ -s -w \ -X main.Version=${_BUILD_VERSION} \ diff --git a/sysutils/glow/distinfo b/sysutils/glow/distinfo index 935f569208e4..451c6ea19c65 100644 --- a/sysutils/glow/distinfo +++ b/sysutils/glow/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1686418526 -SHA256 (go/sysutils_glow/glow-v1.5.1/v1.5.1.mod) = 030147de61efed7519b76cdc0dc8582316c22d22fddfec78301d7ab6c8fba8b8 -SIZE (go/sysutils_glow/glow-v1.5.1/v1.5.1.mod) = 836 -SHA256 (go/sysutils_glow/glow-v1.5.1/v1.5.1.zip) = 7e02931949edcdb4524f386c531e9d363d6252a20d48d42766141bc835a6b50a -SIZE (go/sysutils_glow/glow-v1.5.1/v1.5.1.zip) = 566958 +TIMESTAMP = 1760885321 +SHA256 (go/sysutils_glow/glow-v2.1.1/v2.1.1.mod) = fb1f3331cb2a113a706a6fdb4364b38283366c6f4b03d0da0c53b18888a68f81 +SIZE (go/sysutils_glow/glow-v2.1.1/v2.1.1.mod) = 3234 +SHA256 (go/sysutils_glow/glow-v2.1.1/v2.1.1.zip) = 7a5277a8e5ea76aaa9a159a0c1d0ee1f619f943b47628d4c0c124271c7421158 +SIZE (go/sysutils_glow/glow-v2.1.1/v2.1.1.zip) = 525894 diff --git a/sysutils/glow/files/patch-go.mod b/sysutils/glow/files/patch-go.mod deleted file mode 100644 index 7e802e20e733..000000000000 --- a/sysutils/glow/files/patch-go.mod +++ /dev/null @@ -1,58 +0,0 @@ ---- go.mod.orig 2023-06-10 17:46:50 UTC -+++ go.mod -@@ -1,6 +1,6 @@ - module github.com/charmbracelet/glow - --go 1.16 -+go 1.20 - - require ( - github.com/atotto/clipboard v0.1.4 -@@ -24,4 +24,47 @@ require ( - golang.org/x/sys v0.7.0 - golang.org/x/term v0.7.0 - golang.org/x/text v0.9.0 -+) -+ -+require ( -+ github.com/alecthomas/chroma v0.10.0 // indirect -+ github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect -+ github.com/aymerick/douceur v0.2.0 // indirect -+ github.com/calmh/randomart v1.1.0 // indirect -+ github.com/containerd/console v1.0.3 // indirect -+ github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect -+ github.com/dlclark/regexp2 v1.4.0 // indirect -+ github.com/fsnotify/fsnotify v1.6.0 // indirect -+ github.com/google/uuid v1.1.2 // indirect -+ github.com/gorilla/css v1.0.0 // indirect -+ github.com/hashicorp/hcl v1.0.0 // indirect -+ github.com/inconshreveable/mousetrap v1.0.1 // indirect -+ github.com/lucasb-eyer/go-colorful v1.2.0 // indirect -+ github.com/magiconair/properties v1.8.6 // indirect -+ github.com/mattn/go-isatty v0.0.18 // indirect -+ github.com/mattn/go-localereader v0.0.1 // indirect -+ github.com/microcosm-cc/bluemonday v1.0.21 // indirect -+ github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a // indirect -+ github.com/mitchellh/mapstructure v1.5.0 // indirect -+ github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect -+ github.com/muesli/cancelreader v0.2.2 // indirect -+ github.com/muesli/sasquatch v0.0.0-20200811221207-66979d92330a // indirect -+ github.com/olekukonko/tablewriter v0.0.5 // indirect -+ github.com/pelletier/go-toml v1.9.5 // indirect -+ github.com/pelletier/go-toml/v2 v2.0.5 // indirect -+ github.com/rivo/uniseg v0.2.0 // indirect -+ github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 // indirect -+ github.com/spf13/afero v1.9.2 // indirect -+ github.com/spf13/cast v1.5.0 // indirect -+ github.com/spf13/jwalterweatherman v1.1.0 // indirect -+ github.com/spf13/pflag v1.0.5 // indirect -+ github.com/subosito/gotenv v1.4.1 // indirect -+ github.com/yuin/goldmark v1.5.2 // indirect -+ github.com/yuin/goldmark-emoji v1.0.1 // indirect -+ golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect -+ golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect -+ golang.org/x/sync v0.1.0 // indirect -+ gopkg.in/ini.v1 v1.67.0 // indirect -+ gopkg.in/yaml.v2 v2.4.0 // indirect -+ gopkg.in/yaml.v3 v3.0.1 // indirect - ) diff --git a/sysutils/glow/files/patch-go.sum b/sysutils/glow/files/patch-go.sum deleted file mode 100644 index 5b7f15588374..000000000000 --- a/sysutils/glow/files/patch-go.sum +++ /dev/null @@ -1,1058 +0,0 @@ ---- go.sum.orig 2023-06-10 17:46:55 UTC -+++ go.sum -@@ -17,209 +17,48 @@ cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9v - cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= - cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= - cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= --cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= --cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= --cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= --cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= --cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= --cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= --cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= --cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= --cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= --cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= --cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= --cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= --cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= --cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= --cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= --cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= --cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= --cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= --cloud.google.com/go/analytics v0.12.0/go.mod h1:gkfj9h6XRf9+TS4bmuhPEShsh3hH8PAZzm/41OOhQd4= --cloud.google.com/go/area120 v0.5.0/go.mod h1:DE/n4mp+iqVyvxHN41Vf1CR602GiHQjFPusMFW6bGR4= --cloud.google.com/go/area120 v0.6.0/go.mod h1:39yFJqWVgm0UZqWTOdqkLhjoC7uFfgXRC8g/ZegeAh0= --cloud.google.com/go/artifactregistry v1.6.0/go.mod h1:IYt0oBPSAGYj/kprzsBjZ/4LnG/zOcHyFHjWPCi6SAQ= --cloud.google.com/go/artifactregistry v1.7.0/go.mod h1:mqTOFOnGZx8EtSqK/ZWcsm/4U8B77rbcLP6ruDU2Ixk= --cloud.google.com/go/asset v1.5.0/go.mod h1:5mfs8UvcM5wHhqtSv8J1CtxxaQq3AdBxxQi2jGW/K4o= --cloud.google.com/go/asset v1.7.0/go.mod h1:YbENsRK4+xTiL+Ofoj5Ckf+O17kJtgp3Y3nn4uzZz5s= --cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjbytpUaW0= --cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= --cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= --cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= --cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= --cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8= - cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= - cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= - cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= - cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= - cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= - cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= --cloud.google.com/go/bigquery v1.42.0/go.mod h1:8dRTJxhtG+vwBKzE5OseQn/hiydoQN3EedCaOdYmxRA= --cloud.google.com/go/billing v1.4.0/go.mod h1:g9IdKBEFlItS8bTtlrZdVLWSSdSyFUZKXNS02zKMOZY= --cloud.google.com/go/billing v1.5.0/go.mod h1:mztb1tBc3QekhjSgmpf/CV4LzWXLzCArwpLmP2Gm88s= --cloud.google.com/go/binaryauthorization v1.1.0/go.mod h1:xwnoWu3Y84jbuHa0zd526MJYmtnVXn0syOjaJgy4+dM= --cloud.google.com/go/binaryauthorization v1.2.0/go.mod h1:86WKkJHtRcv5ViNABtYMhhNWRrD1Vpi//uKEy7aYEfI= --cloud.google.com/go/cloudtasks v1.5.0/go.mod h1:fD92REy1x5woxkKEkLdvavGnPJGEn8Uic9nWuLzqCpY= --cloud.google.com/go/cloudtasks v1.6.0/go.mod h1:C6Io+sxuke9/KNRkbQpihnW93SWDU3uXt92nu85HkYI= --cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= --cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= --cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= --cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= --cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= --cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= --cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= --cloud.google.com/go/compute v1.12.0/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU= --cloud.google.com/go/compute v1.12.1/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU= --cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU= --cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM= --cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= --cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4= --cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0= --cloud.google.com/go/datacatalog v1.5.0/go.mod h1:M7GPLNQeLfWqeIm3iuiruhPzkt65+Bx8dAKvScX8jvs= --cloud.google.com/go/datacatalog v1.6.0/go.mod h1:+aEyF8JKg+uXcIdAmmaMUmZ3q1b/lKLtXCmXdnc0lbc= --cloud.google.com/go/dataflow v0.6.0/go.mod h1:9QwV89cGoxjjSR9/r7eFDqqjtvbKxAK2BaYU6PVk9UM= --cloud.google.com/go/dataflow v0.7.0/go.mod h1:PX526vb4ijFMesO1o202EaUmouZKBpjHsTlCtB4parQ= --cloud.google.com/go/dataform v0.3.0/go.mod h1:cj8uNliRlHpa6L3yVhDOBrUXH+BPAO1+KFMQQNSThKo= --cloud.google.com/go/dataform v0.4.0/go.mod h1:fwV6Y4Ty2yIFL89huYlEkwUPtS7YZinZbzzj5S9FzCE= --cloud.google.com/go/datalabeling v0.5.0/go.mod h1:TGcJ0G2NzcsXSE/97yWjIZO0bXj0KbVlINXMG9ud42I= --cloud.google.com/go/datalabeling v0.6.0/go.mod h1:WqdISuk/+WIGeMkpw/1q7bK/tFEZxsrFJOJdY2bXvTQ= --cloud.google.com/go/dataqna v0.5.0/go.mod h1:90Hyk596ft3zUQ8NkFfvICSIfHFh1Bc7C4cK3vbhkeo= --cloud.google.com/go/dataqna v0.6.0/go.mod h1:1lqNpM7rqNLVgWBJyk5NF6Uen2PHym0jtVJonplVsDA= - cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= - cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= --cloud.google.com/go/datastream v1.2.0/go.mod h1:i/uTP8/fZwgATHS/XFu0TcNUhuA0twZxxQ3EyCUQMwo= --cloud.google.com/go/datastream v1.3.0/go.mod h1:cqlOX8xlyYF/uxhiKn6Hbv6WjwPPuI9W2M9SAXwaLLQ= --cloud.google.com/go/dialogflow v1.15.0/go.mod h1:HbHDWs33WOGJgn6rfzBW1Kv807BE3O1+xGbn59zZWI4= --cloud.google.com/go/dialogflow v1.16.1/go.mod h1:po6LlzGfK+smoSmTBnbkIZY2w8ffjz/RcGSS+sh1el0= --cloud.google.com/go/dialogflow v1.17.0/go.mod h1:YNP09C/kXA1aZdBgC/VtXX74G/TKn7XVCcVumTflA+8= --cloud.google.com/go/documentai v1.7.0/go.mod h1:lJvftZB5NRiFSX4moiye1SMxHx0Bc3x1+p9e/RfXYiU= --cloud.google.com/go/documentai v1.8.0/go.mod h1:xGHNEB7CtsnySCNrCFdCyyMz44RhFEEX2Q7UD0c5IhU= --cloud.google.com/go/domains v0.6.0/go.mod h1:T9Rz3GasrpYk6mEGHh4rymIhjlnIuB4ofT1wTxDeT4Y= --cloud.google.com/go/domains v0.7.0/go.mod h1:PtZeqS1xjnXuRPKE/88Iru/LdfoRyEHYA9nFQf4UKpg= --cloud.google.com/go/edgecontainer v0.1.0/go.mod h1:WgkZ9tp10bFxqO8BLPqv2LlfmQF1X8lZqwW4r1BTajk= --cloud.google.com/go/edgecontainer v0.2.0/go.mod h1:RTmLijy+lGpQ7BXuTDa4C4ssxyXT34NIuHIgKuP4s5w= --cloud.google.com/go/firestore v1.8.0/go.mod h1:r3KB8cAdRIe8znzoPWLw8S6gpDVd9treohhn8b09424= --cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk= --cloud.google.com/go/functions v1.7.0/go.mod h1:+d+QBcWM+RsrgZfV9xo6KfA1GlzJfxcfZcRPEhDDfzg= --cloud.google.com/go/gaming v1.5.0/go.mod h1:ol7rGcxP/qHTRQE/RO4bxkXq+Fix0j6D4LFPzYTIrDM= --cloud.google.com/go/gaming v1.6.0/go.mod h1:YMU1GEvA39Qt3zWGyAVA9bpYz/yAhTvaQ1t2sK4KPUA= --cloud.google.com/go/gkeconnect v0.5.0/go.mod h1:c5lsNAg5EwAy7fkqX/+goqFsU1Da/jQFqArp+wGNr/o= --cloud.google.com/go/gkeconnect v0.6.0/go.mod h1:Mln67KyU/sHJEBY8kFZ0xTeyPtzbq9StAVvEULYK16A= --cloud.google.com/go/gkehub v0.9.0/go.mod h1:WYHN6WG8w9bXU0hqNxt8rm5uxnk8IH+lPY9J2TV7BK0= --cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y977wO+hBH0= --cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= --cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= --cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= --cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= --cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= --cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= --cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= --cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= --cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= --cloud.google.com/go/memcache v1.5.0/go.mod h1:dk3fCK7dVo0cUU2c36jKb4VqKPS22BTkf81Xq617aWM= --cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY= --cloud.google.com/go/metastore v1.6.0/go.mod h1:6cyQTls8CWXzk45G55x57DVQ9gWg7RiH65+YgPsNh9s= --cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA= --cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o= --cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ= --cloud.google.com/go/networksecurity v0.6.0/go.mod h1:Q5fjhTr9WMI5mbpRYEbiexTzROf7ZbDzvzCrNl14nyU= --cloud.google.com/go/notebooks v1.2.0/go.mod h1:9+wtppMfVPUeJ8fIWPOq1UnATHISkGXGqTkxeieQ6UY= --cloud.google.com/go/notebooks v1.3.0/go.mod h1:bFR5lj07DtCPC7YAAJ//vHskFBxA5JzYlH68kXVdk34= --cloud.google.com/go/osconfig v1.7.0/go.mod h1:oVHeCeZELfJP7XLxcBGTMBvRO+1nQ5tFG9VQTmYS2Fs= --cloud.google.com/go/osconfig v1.8.0/go.mod h1:EQqZLu5w5XA7eKizepumcvWx+m8mJUhEwiPqWiZeEdg= --cloud.google.com/go/oslogin v1.4.0/go.mod h1:YdgMXWRaElXz/lDk1Na6Fh5orF7gvmJ0FGLIs9LId4E= --cloud.google.com/go/oslogin v1.5.0/go.mod h1:D260Qj11W2qx/HVF29zBg+0fd6YCSjSqLUkY/qEenQU= --cloud.google.com/go/phishingprotection v0.5.0/go.mod h1:Y3HZknsK9bc9dMi+oE8Bim0lczMU6hrX0UpADuMefr0= --cloud.google.com/go/phishingprotection v0.6.0/go.mod h1:9Y3LBLgy0kDTcYET8ZH3bq/7qni15yVUoAxiFxnlSUA= --cloud.google.com/go/privatecatalog v0.5.0/go.mod h1:XgosMUvvPyxDjAVNDYxJ7wBW8//hLDDYmnsNcMGq1K0= --cloud.google.com/go/privatecatalog v0.6.0/go.mod h1:i/fbkZR0hLN29eEWiiwue8Pb+GforiEIBnV9yrRUOKI= - cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= - cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= - cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= - cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= --cloud.google.com/go/recaptchaenterprise v1.3.1/go.mod h1:OdD+q+y4XGeAlxRaMn1Y7/GveP6zmq76byL6tjPE7d4= --cloud.google.com/go/recaptchaenterprise/v2 v2.1.0/go.mod h1:w9yVqajwroDNTfGuhmOjPDN//rZGySaf6PtFVcSCa7o= --cloud.google.com/go/recaptchaenterprise/v2 v2.2.0/go.mod h1:/Zu5jisWGeERrd5HnlS3EUGb/D335f9k51B/FVil0jk= --cloud.google.com/go/recaptchaenterprise/v2 v2.3.0/go.mod h1:O9LwGCjrhGHBQET5CA7dd5NwwNQUErSgEDit1DLNTdo= --cloud.google.com/go/recommendationengine v0.5.0/go.mod h1:E5756pJcVFeVgaQv3WNpImkFP8a+RptV6dDLGPILjvg= --cloud.google.com/go/recommendationengine v0.6.0/go.mod h1:08mq2umu9oIqc7tDy8sx+MNJdLG0fUi3vaSVbztHgJ4= --cloud.google.com/go/recommender v1.5.0/go.mod h1:jdoeiBIVrJe9gQjwd759ecLJbxCDED4A6p+mqoqDvTg= --cloud.google.com/go/recommender v1.6.0/go.mod h1:+yETpm25mcoiECKh9DEScGzIRyDKpZ0cEhWGo+8bo+c= --cloud.google.com/go/redis v1.7.0/go.mod h1:V3x5Jq1jzUcg+UNsRvdmsfuFnit1cfe3Z/PGyq/lm4Y= --cloud.google.com/go/redis v1.8.0/go.mod h1:Fm2szCDavWzBk2cDKxrkmWBqoCiL1+Ctwq7EyqBCA/A= --cloud.google.com/go/retail v1.8.0/go.mod h1:QblKS8waDmNUhghY2TI9O3JLlFk8jybHeV4BF19FrE4= --cloud.google.com/go/retail v1.9.0/go.mod h1:g6jb6mKuCS1QKnH/dpu7isX253absFl6iE92nHwlBUY= --cloud.google.com/go/scheduler v1.4.0/go.mod h1:drcJBmxF3aqZJRhmkHQ9b3uSSpQoltBPGPxGAWROx6s= --cloud.google.com/go/scheduler v1.5.0/go.mod h1:ri073ym49NW3AfT6DZi21vLZrG07GXr5p3H1KxN5QlI= --cloud.google.com/go/secretmanager v1.6.0/go.mod h1:awVa/OXF6IiyaU1wQ34inzQNc4ISIDIrId8qE5QGgKA= --cloud.google.com/go/security v1.5.0/go.mod h1:lgxGdyOKKjHL4YG3/YwIL2zLqMFCKs0UbQwgyZmfJl4= --cloud.google.com/go/security v1.7.0/go.mod h1:mZklORHl6Bg7CNnnjLH//0UlAlaXqiG7Lb9PsPXLfD0= --cloud.google.com/go/security v1.8.0/go.mod h1:hAQOwgmaHhztFhiQ41CjDODdWP0+AE1B3sX4OFlq+GU= --cloud.google.com/go/securitycenter v1.13.0/go.mod h1:cv5qNAqjY84FCN6Y9z28WlkKXyWsgLO832YiWwkCWcU= --cloud.google.com/go/securitycenter v1.14.0/go.mod h1:gZLAhtyKv85n52XYWt6RmeBdydyxfPeTrpToDPw4Auc= --cloud.google.com/go/servicedirectory v1.4.0/go.mod h1:gH1MUaZCgtP7qQiI+F+A+OpeKF/HQWgtAddhTbhL2bs= --cloud.google.com/go/servicedirectory v1.5.0/go.mod h1:QMKFL0NUySbpZJ1UZs3oFAmdvVxhhxB6eJ/Vlp73dfg= --cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM= --cloud.google.com/go/speech v1.7.0/go.mod h1:KptqL+BAQIhMsj1kOP2la5DSEEerPDuOP/2mmkhHhZQ= - cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= - cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= - cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= - cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= - cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= - cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= --cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= --cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= --cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= --cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= --cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= --cloud.google.com/go/videointelligence v1.7.0/go.mod h1:k8pI/1wAhjznARtVT9U1llUaFNPh7muw8QyOUpavru4= --cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0= --cloud.google.com/go/vision/v2 v2.2.0/go.mod h1:uCdV4PpN1S0jyCyq8sIM42v2Y6zOLkZs+4R9LrGYwFo= --cloud.google.com/go/vision/v2 v2.3.0/go.mod h1:UO61abBx9QRMFkNBbf1D8B1LXdS2cGiiCRx0vSpZoUo= --cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xXZmFiHmGE= --cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg= --cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0= --cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= - dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= - github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= - github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= --github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= - github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= - github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek= - github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s= - github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= --github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= - github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= --github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= --github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= --github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= --github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= - github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= --github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= --github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= --github.com/armon/go-metrics v0.4.0/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= --github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= --github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= - github.com/atotto/clipboard v0.1.2/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= - github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= - github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= - github.com/aymanbagabas/go-osc52 v1.0.3/go.mod h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4= --github.com/aymanbagabas/go-osc52 v1.2.1 h1:q2sWUyDcozPLcLabEMd+a+7Ea2DitxZVN9hTxab9L4E= - github.com/aymanbagabas/go-osc52 v1.2.1/go.mod h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4= - github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= - github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= - github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= - github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= --github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= - github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= - github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= --github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= --github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= - github.com/calmh/randomart v1.1.0 h1:evl+iwc10LXtHdMZhzLxmsCQVmWnkXs44SbC6Uk0Il8= - github.com/calmh/randomart v1.1.0/go.mod h1:DQUbPVyP+7PAs21w/AnfMKG5NioxS3TbZ2F9MSK/jFM= - github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= - github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= --github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= - github.com/charmbracelet/bubbles v0.7.5/go.mod h1:IRTORFvhEI6OUH7WhN2Ks8Z8miNGimk1BE6cmHijOkM= - github.com/charmbracelet/bubbles v0.15.0 h1:c5vZ3woHV5W2b8YZI1q7v4ZNQaPetfHuoHzx+56Z6TI= - github.com/charmbracelet/bubbles v0.15.0/go.mod h1:Y7gSFbBzlMpUDR/XM9MhZI374Q+1p1kluf1uLl8iK74= -@@ -237,31 +76,20 @@ github.com/charmbracelet/lipgloss v0.6.0/go.mod h1:tHh - github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= - github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= - github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= --github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= --github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= - github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= - github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= - github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= - github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= --github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= --github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= - github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= - github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= - github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= - github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= - github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= - github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= --github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= - github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= --github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= - github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= - github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= - github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= --github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= - github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= - github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= - github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -@@ -270,7 +98,6 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod - github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= - github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E= - github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= --github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= - github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac h1:opbrjaN/L8gg6Xh5D04Tem+8xVcz6ajZlGCs49mQgyg= - github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= - github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -@@ -278,16 +105,8 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.201910 - github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= - github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= - github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= --github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= --github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= --github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= --github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= - github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= --github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= --github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= --github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= - github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= --github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= - github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= - github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= - github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -@@ -296,22 +115,16 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62 - github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= - github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= - github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= --github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= --github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= - github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= - github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= --github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= - github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= --github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= - github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= - github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= --github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= - github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= - github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= - github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= - github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= - github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= --github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= - github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= - github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= - github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -@@ -319,8 +132,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+ - github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= - github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= - github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= --github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= --github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= - github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= - github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= - github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -@@ -335,10 +146,6 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbY - github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= - github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= - github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= --github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= --github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= --github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= --github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= - github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= - github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= - github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -@@ -349,20 +156,12 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kI - github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= - github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= - github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= - github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= --github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= - github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= --github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= --github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= - github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f/go.mod h1:nOFQdrUlIlx6M6ODdSpBj1NVA+VgLC6kmw60mkw34H4= - github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= - github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= - github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= --github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= - github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= - github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= - github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -@@ -373,29 +172,12 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d864 - github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= - github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= - github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= - github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= - github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -+github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= - github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= --github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= --github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= --github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= --github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= --github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= - github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= - github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= --github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= --github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= --github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= --github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= --github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= --github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo= --github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= --github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= - github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= - github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY= - github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c= -@@ -403,75 +185,29 @@ github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m - github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= - github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= - github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= --github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= --github.com/hashicorp/consul/api v1.15.3/go.mod h1:/g/qgcoBcEXALCNZgRRisyTW0nY86++L0KbeAMXYCeY= --github.com/hashicorp/consul/sdk v0.11.0/go.mod h1:yPkX5Q6CsxTFMjQQDJwzeNmUUF5NUGGbrDsv9wTb8cw= --github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= --github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= --github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= --github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= --github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= --github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= --github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= --github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= --github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= --github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= --github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= --github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= --github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= --github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= --github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= --github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= --github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= --github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= --github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= --github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= --github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= --github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= --github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= - github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= - github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= --github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= - github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= - github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= --github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= --github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= --github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= --github.com/hashicorp/memberlist v0.3.1/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= --github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= --github.com/hashicorp/serf v0.9.8/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= - github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= - github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= - github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= - github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= - github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= - github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= --github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= --github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= --github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= --github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= --github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= --github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= - github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= - github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= - github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= --github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= - github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= --github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= - github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= - github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= --github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= - github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= - github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= - github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= --github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= --github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= - github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= --github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= - github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= - github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= - github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= --github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= - github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= - github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= - github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= -@@ -480,15 +216,6 @@ github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4 - github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= - github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= - github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= --github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= --github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= --github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= --github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= --github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= --github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= --github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= --github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= --github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= - github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= - github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= - github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -@@ -509,25 +236,13 @@ github.com/meowgorithm/babyenv v1.3.1 h1:18ZEYIgbzoFQf - github.com/meowgorithm/babyenv v1.3.1/go.mod h1:lwNX+J6AGBFqNrMZ2PTLkM6SO+W4X8DOg9zBDO4j3Ig= - github.com/microcosm-cc/bluemonday v1.0.21 h1:dNH3e4PSyE4vNX+KlRGHT5KrSvjeUkoNPwEORjffHJg= - github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM= --github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= --github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= - github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a h1:eU8j/ClY2Ty3qdHnn0TyW3ivFoPC/0F1gQZz8yTxbbE= - github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a/go.mod h1:v8eSC2SMp9/7FTKUncp7fH9IwPfw+ysMObcEz5FWheQ= --github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= --github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= - github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= - github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= --github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= --github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= - github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= --github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= - github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= - github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= --github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= --github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= --github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= --github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= --github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= - github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b h1:1XF24mVaiu7u+CFywTdcDo2ie1pzzhwjt6RHqzpMU34= - github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho= - github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA= -@@ -550,72 +265,45 @@ github.com/muesli/termenv v0.14.0/go.mod h1:kG/pF1E7fh - github.com/muesli/termenv v0.15.1 h1:UzuTb/+hhlBugQz28rpzey4ZuKcZ03MeKsoG7IJZIxs= - github.com/muesli/termenv v0.15.1/go.mod h1:HeAQPTzpfs016yGtA4g00CsdYnVLJvxsS4ANqrZs2sQ= - github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= --github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= - github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= - github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= - github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= --github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= --github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= - github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= - github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= - github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= - github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= - github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= - github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= --github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= - github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= - github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= - github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= - github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= --github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= --github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= - github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= - github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= --github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= --github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= --github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= --github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= - github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= - github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= - github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= --github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= - github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= - github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= --github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= --github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= --github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= --github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= - github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= - github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= --github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= --github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= --github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= --github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= - github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= - github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= - github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= - github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= - github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= --github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= - github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= - github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= --github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= - github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= - github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= --github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= --github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= - github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 h1:G04eS0JkAIVZfaJLjla9dNxkJCPiKIGZlw9AfOhzOD0= - github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94/go.mod h1:b18R55ulyQ/h3RaWyloPyER7fWQVZvimKKhnI5OfrJQ= --github.com/sagikazarmark/crypt v0.8.0/go.mod h1:TmKwZAo97S4Fy4sfMH/HX/cQP5D+ijra2NyLpNNmttY= - github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI= - github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y= --github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= - github.com/segmentio/ksuid v1.0.4 h1:sBo2BdShXjmcugAMwjugoGUdUV0pcxY5mW4xKRn3v4c= - github.com/segmentio/ksuid v1.0.4/go.mod h1:/XUiZBD3kVx5SmUOl55voK5yeAbBNNIed+2O73XgrPE= - github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= - github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= --github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= --github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= - github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= - github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= - github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -@@ -639,22 +327,17 @@ github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3Fdv - github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= - github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= - github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= --github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= - github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= --github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= - github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= - github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= - github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= - github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= - github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= --github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= - github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= - github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= --github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= - github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= - github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= - github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= --github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= - github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= - github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= - github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -@@ -662,47 +345,30 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVA - github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= - github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= - github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= --github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= --github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= - github.com/yuin/goldmark v1.5.2 h1:ALmeCk/px5FSm1MAcFBAsVKZjDuMVj8Tm7FFIlMJnqU= - github.com/yuin/goldmark v1.5.2/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= - github.com/yuin/goldmark-emoji v1.0.1 h1:ctuWEyzGBwiucEqxzwe0SOYDXPAucOrE9NQC18Wa1os= - github.com/yuin/goldmark-emoji v1.0.1/go.mod h1:2w1E6FEWLcDQkoTE+7HU6QF1F6SLlNGjRIBbIZQFqkQ= - go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= --go.etcd.io/etcd/api/v3 v3.5.5/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8= --go.etcd.io/etcd/client/pkg/v3 v3.5.5/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ= --go.etcd.io/etcd/client/v2 v2.305.5/go.mod h1:zQjKllfqfBVyVStbt4FaosoX2iYd8fV/GRy/PbowgP4= --go.etcd.io/etcd/client/v3 v3.5.5/go.mod h1:aApjR4WGlSumpnJ2kloS75h6aHUmAyaPLjHMxpc7E7c= - go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= - go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= - go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= - go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= - go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= - go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= --go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= --go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= - go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= --go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= --go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= --go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= - go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= --go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= --go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= - go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= --go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= --go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= - golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= - golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= - golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= - golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= --golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= - golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= - golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= - golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= - golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= - golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= - golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= --golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= - golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= - golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= - golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -@@ -729,7 +395,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/g - golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= - golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= - golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= --golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= - golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= - golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= - golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -@@ -740,9 +405,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3 - golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= - golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= - golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= --golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= --golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= --golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= - golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= - golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= - golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -@@ -755,11 +417,9 @@ golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go - golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= - golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= - golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= --golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= - golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= - golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= - golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= - golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= - golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= - golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -@@ -776,31 +436,12 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go - golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= - golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= - golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= --golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= - golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= - golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= --golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= - golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= --golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= --golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= --golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= --golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= --golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= --golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= --golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= --golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= --golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= --golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= --golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= --golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= --golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= --golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= --golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= --golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= - golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU= - golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= --golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= --golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= - golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= - golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= - golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -@@ -810,21 +451,6 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 - golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= - golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= - golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= --golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= --golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= --golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= --golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= --golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= --golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= --golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= - golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= - golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= - golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -@@ -835,35 +461,23 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/g - golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= - golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= - golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= - golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= - golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= - golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= - golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= - golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= - golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= - golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= --golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= - golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -@@ -877,8 +491,6 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go - golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -@@ -890,53 +502,19 @@ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go - golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= - golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= --golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= - golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ= - golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= - golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -@@ -945,17 +523,12 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 - golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= - golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= - golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= --golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= --golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= - golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= --golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= --golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= - golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= - golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= - golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= - golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= - golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= --golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= - golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= - golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= - golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -@@ -970,7 +543,6 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/ - golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= - golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= - golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= - golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= - golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= - golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -@@ -995,7 +567,6 @@ golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/ - golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= - golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= - golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= --golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= - golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= - golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= - golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -@@ -1004,24 +575,12 @@ golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/ - golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= - golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= - golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= --golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= - golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= - golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= --golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= --golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= --golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= --golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= --golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= --golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= --golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= - golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= - golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= - golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= --golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= --golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= --golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= --golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= - google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= - google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= - google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -@@ -1041,36 +600,6 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiU - google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= - google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= - google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= --google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= --google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= --google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= --google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= --google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= --google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= --google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= --google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= --google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= --google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= --google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= --google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= --google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= --google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= --google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= --google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= --google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= --google.golang.org/api v0.77.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= --google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= --google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= --google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= --google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g= --google.golang.org/api v0.90.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= --google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= --google.golang.org/api v0.95.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI= --google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= --google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= --google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= --google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= --google.golang.org/api v0.102.0/go.mod h1:3VFl6/fzoA+qNuS1N1/VfXY4LjoXN/wzeIp7TweWwGo= - google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= - google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= - google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -@@ -1101,7 +630,6 @@ google.golang.org/genproto v0.0.0-20200312145019-da687 - google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= - google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= - google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= --google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= - google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= - google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= - google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -@@ -1114,73 +642,7 @@ google.golang.org/genproto v0.0.0-20201201144952-b05cb - google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= - google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= - google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= - google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= --google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= --google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= --google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= --google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= --google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= --google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= --google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= --google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= --google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= --google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= --google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= --google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= --google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= --google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= --google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= --google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= --google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= --google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= --google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= --google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= --google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= --google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= --google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= --google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= --google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= --google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= --google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= --google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= --google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= --google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= --google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= --google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= --google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= --google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= --google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= --google.golang.org/genproto v0.0.0-20220722212130-b98a9ff5e252/go.mod h1:GkXuJDJ6aQ7lnJcRF+SJVgFdQhypqgl3LB1C9vabdRE= --google.golang.org/genproto v0.0.0-20220801145646-83ce21fca29f/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc= --google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= --google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= --google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= --google.golang.org/genproto v0.0.0-20220829144015-23454907ede3/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= --google.golang.org/genproto v0.0.0-20220829175752-36a9c930ecbf/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= --google.golang.org/genproto v0.0.0-20220913154956-18f8339a66a5/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= --google.golang.org/genproto v0.0.0-20220914142337-ca0e39ece12f/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= --google.golang.org/genproto v0.0.0-20220915135415-7fd63a7952de/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= --google.golang.org/genproto v0.0.0-20220916172020-2692e8806bfa/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= --google.golang.org/genproto v0.0.0-20220919141832-68c03719ef51/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= --google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006/go.mod h1:ht8XFiar2npT/g4vkk7O0WYS1sHOHbdujxbEp7CJWbw= --google.golang.org/genproto v0.0.0-20220926165614-551eb538f295/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI= --google.golang.org/genproto v0.0.0-20220926220553-6981cbe3cfce/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI= --google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U= --google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= --google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= --google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= - google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= - google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= - google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -@@ -1195,30 +657,9 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACW - google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= - google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= - google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= --google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= - google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= - google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= - google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= --google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= --google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= --google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= --google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= --google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= --google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= --google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= --google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= --google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= --google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= --google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= --google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= --google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= --google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= --google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= --google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= --google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= --google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= --google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= --google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= - google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= - google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= - google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -@@ -1229,16 +670,10 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh - google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= - google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= - google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= --google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= --google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= --google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= --google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= --google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= - gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= - gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= --gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= --gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= - gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= - gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= - gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -@@ -1246,15 +681,9 @@ gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML87 - gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= - gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= - gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= --gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= --gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= --gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= --gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= --gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= - gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= - gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= --gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= - gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= - gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= - honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -@@ -1267,4 +696,3 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W - rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= - rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= - rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= --sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/sysutils/glow/files/patch-vendor_modules.txt b/sysutils/glow/files/patch-vendor_modules.txt deleted file mode 100644 index 4e30361e92f7..000000000000 --- a/sysutils/glow/files/patch-vendor_modules.txt +++ /dev/null @@ -1,260 +0,0 @@ ---- vendor/modules.txt.orig 2023-06-10 17:47:07 UTC -+++ vendor/modules.txt -@@ -1,4 +1,5 @@ - # github.com/alecthomas/chroma v0.10.0 -+## explicit; go 1.13 - github.com/alecthomas/chroma - github.com/alecthomas/chroma/formatters - github.com/alecthomas/chroma/formatters/html -@@ -37,14 +38,17 @@ github.com/alecthomas/chroma/styles - ## explicit - github.com/atotto/clipboard - # github.com/aymanbagabas/go-osc52/v2 v2.0.1 -+## explicit; go 1.16 - github.com/aymanbagabas/go-osc52/v2 - # github.com/aymerick/douceur v0.2.0 -+## explicit - github.com/aymerick/douceur/css - github.com/aymerick/douceur/parser - # github.com/calmh/randomart v1.1.0 -+## explicit - github.com/calmh/randomart - # github.com/charmbracelet/bubbles v0.15.0 --## explicit -+## explicit; go 1.13 - github.com/charmbracelet/bubbles/cursor - github.com/charmbracelet/bubbles/key - github.com/charmbracelet/bubbles/paginator -@@ -53,37 +57,44 @@ github.com/charmbracelet/bubbles/spinner - github.com/charmbracelet/bubbles/textinput - github.com/charmbracelet/bubbles/viewport - # github.com/charmbracelet/bubbletea v0.23.2 --## explicit -+## explicit; go 1.16 - github.com/charmbracelet/bubbletea - # github.com/charmbracelet/charm v0.8.7 --## explicit -+## explicit; go 1.13 - github.com/charmbracelet/charm - github.com/charmbracelet/charm/keygen - github.com/charmbracelet/charm/ui/common - # github.com/charmbracelet/glamour v0.6.0 --## explicit -+## explicit; go 1.13 - github.com/charmbracelet/glamour - github.com/charmbracelet/glamour/ansi - # github.com/charmbracelet/lipgloss v0.6.0 --## explicit -+## explicit; go 1.15 - github.com/charmbracelet/lipgloss - # github.com/containerd/console v1.0.3 -+## explicit; go 1.13 - github.com/containerd/console - # github.com/dgrijalva/jwt-go v3.2.0+incompatible -+## explicit - github.com/dgrijalva/jwt-go - # github.com/dlclark/regexp2 v1.4.0 -+## explicit - github.com/dlclark/regexp2 - github.com/dlclark/regexp2/syntax - # github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac - ## explicit - github.com/dustin/go-humanize - # github.com/fsnotify/fsnotify v1.6.0 -+## explicit; go 1.16 - github.com/fsnotify/fsnotify --# github.com/google/uuid v1.3.0 -+# github.com/google/uuid v1.1.2 -+## explicit - github.com/google/uuid - # github.com/gorilla/css v1.0.0 -+## explicit - github.com/gorilla/css/scanner - # github.com/hashicorp/hcl v1.0.0 -+## explicit - github.com/hashicorp/hcl - github.com/hashicorp/hcl/hcl/ast - github.com/hashicorp/hcl/hcl/parser -@@ -95,44 +106,54 @@ github.com/hashicorp/hcl/json/parser - github.com/hashicorp/hcl/json/scanner - github.com/hashicorp/hcl/json/token - # github.com/inconshreveable/mousetrap v1.0.1 -+## explicit; go 1.18 - github.com/inconshreveable/mousetrap - # github.com/lucasb-eyer/go-colorful v1.2.0 -+## explicit; go 1.12 - github.com/lucasb-eyer/go-colorful - # github.com/magiconair/properties v1.8.6 -+## explicit; go 1.13 - github.com/magiconair/properties - # github.com/mattn/go-isatty v0.0.18 -+## explicit; go 1.15 - github.com/mattn/go-isatty - # github.com/mattn/go-localereader v0.0.1 -+## explicit - github.com/mattn/go-localereader - # github.com/mattn/go-runewidth v0.0.14 --## explicit -+## explicit; go 1.9 - github.com/mattn/go-runewidth - # github.com/meowgorithm/babyenv v1.3.1 --## explicit -+## explicit; go 1.13 - github.com/meowgorithm/babyenv - # github.com/microcosm-cc/bluemonday v1.0.21 -+## explicit; go 1.19 - github.com/microcosm-cc/bluemonday - github.com/microcosm-cc/bluemonday/css - # github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a -+## explicit - github.com/mikesmitty/edkey - # github.com/mitchellh/go-homedir v1.1.0 - ## explicit - github.com/mitchellh/go-homedir - # github.com/mitchellh/mapstructure v1.5.0 -+## explicit; go 1.14 - github.com/mitchellh/mapstructure - # github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b -+## explicit; go 1.17 - github.com/muesli/ansi - github.com/muesli/ansi/compressor - # github.com/muesli/cancelreader v0.2.2 -+## explicit; go 1.17 - github.com/muesli/cancelreader - # github.com/muesli/gitcha v0.2.0 --## explicit -+## explicit; go 1.14 - github.com/muesli/gitcha - # github.com/muesli/go-app-paths v0.2.2 --## explicit -+## explicit; go 1.14 - github.com/muesli/go-app-paths - # github.com/muesli/reflow v0.3.0 --## explicit -+## explicit; go 1.13 - github.com/muesli/reflow/ansi - github.com/muesli/reflow/indent - github.com/muesli/reflow/padding -@@ -140,45 +161,55 @@ github.com/muesli/reflow/truncate - github.com/muesli/reflow/wordwrap - github.com/muesli/reflow/wrap - # github.com/muesli/sasquatch v0.0.0-20200811221207-66979d92330a -+## explicit; go 1.14 - github.com/muesli/sasquatch - github.com/muesli/sasquatch/stream - # github.com/muesli/termenv v0.15.1 --## explicit -+## explicit; go 1.17 - github.com/muesli/termenv - # github.com/olekukonko/tablewriter v0.0.5 -+## explicit; go 1.12 - github.com/olekukonko/tablewriter - # github.com/pelletier/go-toml v1.9.5 -+## explicit; go 1.12 - github.com/pelletier/go-toml - # github.com/pelletier/go-toml/v2 v2.0.5 -+## explicit; go 1.16 - github.com/pelletier/go-toml/v2 - github.com/pelletier/go-toml/v2/internal/ast - github.com/pelletier/go-toml/v2/internal/danger - github.com/pelletier/go-toml/v2/internal/tracker - # github.com/rivo/uniseg v0.2.0 -+## explicit; go 1.12 - github.com/rivo/uniseg - # github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 -+## explicit - github.com/sabhiram/go-gitignore - # github.com/sahilm/fuzzy v0.1.0 - ## explicit - github.com/sahilm/fuzzy - # github.com/segmentio/ksuid v1.0.4 --## explicit -+## explicit; go 1.12 - github.com/segmentio/ksuid - # github.com/spf13/afero v1.9.2 -+## explicit; go 1.16 - github.com/spf13/afero - github.com/spf13/afero/internal/common - github.com/spf13/afero/mem - # github.com/spf13/cast v1.5.0 -+## explicit; go 1.18 - github.com/spf13/cast - # github.com/spf13/cobra v1.6.1 --## explicit -+## explicit; go 1.15 - github.com/spf13/cobra - # github.com/spf13/jwalterweatherman v1.1.0 -+## explicit - github.com/spf13/jwalterweatherman - # github.com/spf13/pflag v1.0.5 -+## explicit; go 1.12 - github.com/spf13/pflag - # github.com/spf13/viper v1.14.0 --## explicit -+## explicit; go 1.17 - github.com/spf13/viper - github.com/spf13/viper/internal/encoding - github.com/spf13/viper/internal/encoding/dotenv -@@ -189,8 +220,10 @@ github.com/spf13/viper/internal/encoding/json - github.com/spf13/viper/internal/encoding/toml - github.com/spf13/viper/internal/encoding/yaml - # github.com/subosito/gotenv v1.4.1 -+## explicit; go 1.18 - github.com/subosito/gotenv - # github.com/yuin/goldmark v1.5.2 -+## explicit; go 1.18 - github.com/yuin/goldmark - github.com/yuin/goldmark/ast - github.com/yuin/goldmark/extension -@@ -201,10 +234,12 @@ github.com/yuin/goldmark/renderer/html - github.com/yuin/goldmark/text - github.com/yuin/goldmark/util - # github.com/yuin/goldmark-emoji v1.0.1 -+## explicit; go 1.15 - github.com/yuin/goldmark-emoji - github.com/yuin/goldmark-emoji/ast - github.com/yuin/goldmark-emoji/definition - # golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e -+## explicit; go 1.17 - golang.org/x/crypto/blowfish - golang.org/x/crypto/chacha20 - golang.org/x/crypto/chacha20poly1305 -@@ -221,29 +256,34 @@ golang.org/x/crypto/ssh - golang.org/x/crypto/ssh/agent - golang.org/x/crypto/ssh/internal/bcrypt_pbkdf - golang.org/x/crypto/ssh/terminal --# golang.org/x/net v0.6.0 -+# golang.org/x/net v0.0.0-20221014081412-f15817d10f9b -+## explicit; go 1.17 - golang.org/x/net/html - golang.org/x/net/html/atom - # golang.org/x/sync v0.1.0 -+## explicit - golang.org/x/sync/errgroup - # golang.org/x/sys v0.7.0 --## explicit -+## explicit; go 1.17 - golang.org/x/sys/cpu - golang.org/x/sys/internal/unsafeheader - golang.org/x/sys/plan9 - golang.org/x/sys/unix - golang.org/x/sys/windows - # golang.org/x/term v0.7.0 --## explicit -+## explicit; go 1.17 - golang.org/x/term - # golang.org/x/text v0.9.0 --## explicit -+## explicit; go 1.17 - golang.org/x/text/runes - golang.org/x/text/transform - golang.org/x/text/unicode/norm - # gopkg.in/ini.v1 v1.67.0 -+## explicit - gopkg.in/ini.v1 - # gopkg.in/yaml.v2 v2.4.0 -+## explicit; go 1.15 - gopkg.in/yaml.v2 - # gopkg.in/yaml.v3 v3.0.1 -+## explicit - gopkg.in/yaml.v3 diff --git a/sysutils/zli/Makefile b/sysutils/zli/Makefile index b77393ffee9d..7403cd6e6b80 100644 --- a/sysutils/zli/Makefile +++ b/sysutils/zli/Makefile @@ -1,6 +1,6 @@ PORTNAME= zli DISTVERSIONPREFIX=v -DISTVERSION= 2.1.9 +DISTVERSION= 2.1.10 CATEGORIES= sysutils MAINTAINER= decke@FreeBSD.org diff --git a/sysutils/zli/distinfo b/sysutils/zli/distinfo index b7531819d91e..8c44120a979c 100644 --- a/sysutils/zli/distinfo +++ b/sysutils/zli/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1760815146 -SHA256 (go/sysutils_zli/project-zot-zot-v2.1.9_GH0/go.mod) = 16a3206d5855b69441896502dc240128b08b162d74f9ed921439b84f596c11d2 -SIZE (go/sysutils_zli/project-zot-zot-v2.1.9_GH0/go.mod) = 29847 -SHA256 (go/sysutils_zli/project-zot-zot-v2.1.9_GH0/project-zot-zot-v2.1.9_GH0.tar.gz) = 9f65945276c28c0e3dfa55a65853d5552baa0e2451de6e9faaf78527da514e0b -SIZE (go/sysutils_zli/project-zot-zot-v2.1.9_GH0/project-zot-zot-v2.1.9_GH0.tar.gz) = 1234286 +TIMESTAMP = 1760874105 +SHA256 (go/sysutils_zli/project-zot-zot-v2.1.10_GH0/go.mod) = d07432ed62c44d742215422e7f1781222ecc7ba809b1474be712d8f46f76fb8b +SIZE (go/sysutils_zli/project-zot-zot-v2.1.10_GH0/go.mod) = 29888 +SHA256 (go/sysutils_zli/project-zot-zot-v2.1.10_GH0/project-zot-zot-v2.1.10_GH0.tar.gz) = 632ad263c0a7b3b45829c0b32f775e7591c58d382b23bb72eb26f1f4567917f7 +SIZE (go/sysutils_zli/project-zot-zot-v2.1.10_GH0/project-zot-zot-v2.1.10_GH0.tar.gz) = 1256153 diff --git a/sysutils/zot/Makefile b/sysutils/zot/Makefile index 0c60ebc22462..ca530c82a6b7 100644 --- a/sysutils/zot/Makefile +++ b/sysutils/zot/Makefile @@ -1,6 +1,6 @@ PORTNAME= zot DISTVERSIONPREFIX=v -DISTVERSION= 2.1.9 +DISTVERSION= 2.1.10 CATEGORIES= sysutils MAINTAINER= decke@FreeBSD.org diff --git a/sysutils/zot/distinfo b/sysutils/zot/distinfo index 9880c11b2e2f..b54f1dd21457 100644 --- a/sysutils/zot/distinfo +++ b/sysutils/zot/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1760816255 -SHA256 (go/sysutils_zot/project-zot-zot-v2.1.9_GH0/go.mod) = 16a3206d5855b69441896502dc240128b08b162d74f9ed921439b84f596c11d2 -SIZE (go/sysutils_zot/project-zot-zot-v2.1.9_GH0/go.mod) = 29847 -SHA256 (go/sysutils_zot/project-zot-zot-v2.1.9_GH0/project-zot-zot-v2.1.9_GH0.tar.gz) = 9f65945276c28c0e3dfa55a65853d5552baa0e2451de6e9faaf78527da514e0b -SIZE (go/sysutils_zot/project-zot-zot-v2.1.9_GH0/project-zot-zot-v2.1.9_GH0.tar.gz) = 1234286 +TIMESTAMP = 1760874367 +SHA256 (go/sysutils_zot/project-zot-zot-v2.1.10_GH0/go.mod) = d07432ed62c44d742215422e7f1781222ecc7ba809b1474be712d8f46f76fb8b +SIZE (go/sysutils_zot/project-zot-zot-v2.1.10_GH0/go.mod) = 29888 +SHA256 (go/sysutils_zot/project-zot-zot-v2.1.10_GH0/project-zot-zot-v2.1.10_GH0.tar.gz) = 632ad263c0a7b3b45829c0b32f775e7591c58d382b23bb72eb26f1f4567917f7 +SIZE (go/sysutils_zot/project-zot-zot-v2.1.10_GH0/project-zot-zot-v2.1.10_GH0.tar.gz) = 1256153 diff --git a/textproc/py-jiter/Makefile b/textproc/py-jiter/Makefile index 0f01f69182a5..b0d5ed44751d 100644 --- a/textproc/py-jiter/Makefile +++ b/textproc/py-jiter/Makefile @@ -1,6 +1,5 @@ PORTNAME= jiter -DISTVERSION= 0.11.0 -PORTREVISION= 1 +DISTVERSION= 0.11.1 CATEGORIES= textproc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -21,6 +20,8 @@ USE_PYTHON= autoplist pep517 CARGO_BUILD= no CARGO_INSTALL= no +MAKE_ENV= ${CARGO_ENV} + BINARY_ALIAS= python3=${PYTHON_CMD} PORTDOCS= README.md diff --git a/textproc/py-jiter/Makefile.crates b/textproc/py-jiter/Makefile.crates index 2b99eccfeb1d..0373002115b5 100644 --- a/textproc/py-jiter/Makefile.crates +++ b/textproc/py-jiter/Makefile.crates @@ -1,20 +1,20 @@ CARGO_CRATES= ahash-0.8.12 \ aho-corasick-1.1.3 \ anes-0.1.6 \ - anstyle-1.0.11 \ + anstyle-1.0.13 \ arbitrary-1.4.2 \ autocfg-1.5.0 \ bitvec-1.0.1 \ bumpalo-3.19.0 \ cast-0.3.0 \ - cc-1.2.37 \ - cfg-if-1.0.3 \ + cc-1.2.41 \ + cfg-if-1.0.4 \ ciborium-0.2.2 \ ciborium-io-0.2.2 \ ciborium-ll-0.2.2 \ - clap-4.5.47 \ - clap_builder-4.5.47 \ - clap_lex-0.7.5 \ + clap-4.5.49 \ + clap_builder-4.5.49 \ + clap_lex-0.7.6 \ codspeed-2.10.1 \ codspeed-criterion-compat-2.10.1 \ codspeed-criterion-compat-walltime-2.10.1 \ @@ -26,28 +26,28 @@ CARGO_CRATES= ahash-0.8.12 \ crunchy-0.2.4 \ either-1.15.0 \ equivalent-1.0.2 \ - find-msvc-tools-0.1.1 \ + find-msvc-tools-0.1.4 \ funty-2.0.0 \ - getrandom-0.3.3 \ - half-2.6.0 \ - hashbrown-0.15.5 \ + getrandom-0.3.4 \ + half-2.7.1 \ + hashbrown-0.16.0 \ heck-0.5.0 \ hermit-abi-0.5.2 \ - indexmap-2.11.1 \ + indexmap-2.11.4 \ indoc-2.0.6 \ is-terminal-0.4.16 \ itertools-0.10.5 \ itoa-1.0.15 \ jobserver-0.1.34 \ - js-sys-0.3.78 \ + js-sys-0.3.81 \ lazy_static-1.5.0 \ - lexical-parse-float-1.0.5 \ - lexical-parse-integer-1.0.5 \ - lexical-util-1.0.6 \ - libc-0.2.175 \ + lexical-parse-float-1.0.6 \ + lexical-parse-integer-1.0.6 \ + lexical-util-1.0.7 \ + libc-0.2.177 \ libfuzzer-sys-0.4.10 \ log-0.4.28 \ - memchr-2.7.5 \ + memchr-2.7.6 \ memoffset-0.9.1 \ num-bigint-0.4.6 \ num-integer-0.1.46 \ @@ -66,24 +66,23 @@ CARGO_CRATES= ahash-0.8.12 \ pyo3-macros-0.26.0 \ pyo3-macros-backend-0.26.0 \ python3-dll-a-0.2.14 \ - quote-1.0.40 \ + quote-1.0.41 \ r-efi-5.3.0 \ radium-0.7.0 \ rayon-1.11.0 \ rayon-core-1.13.0 \ - regex-1.11.2 \ - regex-automata-0.4.10 \ - regex-syntax-0.8.6 \ + regex-1.12.2 \ + regex-automata-0.4.13 \ + regex-syntax-0.8.8 \ rustversion-1.0.22 \ ryu-1.0.20 \ same-file-1.0.6 \ - serde-1.0.223 \ - serde_core-1.0.223 \ - serde_derive-1.0.223 \ + serde-1.0.228 \ + serde_core-1.0.228 \ + serde_derive-1.0.228 \ serde_json-1.0.145 \ shlex-1.3.0 \ smallvec-1.15.1 \ - static_assertions-1.1.0 \ syn-2.0.106 \ tap-1.0.1 \ target-lexicon-0.13.3 \ @@ -93,18 +92,17 @@ CARGO_CRATES= ahash-0.8.12 \ uuid-1.18.1 \ version_check-0.9.5 \ walkdir-2.5.0 \ - wasi-0.14.5+wasi-0.2.4 \ - wasip2-1.0.0+wasi-0.2.4 \ - wasm-bindgen-0.2.101 \ - wasm-bindgen-backend-0.2.101 \ - wasm-bindgen-macro-0.2.101 \ - wasm-bindgen-macro-support-0.2.101 \ - wasm-bindgen-shared-0.2.101 \ - web-sys-0.3.78 \ + wasip2-1.0.1+wasi-0.2.4 \ + wasm-bindgen-0.2.104 \ + wasm-bindgen-backend-0.2.104 \ + wasm-bindgen-macro-0.2.104 \ + wasm-bindgen-macro-support-0.2.104 \ + wasm-bindgen-shared-0.2.104 \ + web-sys-0.3.81 \ winapi-util-0.1.11 \ - windows-link-0.2.0 \ + windows-link-0.2.1 \ windows-sys-0.59.0 \ - windows-sys-0.61.0 \ + windows-sys-0.61.2 \ windows-targets-0.52.6 \ windows_aarch64_gnullvm-0.52.6 \ windows_aarch64_msvc-0.52.6 \ @@ -114,7 +112,7 @@ CARGO_CRATES= ahash-0.8.12 \ windows_x86_64_gnu-0.52.6 \ windows_x86_64_gnullvm-0.52.6 \ windows_x86_64_msvc-0.52.6 \ - wit-bindgen-0.45.1 \ + wit-bindgen-0.46.0 \ wyz-0.5.1 \ zerocopy-0.8.27 \ zerocopy-derive-0.8.27 diff --git a/textproc/py-jiter/distinfo b/textproc/py-jiter/distinfo index ce7dfe316a45..40c59decfe2d 100644 --- a/textproc/py-jiter/distinfo +++ b/textproc/py-jiter/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1758008117 -SHA256 (jiter-0.11.0.tar.gz) = 1d9637eaf8c1d6a63d6562f2a6e5ab3af946c66037eb1b894e8fad75422266e4 -SIZE (jiter-0.11.0.tar.gz) = 167094 +TIMESTAMP = 1760883141 +SHA256 (jiter-0.11.1.tar.gz) = 849dcfc76481c0ea0099391235b7ca97d7279e0fa4c86005457ac7c88e8b76dc +SIZE (jiter-0.11.1.tar.gz) = 168385 SHA256 (rust/crates/ahash-0.8.12.crate) = 5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75 SIZE (rust/crates/ahash-0.8.12.crate) = 43413 SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916 SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311 SHA256 (rust/crates/anes-0.1.6.crate) = 4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299 SIZE (rust/crates/anes-0.1.6.crate) = 23857 -SHA256 (rust/crates/anstyle-1.0.11.crate) = 862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd -SIZE (rust/crates/anstyle-1.0.11.crate) = 15880 +SHA256 (rust/crates/anstyle-1.0.13.crate) = 5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78 +SIZE (rust/crates/anstyle-1.0.13.crate) = 17651 SHA256 (rust/crates/arbitrary-1.4.2.crate) = c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1 SIZE (rust/crates/arbitrary-1.4.2.crate) = 38307 SHA256 (rust/crates/autocfg-1.5.0.crate) = c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8 @@ -19,22 +19,22 @@ SHA256 (rust/crates/bumpalo-3.19.0.crate) = 46c5e41b57b8bba42a04676d81cb89e9ee8e SIZE (rust/crates/bumpalo-3.19.0.crate) = 96414 SHA256 (rust/crates/cast-0.3.0.crate) = 37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5 SIZE (rust/crates/cast-0.3.0.crate) = 11452 -SHA256 (rust/crates/cc-1.2.37.crate) = 65193589c6404eb80b450d618eaf9a2cafaaafd57ecce47370519ef674a7bd44 -SIZE (rust/crates/cc-1.2.37.crate) = 90111 -SHA256 (rust/crates/cfg-if-1.0.3.crate) = 2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9 -SIZE (rust/crates/cfg-if-1.0.3.crate) = 8719 +SHA256 (rust/crates/cc-1.2.41.crate) = ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7 +SIZE (rust/crates/cc-1.2.41.crate) = 91154 +SHA256 (rust/crates/cfg-if-1.0.4.crate) = 9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801 +SIZE (rust/crates/cfg-if-1.0.4.crate) = 9360 SHA256 (rust/crates/ciborium-0.2.2.crate) = 42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e SIZE (rust/crates/ciborium-0.2.2.crate) = 35611 SHA256 (rust/crates/ciborium-io-0.2.2.crate) = 05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757 SIZE (rust/crates/ciborium-io-0.2.2.crate) = 6697 SHA256 (rust/crates/ciborium-ll-0.2.2.crate) = 57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9 SIZE (rust/crates/ciborium-ll-0.2.2.crate) = 14695 -SHA256 (rust/crates/clap-4.5.47.crate) = 7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931 -SIZE (rust/crates/clap-4.5.47.crate) = 58354 -SHA256 (rust/crates/clap_builder-4.5.47.crate) = 2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6 -SIZE (rust/crates/clap_builder-4.5.47.crate) = 170016 -SHA256 (rust/crates/clap_lex-0.7.5.crate) = b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675 -SIZE (rust/crates/clap_lex-0.7.5.crate) = 13469 +SHA256 (rust/crates/clap-4.5.49.crate) = f4512b90fa68d3a9932cea5184017c5d200f5921df706d45e853537dea51508f +SIZE (rust/crates/clap-4.5.49.crate) = 62007 +SHA256 (rust/crates/clap_builder-4.5.49.crate) = 0025e98baa12e766c67ba13ff4695a887a1eba19569aad00a472546795bd6730 +SIZE (rust/crates/clap_builder-4.5.49.crate) = 170616 +SHA256 (rust/crates/clap_lex-0.7.6.crate) = a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d +SIZE (rust/crates/clap_lex-0.7.6.crate) = 13466 SHA256 (rust/crates/codspeed-2.10.1.crate) = 93f4cce9c27c49c4f101fffeebb1826f41a9df2e7498b7cd4d95c0658b796c6c SIZE (rust/crates/codspeed-2.10.1.crate) = 8589 SHA256 (rust/crates/codspeed-criterion-compat-2.10.1.crate) = c3c23d880a28a2aab52d38ca8481dd7a3187157d0a952196b6db1db3c8499725 @@ -57,22 +57,22 @@ SHA256 (rust/crates/either-1.15.0.crate) = 48c757948c5ede0e46177b7add2e67155f70e SIZE (rust/crates/either-1.15.0.crate) = 20114 SHA256 (rust/crates/equivalent-1.0.2.crate) = 877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f SIZE (rust/crates/equivalent-1.0.2.crate) = 7419 -SHA256 (rust/crates/find-msvc-tools-0.1.1.crate) = 7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d -SIZE (rust/crates/find-msvc-tools-0.1.1.crate) = 30228 +SHA256 (rust/crates/find-msvc-tools-0.1.4.crate) = 52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127 +SIZE (rust/crates/find-msvc-tools-0.1.4.crate) = 30817 SHA256 (rust/crates/funty-2.0.0.crate) = e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c SIZE (rust/crates/funty-2.0.0.crate) = 13160 -SHA256 (rust/crates/getrandom-0.3.3.crate) = 26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4 -SIZE (rust/crates/getrandom-0.3.3.crate) = 49493 -SHA256 (rust/crates/half-2.6.0.crate) = 459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9 -SIZE (rust/crates/half-2.6.0.crate) = 59507 -SHA256 (rust/crates/hashbrown-0.15.5.crate) = 9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1 -SIZE (rust/crates/hashbrown-0.15.5.crate) = 140908 +SHA256 (rust/crates/getrandom-0.3.4.crate) = 899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd +SIZE (rust/crates/getrandom-0.3.4.crate) = 50932 +SHA256 (rust/crates/half-2.7.1.crate) = 6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b +SIZE (rust/crates/half-2.7.1.crate) = 61040 +SHA256 (rust/crates/hashbrown-0.16.0.crate) = 5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d +SIZE (rust/crates/hashbrown-0.16.0.crate) = 141708 SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea SIZE (rust/crates/heck-0.5.0.crate) = 11517 SHA256 (rust/crates/hermit-abi-0.5.2.crate) = fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c SIZE (rust/crates/hermit-abi-0.5.2.crate) = 17435 -SHA256 (rust/crates/indexmap-2.11.1.crate) = 206a8042aec68fa4a62e8d3f7aa4ceb508177d9324faf261e1959e495b7a1921 -SIZE (rust/crates/indexmap-2.11.1.crate) = 99966 +SHA256 (rust/crates/indexmap-2.11.4.crate) = 4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5 +SIZE (rust/crates/indexmap-2.11.4.crate) = 100302 SHA256 (rust/crates/indoc-2.0.6.crate) = f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd SIZE (rust/crates/indoc-2.0.6.crate) = 17164 SHA256 (rust/crates/is-terminal-0.4.16.crate) = e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9 @@ -83,24 +83,24 @@ SHA256 (rust/crates/itoa-1.0.15.crate) = 4a5f13b858c8d314ee3e8f639011f7ccefe71f9 SIZE (rust/crates/itoa-1.0.15.crate) = 11231 SHA256 (rust/crates/jobserver-0.1.34.crate) = 9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33 SIZE (rust/crates/jobserver-0.1.34.crate) = 29013 -SHA256 (rust/crates/js-sys-0.3.78.crate) = 0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738 -SIZE (rust/crates/js-sys-0.3.78.crate) = 56010 +SHA256 (rust/crates/js-sys-0.3.81.crate) = ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305 +SIZE (rust/crates/js-sys-0.3.81.crate) = 56399 SHA256 (rust/crates/lazy_static-1.5.0.crate) = bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe SIZE (rust/crates/lazy_static-1.5.0.crate) = 14025 -SHA256 (rust/crates/lexical-parse-float-1.0.5.crate) = de6f9cb01fb0b08060209a057c048fcbab8717b4c1ecd2eac66ebfe39a65b0f2 -SIZE (rust/crates/lexical-parse-float-1.0.5.crate) = 186731 -SHA256 (rust/crates/lexical-parse-integer-1.0.5.crate) = 72207aae22fc0a121ba7b6d479e42cbfea549af1479c3f3a4f12c70dd66df12e -SIZE (rust/crates/lexical-parse-integer-1.0.5.crate) = 36912 -SHA256 (rust/crates/lexical-util-1.0.6.crate) = 5a82e24bf537fd24c177ffbbdc6ebcc8d54732c35b50a3f28cc3f4e4c949a0b3 -SIZE (rust/crates/lexical-util-1.0.6.crate) = 106117 -SHA256 (rust/crates/libc-0.2.175.crate) = 6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543 -SIZE (rust/crates/libc-0.2.175.crate) = 788728 +SHA256 (rust/crates/lexical-parse-float-1.0.6.crate) = 52a9f232fbd6f550bc0137dcb5f99ab674071ac2d690ac69704593cb4abbea56 +SIZE (rust/crates/lexical-parse-float-1.0.6.crate) = 194003 +SHA256 (rust/crates/lexical-parse-integer-1.0.6.crate) = 9a7a039f8fb9c19c996cd7b2fcce303c1b2874fe1aca544edc85c4a5f8489b34 +SIZE (rust/crates/lexical-parse-integer-1.0.6.crate) = 37501 +SHA256 (rust/crates/lexical-util-1.0.7.crate) = 2604dd126bb14f13fb5d1bd6a66155079cb9fa655b37f875b3a742c705dbed17 +SIZE (rust/crates/lexical-util-1.0.7.crate) = 111747 +SHA256 (rust/crates/libc-0.2.177.crate) = 2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976 +SIZE (rust/crates/libc-0.2.177.crate) = 792045 SHA256 (rust/crates/libfuzzer-sys-0.4.10.crate) = 5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404 SIZE (rust/crates/libfuzzer-sys-0.4.10.crate) = 133968 SHA256 (rust/crates/log-0.4.28.crate) = 34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432 SIZE (rust/crates/log-0.4.28.crate) = 51131 -SHA256 (rust/crates/memchr-2.7.5.crate) = 32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0 -SIZE (rust/crates/memchr-2.7.5.crate) = 97603 +SHA256 (rust/crates/memchr-2.7.6.crate) = f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273 +SIZE (rust/crates/memchr-2.7.6.crate) = 97616 SHA256 (rust/crates/memoffset-0.9.1.crate) = 488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a SIZE (rust/crates/memoffset-0.9.1.crate) = 9032 SHA256 (rust/crates/num-bigint-0.4.6.crate) = a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9 @@ -137,8 +137,8 @@ SHA256 (rust/crates/pyo3-macros-backend-0.26.0.crate) = 100246c0ecf400b475341b84 SIZE (rust/crates/pyo3-macros-backend-0.26.0.crate) = 81809 SHA256 (rust/crates/python3-dll-a-0.2.14.crate) = d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8 SIZE (rust/crates/python3-dll-a-0.2.14.crate) = 103489 -SHA256 (rust/crates/quote-1.0.40.crate) = 1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d -SIZE (rust/crates/quote-1.0.40.crate) = 31063 +SHA256 (rust/crates/quote-1.0.41.crate) = ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1 +SIZE (rust/crates/quote-1.0.41.crate) = 31408 SHA256 (rust/crates/r-efi-5.3.0.crate) = 69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f SIZE (rust/crates/r-efi-5.3.0.crate) = 64532 SHA256 (rust/crates/radium-0.7.0.crate) = dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09 @@ -147,32 +147,30 @@ SHA256 (rust/crates/rayon-1.11.0.crate) = 368f01d005bf8fd9b1206fb6fa653e6c4a81ce SIZE (rust/crates/rayon-1.11.0.crate) = 182470 SHA256 (rust/crates/rayon-core-1.13.0.crate) = 22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91 SIZE (rust/crates/rayon-core-1.13.0.crate) = 73151 -SHA256 (rust/crates/regex-1.11.2.crate) = 23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912 -SIZE (rust/crates/regex-1.11.2.crate) = 166265 -SHA256 (rust/crates/regex-automata-0.4.10.crate) = 6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6 -SIZE (rust/crates/regex-automata-0.4.10.crate) = 622754 -SHA256 (rust/crates/regex-syntax-0.8.6.crate) = caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001 -SIZE (rust/crates/regex-syntax-0.8.6.crate) = 358808 +SHA256 (rust/crates/regex-1.12.2.crate) = 843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4 +SIZE (rust/crates/regex-1.12.2.crate) = 163843 +SHA256 (rust/crates/regex-automata-0.4.13.crate) = 5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c +SIZE (rust/crates/regex-automata-0.4.13.crate) = 625250 +SHA256 (rust/crates/regex-syntax-0.8.8.crate) = 7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58 +SIZE (rust/crates/regex-syntax-0.8.8.crate) = 359141 SHA256 (rust/crates/rustversion-1.0.22.crate) = b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d SIZE (rust/crates/rustversion-1.0.22.crate) = 21096 SHA256 (rust/crates/ryu-1.0.20.crate) = 28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f SIZE (rust/crates/ryu-1.0.20.crate) = 48738 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502 SIZE (rust/crates/same-file-1.0.6.crate) = 10183 -SHA256 (rust/crates/serde-1.0.223.crate) = a505d71960adde88e293da5cb5eda57093379f64e61cf77bf0e6a63af07a7bac -SIZE (rust/crates/serde-1.0.223.crate) = 28047 -SHA256 (rust/crates/serde_core-1.0.223.crate) = 20f57cbd357666aa7b3ac84a90b4ea328f1d4ddb6772b430caa5d9e1309bb9e9 -SIZE (rust/crates/serde_core-1.0.223.crate) = 62721 -SHA256 (rust/crates/serde_derive-1.0.223.crate) = 3d428d07faf17e306e699ec1e91996e5a165ba5d6bce5b5155173e91a8a01a56 -SIZE (rust/crates/serde_derive-1.0.223.crate) = 57923 +SHA256 (rust/crates/serde-1.0.228.crate) = 9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e +SIZE (rust/crates/serde-1.0.228.crate) = 83652 +SHA256 (rust/crates/serde_core-1.0.228.crate) = 41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad +SIZE (rust/crates/serde_core-1.0.228.crate) = 63111 +SHA256 (rust/crates/serde_derive-1.0.228.crate) = d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79 +SIZE (rust/crates/serde_derive-1.0.228.crate) = 59605 SHA256 (rust/crates/serde_json-1.0.145.crate) = 402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c SIZE (rust/crates/serde_json-1.0.145.crate) = 155748 SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64 SIZE (rust/crates/shlex-1.3.0.crate) = 18713 SHA256 (rust/crates/smallvec-1.15.1.crate) = 67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03 SIZE (rust/crates/smallvec-1.15.1.crate) = 38116 -SHA256 (rust/crates/static_assertions-1.1.0.crate) = a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f -SIZE (rust/crates/static_assertions-1.1.0.crate) = 18480 SHA256 (rust/crates/syn-2.0.106.crate) = ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6 SIZE (rust/crates/syn-2.0.106.crate) = 301514 SHA256 (rust/crates/tap-1.0.1.crate) = 55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369 @@ -191,30 +189,28 @@ SHA256 (rust/crates/version_check-0.9.5.crate) = 0b928f33d975fc6ad9f86c8f283853a SIZE (rust/crates/version_check-0.9.5.crate) = 15554 SHA256 (rust/crates/walkdir-2.5.0.crate) = 29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b SIZE (rust/crates/walkdir-2.5.0.crate) = 23951 -SHA256 (rust/crates/wasi-0.14.5+wasi-0.2.4.crate) = a4494f6290a82f5fe584817a676a34b9d6763e8d9d18204009fb31dceca98fd4 -SIZE (rust/crates/wasi-0.14.5+wasi-0.2.4.crate) = 18092 -SHA256 (rust/crates/wasip2-1.0.0+wasi-0.2.4.crate) = 03fa2761397e5bd52002cd7e73110c71af2109aca4e521a9f40473fe685b0a24 -SIZE (rust/crates/wasip2-1.0.0+wasi-0.2.4.crate) = 132019 -SHA256 (rust/crates/wasm-bindgen-0.2.101.crate) = 7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b -SIZE (rust/crates/wasm-bindgen-0.2.101.crate) = 47841 -SHA256 (rust/crates/wasm-bindgen-backend-0.2.101.crate) = e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb -SIZE (rust/crates/wasm-bindgen-backend-0.2.101.crate) = 32331 -SHA256 (rust/crates/wasm-bindgen-macro-0.2.101.crate) = 7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d -SIZE (rust/crates/wasm-bindgen-macro-0.2.101.crate) = 9804 -SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.101.crate) = 7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa -SIZE (rust/crates/wasm-bindgen-macro-support-0.2.101.crate) = 26415 -SHA256 (rust/crates/wasm-bindgen-shared-0.2.101.crate) = f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1 -SIZE (rust/crates/wasm-bindgen-shared-0.2.101.crate) = 9055 -SHA256 (rust/crates/web-sys-0.3.78.crate) = 77e4b637749ff0d92b8fad63aa1f7cff3cbe125fd49c175cd6345e7272638b12 -SIZE (rust/crates/web-sys-0.3.78.crate) = 642410 +SHA256 (rust/crates/wasip2-1.0.1+wasi-0.2.4.crate) = 0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7 +SIZE (rust/crates/wasip2-1.0.1+wasi-0.2.4.crate) = 132087 +SHA256 (rust/crates/wasm-bindgen-0.2.104.crate) = c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d +SIZE (rust/crates/wasm-bindgen-0.2.104.crate) = 47345 +SHA256 (rust/crates/wasm-bindgen-backend-0.2.104.crate) = 671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19 +SIZE (rust/crates/wasm-bindgen-backend-0.2.104.crate) = 32230 +SHA256 (rust/crates/wasm-bindgen-macro-0.2.104.crate) = 7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119 +SIZE (rust/crates/wasm-bindgen-macro-0.2.104.crate) = 9390 +SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.104.crate) = 9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7 +SIZE (rust/crates/wasm-bindgen-macro-support-0.2.104.crate) = 26411 +SHA256 (rust/crates/wasm-bindgen-shared-0.2.104.crate) = bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1 +SIZE (rust/crates/wasm-bindgen-shared-0.2.104.crate) = 9057 +SHA256 (rust/crates/web-sys-0.3.81.crate) = 9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120 +SIZE (rust/crates/web-sys-0.3.81.crate) = 641812 SHA256 (rust/crates/winapi-util-0.1.11.crate) = c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22 SIZE (rust/crates/winapi-util-0.1.11.crate) = 13368 -SHA256 (rust/crates/windows-link-0.2.0.crate) = 45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65 -SIZE (rust/crates/windows-link-0.2.0.crate) = 6170 +SHA256 (rust/crates/windows-link-0.2.1.crate) = f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5 +SIZE (rust/crates/windows-link-0.2.1.crate) = 6133 SHA256 (rust/crates/windows-sys-0.59.0.crate) = 1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b SIZE (rust/crates/windows-sys-0.59.0.crate) = 2387323 -SHA256 (rust/crates/windows-sys-0.61.0.crate) = e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa -SIZE (rust/crates/windows-sys-0.61.0.crate) = 2517134 +SHA256 (rust/crates/windows-sys-0.61.2.crate) = ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc +SIZE (rust/crates/windows-sys-0.61.2.crate) = 2517186 SHA256 (rust/crates/windows-targets-0.52.6.crate) = 9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973 SIZE (rust/crates/windows-targets-0.52.6.crate) = 6403 SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3 @@ -233,8 +229,8 @@ SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 24d5b23dc417412679681 SIZE (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 435707 SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564 -SHA256 (rust/crates/wit-bindgen-0.45.1.crate) = 5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36 -SIZE (rust/crates/wit-bindgen-0.45.1.crate) = 60395 +SHA256 (rust/crates/wit-bindgen-0.46.0.crate) = f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59 +SIZE (rust/crates/wit-bindgen-0.46.0.crate) = 60508 SHA256 (rust/crates/wyz-0.5.1.crate) = 05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed SIZE (rust/crates/wyz-0.5.1.crate) = 18790 SHA256 (rust/crates/zerocopy-0.8.27.crate) = 0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c diff --git a/www/Makefile b/www/Makefile index b402998e0907..5eff8b7ceac7 100644 --- a/www/Makefile +++ b/www/Makefile @@ -2340,6 +2340,7 @@ SUBDIR += rubygem-protocol-rack SUBDIR += rubygem-protocol-websocket SUBDIR += rubygem-puma + SUBDIR += rubygem-puma-gitlab SUBDIR += rubygem-puma6 SUBDIR += rubygem-puma_worker_killer SUBDIR += rubygem-pusher-client diff --git a/www/badwolf/Makefile b/www/badwolf/Makefile index c1f620753093..0a789ff5d559 100644 --- a/www/badwolf/Makefile +++ b/www/badwolf/Makefile @@ -1,8 +1,7 @@ PORTNAME= badwolf -DISTVERSION= 1.3.0 -PORTREVISION= 5 +DISTVERSION= 1.4.0 CATEGORIES= www -MASTER_SITES= https://hacktivis.me/releases/ +MASTER_SITES= https://hacktivis.me/releases/badwolf/ MAINTAINER= dtxdf@FreeBSD.org COMMENT= Minimalist and privacy-oriented WebKitGTK browser @@ -30,17 +29,15 @@ LIBSOUP_DESC= Use libsoup URI_PARSER_DESC= URI PARSER GSTREAMER_USES= gstreamer -GSTREAMER_USE= GSTREAMER=bad,good,libav +GSTREAMER_USE= GSTREAMER=bad,good,libav,ugly GURI_CONFIGURE_ENV= WITH_URI_PARSER=guri +GURI_VARS= USE_GNOME+=glib20 LIBSOUP_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup LIBSOUP_CONFIGURE_ENV= WITH_URI_PARSER=libsoup2 NLS_USES= gettext NLS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-configure -GURI_USE_GNOME= glib20 -LIBAV_USE_GSTREAMER= libav - post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} diff --git a/www/badwolf/distinfo b/www/badwolf/distinfo index 50c6f65ebf93..ef5cbf549562 100644 --- a/www/badwolf/distinfo +++ b/www/badwolf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695232667 -SHA256 (badwolf-1.3.0.tar.gz) = 276dfccba8addfc205ceb10477668e4b2b6a4853f344c86d5c1e35b1c703459f -SIZE (badwolf-1.3.0.tar.gz) = 114477 +TIMESTAMP = 1760809679 +SHA256 (badwolf-1.4.0.tar.gz) = 9542978a77fef179e386d803cc3dad340202c354c09201d4200c93b0c95b59d3 +SIZE (badwolf-1.4.0.tar.gz) = 129205 diff --git a/www/badwolf/files/extra-patch-configure b/www/badwolf/files/extra-patch-configure index 5c566356ae2a..42d133a40de9 100644 --- a/www/badwolf/files/extra-patch-configure +++ b/www/badwolf/files/extra-patch-configure @@ -1,47 +1,36 @@ ---- configure.orig 2023-10-01 13:05:07 UTC +--- configure.orig 2025-10-19 17:24:07 UTC +++ configure -@@ -13,8 +13,8 @@ DOCS="usr.bin.badwolf README.md KnowledgeBase.md inter +@@ -13,9 +13,6 @@ DOCS="usr.bin.badwolf README.md KnowledgeBase.md inter EXE_test="fmt_test uri_test bookmarks_test" DOCS="usr.bin.badwolf README.md KnowledgeBase.md interface.md" --TRANS="fr pt_BR tr de vi" --TRANS_MAN="de fr tr vi" -+#TRANS="fr pt_BR tr de vi" -+#TRANS_MAN="de fr tr vi" - +-TRANS="fr pt_BR sr tr de vi" +-TRANS_MAN="de fr sr tr vi" +- lint_targets="" -@@ -373,18 +373,18 @@ done >>config.ninja - echo - done >>config.ninja + min_webkitgtk=2.32.0 +@@ -364,19 +361,6 @@ fi >>config.ninja + echo 'build po/manpage.pot: xgettext_man badwolf.1 | po/pot_license.ed' + fi >>config.ninja -for trans in ${TRANS}; do - echo "build po/${trans}.po: msgmerge po/messages.pot" - echo "build locale/${trans}/LC_MESSAGES/Badwolf.mo: po2mo po/${trans}.po" - all="${all} locale/${trans}/LC_MESSAGES/Badwolf.mo" -done >>config.ninja -+#for trans in ${TRANS}; do -+# echo "build po/${trans}.po: msgmerge po/messages.pot" -+# echo "build locale/${trans}/LC_MESSAGES/Badwolf.mo: po2mo po/${trans}.po" -+# all="${all} locale/${trans}/LC_MESSAGES/Badwolf.mo" -+#done >>config.ninja - +- -for man in ${TRANS_MAN}; do - echo "build po/${man}_man.po: xgettext_man badwolf.1" - echo "build badwolf.${man}.1: translate_manpage po/${man}_man.po" - bundled="${bundled} badwolf.${man}.1" - trans_man="${trans_man} badwolf.${man}.1" -done >>config.ninja -+#for man in ${TRANS_MAN}; do -+# echo "build po/${man}_man.po: xgettext_man badwolf.1" -+# echo "build badwolf.${man}.1: translate_manpage po/${man}_man.po" -+# bundled="${bundled} badwolf.${man}.1" -+# trans_man="${trans_man} badwolf.${man}.1" -+#done >>config.ninja - +- for i in 24 32 48 64 128 256; do echo "build icons/hicolor/${i}x${i}/apps/badwolf.png: gen_icon icons/hicolor/scalable/apps/badwolf.svg -@@ -438,10 +438,10 @@ doins "${MANDIR}/man1" ./badwolf.1 + width = $i +@@ -429,10 +413,6 @@ doins "${MANDIR}/man1" ./badwolf.1 doins "${BINDIR}" ./badwolf doins "${MANDIR}/man1" ./badwolf.1 @@ -49,10 +38,6 @@ - newins "${MANDIR}/\${man}/man1" "./badwolf.\${man}.1" "badwolf.1" -done -doins "${DATADIR}" ./locale -+#for man in ${TRANS_MAN}; do -+# newins "${MANDIR}/\${man}/man1" "./badwolf.\${man}.1" "badwolf.1" -+#done -+#doins "${DATADIR}" ./locale doins "${DATADIR}" ./interface.css doins "${APPSDIR}" badwolf.desktop doins "${DOCDIR}" ${DOCS} diff --git a/www/badwolf/pkg-plist b/www/badwolf/pkg-plist index 6ba90373a2ac..bd70efdae234 100644 --- a/www/badwolf/pkg-plist +++ b/www/badwolf/pkg-plist @@ -15,7 +15,9 @@ share/man/man1/badwolf.1.gz %%NLS%%%%DATADIR%%/locale/pt_BR/LC_MESSAGES/Badwolf.mo %%NLS%%%%DATADIR%%/locale/tr/LC_MESSAGES/Badwolf.mo %%NLS%%%%DATADIR%%/locale/vi/LC_MESSAGES/Badwolf.mo +%%NLS%%%%DATADIR%%/locale/sr/LC_MESSAGES/Badwolf.mo %%NLS%%share/man/de/man1/badwolf.1.gz %%NLS%%share/man/fr/man1/badwolf.1.gz %%NLS%%share/man/tr/man1/badwolf.1.gz %%NLS%%share/man/vi/man1/badwolf.1.gz +%%NLS%%share/man/sr/man1/badwolf.1.gz diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 9a674b7489c2..2cdcd8c88360 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -168,7 +168,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-diffy>=3.4.4<4:textproc/rubygem-diffy \ rubygem-rack22>=2.2.17,3<2.3,3:www/rubygem-rack22 \ rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \ - rubygem-puma6>=6.6.1<6.6.2:www/rubygem-puma6 \ + rubygem-puma-gitlab>=6.6.1<6.6.2:www/rubygem-puma-gitlab \ rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \ rubygem-state_machines-activerecord-gitlab>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord-gitlab \ rubygem-sidekiq-gitlab>=7.3.9:devel/rubygem-sidekiq-gitlab \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 5337de72a2c5..d7451fad1606 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,5 +1,5 @@ GITLAB_VERSION= 18.3.4 -GITLAB_PORTREVISION= 2 +GITLAB_PORTREVISION= 3 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml diff --git a/www/nextcloud-forms/Makefile b/www/nextcloud-forms/Makefile index f14bf5a46323..eb09cb959357 100644 --- a/www/nextcloud-forms/Makefile +++ b/www/nextcloud-forms/Makefile @@ -1,5 +1,5 @@ PORTNAME= forms -PORTVERSION= 5.2.1 +PORTVERSION= 5.2.2 DISTVERSIONPREFIX= v CATEGORIES= www diff --git a/www/nextcloud-forms/distinfo b/www/nextcloud-forms/distinfo index ce6db186488b..7d2135f1d2b3 100644 --- a/www/nextcloud-forms/distinfo +++ b/www/nextcloud-forms/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1759476039 -SHA256 (nextcloud/forms-v5.2.1.tar.gz) = 3f641f3a7279c5b01a20844d1f277c4f80598a9c8e00f3bb5be866ec3abef691 -SIZE (nextcloud/forms-v5.2.1.tar.gz) = 5142232 +TIMESTAMP = 1760898653 +SHA256 (nextcloud/forms-v5.2.2.tar.gz) = 81416b3cedc3c71871d2abd734c2fb11e34eb62cf451a0b65de824efcf81663f +SIZE (nextcloud/forms-v5.2.2.tar.gz) = 5179835 diff --git a/www/nextcloud-news/Makefile b/www/nextcloud-news/Makefile index 0548a2010a35..bb59b6e01526 100644 --- a/www/nextcloud-news/Makefile +++ b/www/nextcloud-news/Makefile @@ -1,5 +1,5 @@ PORTNAME= news -PORTVERSION= 27.0.0 +PORTVERSION= 27.0.1 CATEGORIES= www MASTER_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ DISTNAME= ${PORTNAME} diff --git a/www/nextcloud-news/distinfo b/www/nextcloud-news/distinfo index 52591501e37e..96b07155fa66 100644 --- a/www/nextcloud-news/distinfo +++ b/www/nextcloud-news/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1759139788 -SHA256 (nextcloud/news-27.0.0/news.tar.gz) = 0b803591be350c24b716d0a89e927e83d4c110895a52a5bd602e876b76e3d18c -SIZE (nextcloud/news-27.0.0/news.tar.gz) = 3493438 +TIMESTAMP = 1760897889 +SHA256 (nextcloud/news-27.0.1/news.tar.gz) = 2bddecc06ae21309b5cc1abd1fb1783f67c79936a761d7450117d0a78e7a6ddb +SIZE (nextcloud/news-27.0.1/news.tar.gz) = 3987213 diff --git a/www/rubygem-puma-gitlab/Makefile b/www/rubygem-puma-gitlab/Makefile new file mode 100644 index 000000000000..708eb2ece461 --- /dev/null +++ b/www/rubygem-puma-gitlab/Makefile @@ -0,0 +1,21 @@ +PORTNAME= puma +PORTVERSION= 6.6.1 +CATEGORIES= www rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Fast, multithreaded and highly concurrent ruby web server +WWW= https://puma.io/ \ + https://github.com/puma/puma + +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= rubygem-nio4r>=2.0<3:devel/rubygem-nio4r + +USES= cpe gem ssl + +PLIST_FILES= bin/puma bin/pumactl + +.include <bsd.port.mk> diff --git a/www/rubygem-puma-gitlab/distinfo b/www/rubygem-puma-gitlab/distinfo new file mode 100644 index 000000000000..42714ba48d5a --- /dev/null +++ b/www/rubygem-puma-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1755676001 +SHA256 (rubygem/puma-6.6.1.gem) = b9b56e4a4ea75d1bfa6d9e1972ee2c9f43d0883f011826d914e8e37b3694ea1e +SIZE (rubygem/puma-6.6.1.gem) = 239104 diff --git a/www/rubygem-puma-gitlab/pkg-descr b/www/rubygem-puma-gitlab/pkg-descr new file mode 100644 index 000000000000..c8af03bb0c08 --- /dev/null +++ b/www/rubygem-puma-gitlab/pkg-descr @@ -0,0 +1,7 @@ +Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for +Ruby/Rack applications. Puma is intended for use in both development and +production environments. In order to get the best throughput, it is highly +recommended that you use a Ruby implementation with real threads like Rubinius +or JRuby. + +See also: https://github.com/puma/puma diff --git a/www/tor-browser/Makefile b/www/tor-browser/Makefile index 5618f28450d5..57639d110a50 100644 --- a/www/tor-browser/Makefile +++ b/www/tor-browser/Makefile @@ -1,9 +1,8 @@ PORTNAME= tor-browser -DISTVERSION= 15.0a3 -PORTREVISION= 1 +DISTVERSION= 15.0a4 CATEGORIES= www net security wayland -TAG_BASE= 7a4673ab420d7c52cd3fa7366d0d9cdaa5a37937 -TAG_TOR= db5e90248e74338ce72ff118bdb749fea6ea2606 +TAG_BASE= dff70d135408cfc24931c170efa91fbaded19914 +TAG_TOR= ca310e42296a7085ea59fc323592f3dc702123ac MASTER_SITES= TOR \ LOCAL/vvd \ https://build-sources.tbb.torproject.org/:source1 \ @@ -18,9 +17,9 @@ MASTER_SITES= TOR \ LOCAL/vvd:source5 MASTER_SITE_SUBDIR= torbrowser/${DISTVERSION}/:DEFAULT \ download/releases/:source3 -DISTNAME= src-firefox-tor-browser-140.3.0esr-15.0-1-build3 +DISTNAME= src-firefox-tor-browser-140.4.0esr-15.0-1-build2 MANUAL= manual_215922.zip -NOSCRIPT= noscript-13.0.9.xpi +NOSCRIPT= noscript-13.2.1.xpi DISTFILES= ${DISTNAME}.tar.xz \ ${MANUAL}:source1 \ fonts-3--4348e1.tar.zst:source2 \ diff --git a/www/tor-browser/distinfo b/www/tor-browser/distinfo index 3fcc82235447..a09bc4c5ed05 100644 --- a/www/tor-browser/distinfo +++ b/www/tor-browser/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1758569239 -SHA256 (src-firefox-tor-browser-140.3.0esr-15.0-1-build3.tar.xz) = aec327cd07e161cf0606352a71be1db1f649a33da4519387a93840083d63ab57 -SIZE (src-firefox-tor-browser-140.3.0esr-15.0-1-build3.tar.xz) = 691334928 +TIMESTAMP = 1760818795 +SHA256 (src-firefox-tor-browser-140.4.0esr-15.0-1-build2.tar.xz) = 8f9f58809f738bd88fe19cf8c8842b6f4714a01c48e24e01c220872012e84a5d +SIZE (src-firefox-tor-browser-140.4.0esr-15.0-1-build2.tar.xz) = 692091336 SHA256 (manual_215922.zip) = b5ed703f54d52e9f197320f3698e936d585a3fed23cc4f9fbf59edce2869f885 SIZE (manual_215922.zip) = 28305786 SHA256 (fonts-3--4348e1.tar.zst) = 7fbbecece6de777f196982f6eb567970a6d8e7ac2bf5b1ad6b90e1ea36374032 SIZE (fonts-3--4348e1.tar.zst) = 27441580 -SHA256 (noscript-13.0.9.xpi) = 525ab61aff21f67d10c3e20965a86ed479631549908a658f54692adc47d771f5 -SIZE (noscript-13.0.9.xpi) = 994397 -SHA256 (tpo-translation-7a4673ab420d7c52cd3fa7366d0d9cdaa5a37937_GL0.tar.gz) = bdf9d2e546cc183331c9c8ca2b4f8b7d3c9399c0454b9fffcfd7282b7a90b6b7 -SIZE (tpo-translation-7a4673ab420d7c52cd3fa7366d0d9cdaa5a37937_GL0.tar.gz) = 962329 -SHA256 (tpo-translation-db5e90248e74338ce72ff118bdb749fea6ea2606_GL0.tar.gz) = da2787fcbb953c1772d193d60b4633afce8bd34321e9209e83760bc58c0df901 -SIZE (tpo-translation-db5e90248e74338ce72ff118bdb749fea6ea2606_GL0.tar.gz) = 2897151 +SHA256 (noscript-13.2.1.xpi) = 190297f3d1e55db0c65f9bc00460bea9b753939d428ea593d6cef27fde1ce69a +SIZE (noscript-13.2.1.xpi) = 997750 +SHA256 (tpo-translation-dff70d135408cfc24931c170efa91fbaded19914_GL0.tar.gz) = caceab3ddbb4b7a0e7b85d0fd8e67023473e746e8d5c5caf18b7f97cd0abb3c5 +SIZE (tpo-translation-dff70d135408cfc24931c170efa91fbaded19914_GL0.tar.gz) = 1022345 +SHA256 (tpo-translation-ca310e42296a7085ea59fc323592f3dc702123ac_GL0.tar.gz) = 0af26f717359fdd1ed951d6376e6e350641acf5ee5f4bf28316108caff3086dd +SIZE (tpo-translation-ca310e42296a7085ea59fc323592f3dc702123ac_GL0.tar.gz) = 2904329 SHA256 (mozilla-l10n-firefox-l10n-468bb10_GH0.tar.gz) = f4fa857e29371568c41c9c8a3298c086ffc4df73085a93ec6a1cc6be8a17a3e3 SIZE (mozilla-l10n-firefox-l10n-468bb10_GH0.tar.gz) = 71046393 diff --git a/www/tor-browser/files/patch-memory_mozalloc_throw__gcc.h b/www/tor-browser/files/patch-memory_mozalloc_throw__gcc.h deleted file mode 100644 index 81a511179852..000000000000 --- a/www/tor-browser/files/patch-memory_mozalloc_throw__gcc.h +++ /dev/null @@ -1,69 +0,0 @@ ---- memory/mozalloc/throw_gcc.h.orig 2022-02-02 17:33:38 UTC -+++ memory/mozalloc/throw_gcc.h -@@ -74,50 +74,66 @@ __throw_bad_function_call(void) { - mozalloc_abort("fatal: STL threw bad_function_call"); - } - -+#if !defined(_LIBCPP_VERSION) - MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_logic_error( - const char* msg) { - mozalloc_abort(msg); - } -+#endif // _LIBCPP_VERSION - -+#if !defined(_LIBCPP_VERSION) - MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_domain_error( - const char* msg) { - mozalloc_abort(msg); - } -+#endif // _LIBCPP_VERSION - -+#if !defined(_LIBCPP_VERSION) - MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void - __throw_invalid_argument(const char* msg) { - mozalloc_abort(msg); - } -+#endif // _LIBCPP_VERSION - -+#if !defined(_LIBCPP_VERSION) - MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_length_error( - const char* msg) { - mozalloc_abort(msg); - } -+#endif // _LIBCPP_VERSION - -+#if !defined(_LIBCPP_VERSION) - MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_out_of_range( - const char* msg) { - mozalloc_abort(msg); - } -+#endif // _LIBCPP_VERSION - - MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_runtime_error( - const char* msg) { - mozalloc_abort(msg); - } - -+#if !defined(_LIBCPP_VERSION) - MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_range_error( - const char* msg) { - mozalloc_abort(msg); - } -+#endif // _LIBCPP_VERSION - -+#if !defined(_LIBCPP_VERSION) - MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void - __throw_overflow_error(const char* msg) { - mozalloc_abort(msg); - } -+#endif // _LIBCPP_VERSION - -+#if !defined(_LIBCPP_VERSION) - MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void - __throw_underflow_error(const char* msg) { - mozalloc_abort(msg); - } -+#endif // _LIBCPP_VERSION - - MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_ios_failure( - const char* msg) { diff --git a/x11/walker/Makefile b/x11/walker/Makefile index 8870570247fb..99223aa34818 100644 --- a/x11/walker/Makefile +++ b/x11/walker/Makefile @@ -1,6 +1,6 @@ PORTNAME= walker DISTVERSIONPREFIX= v -DISTVERSION= 2.5.0 +DISTVERSION= 2.5.4 CATEGORIES= x11 wayland PKGNAMESUFFIX= -launcher diff --git a/x11/walker/distinfo b/x11/walker/distinfo index eb4cc0b61f39..e131c5378c68 100644 --- a/x11/walker/distinfo +++ b/x11/walker/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1760430172 +TIMESTAMP = 1760872135 SHA256 (rust/crates/addr2line-0.24.2.crate) = dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1 SIZE (rust/crates/addr2line-0.24.2.crate) = 39015 SHA256 (rust/crates/adler2-2.0.1.crate) = 320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa @@ -501,5 +501,5 @@ SHA256 (rust/crates/xml-rs-0.8.27.crate) = 6fd8403733700263c6eb89f192880191f1b83 SIZE (rust/crates/xml-rs-0.8.27.crate) = 55258 SHA256 (rust/crates/yaml-rust2-0.10.3.crate) = 4ce2a4ff45552406d02501cea6c18d8a7e50228e7736a872951fe2fe75c91be7 SIZE (rust/crates/yaml-rust2-0.10.3.crate) = 76325 -SHA256 (abenz1267-walker-v2.5.0_GH0.tar.gz) = b2cd7dcfe82879a21e5be2451c7924ae3754e74904aba335d3aa73636bbe09cb -SIZE (abenz1267-walker-v2.5.0_GH0.tar.gz) = 114637 +SHA256 (abenz1267-walker-v2.5.4_GH0.tar.gz) = 632bded32f324f3b137bfb72d7b5f4d4068d87677434b1df51319493d7ce6688 +SIZE (abenz1267-walker-v2.5.4_GH0.tar.gz) = 115199 |