diff --git a/archivers/nfpm/Makefile b/archivers/nfpm/Makefile index 33f9626473c..bfb0d60f23a 100644 --- a/archivers/nfpm/Makefile +++ b/archivers/nfpm/Makefile @@ -1,6 +1,7 @@ PORTNAME= nfpm DISTVERSIONPREFIX= v DISTVERSION= 2.19.1 +PORTREVISION= 1 CATEGORIES= archivers MAINTAINER= yuri@FreeBSD.org diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile index 2081bc4cbd2..c30814db1f8 100644 --- a/astro/kstars/Makefile +++ b/astro/kstars/Makefile @@ -1,6 +1,5 @@ PORTNAME= kstars -DISTVERSION= 3.6.0 -PORTREVISION= 2 +DISTVERSION= 3.6.1 PORTEPOCH= 1 CATEGORIES= astro kde MASTER_SITES= KDE/stable/${PORTNAME} diff --git a/astro/kstars/distinfo b/astro/kstars/distinfo index 5064287562b..4d813c0c4ec 100644 --- a/astro/kstars/distinfo +++ b/astro/kstars/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659104422 -SHA256 (kstars-3.6.0.tar.xz) = c1dbf64ce38f201dd5446dd732ce7c8bf1ef30367dc2f11102105036c949db91 -SIZE (kstars-3.6.0.tar.xz) = 111561672 +TIMESTAMP = 1665004948 +SHA256 (kstars-3.6.1.tar.xz) = 5966ed7eabc6775dfe6b8d73f3f32395c865969ba12d7d3c9eed793a56147ae2 +SIZE (kstars-3.6.1.tar.xz) = 110215912 diff --git a/astro/kstars/pkg-plist b/astro/kstars/pkg-plist index 93900f8e7cb..ba85b159ecd 100644 --- a/astro/kstars/pkg-plist +++ b/astro/kstars/pkg-plist @@ -142,8 +142,11 @@ share/doc/HTML/ca/kstars/wut.docbook share/doc/HTML/ca/kstars/wut.png share/doc/HTML/ca/kstars/xplanet_page.png share/doc/HTML/ca/kstars/zenith.docbook +share/doc/HTML/ca@valencia/kstars/add_object.png +share/doc/HTML/ca@valencia/kstars/advanced_page.png share/doc/HTML/ca@valencia/kstars/ai-contents.docbook share/doc/HTML/ca@valencia/kstars/altvstime.docbook +share/doc/HTML/ca@valencia/kstars/altvstime.png share/doc/HTML/ca@valencia/kstars/astroinfo.docbook share/doc/HTML/ca@valencia/kstars/blackbody.docbook share/doc/HTML/ca@valencia/kstars/calc-angdist.docbook @@ -158,16 +161,23 @@ share/doc/HTML/ca@valencia/kstars/calc-julianday.docbook share/doc/HTML/ca@valencia/kstars/calc-planetcoords.docbook share/doc/HTML/ca@valencia/kstars/calc-sidereal.docbook share/doc/HTML/ca@valencia/kstars/calculator.docbook +share/doc/HTML/ca@valencia/kstars/catalog_details.png share/doc/HTML/ca@valencia/kstars/cequator.docbook +share/doc/HTML/ca@valencia/kstars/color_editor.png share/doc/HTML/ca@valencia/kstars/colorandtemp.docbook +share/doc/HTML/ca@valencia/kstars/colors_page.png share/doc/HTML/ca@valencia/kstars/commands.docbook share/doc/HTML/ca@valencia/kstars/config.docbook share/doc/HTML/ca@valencia/kstars/cosmicdist.docbook share/doc/HTML/ca@valencia/kstars/cpoles.docbook +share/doc/HTML/ca@valencia/kstars/create_catalog.png share/doc/HTML/ca@valencia/kstars/credits.docbook share/doc/HTML/ca@valencia/kstars/csphere.docbook +share/doc/HTML/ca@valencia/kstars/csv_import.png share/doc/HTML/ca@valencia/kstars/darkmatter.docbook +share/doc/HTML/ca@valencia/kstars/detaildialog.png share/doc/HTML/ca@valencia/kstars/details.docbook +share/doc/HTML/ca@valencia/kstars/dso_manager.png share/doc/HTML/ca@valencia/kstars/dumpmode.docbook share/doc/HTML/ca@valencia/kstars/ecliptic.docbook share/doc/HTML/ca@valencia/kstars/ekos-align.docbook @@ -183,44 +193,62 @@ share/doc/HTML/ca@valencia/kstars/ekos-setup.docbook share/doc/HTML/ca@valencia/kstars/ekos-tutorials.docbook share/doc/HTML/ca@valencia/kstars/ekos-user-interface.docbook share/doc/HTML/ca@valencia/kstars/ekos.docbook +share/doc/HTML/ca@valencia/kstars/ekos_page.png share/doc/HTML/ca@valencia/kstars/ellipticalgalaxies.docbook share/doc/HTML/ca@valencia/kstars/epoch.docbook share/doc/HTML/ca@valencia/kstars/equinox.docbook share/doc/HTML/ca@valencia/kstars/eyepieceview.docbook share/doc/HTML/ca@valencia/kstars/faq.docbook +share/doc/HTML/ca@valencia/kstars/find.png +share/doc/HTML/ca@valencia/kstars/find2.png +share/doc/HTML/ca@valencia/kstars/fits_page.png share/doc/HTML/ca@valencia/kstars/fitsviewer.docbook share/doc/HTML/ca@valencia/kstars/flux.docbook +share/doc/HTML/ca@valencia/kstars/fovdialog.png share/doc/HTML/ca@valencia/kstars/geocoords.docbook +share/doc/HTML/ca@valencia/kstars/geolocator.png share/doc/HTML/ca@valencia/kstars/greatcircle.docbook +share/doc/HTML/ca@valencia/kstars/guides_page.png share/doc/HTML/ca@valencia/kstars/hips.docbook share/doc/HTML/ca@valencia/kstars/horizon.docbook share/doc/HTML/ca@valencia/kstars/hourangle.docbook share/doc/HTML/ca@valencia/kstars/index.cache.bz2 share/doc/HTML/ca@valencia/kstars/index.docbook share/doc/HTML/ca@valencia/kstars/indi.docbook +share/doc/HTML/ca@valencia/kstars/indi_page.png share/doc/HTML/ca@valencia/kstars/jmoons.docbook share/doc/HTML/ca@valencia/kstars/julianday.docbook +share/doc/HTML/ca@valencia/kstars/kstars_horizon.png share/doc/HTML/ca@valencia/kstars/leapyear.docbook share/doc/HTML/ca@valencia/kstars/lightcurves.docbook share/doc/HTML/ca@valencia/kstars/luminosity.docbook share/doc/HTML/ca@valencia/kstars/magnitude.docbook share/doc/HTML/ca@valencia/kstars/meridian.docbook +share/doc/HTML/ca@valencia/kstars/newfov.png share/doc/HTML/ca@valencia/kstars/obsplanner.docbook share/doc/HTML/ca@valencia/kstars/parallax.docbook +share/doc/HTML/ca@valencia/kstars/popup.png share/doc/HTML/ca@valencia/kstars/precession.docbook share/doc/HTML/ca@valencia/kstars/quicktour.docbook share/doc/HTML/ca@valencia/kstars/retrograde.docbook +share/doc/HTML/ca@valencia/kstars/satellites_page.png +share/doc/HTML/ca@valencia/kstars/screen1.png share/doc/HTML/ca@valencia/kstars/scriptbuilder.docbook share/doc/HTML/ca@valencia/kstars/sidereal.docbook share/doc/HTML/ca@valencia/kstars/skycoords.docbook share/doc/HTML/ca@valencia/kstars/solarsys.docbook +share/doc/HTML/ca@valencia/kstars/solarsystem_page.png share/doc/HTML/ca@valencia/kstars/spiralgalaxies.docbook share/doc/HTML/ca@valencia/kstars/stars.docbook +share/doc/HTML/ca@valencia/kstars/supernovae_page.png share/doc/HTML/ca@valencia/kstars/telescopes.docbook +share/doc/HTML/ca@valencia/kstars/terrain_page.png share/doc/HTML/ca@valencia/kstars/timezones.docbook share/doc/HTML/ca@valencia/kstars/tools.docbook share/doc/HTML/ca@valencia/kstars/utime.docbook +share/doc/HTML/ca@valencia/kstars/viewops.png share/doc/HTML/ca@valencia/kstars/wut.docbook +share/doc/HTML/ca@valencia/kstars/xplanet_page.png share/doc/HTML/ca@valencia/kstars/zenith.docbook share/doc/HTML/en/kstars/Add_Object_to_Session_plan.png share/doc/HTML/en/kstars/Another_way4.png @@ -577,6 +605,259 @@ share/doc/HTML/es/kstars/tools.docbook share/doc/HTML/es/kstars/utime.docbook share/doc/HTML/es/kstars/wut.docbook share/doc/HTML/es/kstars/zenith.docbook +share/doc/HTML/fr/kstars/Add_Object_to_Session_plan.png +share/doc/HTML/fr/kstars/Another_way4.png +share/doc/HTML/fr/kstars/Another_way5.png +share/doc/HTML/fr/kstars/Another_way6.png +share/doc/HTML/fr/kstars/Another_way_to_add.png +share/doc/HTML/fr/kstars/Another_way_to_add_part3.png +share/doc/HTML/fr/kstars/Arp84_EyepieceView.png +share/doc/HTML/fr/kstars/Delete_all_images.png +share/doc/HTML/fr/kstars/EPView_Screenshot.png +share/doc/HTML/fr/kstars/KStars_Neptune.png +share/doc/HTML/fr/kstars/Savin_session.png +share/doc/HTML/fr/kstars/aavso.png +share/doc/HTML/fr/kstars/add-circle.png +share/doc/HTML/fr/kstars/add_object.png +share/doc/HTML/fr/kstars/advanced_page.png +share/doc/HTML/fr/kstars/ai-contents.docbook +share/doc/HTML/fr/kstars/alignment_polaris.png +share/doc/HTML/fr/kstars/alpha.png +share/doc/HTML/fr/kstars/altvstime.docbook +share/doc/HTML/fr/kstars/altvstime.png +share/doc/HTML/fr/kstars/archive-extract.png +share/doc/HTML/fr/kstars/astroinfo.docbook +share/doc/HTML/fr/kstars/astrometry_indexes_settings.png +share/doc/HTML/fr/kstars/astrometry_settings.png +share/doc/HTML/fr/kstars/astrometry_windows_ansvr.png +share/doc/HTML/fr/kstars/blackbody.docbook +share/doc/HTML/fr/kstars/blackbody.png +share/doc/HTML/fr/kstars/calc-angdist.docbook +share/doc/HTML/fr/kstars/calc-angdist.png +share/doc/HTML/fr/kstars/calc-apcoords.docbook +share/doc/HTML/fr/kstars/calc-apcoords.png +share/doc/HTML/fr/kstars/calc-dayduration.docbook +share/doc/HTML/fr/kstars/calc-daylength.png +share/doc/HTML/fr/kstars/calc-ecliptic.docbook +share/doc/HTML/fr/kstars/calc-ecliptic.png +share/doc/HTML/fr/kstars/calc-eqgal.docbook +share/doc/HTML/fr/kstars/calc-eqgal.png +share/doc/HTML/fr/kstars/calc-equinox.docbook +share/doc/HTML/fr/kstars/calc-equinox.png +share/doc/HTML/fr/kstars/calc-geodetic.docbook +share/doc/HTML/fr/kstars/calc-geodetic.png +share/doc/HTML/fr/kstars/calc-horizontal.docbook +share/doc/HTML/fr/kstars/calc-horizontal.png +share/doc/HTML/fr/kstars/calc-julian.png +share/doc/HTML/fr/kstars/calc-julianday.docbook +share/doc/HTML/fr/kstars/calc-planetcoords.docbook +share/doc/HTML/fr/kstars/calc-planetcoords.png +share/doc/HTML/fr/kstars/calc-sidereal.docbook +share/doc/HTML/fr/kstars/calc-sidereal.png +share/doc/HTML/fr/kstars/calculator.docbook +share/doc/HTML/fr/kstars/calibration_settings.png +share/doc/HTML/fr/kstars/capture_settings.png +share/doc/HTML/fr/kstars/catalog_details.png +share/doc/HTML/fr/kstars/center_telescope.png +share/doc/HTML/fr/kstars/cequator.docbook +share/doc/HTML/fr/kstars/color_editor.png +share/doc/HTML/fr/kstars/color_indices.png +share/doc/HTML/fr/kstars/colorandtemp.docbook +share/doc/HTML/fr/kstars/colors_page.png +share/doc/HTML/fr/kstars/commands.docbook +share/doc/HTML/fr/kstars/config.docbook +share/doc/HTML/fr/kstars/cosmicdist.docbook +share/doc/HTML/fr/kstars/cpoles.docbook +share/doc/HTML/fr/kstars/create_catalog.png +share/doc/HTML/fr/kstars/credits.docbook +share/doc/HTML/fr/kstars/csphere.docbook +share/doc/HTML/fr/kstars/csv_import.png +share/doc/HTML/fr/kstars/csv_import_populated.png +share/doc/HTML/fr/kstars/csv_openngc.png +share/doc/HTML/fr/kstars/dark_library.png +share/doc/HTML/fr/kstars/darkmatter.docbook +share/doc/HTML/fr/kstars/detaildialog.png +share/doc/HTML/fr/kstars/details.docbook +share/doc/HTML/fr/kstars/devicemanager.png +share/doc/HTML/fr/kstars/dialog-ok-apply.png +share/doc/HTML/fr/kstars/document-edit.png +share/doc/HTML/fr/kstars/document-open.png +share/doc/HTML/fr/kstars/dome-park.png +share/doc/HTML/fr/kstars/dome-unpark.png +share/doc/HTML/fr/kstars/draw-text.png +share/doc/HTML/fr/kstars/dso_manager.png +share/doc/HTML/fr/kstars/dss.png +share/doc/HTML/fr/kstars/dumpmode.docbook +share/doc/HTML/fr/kstars/ecliptic.docbook +share/doc/HTML/fr/kstars/ekos-align.docbook +share/doc/HTML/fr/kstars/ekos-analyze.docbook +share/doc/HTML/fr/kstars/ekos-capture.docbook +share/doc/HTML/fr/kstars/ekos-focus.docbook +share/doc/HTML/fr/kstars/ekos-guide.docbook +share/doc/HTML/fr/kstars/ekos-logs.docbook +share/doc/HTML/fr/kstars/ekos-profile-editor.docbook +share/doc/HTML/fr/kstars/ekos-profile-wizard.docbook +share/doc/HTML/fr/kstars/ekos-scheduler.docbook +share/doc/HTML/fr/kstars/ekos-setup.docbook +share/doc/HTML/fr/kstars/ekos-tutorials.docbook +share/doc/HTML/fr/kstars/ekos-user-interface.docbook +share/doc/HTML/fr/kstars/ekos.docbook +share/doc/HTML/fr/kstars/ekos_analyze.png +share/doc/HTML/fr/kstars/ekos_astrometry.png +share/doc/HTML/fr/kstars/ekos_capture.png +share/doc/HTML/fr/kstars/ekos_focus.png +share/doc/HTML/fr/kstars/ekos_guide.png +share/doc/HTML/fr/kstars/ekos_guide_phd2.png +share/doc/HTML/fr/kstars/ekos_page.png +share/doc/HTML/fr/kstars/ekos_profile_guider_select.png +share/doc/HTML/fr/kstars/ekos_remote_astrometry.png +share/doc/HTML/fr/kstars/ekos_rotator_settings.png +share/doc/HTML/fr/kstars/ekos_scheduler.png +share/doc/HTML/fr/kstars/ekos_summary.png +share/doc/HTML/fr/kstars/ekos_summary_cheatsheet.png +share/doc/HTML/fr/kstars/ellipticalgalaxies.docbook +share/doc/HTML/fr/kstars/epoch.docbook +share/doc/HTML/fr/kstars/equinox.docbook +share/doc/HTML/fr/kstars/execute_session_nt.png +share/doc/HTML/fr/kstars/execute_session_the_nt.png +share/doc/HTML/fr/kstars/eyepieceview.docbook +share/doc/HTML/fr/kstars/faq.docbook +share/doc/HTML/fr/kstars/file_settings.png +share/doc/HTML/fr/kstars/filter_settings.png +share/doc/HTML/fr/kstars/find.png +share/doc/HTML/fr/kstars/find2.png +share/doc/HTML/fr/kstars/fits_page.png +share/doc/HTML/fr/kstars/fits_settings.png +share/doc/HTML/fr/kstars/fitsviewer.docbook +share/doc/HTML/fr/kstars/fitsviewer.png +share/doc/HTML/fr/kstars/fitsviewer_embedded.png +share/doc/HTML/fr/kstars/fitsviewer_histogram.png +share/doc/HTML/fr/kstars/fitsviewer_selstat.png +share/doc/HTML/fr/kstars/flag-green.png +share/doc/HTML/fr/kstars/flag-red.png +share/doc/HTML/fr/kstars/flux.docbook +share/doc/HTML/fr/kstars/flux.png +share/doc/HTML/fr/kstars/flux1.png +share/doc/HTML/fr/kstars/flux2.png +share/doc/HTML/fr/kstars/focus_bad_focus.png +share/doc/HTML/fr/kstars/focus_ccdfw_group.png +share/doc/HTML/fr/kstars/focus_display.png +share/doc/HTML/fr/kstars/focus_good_focus.png +share/doc/HTML/fr/kstars/focus_mechanics.png +share/doc/HTML/fr/kstars/focus_process.png +share/doc/HTML/fr/kstars/focus_relative_profile.png +share/doc/HTML/fr/kstars/focus_settings.png +share/doc/HTML/fr/kstars/focus_vcurve.png +share/doc/HTML/fr/kstars/focus_vcurve_timeseries.png +share/doc/HTML/fr/kstars/focuser_group.png +share/doc/HTML/fr/kstars/fovdialog.png +share/doc/HTML/fr/kstars/geocoords.docbook +share/doc/HTML/fr/kstars/geolocator.png +share/doc/HTML/fr/kstars/greatcircle.docbook +share/doc/HTML/fr/kstars/guide_calibration_settings.png +share/doc/HTML/fr/kstars/guide_drift_graphics.png +share/doc/HTML/fr/kstars/guide_guide_settings.png +share/doc/HTML/fr/kstars/guides_page.png +share/doc/HTML/fr/kstars/hips.docbook +share/doc/HTML/fr/kstars/horizon.docbook +share/doc/HTML/fr/kstars/hourangle.docbook +share/doc/HTML/fr/kstars/index.cache.bz2 +share/doc/HTML/fr/kstars/index.docbook +share/doc/HTML/fr/kstars/indi.docbook +share/doc/HTML/fr/kstars/indi_page.png +share/doc/HTML/fr/kstars/indiclient.png +share/doc/HTML/fr/kstars/indicontrolpanel.png +share/doc/HTML/fr/kstars/install.docbook +share/doc/HTML/fr/kstars/jmoons.docbook +share/doc/HTML/fr/kstars/jmoons.png +share/doc/HTML/fr/kstars/julianday.docbook +share/doc/HTML/fr/kstars/kstars_annotation.png +share/doc/HTML/fr/kstars/kstars_ekos.png +share/doc/HTML/fr/kstars/kstars_fitsviewer.png +share/doc/HTML/fr/kstars/kstars_hips.png +share/doc/HTML/fr/kstars/kstars_horizon.png +share/doc/HTML/fr/kstars/kstars_indi.png +share/doc/HTML/fr/kstars/lambda_ex.png +share/doc/HTML/fr/kstars/lambda_max.png +share/doc/HTML/fr/kstars/leapyear.docbook +share/doc/HTML/fr/kstars/lightcurve.png +share/doc/HTML/fr/kstars/lightcurves.docbook +share/doc/HTML/fr/kstars/limit_settings.png +share/doc/HTML/fr/kstars/list-add.png +share/doc/HTML/fr/kstars/lock-open.png +share/doc/HTML/fr/kstars/luminosity.docbook +share/doc/HTML/fr/kstars/luminosity.png +share/doc/HTML/fr/kstars/luminosity_ex.png +share/doc/HTML/fr/kstars/magnitude.docbook +share/doc/HTML/fr/kstars/media-playback-pause.png +share/doc/HTML/fr/kstars/media-playback-start.png +share/doc/HTML/fr/kstars/media-record.png +share/doc/HTML/fr/kstars/meridian.docbook +share/doc/HTML/fr/kstars/mosaic_adjust_grid.png +share/doc/HTML/fr/kstars/mosaic_close_pole.png +share/doc/HTML/fr/kstars/mosaic_confirm_equipment.png +share/doc/HTML/fr/kstars/mosaic_create_jobs.png +share/doc/HTML/fr/kstars/mosaic_planner.png +share/doc/HTML/fr/kstars/mosaic_select_grid.png +share/doc/HTML/fr/kstars/newfov.png +share/doc/HTML/fr/kstars/object-rotate-right.png +share/doc/HTML/fr/kstars/observinglist.docbook +share/doc/HTML/fr/kstars/observinglist.png +share/doc/HTML/fr/kstars/obsplanner.docbook +share/doc/HTML/fr/kstars/parallax.docbook +share/doc/HTML/fr/kstars/polar_alignment_result.png +share/doc/HTML/fr/kstars/polar_assistant_main.png +share/doc/HTML/fr/kstars/popup.png +share/doc/HTML/fr/kstars/precession.docbook +share/doc/HTML/fr/kstars/process-stop.png +share/doc/HTML/fr/kstars/profile_editor.png +share/doc/HTML/fr/kstars/profile_editor_scripts.png +share/doc/HTML/fr/kstars/profile_wizard_done.png +share/doc/HTML/fr/kstars/profile_wizard_remote.png +share/doc/HTML/fr/kstars/profile_wizard_select.png +share/doc/HTML/fr/kstars/profile_wizard_welcome.png +share/doc/HTML/fr/kstars/quicktour.docbook +share/doc/HTML/fr/kstars/retrograde.docbook +share/doc/HTML/fr/kstars/satellites_page.png +share/doc/HTML/fr/kstars/scheduler_planner.png +share/doc/HTML/fr/kstars/screen1.png +share/doc/HTML/fr/kstars/scriptbuilder.docbook +share/doc/HTML/fr/kstars/scriptbuilder.png +share/doc/HTML/fr/kstars/sds.png +share/doc/HTML/fr/kstars/security-high.png +share/doc/HTML/fr/kstars/security-low.png +share/doc/HTML/fr/kstars/security-medium.png +share/doc/HTML/fr/kstars/sequence_settings.png +share/doc/HTML/fr/kstars/sidereal.docbook +share/doc/HTML/fr/kstars/skycoords.docbook +share/doc/HTML/fr/kstars/skymapdevice.png +share/doc/HTML/fr/kstars/solarsys.docbook +share/doc/HTML/fr/kstars/solarsystem.png +share/doc/HTML/fr/kstars/solarsystem_page.png +share/doc/HTML/fr/kstars/solver_settings.png +share/doc/HTML/fr/kstars/spiralgalaxies.docbook +share/doc/HTML/fr/kstars/star_colors.png +share/doc/HTML/fr/kstars/star_profile_examine_pixels.png +share/doc/HTML/fr/kstars/star_profile_final.png +share/doc/HTML/fr/kstars/star_profile_main.png +share/doc/HTML/fr/kstars/star_profile_toolbar1.png +share/doc/HTML/fr/kstars/star_profile_toolbar2.png +share/doc/HTML/fr/kstars/star_profile_vertical.png +share/doc/HTML/fr/kstars/stars.docbook +share/doc/HTML/fr/kstars/supernovae_page.png +share/doc/HTML/fr/kstars/telescopes.docbook +share/doc/HTML/fr/kstars/terrain_page.png +share/doc/HTML/fr/kstars/timezones.docbook +share/doc/HTML/fr/kstars/tools.docbook +share/doc/HTML/fr/kstars/utime.docbook +share/doc/HTML/fr/kstars/view-filter.png +share/doc/HTML/fr/kstars/view-fullscreen.png +share/doc/HTML/fr/kstars/view-refresh.png +share/doc/HTML/fr/kstars/viewops.png +share/doc/HTML/fr/kstars/wut.docbook +share/doc/HTML/fr/kstars/wut.png +share/doc/HTML/fr/kstars/xplanet_page.png +share/doc/HTML/fr/kstars/zenith.docbook share/doc/HTML/nl/kstars/aavso.png share/doc/HTML/nl/kstars/ai-contents.docbook share/doc/HTML/nl/kstars/altvstime.docbook diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index dbbb5178d74..13e4fef4e1b 100644 --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -1,7 +1,6 @@ PORTNAME= audacity DISTVERSIONPREFIX= Audacity- -DISTVERSION= 3.1.3 -PORTREVISION= 2 +DISTVERSION= 3.2.0 CATEGORIES= audio MAINTAINER= xxjack12xx@gmail.com @@ -15,12 +14,14 @@ BUILD_DEPENDS= conan:sysutils/conan LIB_DEPENDS= libasound.so:audio/alsa-lib \ libexpat.so:textproc/expat2 \ libmp3lame.so:audio/lame \ + libmpg123.so:audio/mpg123 \ libopus.so:audio/opus \ libportaudio.so:audio/portaudio \ libportmidi.so:audio/portmidi \ libsndfile.so:audio/libsndfile \ libsoxr.so:audio/libsoxr \ libsqlite3.so:databases/sqlite3 \ + libwavpack.so:audio/wavpack \ libuuid.so:misc/e2fsprogs-libuuid USES= cmake compiler:c++17-lang cpe desktop-file-utils gettext \ @@ -46,8 +47,9 @@ CMAKE_ARGS= -Daudacity_lib_preference:STRING=system \ -Daudacity_use_wxwidgets:STRING=system \ -Daudacity_use_zlib:STRING=system CMAKE_ON= audacity_use_pa_oss audacity_obey_system_dependencies -CMAKE_OFF= audacity_has_networking audacity_has_updates_check \ - audacity_use_pa_alsa audacity_use_pch +CMAKE_OFF= audacity_has_audiocom_upload audacity_has_networking audacity_has_updates_check \ + audacity_use_pa_alsa audacity_use_pch audacity_has_sentry_reporting \ + audacity_has_tests audacity_has_vst3 OPTIONS_DEFINE= DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LV2 MAD \ OGG SBSMS SOUNDTOUCH TWOLAME VAMP \ diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo index fd6da1ee09b..91068f1e787 100644 --- a/audio/audacity/distinfo +++ b/audio/audacity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640677957 -SHA256 (audacity-audacity-Audacity-3.1.3_GH0.tar.gz) = 07aed333a20b8df381d5c0a167840883fff8ef65f5e5f71e654c0925d6c60de8 -SIZE (audacity-audacity-Audacity-3.1.3_GH0.tar.gz) = 56500219 +TIMESTAMP = 1664238989 +SHA256 (audacity-audacity-Audacity-3.2.0_GH0.tar.gz) = b6c3b15607a4925ea2ea5af12db8adaed759481fd1d3f51c5d8d9020171eea61 +SIZE (audacity-audacity-Audacity-3.2.0_GH0.tar.gz) = 56964814 diff --git a/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt b/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt index 292e44f38c0..600659ad1b5 100644 --- a/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt +++ b/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt @@ -1,11 +1,11 @@ ---- cmake-proxies/CMakeLists.txt.orig 2022-05-07 05:25:37 UTC +--- cmake-proxies/CMakeLists.txt.orig 2022-09-27 06:14:03 UTC +++ cmake-proxies/CMakeLists.txt -@@ -103,7 +103,7 @@ add_conan_lib( - libmad - libmad/0.15.2b@audacity/stable - OPTION_NAME libmad -- PKG_CONFIG "mad >= 0.15.0b" # Ubuntu has broken PC file -+ PKG_CONFIG "libmad >= 0.15.0b" # Ubuntu has broken PC file - ) +@@ -130,7 +130,7 @@ else() + libmad + libmad/0.15.2b-1@ + OPTION_NAME libmad +- PKG_CONFIG "mad >= 0.15.0b" # Ubuntu has broken PC file ++ PKG_CONFIG "libmad >= 0.15.0b" # Ubuntu has broken PC file + ) + endif() - add_conan_lib( diff --git a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h index 64e0f0276d9..22ab44bcac7 100644 --- a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h +++ b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h @@ -1,6 +1,6 @@ ---- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig 2021-02-04 18:52:51 UTC +--- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig 2022-09-22 16:16:06 UTC +++ lib-src/libnyquist/nyquist/xlisp/xlisp.h -@@ -172,6 +172,15 @@ extern long ptrtoabs(); +@@ -181,6 +181,15 @@ extern long ptrtoabs(); #endif #endif diff --git a/audio/audacity/files/patch-libraries_lib-basic-ui_BasicUI.cpp b/audio/audacity/files/patch-libraries_lib-basic-ui_BasicUI.cpp new file mode 100644 index 00000000000..324ae029e6b --- /dev/null +++ b/audio/audacity/files/patch-libraries_lib-basic-ui_BasicUI.cpp @@ -0,0 +1,10 @@ +--- libraries/lib-basic-ui/BasicUI.cpp.orig 2022-09-28 03:57:45 UTC ++++ libraries/lib-basic-ui/BasicUI.cpp +@@ -29,6 +29,7 @@ Paul Licameli + + #include + ++extern char** environ; + namespace + { + diff --git a/audio/audacity/files/patch-src_AboutDialog.cpp b/audio/audacity/files/patch-src_AboutDialog.cpp index db7c2510c6d..0a9529d7fd5 100644 --- a/audio/audacity/files/patch-src_AboutDialog.cpp +++ b/audio/audacity/files/patch-src_AboutDialog.cpp @@ -1,6 +1,6 @@ ---- src/AboutDialog.cpp.orig 2021-09-22 19:37:04 UTC +--- src/AboutDialog.cpp.orig 2022-09-22 16:16:06 UTC +++ src/AboutDialog.cpp -@@ -64,7 +64,7 @@ hold information about one contributor to Audacity. +@@ -59,7 +59,7 @@ hold information about one contributor to Audacity. // RevisionIdent.h may contain #defines like these ones: //#define REV_LONG "28864acb238cb3ca71dda190a2d93242591dd80e" //#define REV_TIME "Sun Apr 12 12:40:22 2015 +0100" diff --git a/audio/audacity/files/patch-src_CMakeLists.txt b/audio/audacity/files/patch-src_CMakeLists.txt deleted file mode 100644 index fcb46599dfa..00000000000 --- a/audio/audacity/files/patch-src_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- src/CMakeLists.txt.orig 2021-10-28 09:14:30 UTC -+++ src/CMakeLists.txt -@@ -38,7 +38,7 @@ elseif( GIT_FOUND ) - else() - # No Git installed and no version data is available. - # Generate an empty file and let AboutDialog do the rest -- file( TOUCH "${_PRVDIR}/RevisionIdent.h" ) -+ file( WRITE "${_PRVDIR}/RevisionIdent.h" "\n" ) - endif() - - # Handle Audio Units option diff --git a/audio/audacity/files/patch-src_MIDIPlay.cpp b/audio/audacity/files/patch-src_MIDIPlay.cpp index 4c6b68156c2..44399cc73e0 100644 --- a/audio/audacity/files/patch-src_MIDIPlay.cpp +++ b/audio/audacity/files/patch-src_MIDIPlay.cpp @@ -1,11 +1,11 @@ ---- src/MIDIPlay.cpp.orig 2021-10-31 02:53:52 UTC +--- src/MIDIPlay.cpp.orig 2022-09-27 05:35:02 UTC +++ src/MIDIPlay.cpp @@ -490,7 +490,7 @@ static double SystemTime(bool usingAlsa) if (usingAlsa) { struct timespec now; // CLOCK_MONOTONIC_RAW is unaffected by NTP or adj-time -- clock_gettime(CLOCK_MONOTONIC_RAW, &now); -+ clock_gettime(CLOCK_REALTIME, &now); - //return now.tv_sec + now.tv_nsec * 0.000000001; - return (now.tv_sec + now.tv_nsec * 0.000000001) - streamStartTime; - } +-#ifdef FreeBSD ++#ifdef __FreeBSD__ + clock_gettime(CLOCK_REALTIME, &now); + #else + clock_gettime(CLOCK_MONOTONIC_RAW, &now); diff --git a/audio/audacity/pkg-plist b/audio/audacity/pkg-plist index aeb76908302..0a5313d9aa2 100644 --- a/audio/audacity/pkg-plist +++ b/audio/audacity/pkg-plist @@ -1,27 +1,34 @@ -audacity bin/audacity lib/audacity/lib-audio-devices.so +lib/audacity/lib-audio-graph.so lib/audacity/lib-basic-ui.so lib/audacity/lib-components.so lib/audacity/lib-exceptions.so lib/audacity/lib-ffmpeg-support.so lib/audacity/lib-files.so +lib/audacity/lib-graphics.so +lib/audacity/lib-ipc.so lib/audacity/lib-math.so +lib/audacity/lib-module-manager.so lib/audacity/lib-preferences.so +lib/audacity/lib-project-history.so lib/audacity/lib-project-rate.so lib/audacity/lib-project.so lib/audacity/lib-registries.so +lib/audacity/lib-sample-track.so lib/audacity/lib-screen-geometry.so lib/audacity/lib-string-utils.so lib/audacity/lib-strings.so +lib/audacity/lib-theme-resources.so lib/audacity/lib-theme.so +lib/audacity/lib-track.so +lib/audacity/lib-transactions.so lib/audacity/lib-utility.so lib/audacity/lib-uuid.so lib/audacity/lib-xml.so lib/audacity/modules/mod-script-pipe.so -share/man/man1/audacity.1.gz share/applications/audacity.desktop -%%DATADIR%%/EQDefaultCurves.xml +%%DATADIR%%/EffectsMenuDefaults.xml %%DATADIR%%/nyquist/aud-do-support.lsp %%DATADIR%%/nyquist/dspprims.lsp %%DATADIR%%/nyquist/envelopes.lsp @@ -159,6 +166,7 @@ share/icons/hicolor/scalable/apps/audacity.svg %%NLS%%share/locale/vi/LC_MESSAGES/audacity.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/audacity.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/audacity.mo +share/man/man1/audacity.1.gz share/metainfo/audacity.appdata.xml share/mime/packages/audacity.xml share/pixmaps/audacity.xpm diff --git a/audio/faust/Makefile b/audio/faust/Makefile index c78a103eb85..8cecb023768 100644 --- a/audio/faust/Makefile +++ b/audio/faust/Makefile @@ -1,5 +1,5 @@ PORTNAME= faust -DISTVERSION= 2.41.1 +DISTVERSION= 2.50.6 CATEGORIES= audio devel MAINTAINER= yuri@FreeBSD.org @@ -18,9 +18,7 @@ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= grame-cncm GH_TUPLE= \ - grame-cncm:faustlibraries:9b05121:grame_cncm_faustlibraries/libraries \ - google:oboe:7146098:google_oboe/architecture/android/app/oboe \ - google:oboe:7146098:google_oboe/architecture/smartKeyboard/android/app/oboe + grame-cncm:faustlibraries:f9efea9:grame_cncm_faustlibraries/libraries SHEBANG_FILES= tools/faust2appls/* tools/benchmark/faustbench tools/sound2faust/sound2reader @@ -49,6 +47,12 @@ HTTPD_LIB_LIB_DEPENDS= libmicrohttpd.so:www/libmicrohttpd PORTEXAMPLES= * +post-patch: + # change qmake (5) -> qmake6 + @cd ${WRKSRC} && \ + ${REINPLACE_CMD} -i '' -e 's|echo qmake)|echo qmake6)|; s|echo qmake-qt5)|echo qmake6)|' \ + tools/faust2appls/faust2* + post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/faust @${RM} -r ${STAGEDIR}${PREFIX}/lib/faust # https://github.com/grame-cncm/faust/issues/135 diff --git a/audio/faust/distinfo b/audio/faust/distinfo index 43901664d6c..7c8b6e73379 100644 --- a/audio/faust/distinfo +++ b/audio/faust/distinfo @@ -1,7 +1,5 @@ -TIMESTAMP = 1656734109 -SHA256 (grame-cncm-faust-2.41.1_GH0.tar.gz) = d2d6984e916b108ee95b0d502bc4e4a7f6657bd442e81530cc80ce0c81103160 -SIZE (grame-cncm-faust-2.41.1_GH0.tar.gz) = 67674609 -SHA256 (grame-cncm-faustlibraries-9b05121_GH0.tar.gz) = 1d93db668ad768a035e9d7b0f51e7480938366e79eec11f4e5349994392c47ff -SIZE (grame-cncm-faustlibraries-9b05121_GH0.tar.gz) = 7757810 -SHA256 (google-oboe-7146098_GH0.tar.gz) = 68a378c0db26705479171f220400afeb1118bb95fbff5ee19a4ca3591637acce -SIZE (google-oboe-7146098_GH0.tar.gz) = 6181956 +TIMESTAMP = 1664937692 +SHA256 (grame-cncm-faust-2.50.6_GH0.tar.gz) = fc5b50d4bd1cbb142153406f4a2a8d534a816f4c37f207adae8c3dc397529ab9 +SIZE (grame-cncm-faust-2.50.6_GH0.tar.gz) = 69639553 +SHA256 (grame-cncm-faustlibraries-f9efea9_GH0.tar.gz) = 19c98d857edee00ae7682c222377c9e4fcc51d54029d7fe59bb66b2e2cdaf77c +SIZE (grame-cncm-faustlibraries-f9efea9_GH0.tar.gz) = 7810456 diff --git a/audio/faust/pkg-message b/audio/faust/pkg-message index f0f9f82c388..b14849248ec 100644 --- a/audio/faust/pkg-message +++ b/audio/faust/pkg-message @@ -9,6 +9,7 @@ https://faustdoc.grame.fr/tutorials/basic-osc/ into the source file example.dsp, and run the faust compiler that will create Qt UI with Jack audio backend: +$ sudo pkg install -A qt6-base $ cp files/example.dsp . $ faust2jaqt example.dsp $ ./example # this assumes that Jack audio server is up and running diff --git a/audio/faust/pkg-plist b/audio/faust/pkg-plist index 3bdf6ed56af..d088a607bab 100644 --- a/audio/faust/pkg-plist +++ b/audio/faust/pkg-plist @@ -262,7 +262,7 @@ lib/ios-libsndfile.a lib/libOSCFaust.a lib/libfaust.so lib/libfaust.so.2 -lib/libfaust.so.2.41.1 +lib/libfaust.so.2.50.6 %%HIGHLIGHT%%share/apps/katepart/syntax/faust.xml %%DATADIR%%/AU/AUPublic/AUBase/AUBase.cpp %%DATADIR%%/AU/AUPublic/AUBase/AUBase.h @@ -842,6 +842,7 @@ lib/libfaust.so.2.41.1 %%DATADIR%%/synths.lib %%DATADIR%%/teensy/teensy.cpp %%DATADIR%%/teensy/teensy.h +%%DATADIR%%/template-llvm.cpp %%DATADIR%%/thread.h %%DATADIR%%/tonestacks.lib %%DATADIR%%/tubes.lib diff --git a/audio/gonic/Makefile b/audio/gonic/Makefile index 9914365735c..bfa23d9ff9e 100644 --- a/audio/gonic/Makefile +++ b/audio/gonic/Makefile @@ -1,6 +1,6 @@ PORTNAME= gonic PORTVERSION= 0.14.0 -PORTREVISION= 3 +PORTREVISION= 4 DISTVERSIONPREFIX= v CATEGORIES= audio net diff --git a/audio/murmur-cli/Makefile b/audio/murmur-cli/Makefile index 3bfd5ebdf3f..f7662e9cf43 100644 --- a/audio/murmur-cli/Makefile +++ b/audio/murmur-cli/Makefile @@ -1,6 +1,6 @@ PORTNAME= murmur-cli PORTVERSION= 0.0.0.20200528 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio MAINTAINER= feld@FreeBSD.org diff --git a/audio/pms-devel/Makefile b/audio/pms-devel/Makefile index dc1fa21fe03..d01f5e4fe54 100644 --- a/audio/pms-devel/Makefile +++ b/audio/pms-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= pms-devel PORTVERSION= 0.0.20220831 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MAINTAINER= riggs@FreeBSD.org diff --git a/audio/stmp/Makefile b/audio/stmp/Makefile index c6421c4b49f..b404de4b112 100644 --- a/audio/stmp/Makefile +++ b/audio/stmp/Makefile @@ -1,6 +1,6 @@ PORTNAME= stmp PORTVERSION= 0.0.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio MAINTAINER= bapt@FreeBSD.org diff --git a/audio/visp-go/Makefile b/audio/visp-go/Makefile index e9a27be252f..ac464197d55 100644 --- a/audio/visp-go/Makefile +++ b/audio/visp-go/Makefile @@ -1,6 +1,6 @@ PORTNAME= visp-go DISTVERSION= g20210723 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio MAINTAINER= lcook@FreeBSD.org diff --git a/benchmarks/ali/Makefile b/benchmarks/ali/Makefile index af26a18ee4a..29488f02fcf 100644 --- a/benchmarks/ali/Makefile +++ b/benchmarks/ali/Makefile @@ -1,7 +1,7 @@ PORTNAME= ali PORTVERSION= 0.7.5 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= benchmarks MAINTAINER= olgeni@FreeBSD.org diff --git a/benchmarks/bombardier/Makefile b/benchmarks/bombardier/Makefile index 97d7ed8b630..f9730d4a77d 100644 --- a/benchmarks/bombardier/Makefile +++ b/benchmarks/bombardier/Makefile @@ -1,7 +1,7 @@ PORTNAME= bombardier PORTVERSION= 1.2.5 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= benchmarks MAINTAINER= danilo@FreeBSD.org diff --git a/benchmarks/ddosify/Makefile b/benchmarks/ddosify/Makefile index b51f1ba9288..e182b973c5d 100644 --- a/benchmarks/ddosify/Makefile +++ b/benchmarks/ddosify/Makefile @@ -1,7 +1,7 @@ PORTNAME= ddosify DISTVERSIONPREFIX= v DISTVERSION= 0.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= benchmarks MAINTAINER= 0xdutra@gmail.com diff --git a/benchmarks/hey/Makefile b/benchmarks/hey/Makefile index d72fa254a89..bb4f5fb17e9 100644 --- a/benchmarks/hey/Makefile +++ b/benchmarks/hey/Makefile @@ -1,7 +1,7 @@ PORTNAME= hey PORTVERSION= 0.1.4 DISTVERSIONPREFIX= v -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= benchmarks MAINTAINER= dmgk@FreeBSD.org diff --git a/benchmarks/vegeta/Makefile b/benchmarks/vegeta/Makefile index 16160cf7621..c37d27c4f83 100644 --- a/benchmarks/vegeta/Makefile +++ b/benchmarks/vegeta/Makefile @@ -1,7 +1,7 @@ PORTNAME= vegeta DISTVERSIONPREFIX= v DISTVERSION= 12.8.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= benchmarks www MAINTAINER= egypcio@FreeBSD.org diff --git a/biology/kmcp/Makefile b/biology/kmcp/Makefile index 9b5b82855db..08c4ab2fb92 100644 --- a/biology/kmcp/Makefile +++ b/biology/kmcp/Makefile @@ -1,7 +1,7 @@ PORTNAME= kmcp DISTVERSIONPREFIX= v DISTVERSION= 0.8.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= biology MAINTAINER= yuri@FreeBSD.org diff --git a/biology/ncbi-entrez-direct/Makefile b/biology/ncbi-entrez-direct/Makefile index 01618a21220..ff10663a707 100644 --- a/biology/ncbi-entrez-direct/Makefile +++ b/biology/ncbi-entrez-direct/Makefile @@ -1,6 +1,6 @@ PORTNAME= ncbi-entrez-direct DISTVERSION= 14.9.20210423 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= biology perl5 MASTER_SITES= ftp://ftp.ncbi.nlm.nih.gov/entrez/entrezdirect/versions/${PORTVERSION}/ DISTFILES= edirect.tar.gz diff --git a/biology/seqkit/Makefile b/biology/seqkit/Makefile index 751a66fe3a3..f31be186534 100644 --- a/biology/seqkit/Makefile +++ b/biology/seqkit/Makefile @@ -1,6 +1,7 @@ PORTNAME= seqkit DISTVERSIONPREFIX= v DISTVERSION= 2.3.1 +PORTREVISION= 1 CATEGORIES= biology MAINTAINER= yuri@FreeBSD.org diff --git a/biology/taxonkit/Makefile b/biology/taxonkit/Makefile index c1e9c71dde4..46f14aaf195 100644 --- a/biology/taxonkit/Makefile +++ b/biology/taxonkit/Makefile @@ -1,6 +1,7 @@ PORTNAME= taxonkit DISTVERSIONPREFIX= v DISTVERSION= 0.13.0 +PORTREVISION= 1 CATEGORIES= biology MAINTAINER= yuri@FreeBSD.org diff --git a/biology/unikmer/Makefile b/biology/unikmer/Makefile index eaceb196ab6..1d21deffdd3 100644 --- a/biology/unikmer/Makefile +++ b/biology/unikmer/Makefile @@ -1,7 +1,7 @@ PORTNAME= unikmer DISTVERSIONPREFIX= v DISTVERSION= 0.19.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= biology MAINTAINER= yuri@FreeBSD.org diff --git a/cad/horizon-eda/Makefile b/cad/horizon-eda/Makefile index 1f350fbff46..1d1e50ba189 100644 --- a/cad/horizon-eda/Makefile +++ b/cad/horizon-eda/Makefile @@ -11,8 +11,6 @@ WWW= https://horizon-eda.org/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_14= fails to compile (error: no matching function for call to '__search') due to this clang regression: https://github.com/llvm/llvm-project/issues/55683 - BUILD_DEPENDS= ${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs \ cppzmq>0:net/cppzmq \ glm>0:math/glm diff --git a/cad/horizon-eda/files/patch-src_util_fs__util.cpp b/cad/horizon-eda/files/patch-src_util_fs__util.cpp new file mode 100644 index 00000000000..6fa4f04f2d2 --- /dev/null +++ b/cad/horizon-eda/files/patch-src_util_fs__util.cpp @@ -0,0 +1,20 @@ +- workaround for https://github.com/llvm/llvm-project/issues/55683 + +--- src/util/fs_util.cpp.orig 2022-05-29 18:00:44 UTC ++++ src/util/fs_util.cpp +@@ -8,10 +8,10 @@ std::optional get_relative_filename(const + { + const auto p = fs::u8path(path); + const auto b = fs::u8path(base); +- const auto x = std::search(p.begin(), p.end(), b.begin(), b.end()); +- if (x == p.begin()) // path is in base path +- return fs::relative(p, b).u8string(); +- else +- return {}; ++ for (auto ip = p.begin(), ib = b.begin(); ib != b.end(); ip++, ib++) { ++ if (ip == p.end() || *ip != *ib) ++ return {}; ++ } ++ return fs::relative(p, b).u8string(); + } + } // namespace horizon diff --git a/cad/stepcode/Makefile b/cad/stepcode/Makefile index 8d8cabaa69f..d7e60084e82 100644 --- a/cad/stepcode/Makefile +++ b/cad/stepcode/Makefile @@ -1,7 +1,6 @@ PORTNAME= stepcode -PORTVERSION= 0.8 +PORTVERSION= 0.8.1 DISTVERSIONPREFIX= v -PORTREVISION= 6 CATEGORIES= cad MAINTAINER= fernape@FreeBSD.org @@ -21,10 +20,6 @@ CMAKE_ARGS+= -DSC_INSTALL_PREFIX=${PREFIX} \ MANDIRS= ${PREFIX}/man -post-patch: - @${REINPLACE_CMD} -e 's,( JudyValue ) 0,nullptr,' \ - ${WRKSRC}/src/base/judy/src/judy*Array.h - post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/schema_scanner @(cd ${STAGEDIR}${PREFIX} ; \ diff --git a/cad/stepcode/distinfo b/cad/stepcode/distinfo index 4400fbd16c2..368c14b056a 100644 --- a/cad/stepcode/distinfo +++ b/cad/stepcode/distinfo @@ -1,2 +1,3 @@ -SHA256 (stepcode-stepcode-v0.8_GH0.tar.gz) = f9cc8a5a4193f97add595c1909433154f82983b892c532be2a696758b153fd2c -SIZE (stepcode-stepcode-v0.8_GH0.tar.gz) = 5967472 +TIMESTAMP = 1664815159 +SHA256 (stepcode-stepcode-v0.8.1_GH0.tar.gz) = ff335210ce9a8a4e9ab9ba37b368efbe132c8244d8646583ad221d0db4332437 +SIZE (stepcode-stepcode-v0.8.1_GH0.tar.gz) = 6023794 diff --git a/cad/stepcode/pkg-plist b/cad/stepcode/pkg-plist index 78e722bc390..8b4e53f1999 100644 --- a/cad/stepcode/pkg-plist +++ b/cad/stepcode/pkg-plist @@ -2,117 +2,28 @@ bin/check-express bin/exp2cxx bin/exp2python bin/exppp -bin/lazy_sdai_IFC4 -bin/lazy_sdai_ISO15926 -bin/lazy_sdai_ap203 -bin/lazy_sdai_ap203e2 -bin/lazy_sdai_ap210e2 -bin/lazy_sdai_ap214e3 -bin/lazy_sdai_ap219 -bin/lazy_sdai_ap227 -bin/lazy_sdai_ap235 -bin/lazy_sdai_ap238 -bin/lazy_sdai_ap239 -bin/lazy_sdai_ap240 -bin/lazy_sdai_cd209 -bin/lazy_sdai_cd242 -bin/lazy_sdai_ifc2x3 -bin/lazy_sdai_pdm -bin/lazy_sdai_wip210e3 -bin/lazy_test -bin/p21read_sdai_IFC4 -bin/p21read_sdai_ISO15926 -bin/p21read_sdai_ap203 -bin/p21read_sdai_ap203e2 -bin/p21read_sdai_ap210e2 -bin/p21read_sdai_ap214e3 -bin/p21read_sdai_ap219 -bin/p21read_sdai_ap227 -bin/p21read_sdai_ap235 -bin/p21read_sdai_ap238 -bin/p21read_sdai_ap239 -bin/p21read_sdai_ap240 -bin/p21read_sdai_cd209 -bin/p21read_sdai_cd242 -bin/p21read_sdai_ifc2x3 -bin/p21read_sdai_pdm -bin/p21read_sdai_wip210e3 bin/schema_scanner @comment include/* is handled dynamically in the Makefile -lib/libbase.so -lib/libbase.so.2 -lib/libbase.so.2.0.0 lib/libexppp.so -lib/libexppp.so.2 -lib/libexppp.so.2.0.0 +lib/libexppp.so.0 +lib/libexppp.so.0.8.1 lib/libexpress.so -lib/libexpress.so.2 -lib/libexpress.so.2.0.0 -lib/libsdai_IFC4.so -lib/libsdai_IFC4.so.2 -lib/libsdai_IFC4.so.2.0.0 -lib/libsdai_ISO15926.so -lib/libsdai_ISO15926.so.2 -lib/libsdai_ISO15926.so.2.0.0 -lib/libsdai_ap203.so -lib/libsdai_ap203.so.2 -lib/libsdai_ap203.so.2.0.0 -lib/libsdai_ap203e2.so -lib/libsdai_ap203e2.so.2 -lib/libsdai_ap203e2.so.2.0.0 -lib/libsdai_ap210e2.so -lib/libsdai_ap210e2.so.2 -lib/libsdai_ap210e2.so.2.0.0 -lib/libsdai_ap214e3.so -lib/libsdai_ap214e3.so.2 -lib/libsdai_ap214e3.so.2.0.0 -lib/libsdai_ap219.so -lib/libsdai_ap219.so.2 -lib/libsdai_ap219.so.2.0.0 -lib/libsdai_ap227.so -lib/libsdai_ap227.so.2 -lib/libsdai_ap227.so.2.0.0 -lib/libsdai_ap235.so -lib/libsdai_ap235.so.2 -lib/libsdai_ap235.so.2.0.0 -lib/libsdai_ap238.so -lib/libsdai_ap238.so.2 -lib/libsdai_ap238.so.2.0.0 -lib/libsdai_ap239.so -lib/libsdai_ap239.so.2 -lib/libsdai_ap239.so.2.0.0 -lib/libsdai_ap240.so -lib/libsdai_ap240.so.2 -lib/libsdai_ap240.so.2.0.0 -lib/libsdai_cd209.so -lib/libsdai_cd209.so.2 -lib/libsdai_cd209.so.2.0.0 -lib/libsdai_cd242.so -lib/libsdai_cd242.so.2 -lib/libsdai_cd242.so.2.0.0 -lib/libsdai_ifc2x3.so -lib/libsdai_ifc2x3.so.2 -lib/libsdai_ifc2x3.so.2.0.0 -lib/libsdai_pdm.so -lib/libsdai_pdm.so.2 -lib/libsdai_pdm.so.2.0.0 -lib/libsdai_wip210e3.so -lib/libsdai_wip210e3.so.2 -lib/libsdai_wip210e3.so.2.0.0 +lib/libexpress.so.0 +lib/libexpress.so.0.8.1 lib/libstepcore.so -lib/libstepcore.so.2 -lib/libstepcore.so.2.0.0 +lib/libstepcore.so.0 +lib/libstepcore.so.0.8.1 lib/libstepdai.so -lib/libstepdai.so.2 -lib/libstepdai.so.2.0.0 +lib/libstepdai.so.0 +lib/libstepdai.so.0.8.1 lib/libstepeditor.so -lib/libstepeditor.so.2 -lib/libstepeditor.so.2.0.0 +lib/libstepeditor.so.0 +lib/libstepeditor.so.0.8.1 lib/libsteplazyfile.so -lib/libsteplazyfile.so.2 -lib/libsteplazyfile.so.2.0.0 +lib/libsteplazyfile.so.0 +lib/libsteplazyfile.so.0.8.1 lib/libsteputils.so -lib/libsteputils.so.2 -lib/libsteputils.so.2.0.0 -man/man1/exp2cxx.1.gz -man/man1/fedex.1.gz +lib/libsteputils.so.0 +lib/libsteputils.so.0.8.1 +share/man/man1/exp2cxx.1.gz +share/man/man1/fedex.1.gz diff --git a/converters/cl-babel-sbcl/Makefile b/converters/cl-babel-sbcl/Makefile index c2388cbd220..3f6bcb04390 100644 --- a/converters/cl-babel-sbcl/Makefile +++ b/converters/cl-babel-sbcl/Makefile @@ -1,6 +1,6 @@ PORTNAME= babel PORTVERSION= 2010.01.16 -PORTREVISION= 70 +PORTREVISION= 71 CATEGORIES= converters lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/converters/yj/Makefile b/converters/yj/Makefile index 9317ad22cb9..2669043f4a9 100644 --- a/converters/yj/Makefile +++ b/converters/yj/Makefile @@ -1,6 +1,6 @@ PORTNAME= yj PORTVERSION= 5.1.0 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONPREFIX= v CATEGORIES= converters DIST_SUBDIR= yj diff --git a/databases/cayley/Makefile b/databases/cayley/Makefile index 97c26191b16..5f42f1d3d3d 100644 --- a/databases/cayley/Makefile +++ b/databases/cayley/Makefile @@ -2,7 +2,7 @@ PORTNAME= cayley DISTVERSIONPREFIX= v DISTVERSION= 0.7.5-2 DISTVERSIONSUFFIX= -gcf576ba -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases MAINTAINER= yuri@FreeBSD.org diff --git a/databases/cockroach/Makefile b/databases/cockroach/Makefile index 36a8914da1c..2b7cf816369 100644 --- a/databases/cockroach/Makefile +++ b/databases/cockroach/Makefile @@ -1,7 +1,7 @@ PORTNAME= cockroach DISTVERSIONPREFIX= v DISTVERSION= 19.1.11 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases MASTER_SITES= https://binaries.cockroachdb.com/ EXTRACT_SUFX= .src.tgz diff --git a/databases/go-carbon/Makefile b/databases/go-carbon/Makefile index 6c922d78941..b01873fae6e 100644 --- a/databases/go-carbon/Makefile +++ b/databases/go-carbon/Makefile @@ -1,7 +1,7 @@ PORTNAME= go-carbon DISTVERSIONPREFIX= v DISTVERSION= 0.12.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= databases MAINTAINER= a.andersson.thn@gmail.com diff --git a/databases/go-pgweb/Makefile b/databases/go-pgweb/Makefile index 7cfeff4a9bb..787dcf3bd0f 100644 --- a/databases/go-pgweb/Makefile +++ b/databases/go-pgweb/Makefile @@ -1,7 +1,7 @@ PORTNAME= pgweb DISTVERSIONPREFIX= v DISTVERSION= 0.11.7 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= databases www PKGNAMEPREFIX= go- diff --git a/databases/influxdb/Makefile b/databases/influxdb/Makefile index 9127d134642..167bbc45bd5 100644 --- a/databases/influxdb/Makefile +++ b/databases/influxdb/Makefile @@ -1,7 +1,7 @@ PORTNAME= influxdb DISTVERSIONPREFIX= v DISTVERSION= 1.8.10 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= databases net-mgmt MAINTAINER= driesm@FreeBSD.org diff --git a/databases/influxdb2-cli/Makefile b/databases/influxdb2-cli/Makefile index 59c0b1e8200..c457a77dea4 100644 --- a/databases/influxdb2-cli/Makefile +++ b/databases/influxdb2-cli/Makefile @@ -1,7 +1,7 @@ PORTNAME= influxdb2-cli DISTVERSIONPREFIX= v DISTVERSION= 2.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases net-mgmt MAINTAINER= driesm@FreeBSD.org diff --git a/databases/litestream/Makefile b/databases/litestream/Makefile index 933f0394a7c..6e10b535b4b 100644 --- a/databases/litestream/Makefile +++ b/databases/litestream/Makefile @@ -1,7 +1,7 @@ PORTNAME= litestream DISTVERSIONPREFIX= v DISTVERSION= 0.3.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MAINTAINER= nc@FreeBSD.org diff --git a/databases/mongodb-tools/Makefile b/databases/mongodb-tools/Makefile index e33dbd430d7..9dc7fdbc662 100644 --- a/databases/mongodb-tools/Makefile +++ b/databases/mongodb-tools/Makefile @@ -1,6 +1,6 @@ PORTNAME= mongodb-tools DISTVERSION= 100.5.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MAINTAINER= ronald-lists@klop.ws diff --git a/databases/mongodb36-tools/Makefile b/databases/mongodb36-tools/Makefile index e16bb7b27fc..a247d411aa8 100644 --- a/databases/mongodb36-tools/Makefile +++ b/databases/mongodb36-tools/Makefile @@ -1,7 +1,7 @@ PORTNAME= mongodb36-tools PORTVERSION= 3.6.3 DISTVERSIONPREFIX= r -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases net MAINTAINER= numisemis@yahoo.com diff --git a/databases/mongodb40-tools/Makefile b/databases/mongodb40-tools/Makefile index 1d9fa5816bb..645983b58ae 100644 --- a/databases/mongodb40-tools/Makefile +++ b/databases/mongodb40-tools/Makefile @@ -1,7 +1,7 @@ PORTNAME= mongodb40-tools DISTVERSIONPREFIX= r DISTVERSION= 4.0.28 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases MAINTAINER= dev.ashevchuk@gmail.com diff --git a/databases/mongodb42-tools/Makefile b/databases/mongodb42-tools/Makefile index aebd6c8615f..abb77e3c3ae 100644 --- a/databases/mongodb42-tools/Makefile +++ b/databases/mongodb42-tools/Makefile @@ -1,7 +1,7 @@ PORTNAME= mongodb42-tools DISTVERSIONPREFIX= r DISTVERSION= 4.2.19 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases MAINTAINER= ronald-lists@klop.ws diff --git a/databases/pg_tileserv/Makefile b/databases/pg_tileserv/Makefile index 1babff68cbb..912f05696f0 100644 --- a/databases/pg_tileserv/Makefile +++ b/databases/pg_tileserv/Makefile @@ -1,6 +1,7 @@ PORTNAME= pg_tileserv DISTVERSIONPREFIX= v DISTVERSION= 1.0.9 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= lbartoletti@FreeBSD.org diff --git a/databases/pgmetrics/Makefile b/databases/pgmetrics/Makefile index 220dc6aa299..aba93d0bffc 100644 --- a/databases/pgmetrics/Makefile +++ b/databases/pgmetrics/Makefile @@ -1,6 +1,6 @@ PORTNAME= pgmetrics PORTVERSION= 1.13.1 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX=v CATEGORIES= databases diff --git a/databases/postgresql15-server/Makefile b/databases/postgresql15-server/Makefile index c879743cc4a..20fd7123bd3 100644 --- a/databases/postgresql15-server/Makefile +++ b/databases/postgresql15-server/Makefile @@ -1,5 +1,5 @@ PORTNAME?= postgresql -DISTVERSION?= 15rc1 +DISTVERSION?= 15rc2 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. PORTREVISION?= 0 diff --git a/databases/postgresql15-server/distinfo b/databases/postgresql15-server/distinfo index f2ae2f5d4b6..446ca72c861 100644 --- a/databases/postgresql15-server/distinfo +++ b/databases/postgresql15-server/distinfo @@ -1,3 +1,3 @@ TIMESTAMP = 1664272247 -SHA256 (postgresql/postgresql-15rc1.tar.bz2) = 576476fab0d49f05f27625e1d6ed433e6e1358fabba92ae41780421e65fa7ad4 -SIZE (postgresql/postgresql-15rc1.tar.bz2) = 22415390 +SHA256 (postgresql/postgresql-15rc2.tar.bz2) = 11739405e96699198733f4a0055362262c9c89f32d2e835e0b815687d700cc23 +SIZE (postgresql/postgresql-15rc2.tar.bz2) = 22420528 diff --git a/databases/prometheus-postgresql-adapter/Makefile b/databases/prometheus-postgresql-adapter/Makefile index fcfd2a39642..223081c891f 100644 --- a/databases/prometheus-postgresql-adapter/Makefile +++ b/databases/prometheus-postgresql-adapter/Makefile @@ -1,7 +1,7 @@ PORTNAME= prometheus-postgresql-adapter DISTVERSIONPREFIX= v DISTVERSION= 0.6.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases MAINTAINER= felix@userspace.com.au diff --git a/databases/redis_exporter/Makefile b/databases/redis_exporter/Makefile index 59eb9482aee..6aaa9c4f0c6 100644 --- a/databases/redis_exporter/Makefile +++ b/databases/redis_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= redis_exporter PORTVERSION= 1.33.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases MAINTAINER= arcade@b1t.name diff --git a/databases/tile38/Makefile b/databases/tile38/Makefile index 4379e4f1eed..dc3a99dbf61 100644 --- a/databases/tile38/Makefile +++ b/databases/tile38/Makefile @@ -1,6 +1,6 @@ PORTNAME= tile38 DISTVERSION= 1.12.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases MAINTAINER= a.andersson.thn@gmail.com diff --git a/databases/timescaledb-backup/Makefile b/databases/timescaledb-backup/Makefile index 91f5617ec07..10f84afb0d2 100644 --- a/databases/timescaledb-backup/Makefile +++ b/databases/timescaledb-backup/Makefile @@ -1,6 +1,6 @@ PORTNAME= timescaledb-backup DISTVERSION= 0.1.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases MAINTAINER= kbowling@FreeBSD.org diff --git a/databases/timescaledb-tune/Makefile b/databases/timescaledb-tune/Makefile index 9bb2723a54b..7e3718b5cd8 100644 --- a/databases/timescaledb-tune/Makefile +++ b/databases/timescaledb-tune/Makefile @@ -1,7 +1,7 @@ PORTNAME= timescaledb-tune DISTVERSIONPREFIX= v DISTVERSION= 0.14.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MAINTAINER= kbowling@FreeBSD.org diff --git a/databases/usql/Makefile b/databases/usql/Makefile index a2b643fd76c..c510112bcb9 100644 --- a/databases/usql/Makefile +++ b/databases/usql/Makefile @@ -1,6 +1,7 @@ PORTNAME= usql DISTVERSIONPREFIX= v DISTVERSION= 0.12.13 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= yuri@FreeBSD.org diff --git a/deskutils/Makefile b/deskutils/Makefile index 13e1f9d3b8a..89389088750 100644 --- a/deskutils/Makefile +++ b/deskutils/Makefile @@ -123,6 +123,7 @@ SUBDIR += i3lock SUBDIR += i3status SUBDIR += ical + SUBDIR += iconbrowser SUBDIR += itinerary SUBDIR += jjclient SUBDIR += jlj @@ -153,7 +154,6 @@ SUBDIR += libkdepim SUBDIR += libportal SUBDIR += ljclive - SUBDIR += lookbook SUBDIR += lumina-archiver SUBDIR += lumina-calculator SUBDIR += lumina-fileinfo diff --git a/deskutils/ausweisapp2/Makefile b/deskutils/ausweisapp2/Makefile index 6f51eaa46a9..6902b286439 100644 --- a/deskutils/ausweisapp2/Makefile +++ b/deskutils/ausweisapp2/Makefile @@ -1,5 +1,5 @@ PORTNAME= ausweisapp2 -DISTVERSION= 1.22.5 +DISTVERSION= 1.24.2 CATEGORIES= deskutils security MAINTAINER= freebsd@sysctl.cz @@ -11,7 +11,8 @@ LICENSE_NAME= European Union Public Licence V. 1.2 LICENSE_FILE= ${WRKSRC}/LICENSE.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= pcsc-lite>0:devel/pcsc-lite +BUILD_DEPENDS= pcsc-lite>0:devel/pcsc-lite \ + qt5-declarative-test>0:x11-toolkits/qt5-declarative-test LIB_DEPENDS= libhttp_parser.so:www/http-parser \ libpcsclite.so:devel/pcsc-lite \ libudev.so:devel/libudev-devd @@ -22,7 +23,7 @@ GH_ACCOUNT= Governikus GH_PROJECT= AusweisApp2 USE_QT= concurrent core declarative graphicaleffects gui network \ quickcontrols2 svg websockets widgets \ - buildtools:build linguisttools:build + buildtools linguisttools # The VENDOR variable controls the name of the directory in ${PREFIX}/share. CMAKE_ARGS= -DVENDOR=${PORTNAME} diff --git a/deskutils/ausweisapp2/distinfo b/deskutils/ausweisapp2/distinfo index fa33339f99e..ad087c34a26 100644 --- a/deskutils/ausweisapp2/distinfo +++ b/deskutils/ausweisapp2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650884872 -SHA256 (Governikus-AusweisApp2-1.22.5_GH0.tar.gz) = 09787d23663861673a3f7e604a5212ebc9575d149d6b5bd24519417de6d22ccf -SIZE (Governikus-AusweisApp2-1.22.5_GH0.tar.gz) = 11251263 +TIMESTAMP = 1664903413 +SHA256 (Governikus-AusweisApp2-1.24.2_GH0.tar.gz) = bb92f2e73e352921878000cd5ec81fcd8924c8d360059bf09b70707e06d35f05 +SIZE (Governikus-AusweisApp2-1.24.2_GH0.tar.gz) = 11478273 diff --git a/deskutils/ausweisapp2/files/patch-cmake_Libraries.cmake b/deskutils/ausweisapp2/files/patch-cmake_Libraries.cmake index d162f28f2a7..2cfe616a9e1 100644 --- a/deskutils/ausweisapp2/files/patch-cmake_Libraries.cmake +++ b/deskutils/ausweisapp2/files/patch-cmake_Libraries.cmake @@ -1,17 +1,11 @@ ---- cmake/Libraries.cmake.orig 2022-04-25 13:11:06 +0200 +--- cmake/Libraries.cmake.orig 2022-09-06 11:32:26 UTC +++ cmake/Libraries.cmake -@@ -124,11 +124,9 @@ +@@ -144,7 +144,7 @@ elseif(MAC) + find_library(OSX_FOUNDATION Foundation) + find_library(OSX_SERVICEMANAGEMENT ServiceManagement) elseif(UNIX) - find_package(PkgConfig REQUIRED) - - if(LINUX) -- pkg_check_modules(UDEV IMPORTED_TARGET libudev) -- if(NOT TARGET PkgConfig::UDEV) -- message(STATUS "Hardware detection disabled - Missing libudev") -- endif() -+ pkg_check_modules(UDEV IMPORTED_TARGET libudev) -+ if(NOT TARGET PkgConfig::UDEV) -+ message(STATUS "Hardware detection disabled - Missing libudev") - endif() - - pkg_check_modules(PCSC REQUIRED libpcsclite) ++ if(LINUX OR BSD) + find_package(PkgConfig REQUIRED) + pkg_check_modules(UDEV IMPORTED_TARGET libudev) + if(NOT TARGET PkgConfig::UDEV) diff --git a/deskutils/ausweisapp2/pkg-plist b/deskutils/ausweisapp2/pkg-plist index 359e4356650..546fcb6b7d1 100644 --- a/deskutils/ausweisapp2/pkg-plist +++ b/deskutils/ausweisapp2/pkg-plist @@ -1,9 +1,7 @@ bin/AusweisApp2 share/man/man1/AusweisApp2.1.gz share/applications/com.governikus.ausweisapp2.desktop -%%DATADIR%%/AusweisApp2/AusweisApp2.rcc -%%DATADIR%%/AusweisApp2/config.json -%%DATADIR%%/AusweisApp2/translations/ausweisapp2_de.qm share/icons/hicolor/96x96/apps/AusweisApp2.png share/icons/hicolor/scalable/apps/AusweisApp2.svg share/metainfo/com.governikus.ausweisapp2.metainfo.xml +%%DATADIR%%/AusweisApp2/AusweisApp2.rcc diff --git a/deskutils/chart/Makefile b/deskutils/chart/Makefile index cca90f74999..53872cdc99a 100644 --- a/deskutils/chart/Makefile +++ b/deskutils/chart/Makefile @@ -1,7 +1,7 @@ PORTNAME= chart DISTVERSIONPREFIX= v DISTVERSION= 3.0.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils MAINTAINER= mail@dbalan.in diff --git a/deskutils/dstask/Makefile b/deskutils/dstask/Makefile index 4010a3bb90b..db60795db90 100644 --- a/deskutils/dstask/Makefile +++ b/deskutils/dstask/Makefile @@ -1,7 +1,7 @@ PORTNAME= dstask DISTVERSIONPREFIX= v DISTVERSION= 0.25 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils MAINTAINER= ashish@FreeBSD.org diff --git a/deskutils/gnome-characters/Makefile b/deskutils/gnome-characters/Makefile index 90088286f01..565cee0c9ff 100644 --- a/deskutils/gnome-characters/Makefile +++ b/deskutils/gnome-characters/Makefile @@ -1,5 +1,5 @@ PORTNAME= gnome-characters -PORTVERSION= 42.0 +PORTVERSION= 43.0 CATEGORIES= deskutils gnome MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/} DIST_SUBDIR= gnome diff --git a/deskutils/gnome-characters/distinfo b/deskutils/gnome-characters/distinfo index 052ac54607c..c7b140e0e9a 100644 --- a/deskutils/gnome-characters/distinfo +++ b/deskutils/gnome-characters/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656739434 -SHA256 (gnome/gnome-characters-42.0.tar.xz) = 5da0ffb816f8a6b44f303744ca827a34080118c1c938d8d79af17b7fe67980f8 -SIZE (gnome/gnome-characters-42.0.tar.xz) = 561308 +TIMESTAMP = 1664993395 +SHA256 (gnome/gnome-characters-43.0.tar.xz) = a685b9cbf93545ed391168c41c9d8bf83785abbfb489675827ee7342471baac8 +SIZE (gnome/gnome-characters-43.0.tar.xz) = 582892 diff --git a/deskutils/gnome-characters/pkg-plist b/deskutils/gnome-characters/pkg-plist index be39bfb06a1..27ad160afaf 100644 --- a/deskutils/gnome-characters/pkg-plist +++ b/deskutils/gnome-characters/pkg-plist @@ -37,6 +37,7 @@ share/locale/id/LC_MESSAGES/org.gnome.Characters.mo share/locale/is/LC_MESSAGES/org.gnome.Characters.mo share/locale/it/LC_MESSAGES/org.gnome.Characters.mo share/locale/ja/LC_MESSAGES/org.gnome.Characters.mo +share/locale/ka/LC_MESSAGES/org.gnome.Characters.mo share/locale/kk/LC_MESSAGES/org.gnome.Characters.mo share/locale/ko/LC_MESSAGES/org.gnome.Characters.mo share/locale/ln/LC_MESSAGES/org.gnome.Characters.mo diff --git a/deskutils/iconbrowser/Makefile b/deskutils/iconbrowser/Makefile new file mode 100644 index 00000000000..a2cbacf8316 --- /dev/null +++ b/deskutils/iconbrowser/Makefile @@ -0,0 +1,21 @@ +PORTNAME= iconbrowser +DISTVERSION= 2.0.0 +CATEGORIES= deskutils + +MAINTAINER= greg@unrelenting.technology +COMMENT= Browse and find system icons +WWW= https://github.com/elementary/iconbrowser + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libgranite-7.so:x11-toolkits/granite7 \ + libhandy-1.so:x11-toolkits/libhandy + +USES= gettext-tools gnome meson pkgconfig python:3.7+,build vala:build +USE_GITHUB= yes +GH_ACCOUNT= elementary +USE_GNOME= glib20 gtk40 gtksourceview5 +GLIB_SCHEMAS= io.elementary.iconbrowser.gschema.xml + +.include diff --git a/deskutils/iconbrowser/distinfo b/deskutils/iconbrowser/distinfo new file mode 100644 index 00000000000..1bd7bf1569c --- /dev/null +++ b/deskutils/iconbrowser/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1664957609 +SHA256 (elementary-iconbrowser-2.0.0_GH0.tar.gz) = a169268bede2d0f43aaf09ce2ee118d523b98b6e1318f1446a86ab6c02aa5124 +SIZE (elementary-iconbrowser-2.0.0_GH0.tar.gz) = 520187 diff --git a/deskutils/iconbrowser/pkg-descr b/deskutils/iconbrowser/pkg-descr new file mode 100644 index 00000000000..00a4d43cac1 --- /dev/null +++ b/deskutils/iconbrowser/pkg-descr @@ -0,0 +1,2 @@ +Icon Browser is a GTK based browser for system icons with search and +code sample functionality. diff --git a/deskutils/iconbrowser/pkg-plist b/deskutils/iconbrowser/pkg-plist new file mode 100644 index 00000000000..87a1c40ec06 --- /dev/null +++ b/deskutils/iconbrowser/pkg-plist @@ -0,0 +1,21 @@ +bin/io.elementary.iconbrowser +share/applications/io.elementary.iconbrowser.desktop +share/icons/hicolor/128x128/apps/io.elementary.iconbrowser.svg +share/icons/hicolor/128x128@2/apps/io.elementary.iconbrowser.svg +share/icons/hicolor/16x16/apps/io.elementary.iconbrowser.svg +share/icons/hicolor/16x16@2/apps/io.elementary.iconbrowser.svg +share/icons/hicolor/24x24/apps/io.elementary.iconbrowser.svg +share/icons/hicolor/24x24@2/apps/io.elementary.iconbrowser.svg +share/icons/hicolor/32x32/apps/io.elementary.iconbrowser.svg +share/icons/hicolor/32x32@2/apps/io.elementary.iconbrowser.svg +share/icons/hicolor/48x48/apps/io.elementary.iconbrowser.svg +share/icons/hicolor/48x48@2/apps/io.elementary.iconbrowser.svg +share/icons/hicolor/64x64/apps/io.elementary.iconbrowser.svg +share/icons/hicolor/64x64@2/apps/io.elementary.iconbrowser.svg +share/locale/fr/LC_MESSAGES/io.elementary.iconbrowser.mo +share/locale/ja/LC_MESSAGES/io.elementary.iconbrowser.mo +share/locale/pt/LC_MESSAGES/io.elementary.iconbrowser.mo +share/locale/ru/LC_MESSAGES/io.elementary.iconbrowser.mo +share/locale/sk/LC_MESSAGES/io.elementary.iconbrowser.mo +share/locale/uk/LC_MESSAGES/io.elementary.iconbrowser.mo +share/metainfo/io.elementary.iconbrowser.appdata.xml diff --git a/deskutils/lookbook/Makefile b/deskutils/lookbook/Makefile deleted file mode 100644 index a42765b90cd..00000000000 --- a/deskutils/lookbook/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -PORTNAME= lookbook -DISTVERSION= 1.2.0 -PORTREVISION= 3 -CATEGORIES= deskutils - -MAINTAINER= greg@unrelenting.technology -COMMENT= Browse and find system icons -WWW= https://github.com/danrabbit/lookbook - -LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/COPYING - -LIB_DEPENDS= libgranite.so:x11-toolkits/granite \ - libhandy-1.so:x11-toolkits/libhandy - -USES= gettext-tools gnome meson pkgconfig python:3.6+,build vala:build -USE_GITHUB= yes -GH_ACCOUNT= danrabbit -USE_GNOME= glib20 gtk30 gtksourceview4 -GLIB_SCHEMAS= com.github.danrabbit.lookbook.gschema.xml - -.include diff --git a/deskutils/lookbook/distinfo b/deskutils/lookbook/distinfo deleted file mode 100644 index 8340dff8054..00000000000 --- a/deskutils/lookbook/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1628950778 -SHA256 (danrabbit-lookbook-1.2.0_GH0.tar.gz) = d9ada6459665f880427d6d50e6c4d7963d36bba91387c261e2db3de22e06d823 -SIZE (danrabbit-lookbook-1.2.0_GH0.tar.gz) = 580413 diff --git a/deskutils/lookbook/pkg-descr b/deskutils/lookbook/pkg-descr deleted file mode 100644 index b3c4c3dc40d..00000000000 --- a/deskutils/lookbook/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -LookBook is a GTK based browser for system icons with search and -code sample functionality. diff --git a/deskutils/lookbook/pkg-plist b/deskutils/lookbook/pkg-plist deleted file mode 100644 index 536a987d6c4..00000000000 --- a/deskutils/lookbook/pkg-plist +++ /dev/null @@ -1,17 +0,0 @@ -bin/com.github.danrabbit.lookbook -share/applications/com.github.danrabbit.lookbook.desktop -share/icons/hicolor/128x128/apps/com.github.danrabbit.lookbook.svg -share/icons/hicolor/128x128@2/apps/com.github.danrabbit.lookbook.svg -share/icons/hicolor/16x16/apps/com.github.danrabbit.lookbook.svg -share/icons/hicolor/16x16@2/apps/com.github.danrabbit.lookbook.svg -share/icons/hicolor/24x24/apps/com.github.danrabbit.lookbook.svg -share/icons/hicolor/24x24@2/apps/com.github.danrabbit.lookbook.svg -share/icons/hicolor/32x32/apps/com.github.danrabbit.lookbook.svg -share/icons/hicolor/32x32@2/apps/com.github.danrabbit.lookbook.svg -share/icons/hicolor/48x48/apps/com.github.danrabbit.lookbook.svg -share/icons/hicolor/48x48@2/apps/com.github.danrabbit.lookbook.svg -share/icons/hicolor/64x64/apps/com.github.danrabbit.lookbook.svg -share/icons/hicolor/64x64@2/apps/com.github.danrabbit.lookbook.svg -share/locale/fr/LC_MESSAGES/com.github.danrabbit.lookbook.mo -share/locale/pt/LC_MESSAGES/com.github.danrabbit.lookbook.mo -share/metainfo/com.github.danrabbit.lookbook.appdata.xml diff --git a/deskutils/noti/Makefile b/deskutils/noti/Makefile index c3201a8e3e9..bdf0eb72790 100644 --- a/deskutils/noti/Makefile +++ b/deskutils/noti/Makefile @@ -1,6 +1,6 @@ PORTNAME= noti DISTVERSION= 3.5.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= deskutils MAINTAINER= tagattie@FreeBSD.org diff --git a/deskutils/pet/Makefile b/deskutils/pet/Makefile index 6d0363ee993..5b3f64b1c82 100644 --- a/deskutils/pet/Makefile +++ b/deskutils/pet/Makefile @@ -1,7 +1,7 @@ PORTNAME= pet DISTVERSIONPREFIX= v DISTVERSION= 0.4.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= deskutils MAINTAINER= yuri@FreeBSD.org diff --git a/deskutils/ultralist/Makefile b/deskutils/ultralist/Makefile index c1bcff12a41..5c1725e581c 100644 --- a/deskutils/ultralist/Makefile +++ b/deskutils/ultralist/Makefile @@ -1,6 +1,6 @@ PORTNAME= ultralist DISTVERSION= 1.7.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= deskutils MAINTAINER= lcook@FreeBSD.org diff --git a/devel/Makefile b/devel/Makefile index a58fd5e91fe..49155afeefd 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -5672,6 +5672,7 @@ SUBDIR += quantum SUBDIR += quickcheck++ SUBDIR += quilt + SUBDIR += qxlsx SUBDIR += rabs SUBDIR += radare2 SUBDIR += radian diff --git a/devel/R-cran-crayon/Makefile b/devel/R-cran-crayon/Makefile index 7a8a4e4498d..e64945cdc71 100644 --- a/devel/R-cran-crayon/Makefile +++ b/devel/R-cran-crayon/Makefile @@ -1,11 +1,11 @@ PORTNAME= crayon -DISTVERSION= 1.5.1 +DISTVERSION= 1.5.2 CATEGORIES= devel DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= ygy@FreeBSD.org COMMENT= Colored Terminal Output -WWW= https://github.com/r-lib/crayon #readme +WWW= https://github.com/r-lib/crayon#readme LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE diff --git a/devel/R-cran-crayon/distinfo b/devel/R-cran-crayon/distinfo index f1340c0fd0f..ff299adb903 100644 --- a/devel/R-cran-crayon/distinfo +++ b/devel/R-cran-crayon/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1648402920 -SHA256 (crayon_1.5.1.tar.gz) = c025c73b78a8e88e8e4363c8e1a941da5089a7baea39e59ea5342ab9ebe45df9 -SIZE (crayon_1.5.1.tar.gz) = 40178 +TIMESTAMP = 1664941495 +SHA256 (crayon_1.5.2.tar.gz) = 70a9a505b5b3c0ee6682ad8b965e28b7e24d9f942160d0a2bad18eec22b45a7a +SIZE (crayon_1.5.2.tar.gz) = 40567 diff --git a/devel/R-cran-crayon/pkg-descr b/devel/R-cran-crayon/pkg-descr index 01bbebef234..ff5106408e4 100644 --- a/devel/R-cran-crayon/pkg-descr +++ b/devel/R-cran-crayon/pkg-descr @@ -1,5 +1,6 @@ -Colored terminal output on terminals that support 'ANSI' color and highlight -codes. It also works in 'Emacs' 'ESS'. 'ANSI' color support is automatically -detected. Colors and highlighting can be combined and nested. New styles can -also be created easily. This package was inspired by the 'chalk' 'JavaScript' -project. +The crayon package is now superseded. Please use the 'cli' package for new +projects. Colored terminal output on terminals that support 'ANSI' color and +highlight codes. It also works in 'Emacs' 'ESS'. 'ANSI' color support is +automatically detected. Colors and highlighting can be combined and nested. New +styles can also be created easily. This package was inspired by the 'chalk' +'JavaScript' project. diff --git a/devel/android-tools/Makefile b/devel/android-tools/Makefile index 43f4dd30d58..f675e1001dd 100644 --- a/devel/android-tools/Makefile +++ b/devel/android-tools/Makefile @@ -1,6 +1,6 @@ PORTNAME= android-tools PORTVERSION= 31.0.3p2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= GH diff --git a/devel/app-builder/Makefile b/devel/app-builder/Makefile index 188eaa1ffcf..86c8c35aa79 100644 --- a/devel/app-builder/Makefile +++ b/devel/app-builder/Makefile @@ -1,7 +1,7 @@ PORTNAME= app-builder DISTVERSIONPREFIX= v DISTVERSION= 3.4.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel MAINTAINER= tagattie@FreeBSD.org diff --git a/devel/arduino-builder/Makefile b/devel/arduino-builder/Makefile index ace55bd0ab7..514a1325ba7 100644 --- a/devel/arduino-builder/Makefile +++ b/devel/arduino-builder/Makefile @@ -1,6 +1,6 @@ PORTNAME= arduino-builder PORTVERSION= 1.3.25 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel MAINTAINER= kevans@FreeBSD.org diff --git a/devel/arduinoOTA/Makefile b/devel/arduinoOTA/Makefile index 56f8015cd85..5d2e2be66ec 100644 --- a/devel/arduinoOTA/Makefile +++ b/devel/arduinoOTA/Makefile @@ -1,6 +1,6 @@ PORTNAME= arduinoOTA PORTVERSION= 1.2.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= kevans@FreeBSD.org diff --git a/devel/athens/Makefile b/devel/athens/Makefile index 87a7df21fee..7aa34f29b7f 100644 --- a/devel/athens/Makefile +++ b/devel/athens/Makefile @@ -1,7 +1,7 @@ PORTNAME= athens PORTVERSION= 0.11.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= swills@FreeBSD.org diff --git a/devel/atlantis/Makefile b/devel/atlantis/Makefile index b7bac2b5e0a..1dcdc8cf6af 100644 --- a/devel/atlantis/Makefile +++ b/devel/atlantis/Makefile @@ -1,7 +1,7 @@ PORTNAME= atlantis DISTVERSIONPREFIX= v DISTVERSION= 0.18.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= 0xdutra@gmail.com diff --git a/devel/awless/Makefile b/devel/awless/Makefile index 03a55205a3d..a178e533d22 100644 --- a/devel/awless/Makefile +++ b/devel/awless/Makefile @@ -1,7 +1,7 @@ PORTNAME= awless DISTVERSIONPREFIX= v DISTVERSION= 0.1.11 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel MAINTAINER= dmgk@FreeBSD.org diff --git a/devel/aws-crt-cpp/Makefile b/devel/aws-crt-cpp/Makefile index 943b0bfdefb..965f3daaebe 100644 --- a/devel/aws-crt-cpp/Makefile +++ b/devel/aws-crt-cpp/Makefile @@ -1,6 +1,6 @@ PORTNAME= aws-crt-cpp DISTVERSIONPREFIX= v -DISTVERSION= 0.18.7 +DISTVERSION= 0.18.8 CATEGORIES= devel MAINTAINER= eduardo@FreeBSD.org diff --git a/devel/aws-crt-cpp/distinfo b/devel/aws-crt-cpp/distinfo index eb9ccae0811..f27b6217b42 100644 --- a/devel/aws-crt-cpp/distinfo +++ b/devel/aws-crt-cpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663856672 -SHA256 (awslabs-aws-crt-cpp-v0.18.7_GH0.tar.gz) = cbd0301bff04145b8780e89711593f3c4a661bcf097ee1fcf1fdbf744eaec8ff -SIZE (awslabs-aws-crt-cpp-v0.18.7_GH0.tar.gz) = 241750 +TIMESTAMP = 1664965515 +SHA256 (awslabs-aws-crt-cpp-v0.18.8_GH0.tar.gz) = 70ea622cf8c1a7028b24078e909ee5898990444436584178f58d61b50b5b197d +SIZE (awslabs-aws-crt-cpp-v0.18.8_GH0.tar.gz) = 244106 diff --git a/devel/bazel-buildtools/Makefile b/devel/bazel-buildtools/Makefile index d125d07f244..923dd4194b6 100644 --- a/devel/bazel-buildtools/Makefile +++ b/devel/bazel-buildtools/Makefile @@ -1,6 +1,6 @@ PORTNAME= bazel-buildtools DISTVERSION= 3.2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org diff --git a/devel/bit/Makefile b/devel/bit/Makefile index 30d20b9b204..16e2013c7ed 100644 --- a/devel/bit/Makefile +++ b/devel/bit/Makefile @@ -1,7 +1,7 @@ PORTNAME= bit DISTVERSIONPREFIX= v DISTVERSION= 1.1.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= ashish@FreeBSD.org diff --git a/devel/buildkite-agent/Makefile b/devel/buildkite-agent/Makefile index b92d79eb03c..d70459fa333 100644 --- a/devel/buildkite-agent/Makefile +++ b/devel/buildkite-agent/Makefile @@ -1,7 +1,7 @@ PORTNAME= buildkite-agent DISTVERSIONPREFIX= v DISTVERSION= 3.35.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel sysutils MAINTAINER= dch@FreeBSD.org diff --git a/devel/chroma/Makefile b/devel/chroma/Makefile index b623a093e5a..9ab7061281a 100644 --- a/devel/chroma/Makefile +++ b/devel/chroma/Makefile @@ -1,7 +1,7 @@ PORTNAME= chroma DISTVERSIONPREFIX= v DISTVERSION= 0.9.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel PKGNAMESUFFIX= -syntax-highlighter diff --git a/devel/cirrus-cli/Makefile b/devel/cirrus-cli/Makefile index d57e8b299bd..c6081b056f0 100644 --- a/devel/cirrus-cli/Makefile +++ b/devel/cirrus-cli/Makefile @@ -1,6 +1,6 @@ PORTNAME= cirrus-cli PORTVERSION= 0.85.0 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/cl-alexandria-sbcl/Makefile b/devel/cl-alexandria-sbcl/Makefile index f774d2c6dc3..b06e6c1aa4d 100644 --- a/devel/cl-alexandria-sbcl/Makefile +++ b/devel/cl-alexandria-sbcl/Makefile @@ -1,6 +1,6 @@ PORTNAME= alexandria PORTVERSION= 1.2 -PORTREVISION= 19 +PORTREVISION= 20 PORTEPOCH= 1 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- diff --git a/devel/cl-infix-sbcl/Makefile b/devel/cl-infix-sbcl/Makefile index aa3aff5c0af..6ce161b4070 100644 --- a/devel/cl-infix-sbcl/Makefile +++ b/devel/cl-infix-sbcl/Makefile @@ -1,6 +1,6 @@ PORTNAME= infix PORTVERSION= 19960628 -PORTREVISION= 74 +PORTREVISION= 75 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-port-sbcl/Makefile b/devel/cl-port-sbcl/Makefile index 8b00b66c9b6..281b0b7124a 100644 --- a/devel/cl-port-sbcl/Makefile +++ b/devel/cl-port-sbcl/Makefile @@ -1,6 +1,6 @@ PORTNAME= port PORTVERSION= 2002.10.02.1 -PORTREVISION= 72 +PORTREVISION= 73 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-split-sequence-sbcl/Makefile b/devel/cl-split-sequence-sbcl/Makefile index d1964706ad6..2556eac8328 100644 --- a/devel/cl-split-sequence-sbcl/Makefile +++ b/devel/cl-split-sequence-sbcl/Makefile @@ -1,6 +1,6 @@ PORTNAME= split-sequence PORTVERSION= 20011114.1 -PORTREVISION= 71 +PORTREVISION= 72 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-trivial-features-sbcl/Makefile b/devel/cl-trivial-features-sbcl/Makefile index 03351eb94ad..f5fa2ee9a7e 100644 --- a/devel/cl-trivial-features-sbcl/Makefile +++ b/devel/cl-trivial-features-sbcl/Makefile @@ -1,6 +1,6 @@ PORTNAME= trivial-features PORTVERSION= 2010.01.16 -PORTREVISION= 71 +PORTREVISION= 72 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-trivial-gray-streams-sbcl/Makefile b/devel/cl-trivial-gray-streams-sbcl/Makefile index fb08274135a..9d47a46f156 100644 --- a/devel/cl-trivial-gray-streams-sbcl/Makefile +++ b/devel/cl-trivial-gray-streams-sbcl/Makefile @@ -1,6 +1,6 @@ PORTNAME= trivial-gray-streams PORTVERSION= 2008.11.02 -PORTREVISION= 71 +PORTREVISION= 72 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cligen/Makefile b/devel/cligen/Makefile index c406d922094..9337c368d83 100644 --- a/devel/cligen/Makefile +++ b/devel/cligen/Makefile @@ -2,7 +2,7 @@ PORTNAME= cligen PORTVERSION= 5.8.0 CATEGORIES= devel -MAINTAINER= dcornejo@netgate.com +MAINTAINER= dave@dogwood.com COMMENT= Command-line interface generator WWW= https://cligen.se/ diff --git a/devel/clixon/Makefile b/devel/clixon/Makefile index 4f36b5a6e7c..16eb4110a21 100644 --- a/devel/clixon/Makefile +++ b/devel/clixon/Makefile @@ -2,7 +2,7 @@ PORTNAME= clixon PORTVERSION= 5.8.0 CATEGORIES= devel -MAINTAINER= dcornejo@netgate.com +MAINTAINER= dave@dogwood.com COMMENT= YANG-based toolchain including CLI, NETCONF and RESTCONF interfaces WWW= https://www.clicon.org/ diff --git a/devel/delve/Makefile b/devel/delve/Makefile index 1a45f53a18c..096378594fb 100644 --- a/devel/delve/Makefile +++ b/devel/delve/Makefile @@ -1,7 +1,7 @@ PORTNAME= delve DISTVERSIONPREFIX= v DISTVERSION= 1.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= dmitry.wagin@ya.ru diff --git a/devel/dupl/Makefile b/devel/dupl/Makefile index 293846abdd0..2a2f53d3b6e 100644 --- a/devel/dupl/Makefile +++ b/devel/dupl/Makefile @@ -2,7 +2,7 @@ PORTNAME= dupl DISTVERSIONPREFIX= v DISTVERSION= 1.0.0-11 DISTVERSIONSUFFIX= -g28d787e -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org diff --git a/devel/dwarf2json/Makefile b/devel/dwarf2json/Makefile index 0df5f01ba1a..e1bf08a7a35 100644 --- a/devel/dwarf2json/Makefile +++ b/devel/dwarf2json/Makefile @@ -1,6 +1,6 @@ PORTNAME= dwarf2json DISTVERSION= g20220807 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= antoine@FreeBSD.org diff --git a/devel/esbuild/Makefile b/devel/esbuild/Makefile index f0422c430d5..04e18e66c8d 100644 --- a/devel/esbuild/Makefile +++ b/devel/esbuild/Makefile @@ -1,7 +1,7 @@ PORTNAME= esbuild DISTVERSIONPREFIX= v DISTVERSION= 0.14.23 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel www MAINTAINER= dch@FreeBSD.org diff --git a/devel/etcd/Makefile b/devel/etcd/Makefile index 7757535f9a6..588edecd58c 100644 --- a/devel/etcd/Makefile +++ b/devel/etcd/Makefile @@ -1,7 +1,7 @@ PORTNAME= etcd PORTVERSION= 2.3.8 DISTVERSIONPREFIX= v -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel PKGNAMEPREFIX= coreos- diff --git a/devel/etcd31/Makefile b/devel/etcd31/Makefile index ce0be19302c..b4ff5a0b26e 100644 --- a/devel/etcd31/Makefile +++ b/devel/etcd31/Makefile @@ -1,7 +1,7 @@ PORTNAME= etcd PORTVERSION= 3.1.20 DISTVERSIONPREFIX= v -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel PKGNAMEPREFIX= coreos- PKGNAMESUFFIX= 31 diff --git a/devel/etcd32/Makefile b/devel/etcd32/Makefile index 06894100ce6..36a45e7a71a 100644 --- a/devel/etcd32/Makefile +++ b/devel/etcd32/Makefile @@ -1,7 +1,7 @@ PORTNAME= etcd PORTVERSION= 3.2.32 DISTVERSIONPREFIX= v -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel PKGNAMEPREFIX= coreos- PKGNAMESUFFIX= 32 diff --git a/devel/etcd33/Makefile b/devel/etcd33/Makefile index 64ec198be41..2f6288245a5 100644 --- a/devel/etcd33/Makefile +++ b/devel/etcd33/Makefile @@ -1,7 +1,7 @@ PORTNAME= etcd PORTVERSION= 3.3.23 DISTVERSIONPREFIX= v -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel PKGNAMEPREFIX= coreos- PKGNAMESUFFIX= 33 diff --git a/devel/etcd34/Makefile b/devel/etcd34/Makefile index 68d8ceb82ea..6c9e33426ae 100644 --- a/devel/etcd34/Makefile +++ b/devel/etcd34/Makefile @@ -1,7 +1,7 @@ PORTNAME= etcd PORTVERSION= 3.4.18 DISTVERSIONPREFIX= v -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel PKGNAMEPREFIX= coreos- PKGNAMESUFFIX= 34 diff --git a/devel/gh/Makefile b/devel/gh/Makefile index 1fed8d9b770..d90dde84090 100644 --- a/devel/gh/Makefile +++ b/devel/gh/Makefile @@ -1,6 +1,7 @@ PORTNAME= gh DISTVERSIONPREFIX= v DISTVERSION= 2.15.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= lcook@FreeBSD.org diff --git a/devel/ghq/Makefile b/devel/ghq/Makefile index 764b3401b4d..b9d98e81fc5 100644 --- a/devel/ghq/Makefile +++ b/devel/ghq/Makefile @@ -1,7 +1,7 @@ PORTNAME= ghq DISTVERSIONPREFIX= v DISTVERSION= 1.3.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MAINTAINER= driesm@FreeBSD.org diff --git a/devel/git-bug/Makefile b/devel/git-bug/Makefile index 93bfe2bf0df..257ac2df753 100644 --- a/devel/git-bug/Makefile +++ b/devel/git-bug/Makefile @@ -1,7 +1,7 @@ PORTNAME= git-bug DISTVERSIONPREFIX= v DISTVERSION= 0.7.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel MAINTAINER= lcook@FreeBSD.org diff --git a/devel/git-codereview/Makefile b/devel/git-codereview/Makefile index 38cb160fe2b..f7e1c0e7869 100644 --- a/devel/git-codereview/Makefile +++ b/devel/git-codereview/Makefile @@ -1,7 +1,7 @@ PORTNAME= git-codereview PORTVERSION= 1.0.3 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= swills@FreeBSD.org diff --git a/devel/git-lfs/Makefile b/devel/git-lfs/Makefile index 9436ae4751c..a8c9097dfc2 100644 --- a/devel/git-lfs/Makefile +++ b/devel/git-lfs/Makefile @@ -1,7 +1,7 @@ PORTNAME= git-lfs DISTVERSIONPREFIX= v DISTVERSION= 3.0.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ diff --git a/devel/git-town/Makefile b/devel/git-town/Makefile index 6969a0124bb..c68a8f4f83e 100644 --- a/devel/git-town/Makefile +++ b/devel/git-town/Makefile @@ -1,7 +1,7 @@ PORTNAME= git-town DISTVERSIONPREFIX= v DISTVERSION= 7.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 4002b9409b2..303213e52b8 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,5 +1,6 @@ PORTNAME= gitaly DISTVERSION= 15.3.4 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/gitlab-metrics-exporter/Makefile b/devel/gitlab-metrics-exporter/Makefile index 51539ec92b3..007c7160b98 100644 --- a/devel/gitlab-metrics-exporter/Makefile +++ b/devel/gitlab-metrics-exporter/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitlab-metrics-exporter PORTVERSION= 0.1.1 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/gitlab-runner/Makefile b/devel/gitlab-runner/Makefile index d873b2adf30..8a5e2b564a3 100644 --- a/devel/gitlab-runner/Makefile +++ b/devel/gitlab-runner/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitlab-runner PORTVERSION= 14.5.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MASTER_SITES= https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerx64 \ https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerarm diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile index ba97298f6aa..15be3293a4f 100644 --- a/devel/gitlab-shell/Makefile +++ b/devel/gitlab-shell/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitlab-shell PORTVERSION= 14.10.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org diff --git a/devel/gitleaks/Makefile b/devel/gitleaks/Makefile index 865e0046e54..2a2335aa7c5 100644 --- a/devel/gitleaks/Makefile +++ b/devel/gitleaks/Makefile @@ -1,6 +1,7 @@ PORTNAME= gitleaks DISTVERSIONPREFIX= v DISTVERSION= 8.13.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org diff --git a/devel/gitty/Makefile b/devel/gitty/Makefile index 7d7555ec9cf..8bae4cb5e7c 100644 --- a/devel/gitty/Makefile +++ b/devel/gitty/Makefile @@ -1,7 +1,7 @@ PORTNAME= gitty DISTVERSIONPREFIX= v DISTVERSION= 0.4.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= dch@FreeBSD.org diff --git a/devel/glab/Makefile b/devel/glab/Makefile index 4d1b7a04cd0..217f06e4e89 100644 --- a/devel/glab/Makefile +++ b/devel/glab/Makefile @@ -1,7 +1,7 @@ PORTNAME= glab DISTVERSIONPREFIX= v DISTVERSION= 1.22.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= lcook@FreeBSD.org diff --git a/devel/gllvm/Makefile b/devel/gllvm/Makefile index 6f7c6e75e64..5d6b70f9dad 100644 --- a/devel/gllvm/Makefile +++ b/devel/gllvm/Makefile @@ -1,6 +1,7 @@ PORTNAME= gllvm DISTVERSIONPREFIX= v DISTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= arrowd@FreeBSD.org diff --git a/devel/go-bindata-assetfs/Makefile b/devel/go-bindata-assetfs/Makefile index 5335cc7c222..3e454d58c64 100644 --- a/devel/go-bindata-assetfs/Makefile +++ b/devel/go-bindata-assetfs/Makefile @@ -1,7 +1,7 @@ PORTNAME= go-bindata-assetfs DISTVERSIONPREFIX= v DISTVERSION= 1.0.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel www MAINTAINER= egypcio@FreeBSD.org diff --git a/devel/go-bindata/Makefile b/devel/go-bindata/Makefile index 92cac054005..659f1041fa8 100644 --- a/devel/go-bindata/Makefile +++ b/devel/go-bindata/Makefile @@ -1,7 +1,7 @@ PORTNAME= go-bindata PORTVERSION= 3.1.3 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= swills@FreeBSD.org diff --git a/devel/go-git/Makefile b/devel/go-git/Makefile index 81274ee1f81..eb764159755 100644 --- a/devel/go-git/Makefile +++ b/devel/go-git/Makefile @@ -1,7 +1,7 @@ PORTNAME= go-git DISTVERSIONPREFIX= v DISTVERSION= 5.4.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= eduardo@FreeBSD.org diff --git a/devel/go-perf/Makefile b/devel/go-perf/Makefile index 7d06c434023..7da92e0dbd9 100644 --- a/devel/go-perf/Makefile +++ b/devel/go-perf/Makefile @@ -1,6 +1,6 @@ PORTNAME= go-perf PORTVERSION= ${MODVERSION:S/-/./g:R} -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/go-protobuf/Makefile b/devel/go-protobuf/Makefile index 56d56400b0a..b739ee8b071 100644 --- a/devel/go-protobuf/Makefile +++ b/devel/go-protobuf/Makefile @@ -1,6 +1,6 @@ PORTNAME= protobuf DISTVERSION= 1.3.2 -PORTREVISION= 5 +PORTREVISION= 6 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= devel diff --git a/devel/go-tools/Makefile b/devel/go-tools/Makefile index fffac6892fd..e60e7b1424d 100644 --- a/devel/go-tools/Makefile +++ b/devel/go-tools/Makefile @@ -1,7 +1,7 @@ PORTNAME= tools DISTVERSIONPREFIX= v DISTVERSION= 0.1.12 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= devel PKGNAMEPREFIX= go- diff --git a/devel/go-wire/Makefile b/devel/go-wire/Makefile index 033b0dc23fd..1e41fe5da46 100644 --- a/devel/go-wire/Makefile +++ b/devel/go-wire/Makefile @@ -1,7 +1,7 @@ PORTNAME= wire DISTVERSIONPREFIX= v DISTVERSION= 0.5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel PKGNAMEPREFIX= go- diff --git a/devel/gocheese/Makefile b/devel/gocheese/Makefile index 41dcf813afc..77f5360be71 100644 --- a/devel/gocheese/Makefile +++ b/devel/gocheese/Makefile @@ -1,6 +1,6 @@ PORTNAME= gocheese PORTVERSION= 2.5.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel python MASTER_SITES= http://www.gocheese.cypherpunks.ru/ diff --git a/devel/gocritic/Makefile b/devel/gocritic/Makefile index 28a254e81d1..20d2bef158b 100644 --- a/devel/gocritic/Makefile +++ b/devel/gocritic/Makefile @@ -1,7 +1,7 @@ PORTNAME= gocritic DISTVERSIONPREFIX= v DISTVERSION= 0.6.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MAINTAINER= fuz@fuz.su diff --git a/devel/gogs/Makefile b/devel/gogs/Makefile index 3371274e4e3..4a43244e995 100644 --- a/devel/gogs/Makefile +++ b/devel/gogs/Makefile @@ -1,7 +1,7 @@ PORTNAME= gogs DISTVERSIONPREFIX= v DISTVERSION= 0.12.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel www MAINTAINER= dmgk@FreeBSD.org diff --git a/devel/golangci-lint/Makefile b/devel/golangci-lint/Makefile index 6e31ffefb7c..1769ee94c83 100644 --- a/devel/golangci-lint/Makefile +++ b/devel/golangci-lint/Makefile @@ -1,7 +1,7 @@ PORTNAME= golangci-lint DISTVERSIONPREFIX= v DISTVERSION= 1.49.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= lcook@FreeBSD.org diff --git a/devel/golint/Makefile b/devel/golint/Makefile index cfdbe2edc83..6197cdb26d7 100644 --- a/devel/golint/Makefile +++ b/devel/golint/Makefile @@ -1,6 +1,6 @@ PORTNAME= golint PORTVERSION= g20190409 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org diff --git a/devel/gopls/Makefile b/devel/gopls/Makefile index f5138c67b8c..0bcc0e01a23 100644 --- a/devel/gopls/Makefile +++ b/devel/gopls/Makefile @@ -1,6 +1,7 @@ PORTNAME= gopls DISTVERSIONPREFIX= v DISTVERSION= 0.9.5 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= fuz@fuz.su diff --git a/devel/goprotobuf/Makefile b/devel/goprotobuf/Makefile index 3a4f27c81b0..b2733d18655 100644 --- a/devel/goprotobuf/Makefile +++ b/devel/goprotobuf/Makefile @@ -1,7 +1,7 @@ PORTNAME= goprotobuf DISTVERSIONPREFIX= v DISTVERSION= 1.5.2 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= devel diff --git a/devel/goredo/Makefile b/devel/goredo/Makefile index d37a6e3a44b..451f796858c 100644 --- a/devel/goredo/Makefile +++ b/devel/goredo/Makefile @@ -1,6 +1,6 @@ PORTNAME= goredo DISTVERSION= 1.26.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://www.goredo.cypherpunks.ru/download/ diff --git a/devel/goreleaser/Makefile b/devel/goreleaser/Makefile index c0f4403a8ff..8c226664e50 100644 --- a/devel/goreleaser/Makefile +++ b/devel/goreleaser/Makefile @@ -1,6 +1,7 @@ PORTNAME= goreleaser DISTVERSIONPREFIX= v -DISTVERSION= 1.11.4 +DISTVERSION= 1.11.5 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= fuz@fuz.su diff --git a/devel/goreleaser/distinfo b/devel/goreleaser/distinfo index 2aa7d8f111b..4c7fda92ac5 100644 --- a/devel/goreleaser/distinfo +++ b/devel/goreleaser/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1663679889 -SHA256 (go/devel_goreleaser/goreleaser-v1.11.4/v1.11.4.mod) = 843e9c6062478a3f2d069a5eb91c9135bc7e43069f1d36560010413f27b26731 -SIZE (go/devel_goreleaser/goreleaser-v1.11.4/v1.11.4.mod) = 8116 -SHA256 (go/devel_goreleaser/goreleaser-v1.11.4/v1.11.4.zip) = e57fe901e882a01964bf1f8bc775454d2aad3cc8099033484aa5d9350d114c3e -SIZE (go/devel_goreleaser/goreleaser-v1.11.4/v1.11.4.zip) = 953373 +TIMESTAMP = 1664883893 +SHA256 (go/devel_goreleaser/goreleaser-v1.11.5/v1.11.5.mod) = a00b62f7b82f030a9b4927a0155e8e6cd2208f547fc6b0cf23899c81b66427df +SIZE (go/devel_goreleaser/goreleaser-v1.11.5/v1.11.5.mod) = 8116 +SHA256 (go/devel_goreleaser/goreleaser-v1.11.5/v1.11.5.zip) = 59ee020901853563d5959a35945f121a51cd9b6d497607e4896ea1ab63dbe706 +SIZE (go/devel_goreleaser/goreleaser-v1.11.5/v1.11.5.zip) = 954601 diff --git a/devel/goswagger/Makefile b/devel/goswagger/Makefile index 8a8ec98b9d8..23ea9a95252 100644 --- a/devel/goswagger/Makefile +++ b/devel/goswagger/Makefile @@ -1,6 +1,7 @@ PORTNAME= goswagger DISTVERSIONPREFIX= v DISTVERSION= 0.30.3 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= dmgk@FreeBSD.org diff --git a/devel/gpm/Makefile b/devel/gpm/Makefile index 79f8b8b078a..570e198c737 100644 --- a/devel/gpm/Makefile +++ b/devel/gpm/Makefile @@ -1,7 +1,7 @@ PORTNAME= gpm PORTVERSION= 1.4.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= lukejee@gmail.com diff --git a/devel/grv/Makefile b/devel/grv/Makefile index cddffbb32b4..20550c1c0f7 100644 --- a/devel/grv/Makefile +++ b/devel/grv/Makefile @@ -1,7 +1,7 @@ PORTNAME= grv DISTVERSIONPREFIX= v DISTVERSION= 0.3.2 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel MAINTAINER= dmgk@FreeBSD.org diff --git a/devel/gvp/Makefile b/devel/gvp/Makefile index 27a8f0c7090..cc9b2cf4999 100644 --- a/devel/gvp/Makefile +++ b/devel/gvp/Makefile @@ -1,7 +1,7 @@ PORTNAME= gvp PORTVERSION= 0.3.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= lukejee@gmail.com diff --git a/devel/hub/Makefile b/devel/hub/Makefile index 854d57d996f..be6fb1e8836 100644 --- a/devel/hub/Makefile +++ b/devel/hub/Makefile @@ -1,7 +1,7 @@ PORTNAME= hub PORTVERSION= 2.14.2 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel sysutils MAINTAINER= egypcio@FreeBSD.org diff --git a/devel/influx-pkg-config/Makefile b/devel/influx-pkg-config/Makefile index 6bec1d75000..a2e686d75f9 100644 --- a/devel/influx-pkg-config/Makefile +++ b/devel/influx-pkg-config/Makefile @@ -1,7 +1,7 @@ PORTNAME= pkg-config DISTVERSIONPREFIX= v DISTVERSION= 0.2.12 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel PKGNAMEPREFIX= influx diff --git a/devel/jenkins-lts/Makefile b/devel/jenkins-lts/Makefile index 2f020ec021b..25ff1e6a548 100644 --- a/devel/jenkins-lts/Makefile +++ b/devel/jenkins-lts/Makefile @@ -1,5 +1,5 @@ PORTNAME= jenkins -PORTVERSION= 2.361.1 +PORTVERSION= 2.361.2 CATEGORIES= devel java MASTER_SITES= https://get.jenkins.io/war-stable/${PORTVERSION}/ PKGNAMESUFFIX= -lts diff --git a/devel/jenkins-lts/distinfo b/devel/jenkins-lts/distinfo index b45aa30ec7b..e9f6a8cc4b7 100644 --- a/devel/jenkins-lts/distinfo +++ b/devel/jenkins-lts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662571801 -SHA256 (jenkins/2.361.1/jenkins.war) = 08a72b43d570f785796a7f8b398d2d4865d20cdd985e524bc33b7f9cd5907eb3 -SIZE (jenkins/2.361.1/jenkins.war) = 93504273 +TIMESTAMP = 1664998975 +SHA256 (jenkins/2.361.2/jenkins.war) = 411a79c7e0d5082745071e261081346aa4ca27f649feb041756d1d27a983dbf6 +SIZE (jenkins/2.361.2/jenkins.war) = 93504834 diff --git a/devel/jenkins/Makefile b/devel/jenkins/Makefile index 1b6c78bcfca..a9ce854e7a3 100644 --- a/devel/jenkins/Makefile +++ b/devel/jenkins/Makefile @@ -1,5 +1,5 @@ PORTNAME= jenkins -PORTVERSION= 2.367 +PORTVERSION= 2.372 CATEGORIES= devel java MASTER_SITES= https://get.jenkins.io/war/${PORTVERSION}/ DISTNAME= jenkins diff --git a/devel/jenkins/distinfo b/devel/jenkins/distinfo index 41827b95c16..472dc81d1cf 100644 --- a/devel/jenkins/distinfo +++ b/devel/jenkins/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662555990 -SHA256 (jenkins/2.367/jenkins.war) = 8d6937d20c29089be6f54959258ef9b1de07a33bcbf9073155f674e73518a8d4 -SIZE (jenkins/2.367/jenkins.war) = 93535915 +TIMESTAMP = 1664998978 +SHA256 (jenkins/2.372/jenkins.war) = cb2ba4c4dd2bfb1bcfc57d129ea3b299baec82358aa99e77ff142b9e432bbb25 +SIZE (jenkins/2.372/jenkins.war) = 93548489 diff --git a/devel/jiri/Makefile b/devel/jiri/Makefile index 48e14c07afe..b0402338e7e 100644 --- a/devel/jiri/Makefile +++ b/devel/jiri/Makefile @@ -1,6 +1,6 @@ PORTNAME= jiri PORTVERSION= g${TIMESTAMP:S/-/./g:C/T.*//g} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MASTER_SITES= LOCAL/swills DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} diff --git a/devel/lab/Makefile b/devel/lab/Makefile index 1348d824479..4f384c2533c 100644 --- a/devel/lab/Makefile +++ b/devel/lab/Makefile @@ -1,7 +1,7 @@ PORTNAME= lab PORTVERSION= 0.23.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= swills@FreeBSD.org diff --git a/devel/lazygit/Makefile b/devel/lazygit/Makefile index 77960b1a239..156a24a5894 100644 --- a/devel/lazygit/Makefile +++ b/devel/lazygit/Makefile @@ -1,7 +1,7 @@ PORTNAME= lazygit DISTVERSIONPREFIX= v DISTVERSION= 0.35 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= meta@FreeBSD.org diff --git a/devel/liteide/Makefile b/devel/liteide/Makefile index cd9c6f5e573..065985143ce 100644 --- a/devel/liteide/Makefile +++ b/devel/liteide/Makefile @@ -1,7 +1,7 @@ PORTNAME= liteide DISTVERSIONPREFIX= x DISTVERSION= 38.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel editors MAINTAINER= dmgk@FreeBSD.org diff --git a/devel/loccount/Makefile b/devel/loccount/Makefile index e105d0c2c3e..9b4e2d19bee 100644 --- a/devel/loccount/Makefile +++ b/devel/loccount/Makefile @@ -1,6 +1,6 @@ PORTNAME= loccount DISTVERSION= 2.12 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org diff --git a/devel/lua-language-server/Makefile b/devel/lua-language-server/Makefile index 58852b04bb0..163329c1562 100644 --- a/devel/lua-language-server/Makefile +++ b/devel/lua-language-server/Makefile @@ -11,7 +11,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libinotify.so:devel/libinotify -USES= dos2unix lua:build ninja:make +# BROKEN_FREEBSD_12= 3rd/bee.lua/bee/thread/spinlock.h:9:14: fatal error: 'immintrin.h' file not found + +USES= compiler:features dos2unix lua:build ninja:make USE_GITHUB= yes GH_ACCOUNT= sumneko GH_TUPLE= actboy168:bee.lua:a749943:bee/3rd/bee.lua \ @@ -33,6 +35,15 @@ PLIST_FILES= bin/lua-language-server \ ${DATADIR_REL}/main.lua PORTDATA= locale meta script +.include + +.if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 130 +BUILD_DEPENDS+= llvm13>0:devel/llvm13 +CPP= ${LOCALBASE}/bin/clang-cpp13 +CC= ${LOCALBASE}/bin/clang13 +CXX= ${LOCALBASE}/bin/clang++13 +.endif + # post-extract: # ${CP} -rp ${WRKSRC}/3rd/bee.lua ${WRKSRC}/3rd/luamake/3rd diff --git a/devel/modd/Makefile b/devel/modd/Makefile index 5f460e3efac..54bda5b83a0 100644 --- a/devel/modd/Makefile +++ b/devel/modd/Makefile @@ -1,7 +1,7 @@ PORTNAME= modd DISTVERSIONPREFIX= v DISTVERSION= 0.8 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel sysutils MAINTAINER= yuri@FreeBSD.org diff --git a/devel/mutagen/Makefile b/devel/mutagen/Makefile index 0a3b9580b9d..cb437eabaf5 100644 --- a/devel/mutagen/Makefile +++ b/devel/mutagen/Makefile @@ -1,7 +1,7 @@ PORTNAME= mutagen DISTVERSIONPREFIX= v DISTVERSION= 0.15.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel net MAINTAINER= yuri@FreeBSD.org diff --git a/devel/packr/Makefile b/devel/packr/Makefile index f29b2070949..144ad1198d5 100644 --- a/devel/packr/Makefile +++ b/devel/packr/Makefile @@ -1,7 +1,7 @@ PORTNAME= packr DISTVERSIONPREFIX= v DISTVERSION= 2.8.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= dmgk@FreeBSD.org diff --git a/devel/pika/Makefile b/devel/pika/Makefile index c1cf7f07ed6..ab0fb513f3b 100644 --- a/devel/pika/Makefile +++ b/devel/pika/Makefile @@ -1,5 +1,5 @@ PORTNAME= pika -DISTVERSION= 0.8.0 +DISTVERSION= 0.9.0 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org diff --git a/devel/pika/distinfo b/devel/pika/distinfo index 092f697e6f2..eab629ad5aa 100644 --- a/devel/pika/distinfo +++ b/devel/pika/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664150244 -SHA256 (pika-org-pika-0.8.0_GH0.tar.gz) = 058e82d7c8f95badabe52bbb4682d55aadf340d67ced1226c0673b4529adc182 -SIZE (pika-org-pika-0.8.0_GH0.tar.gz) = 2059513 +TIMESTAMP = 1665004105 +SHA256 (pika-org-pika-0.9.0_GH0.tar.gz) = c349b2a96476d6974d2421288ca4d2e14ef9e5897d44cd7d5343165faa2d1299 +SIZE (pika-org-pika-0.9.0_GH0.tar.gz) = 2061908 diff --git a/devel/pika/files/patch-libs_pika_coroutines_include_pika_coroutines_detail_context__impl.hpp b/devel/pika/files/patch-libs_pika_coroutines_include_pika_coroutines_detail_context__impl.hpp index 13d2ab1a26b..05b9b504b26 100644 --- a/devel/pika/files/patch-libs_pika_coroutines_include_pika_coroutines_detail_context__impl.hpp +++ b/devel/pika/files/patch-libs_pika_coroutines_include_pika_coroutines_detail_context__impl.hpp @@ -1,4 +1,4 @@ ---- libs/pika/coroutines/include/pika/coroutines/detail/context_impl.hpp.orig 2022-07-13 00:16:52 UTC +--- libs/pika/coroutines/include/pika/coroutines/detail/context_impl.hpp.orig 2022-10-05 07:55:59 UTC +++ libs/pika/coroutines/include/pika/coroutines/detail/context_impl.hpp @@ -112,7 +112,7 @@ namespace pika { namespace threads { namespace corouti generic_context::fcontext_context_impl; @@ -6,6 +6,6 @@ -#elif (defined(__linux) || defined(linux) || defined(__linux__)) && \ +#elif (defined(__linux) || defined(linux) || defined(__linux__) || defined(__FreeBSD__)) && \ - !defined(__bgq__) && !defined(__powerpc__) && !defined(__s390x__) + !defined(__bgq__) && !defined(__powerpc__) && !defined(__s390x__) && \ + !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__) - #include diff --git a/devel/pika/files/patch-libs_pika_coroutines_src_detail_context__posix.cpp b/devel/pika/files/patch-libs_pika_coroutines_src_detail_context__posix.cpp index a00b287371e..ae356aaca2c 100644 --- a/devel/pika/files/patch-libs_pika_coroutines_src_detail_context__posix.cpp +++ b/devel/pika/files/patch-libs_pika_coroutines_src_detail_context__posix.cpp @@ -1,4 +1,4 @@ ---- libs/pika/coroutines/src/detail/context_posix.cpp.orig 2022-07-13 00:20:17 UTC +--- libs/pika/coroutines/src/detail/context_posix.cpp.orig 2022-10-05 07:55:59 UTC +++ libs/pika/coroutines/src/detail/context_posix.cpp @@ -14,7 +14,7 @@ @@ -6,6 +6,6 @@ -#elif (defined(__linux) || defined(linux) || defined(__linux__)) && \ +#elif (defined(__linux) || defined(linux) || defined(__linux__) || defined(__FreeBSD__)) && \ - !defined(__bgq__) && !defined(__powerpc__) && !defined(__s390x__) + !defined(__bgq__) && !defined(__powerpc__) && !defined(__s390x__) && \ + !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__) - // left empty on purpose diff --git a/devel/pika/files/patch-libs_pika_coroutines_src_swapcontext.cpp b/devel/pika/files/patch-libs_pika_coroutines_src_swapcontext.cpp index 277bbed61f7..034529b8c46 100644 --- a/devel/pika/files/patch-libs_pika_coroutines_src_swapcontext.cpp +++ b/devel/pika/files/patch-libs_pika_coroutines_src_swapcontext.cpp @@ -1,4 +1,4 @@ ---- libs/pika/coroutines/src/swapcontext.cpp.orig 2022-07-13 00:26:04 UTC +--- libs/pika/coroutines/src/swapcontext.cpp.orig 2022-10-05 07:55:59 UTC +++ libs/pika/coroutines/src/swapcontext.cpp @@ -9,7 +9,7 @@ @@ -6,6 +6,6 @@ -#if (defined(__linux) || defined(linux) || defined(__linux__)) && \ +#if (defined(__linux) || defined(linux) || defined(__linux__) || defined(__FreeBSD__)) && \ - !defined(__bgq__) && !defined(__powerpc__) && !defined(__s390x__) + !defined(__bgq__) && !defined(__powerpc__) && !defined(__s390x__) && \ + !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__) - #if defined(__x86_64__) || defined(__amd64__) diff --git a/devel/pika/pkg-plist b/devel/pika/pkg-plist index 7fb257df5bc..0ce7f4325db 100644 --- a/devel/pika/pkg-plist +++ b/devel/pika/pkg-plist @@ -865,6 +865,7 @@ lib/cmake/pika/pika_setup_p2300.cmake lib/cmake/pika/pika_setup_target.cmake lib/cmake/pika/pika_setup_threads.cmake lib/cmake/pika/pika_setup_valgrind.cmake +lib/cmake/pika/pika_setup_whip.cmake lib/cmake/pika/pika_shorten_pseudo_target.cmake lib/cmake/pika/pika_target_arch.cmake lib/cmake/pika/pika_targets-%%CMAKE_BUILD_TYPE%%.cmake @@ -905,4 +906,4 @@ lib/cmake/pika/tests/stable_inplace_merge.cpp lib/cmake/pika/tests/unistd_h.cpp lib/libpika.so lib/libpika.so.0 -lib/libpika.so.0.8.0 +lib/libpika.so.0.9.0 diff --git a/devel/please/Makefile b/devel/please/Makefile index 078dd10ee1f..aa851168b49 100644 --- a/devel/please/Makefile +++ b/devel/please/Makefile @@ -1,7 +1,7 @@ PORTNAME= please DISTVERSIONPREFIX= v DISTVERSION= 15.17.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel PKGNAMESUFFIX= .build diff --git a/devel/pprof/Makefile b/devel/pprof/Makefile index 4b628870bf4..fb01d2cca3e 100644 --- a/devel/pprof/Makefile +++ b/devel/pprof/Makefile @@ -1,6 +1,6 @@ PORTNAME= pprof DISTVERSION= g20200905 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org diff --git a/devel/prototool/Makefile b/devel/prototool/Makefile index 7e34fee9130..b43f1d4f737 100644 --- a/devel/prototool/Makefile +++ b/devel/prototool/Makefile @@ -1,7 +1,7 @@ PORTNAME= prototool DISTVERSIONPREFIX= v DISTVERSION= 1.10.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org diff --git a/devel/py-numba/Makefile b/devel/py-numba/Makefile index ca658f6189b..5ec716d6b3f 100644 --- a/devel/py-numba/Makefile +++ b/devel/py-numba/Makefile @@ -11,7 +11,6 @@ WWW= https://numba.pydata.org/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= not compatible with onetbb-2021.6.0, see https://github.com/numba/numba/issues/8487 .if !exists(/usr/include/omp.h) BROKEN= requires OpenMP support that is missing on this architecture .endif @@ -23,6 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}llvmlite>=0.31.0:devel/py-llvmlite@${PY_FLAV USES= compiler:c++11-lang python:3.6+ fortran localbase USE_PYTHON= distutils concurrent autoplist unittest +MAKE_ENV= NUMBA_DISABLE_TBB=1 # workaround for: not compatible with onetbb-2021.6.0, see https://github.com/numba/numba/issues/8487 TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} TEST_WRKSRC= ${WRKSRC}/numba/tests diff --git a/devel/py-twilio/Makefile b/devel/py-twilio/Makefile index 1045cf5962a..fd63ad2c33b 100644 --- a/devel/py-twilio/Makefile +++ b/devel/py-twilio/Makefile @@ -1,5 +1,5 @@ PORTNAME= twilio -PORTVERSION= 7.14.1 +PORTVERSION= 7.14.2 PORTREVISION= 0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP diff --git a/devel/py-twilio/distinfo b/devel/py-twilio/distinfo index d94213cea4d..5b8494f72a4 100644 --- a/devel/py-twilio/distinfo +++ b/devel/py-twilio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663834872 -SHA256 (twilio-7.14.1.tar.gz) = b4d36ed630b8963c361ac005aa8f19384085b07ef638044f3f9b28d0d9210273 -SIZE (twilio-7.14.1.tar.gz) = 556438 +TIMESTAMP = 1665031660 +SHA256 (twilio-7.14.2.tar.gz) = 18fa85693641cfafaf2433c3af545e3766b691046a277914ae01bf7c805bc6cb +SIZE (twilio-7.14.2.tar.gz) = 557844 diff --git a/devel/pydio-packr/Makefile b/devel/pydio-packr/Makefile index 8908ba3e7cc..abad0a60553 100644 --- a/devel/pydio-packr/Makefile +++ b/devel/pydio-packr/Makefile @@ -2,7 +2,7 @@ PORTNAME= packr DISTVERSIONPREFIX= v DISTVERSION= 1.30.2-0.20200608151212 DISTVERSIONSUFFIX= -7d41389ccc6e -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel PKGNAMEPREFIX= pydio- diff --git a/devel/qxlsx/Makefile b/devel/qxlsx/Makefile new file mode 100644 index 00000000000..b63b06082aa --- /dev/null +++ b/devel/qxlsx/Makefile @@ -0,0 +1,26 @@ +PORTNAME= ${GH_PROJECT:tl} +PORTVERSION= 1.4.4 +DISTVERSIONPREFIX= v +CATEGORIES= devel + +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= 8e83402db866ae7a67582da28aa68c83545f13c8.patch:-p2 + +MAINTAINER= danfe@FreeBSD.org +COMMENT= Excel file reader/writer library using Qt +WWW= https://qtexcel.github.io/QXlsx/ + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/../LICENSE + +USES= cmake qt:5 +USE_GITHUB= yes +GH_ACCOUNT= QtExcel +GH_PROJECT= QXlsx +USE_LDCONFIG= yes +USE_QT= buildtools:build qmake:build core gui + +CMAKE_ON= BUILD_SHARED_LIBS +WRKSRC_SUBDIR= ${GH_PROJECT} + +.include diff --git a/devel/qxlsx/distinfo b/devel/qxlsx/distinfo new file mode 100644 index 00000000000..40ddec85933 --- /dev/null +++ b/devel/qxlsx/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1658513489 +SHA256 (QtExcel-QXlsx-v1.4.4_GH0.tar.gz) = 5c6f7117000c7559d6557d00a2f7b836bee670f9bc16309a72bc23aaedf994d9 +SIZE (QtExcel-QXlsx-v1.4.4_GH0.tar.gz) = 4703732 +SHA256 (8e83402db866ae7a67582da28aa68c83545f13c8.patch) = a3d0a12b093cebc8a27e156c67871e43f020d6db207b3d7ab447562b042107fc +SIZE (8e83402db866ae7a67582da28aa68c83545f13c8.patch) = 749 diff --git a/devel/qxlsx/pkg-descr b/devel/qxlsx/pkg-descr new file mode 100644 index 00000000000..4cf8cd7f2f6 --- /dev/null +++ b/devel/qxlsx/pkg-descr @@ -0,0 +1,3 @@ +QXlsx is reader/writer library for Microsoft Excel files (*.xlsx). +Because QtXlsx is no longer supported since 2014, new project had +been created based off of it in 2017. diff --git a/devel/qxlsx/pkg-plist b/devel/qxlsx/pkg-plist new file mode 100644 index 00000000000..aa548777b0b --- /dev/null +++ b/devel/qxlsx/pkg-plist @@ -0,0 +1,26 @@ +include/QXlsx/xlsxabstractooxmlfile.h +include/QXlsx/xlsxabstractsheet.h +include/QXlsx/xlsxabstractsheet_p.h +include/QXlsx/xlsxcell.h +include/QXlsx/xlsxcellformula.h +include/QXlsx/xlsxcelllocation.h +include/QXlsx/xlsxcellrange.h +include/QXlsx/xlsxcellreference.h +include/QXlsx/xlsxchart.h +include/QXlsx/xlsxchartsheet.h +include/QXlsx/xlsxconditionalformatting.h +include/QXlsx/xlsxdatavalidation.h +include/QXlsx/xlsxdatetype.h +include/QXlsx/xlsxdocument.h +include/QXlsx/xlsxformat.h +include/QXlsx/xlsxglobal.h +include/QXlsx/xlsxrichstring.h +include/QXlsx/xlsxworkbook.h +include/QXlsx/xlsxworksheet.h +lib/cmake/QXlsx/QXlsxConfig.cmake +lib/cmake/QXlsx/QXlsxConfigVersion.cmake +lib/cmake/QXlsx/QXlsxTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/QXlsx/QXlsxTargets.cmake +lib/libQXlsx.so +lib/libQXlsx.so.0 +lib/libQXlsx.so.1.4.4 diff --git a/devel/revive/Makefile b/devel/revive/Makefile index 835b809efdc..a935dfdc5a2 100644 --- a/devel/revive/Makefile +++ b/devel/revive/Makefile @@ -1,6 +1,7 @@ PORTNAME= revive DISTVERSIONPREFIX= v DISTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= lcook@FreeBSD.org diff --git a/devel/rgbds/Makefile b/devel/rgbds/Makefile index 23611c95a53..669efeec0bd 100644 --- a/devel/rgbds/Makefile +++ b/devel/rgbds/Makefile @@ -1,5 +1,5 @@ PORTNAME= rgbds -DISTVERSION= 0.5.2 +DISTVERSION= 0.6.0 CATEGORIES= devel games MASTER_SITES= https://github.com/gbdev/rgbds/releases/download/v${DISTVERSION}/ @@ -22,4 +22,12 @@ do-configure: ${CC} -std=gnu11 -D_POSIX_C_SOURCE=200809L -D_ISOC11_SOURCE -xc - 2>/dev/null || \ ${REINPLACE_CMD} 's,-D_POSIX_C_SOURCE=200809L,,' ${WRKSRC}/Makefile -.include +.include + +# clang build fails on 13.1 and 14 current +# see https://github.com/gbdev/rgbds/issues/1091 +.if ${OSVERSION} >= 1300000 +USE_GCC= yes +.endif + +.include diff --git a/devel/rgbds/distinfo b/devel/rgbds/distinfo index d3a12593441..c1a59fd5c51 100644 --- a/devel/rgbds/distinfo +++ b/devel/rgbds/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1637707257 -SHA256 (rgbds-0.5.2.tar.gz) = 142479e1b68e3947af2dace884fb0efa65e789163cb5909bdcbae1f132dc1457 -SIZE (rgbds-0.5.2.tar.gz) = 7955107 +TIMESTAMP = 1664826997 +SHA256 (rgbds-0.6.0.tar.gz) = a5fa40b92e0562c6a092bc81ca56614316730aca7b10b8177285023781ff0e32 +SIZE (rgbds-0.6.0.tar.gz) = 8041666 diff --git a/devel/ruby-build/Makefile b/devel/ruby-build/Makefile index 2bd5de6ce76..cf6cc13f1d2 100644 --- a/devel/ruby-build/Makefile +++ b/devel/ruby-build/Makefile @@ -1,5 +1,5 @@ PORTNAME= ruby-build -PORTVERSION= 20220930 +PORTVERSION= 20221004 DISTVERSIONPREFIX= v CATEGORIES= devel ruby diff --git a/devel/ruby-build/distinfo b/devel/ruby-build/distinfo index f41911e5be9..9db1b8a3e01 100644 --- a/devel/ruby-build/distinfo +++ b/devel/ruby-build/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664768208 -SHA256 (rbenv-ruby-build-v20220930_GH0.tar.gz) = b224177101f05558e5dbfac4f96b21b004a0ac0173fb24270473521be1a3c76d -SIZE (rbenv-ruby-build-v20220930_GH0.tar.gz) = 78886 +TIMESTAMP = 1664973132 +SHA256 (rbenv-ruby-build-v20221004_GH0.tar.gz) = da6cefa3f15c44683c749cd8612910768a30eefbfb8213ff3420abe0d3478704 +SIZE (rbenv-ruby-build-v20221004_GH0.tar.gz) = 78907 diff --git a/devel/sbt/Makefile b/devel/sbt/Makefile index eab2bee36c6..7d8eabb839f 100644 --- a/devel/sbt/Makefile +++ b/devel/sbt/Makefile @@ -1,5 +1,5 @@ PORTNAME= sbt -PORTVERSION= 1.7.1 +PORTVERSION= 1.7.2 CATEGORIES= devel java MASTER_SITES= https://github.com/sbt/sbt/releases/download/v${PORTVERSION}/ diff --git a/devel/sbt/distinfo b/devel/sbt/distinfo index a67411e2f20..0efc3e5c7a3 100644 --- a/devel/sbt/distinfo +++ b/devel/sbt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1657635395 -SHA256 (sbt-1.7.1.tgz) = 8a183afdb3519290dde2f8c81c9b2bad19ddd78735ef311fb5fb9bdcf68d3fe4 -SIZE (sbt-1.7.1.tgz) = 29159575 +TIMESTAMP = 1665041625 +SHA256 (sbt-1.7.2.tgz) = bd64839c8cd63f2dec31d6ea24e0de16c613c84a927a1f458ae4019b2ba310d7 +SIZE (sbt-1.7.2.tgz) = 29167695 diff --git a/devel/shfmt/Makefile b/devel/shfmt/Makefile index f5822ce6700..1bb37f522a3 100644 --- a/devel/shfmt/Makefile +++ b/devel/shfmt/Makefile @@ -1,7 +1,7 @@ PORTNAME= shfmt DISTVERSIONPREFIX= v DISTVERSION= 3.5.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MAINTAINER= adamw@FreeBSD.org diff --git a/devel/soft-serve/Makefile b/devel/soft-serve/Makefile index c9310c0eca6..a7bbac7e5b3 100644 --- a/devel/soft-serve/Makefile +++ b/devel/soft-serve/Makefile @@ -1,7 +1,7 @@ PORTNAME= soft-serve DISTVERSIONPREFIX= v DISTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= ashish@FreeBSD.org diff --git a/devel/statik/Makefile b/devel/statik/Makefile index 18bba058b9e..11c5e582345 100644 --- a/devel/statik/Makefile +++ b/devel/statik/Makefile @@ -1,7 +1,7 @@ PORTNAME= statik DISTVERSIONPREFIX= v DISTVERSION= 0.1.2 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= devel diff --git a/devel/stuffbin/Makefile b/devel/stuffbin/Makefile index 0102cd17a53..3f9bce0ccb3 100644 --- a/devel/stuffbin/Makefile +++ b/devel/stuffbin/Makefile @@ -1,7 +1,7 @@ PORTNAME= stuffbin DISTVERSIONPREFIX= v DISTVERSION= 1.1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= lcook@FreeBSD.org diff --git a/devel/taskctl/Makefile b/devel/taskctl/Makefile index 54662cd675a..0dc45f4bde5 100644 --- a/devel/taskctl/Makefile +++ b/devel/taskctl/Makefile @@ -1,6 +1,6 @@ PORTNAME= taskctl PORTVERSION= 1.4.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= olgeni@FreeBSD.org diff --git a/devel/tinygo/Makefile b/devel/tinygo/Makefile index 7982239f494..f24358a5bab 100644 --- a/devel/tinygo/Makefile +++ b/devel/tinygo/Makefile @@ -1,7 +1,7 @@ PORTNAME= tinygo DISTVERSIONPREFIX= v DISTVERSION= 0.19.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= ports@FreeBSD.org diff --git a/devel/upnp/Makefile b/devel/upnp/Makefile index 9ea7fee292d..56bb25ae70d 100644 --- a/devel/upnp/Makefile +++ b/devel/upnp/Makefile @@ -1,6 +1,6 @@ PORTNAME= upnp DISTVERSIONPREFIX= release- -DISTVERSION= 1.14.13 +DISTVERSION= 1.14.14 PORTEPOCH= 1 CATEGORIES= devel diff --git a/devel/upnp/distinfo b/devel/upnp/distinfo index bcdd171ae21..479734dff4c 100644 --- a/devel/upnp/distinfo +++ b/devel/upnp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659807940 -SHA256 (pupnp-pupnp-release-1.14.13_GH0.tar.gz) = 8c099da99b3506bef683d46415bc3158260ca5528b4cec211d880eb5dea61176 -SIZE (pupnp-pupnp-release-1.14.13_GH0.tar.gz) = 807484 +TIMESTAMP = 1665081105 +SHA256 (pupnp-pupnp-release-1.14.14_GH0.tar.gz) = 36c0e0d7135c81516bba2292504bdbff6bd182904127b6f137c3945a93c4bccd +SIZE (pupnp-pupnp-release-1.14.14_GH0.tar.gz) = 808851 diff --git a/devel/upnp/pkg-plist b/devel/upnp/pkg-plist index 97b66e169cf..2d8daf5c31e 100644 --- a/devel/upnp/pkg-plist +++ b/devel/upnp/pkg-plist @@ -31,6 +31,6 @@ lib/libixml.so.11.1.2 lib/libupnp.a lib/libupnp.so lib/libupnp.so.17 -lib/libupnp.so.17.1.4 +lib/libupnp.so.17.1.5 libdata/pkgconfig/libupnp.pc %%PORTDOCS%%%%DOCSDIR%%/UPnP_Programming_Guide.pdf diff --git a/devel/yaegi/Makefile b/devel/yaegi/Makefile index 5141593171a..45c7a6d5e87 100644 --- a/devel/yaegi/Makefile +++ b/devel/yaegi/Makefile @@ -1,6 +1,6 @@ PORTNAME= yaegi DISTVERSION= 0.9.23 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/dns/acme-dns/Makefile b/dns/acme-dns/Makefile index 91fa676dfa1..b6790e582ef 100644 --- a/dns/acme-dns/Makefile +++ b/dns/acme-dns/Makefile @@ -1,7 +1,7 @@ PORTNAME= acme-dns DISTVERSIONPREFIX= v DISTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= dns diff --git a/dns/amass/Makefile b/dns/amass/Makefile index 62ce71f5fca..51f84ba633b 100644 --- a/dns/amass/Makefile +++ b/dns/amass/Makefile @@ -1,6 +1,7 @@ PORTNAME= amass DISTVERSIONPREFIX= v DISTVERSION= 3.20.0 +PORTREVISION= 1 CATEGORIES= dns MAINTAINER= yuri@FreeBSD.org diff --git a/dns/blocky/Makefile b/dns/blocky/Makefile index 4656bcd36e0..b82a35ea399 100644 --- a/dns/blocky/Makefile +++ b/dns/blocky/Makefile @@ -1,7 +1,7 @@ PORTNAME= blocky DISTVERSIONPREFIX= v DISTVERSION= 0.19 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= dns MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod DISTFILES= go.mod:gomod diff --git a/dns/cli53/Makefile b/dns/cli53/Makefile index f5f592f9164..f878a5f0e9f 100644 --- a/dns/cli53/Makefile +++ b/dns/cli53/Makefile @@ -1,6 +1,6 @@ PORTNAME= cli53 DISTVERSION= 0.8.18 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= dns MAINTAINER= meta@FreeBSD.org diff --git a/dns/coredns/Makefile b/dns/coredns/Makefile index d3d2331ea14..203bf9074c3 100644 --- a/dns/coredns/Makefile +++ b/dns/coredns/Makefile @@ -1,6 +1,7 @@ PORTNAME= coredns DISTVERSIONPREFIX= v DISTVERSION= 1.10.0 +PORTREVISION= 1 CATEGORIES= dns MAINTAINER= yuri@FreeBSD.org diff --git a/dns/dnscontrol/Makefile b/dns/dnscontrol/Makefile index 5e4e25c38e0..805d074791b 100644 --- a/dns/dnscontrol/Makefile +++ b/dns/dnscontrol/Makefile @@ -1,7 +1,7 @@ PORTNAME= dnscontrol DISTVERSIONPREFIX=v DISTVERSION= 3.19.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns MAINTAINER= decke@FreeBSD.org diff --git a/dns/doggo/Makefile b/dns/doggo/Makefile index 4d9b58bc33d..b9e7cbc8975 100644 --- a/dns/doggo/Makefile +++ b/dns/doggo/Makefile @@ -1,7 +1,7 @@ PORTNAME= doggo DISTVERSIONPREFIX= v DISTVERSION= 0.5.4 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= dns diff --git a/dns/nextdns/Makefile b/dns/nextdns/Makefile index 635b723df4a..073ab0a1719 100644 --- a/dns/nextdns/Makefile +++ b/dns/nextdns/Makefile @@ -1,7 +1,7 @@ PORTNAME= nextdns PORTVERSION= 1.37.11 DISTVERSIONPREFIX= v -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= dns security MAINTAINER= rs@nextdns.io diff --git a/dns/prometheus-dnssec-exporter/Makefile b/dns/prometheus-dnssec-exporter/Makefile index 2e1f4e58041..b9c6cd3b18c 100644 --- a/dns/prometheus-dnssec-exporter/Makefile +++ b/dns/prometheus-dnssec-exporter/Makefile @@ -1,5 +1,6 @@ PORTNAME= prometheus-dnssec-exporter DISTVERSION= g20220925 +PORTREVISION= 1 CATEGORIES= dns MAINTAINER= philip@FreeBSD.org diff --git a/dns/rdap/Makefile b/dns/rdap/Makefile index a1660a5b9c5..822c220e4b7 100644 --- a/dns/rdap/Makefile +++ b/dns/rdap/Makefile @@ -1,7 +1,7 @@ PORTNAME= rdap DISTVERSIONPREFIX= v DISTVERSION= 0.9.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= dns MAINTAINER= pi@FreeBSD.org diff --git a/dns/subfinder/Makefile b/dns/subfinder/Makefile index 0490bc5e998..443ba4dcd6b 100644 --- a/dns/subfinder/Makefile +++ b/dns/subfinder/Makefile @@ -1,6 +1,7 @@ PORTNAME= subfinder DISTVERSIONPREFIX= v DISTVERSION= 2.5.3 +PORTREVISION= 1 CATEGORIES= dns MAINTAINER= yuri@FreeBSD.org diff --git a/dns/yandex-ddns/Makefile b/dns/yandex-ddns/Makefile index 7584c567d58..6ed60ba5171 100644 --- a/dns/yandex-ddns/Makefile +++ b/dns/yandex-ddns/Makefile @@ -1,6 +1,6 @@ PORTNAME= yandex-ddns DISTVERSION= g20200613 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= dns MAINTAINER= rigoletto@FreeBSD.org diff --git a/editors/gomate/Makefile b/editors/gomate/Makefile index e684dd92629..8fe870591f5 100644 --- a/editors/gomate/Makefile +++ b/editors/gomate/Makefile @@ -1,6 +1,6 @@ PORTNAME= gomate DISTVERSION= g20170711 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= editors MAINTAINER= fabian.freyer@physik.tu-berlin.de diff --git a/editors/lapce/Makefile b/editors/lapce/Makefile index d18e6b467e9..007a02893c6 100644 --- a/editors/lapce/Makefile +++ b/editors/lapce/Makefile @@ -1,6 +1,7 @@ PORTNAME= lapce DISTVERSIONPREFIX= v DISTVERSION= 0.2.0 # remove openssl-src-* from CARGO-CRATES each update +PORTREVISION= 1 CATEGORIES= editors MAINTAINER= eduardo@FreeBSD.org @@ -8,6 +9,7 @@ COMMENT= Lightning-fast and Powerful Code Editor WWW= https://lapce.dev/ LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON_i386= doesn't build: [zstd-sys 2.0.1+zstd.1.5.2] AR_i686_unknown_freebsd = None @@ -18,7 +20,9 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libgit2.so:devel/libgit2 \ libssh2.so:security/libssh2 -USES= cargo gmake gnome localbase:ldflags perl5 pkgconfig ssl +USES= cargo dos2unix gmake gnome localbase:ldflags perl5 pkgconfig \ + ssl +DOS2UNIX_FILES= cargo-crates/process_path-0.1.4/src/bsd.rs USE_GITHUB= yes USE_GNOME= atk gdkpixbuf2 gtk30 pango diff --git a/editors/lapce/files/patch-cargo-crates_process__path-0.1.4_src_bsd.rs b/editors/lapce/files/patch-cargo-crates_process__path-0.1.4_src_bsd.rs new file mode 100644 index 00000000000..2a3683c7854 --- /dev/null +++ b/editors/lapce/files/patch-cargo-crates_process__path-0.1.4_src_bsd.rs @@ -0,0 +1,11 @@ +--- cargo-crates/process_path-0.1.4/src/bsd.rs.orig 2022-10-06 14:01:42 UTC ++++ cargo-crates/process_path-0.1.4/src/bsd.rs +@@ -35,7 +35,7 @@ pub fn get_executable_path() -> Option { + // FreeBSD without procfs + if result == 0 { + // Convert the string allocated on the stack to a Rust string. +- let len = unsafe { strlen(buf.as_ptr() as *const i8) }; ++ let len = unsafe { strlen(buf.as_ptr() as *const libc::c_char) }; + unsafe { buf.set_len(len) }; + match String::from_utf8(buf).ok() { + Some(path) => { diff --git a/editors/micro/Makefile b/editors/micro/Makefile index 7e2cb8d4d56..593c5f2ce90 100644 --- a/editors/micro/Makefile +++ b/editors/micro/Makefile @@ -1,7 +1,7 @@ PORTNAME= micro DISTVERSIONPREFIX= v DISTVERSION= 2.0.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MAINTAINER= lcook@FreeBSD.org diff --git a/editors/o/Makefile b/editors/o/Makefile index 4af0a20a2f3..eaa907e49cb 100644 --- a/editors/o/Makefile +++ b/editors/o/Makefile @@ -1,6 +1,7 @@ PORTNAME= o DISTVERSIONPREFIX= v DISTVERSION= 2.56.0 +PORTREVISION= 1 CATEGORIES= editors MAINTAINER= yuri@FreeBSD.org diff --git a/emulators/magia/Makefile b/emulators/magia/Makefile index 219d7dd5683..be563e581f6 100644 --- a/emulators/magia/Makefile +++ b/emulators/magia/Makefile @@ -1,7 +1,7 @@ PORTNAME= magia DISTVERSIONPREFIX= v DISTVERSION= 0.2.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= emulators MAINTAINER= nc@FreeBSD.org diff --git a/emulators/sameboy/Makefile b/emulators/sameboy/Makefile index 3fed0c48916..477e78ff08b 100644 --- a/emulators/sameboy/Makefile +++ b/emulators/sameboy/Makefile @@ -1,8 +1,12 @@ PORTNAME= sameboy DISTVERSIONPREFIX= v DISTVERSION= 0.15.6 +PORTREVISION= 1 CATEGORIES= emulators games +PATCH_SITES= https://github.com/LIJI32/SameBoy/commit/ +PATCHFILES= c0966ceebaf1cf2518427ffa3c0189d8f96ab5aa.patch:-p1 # https://github.com/LIJI32/SameBoy/pull/501 + MAINTAINER= eduardo@FreeBSD.org COMMENT= Game Boy and Game Boy Color emulator written in C WWW= https://sameboy.github.io/ diff --git a/emulators/sameboy/distinfo b/emulators/sameboy/distinfo index 0545322d5cb..10e5fe35a1d 100644 --- a/emulators/sameboy/distinfo +++ b/emulators/sameboy/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1663535805 +TIMESTAMP = 1664963905 SHA256 (LIJI32-SameBoy-v0.15.6_GH0.tar.gz) = 2a093310b85728a201dc95a9538a167942f099c78a2ff16afe3e49317934d29b SIZE (LIJI32-SameBoy-v0.15.6_GH0.tar.gz) = 3096139 +SHA256 (c0966ceebaf1cf2518427ffa3c0189d8f96ab5aa.patch) = 3276c2c455e4b7c9076c1220af7c4bcd3337e3386f43e7f8c8b52de2272c8a6c +SIZE (c0966ceebaf1cf2518427ffa3c0189d8f96ab5aa.patch) = 36701 diff --git a/finance/cointop/Makefile b/finance/cointop/Makefile index 2e3a3f604d6..433a48ceeb1 100644 --- a/finance/cointop/Makefile +++ b/finance/cointop/Makefile @@ -1,7 +1,7 @@ PORTNAME= cointop DISTVERSIONPREFIX= v DISTVERSION= 1.6.10 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= finance MAINTAINER= lcook@FreeBSD.org diff --git a/finance/fixc/Makefile b/finance/fixc/Makefile index 49d1c445e6e..338034d09b0 100644 --- a/finance/fixc/Makefile +++ b/finance/fixc/Makefile @@ -1,7 +1,7 @@ PORTNAME= fixc PORTVERSION= 1.2 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= finance MAINTAINER= blttll@gmail.com diff --git a/finance/ticker/Makefile b/finance/ticker/Makefile index f4a37f9fa07..9136514a964 100644 --- a/finance/ticker/Makefile +++ b/finance/ticker/Makefile @@ -1,7 +1,7 @@ PORTNAME= ticker DISTVERSIONPREFIX= v DISTVERSION= 4.5.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= finance MAINTAINER= fuz@fuz.su diff --git a/ftp/curlie/Makefile b/ftp/curlie/Makefile index 506e07d8cd6..2c6104b45d7 100644 --- a/ftp/curlie/Makefile +++ b/ftp/curlie/Makefile @@ -1,7 +1,7 @@ PORTNAME= curlie DISTVERSIONPREFIX= v DISTVERSION= 1.6.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= ftp net www MAINTAINER= 0mp@FreeBSD.org diff --git a/ftp/lftp/files/patch-src-Makefile.in b/ftp/lftp/files/patch-src-Makefile.in index a0a82f1b364..be33f1b58e7 100644 --- a/ftp/lftp/files/patch-src-Makefile.in +++ b/ftp/lftp/files/patch-src-Makefile.in @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig 2019-12-21 09:41:47 UTC +--- src/Makefile.in.orig 2020-08-13 19:57:03 UTC +++ src/Makefile.in -@@ -2607,7 +2607,7 @@ info: info-am +@@ -2625,7 +2625,7 @@ info: info-am info-am: diff --git a/ftp/lftp/files/patch-src_lftp__ssl.cc b/ftp/lftp/files/patch-src_lftp__ssl.cc index 03a2b75a31c..79d85fd0420 100644 --- a/ftp/lftp/files/patch-src_lftp__ssl.cc +++ b/ftp/lftp/files/patch-src_lftp__ssl.cc @@ -9,6 +9,15 @@ #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject #endif extern "C" { +@@ -775,7 +775,7 @@ error: + #elif USE_OPENSSL + //static int lftp_ssl_passwd_callback(char *buf,int size,int rwflag,void *userdata); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000L) + // for compatibility with older versions + X509_OBJECT *X509_OBJECT_new() + { @@ -840,7 +840,7 @@ lftp_ssl_openssl_instance::lftp_ssl_openssl_instance() ssl_ctx=SSL_CTX_new(); X509_set_default_verify_paths(ssl_ctx->cert); diff --git a/ftp/sftpgo/Makefile b/ftp/sftpgo/Makefile index 78e8b54333c..5727e625e82 100644 --- a/ftp/sftpgo/Makefile +++ b/ftp/sftpgo/Makefile @@ -1,6 +1,6 @@ PORTNAME= sftpgo PORTVERSION= 2.3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ftp www MASTER_SITES= https://github.com/drakkan/${PORTNAME}/releases/download/v${DISTVERSION}/ DISTNAME= ${PORTNAME}_v${PORTVERSION}_src_with_deps diff --git a/games/OpenDiablo2/Makefile b/games/OpenDiablo2/Makefile index 2af9758d9ce..f5de493ea7a 100644 --- a/games/OpenDiablo2/Makefile +++ b/games/OpenDiablo2/Makefile @@ -1,7 +1,7 @@ PORTNAME= OpenDiablo2 DISTVERSIONPREFIX= v DISTVERSION= 0.1-g20210514 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MAINTAINER= eduardo@FreeBSD.org diff --git a/games/anki/Makefile b/games/anki/Makefile index a6ea8d1d137..0c8553de4ed 100644 --- a/games/anki/Makefile +++ b/games/anki/Makefile @@ -1,5 +1,6 @@ PORTNAME= anki DISTVERSION= 2.1.54 +PORTREVISION= 1 # Don't forget to update ${_MY_BUILDHASH} if DISTVERSION changes CATEGORIES= games education python MASTER_SITES= LOCAL/kai/:yarncache \ diff --git a/games/arttime/Makefile b/games/arttime/Makefile index 331befa50d0..16b829253e3 100644 --- a/games/arttime/Makefile +++ b/games/arttime/Makefile @@ -1,11 +1,12 @@ PORTNAME= arttime PORTVERSION= 1.9.1 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= games MAINTAINER= ehaupt@FreeBSD.org COMMENT= Bring curated text/ascii art to artless terminals -WWW= https://github.com/reportaman/arttime +WWW= https://github.com/poetaman/arttime LICENSE= GPLv3 @@ -13,7 +14,7 @@ BUILD_DEPENDS= zsh:shells/zsh RUN_DEPENDS= zsh:shells/zsh USE_GITHUB= yes -GH_ACCOUNT= reportaman +GH_ACCOUNT= poetaman NO_ARCH= yes NO_BUILD= yes diff --git a/games/arttime/distinfo b/games/arttime/distinfo index 869801e575e..4d3eaf7e5b6 100644 --- a/games/arttime/distinfo +++ b/games/arttime/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664875407 -SHA256 (reportaman-arttime-v1.9.1_GH0.tar.gz) = 17a2bbfcdc423540f851ca42ac0403a100b829b2ad06f8e40a1892f995679544 -SIZE (reportaman-arttime-v1.9.1_GH0.tar.gz) = 283943 +TIMESTAMP = 1665044785 +SHA256 (poetaman-arttime-v1.9.1_GH0.tar.gz) = 17a2bbfcdc423540f851ca42ac0403a100b829b2ad06f8e40a1892f995679544 +SIZE (poetaman-arttime-v1.9.1_GH0.tar.gz) = 283943 diff --git a/games/automuteus/Makefile b/games/automuteus/Makefile index 1adeb359693..07bdbe65c02 100644 --- a/games/automuteus/Makefile +++ b/games/automuteus/Makefile @@ -1,6 +1,6 @@ PORTNAME= automuteus DISTVERSION= 7.2.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MAINTAINER= nc@FreeBSD.org diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile index a043d17b2f2..59355d025c5 100644 --- a/games/gnome-chess/Makefile +++ b/games/gnome-chess/Makefile @@ -1,5 +1,5 @@ PORTNAME= gnome-chess -PORTVERSION= 42.1 +PORTVERSION= 43.0 CATEGORIES= games gnome MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/} DIST_SUBDIR= gnome diff --git a/games/gnome-chess/distinfo b/games/gnome-chess/distinfo index 4af997e9fbc..5d0d92bb37e 100644 --- a/games/gnome-chess/distinfo +++ b/games/gnome-chess/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660853893 -SHA256 (gnome/gnome-chess-42.1.tar.xz) = 66290bf72864cbc6ee7cce8c9f40de8124e8e6097bd76862f2d7aab0c4bdb02c -SIZE (gnome/gnome-chess-42.1.tar.xz) = 663036 +TIMESTAMP = 1664993307 +SHA256 (gnome/gnome-chess-43.0.tar.xz) = 6433fedf2f42fb22bf202d9f138ec2ee07237ad5d743809050b5c809b56cdbcb +SIZE (gnome/gnome-chess-43.0.tar.xz) = 658156 diff --git a/games/neo-cowsay/Makefile b/games/neo-cowsay/Makefile index 7408f552996..5c18c4d46f4 100644 --- a/games/neo-cowsay/Makefile +++ b/games/neo-cowsay/Makefile @@ -1,7 +1,7 @@ PORTNAME= neo-cowsay DISTVERSIONPREFIX= v DISTVERSION= 2.0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MAINTAINER= eduardo@FreeBSD.org diff --git a/games/openrct2/Makefile b/games/openrct2/Makefile index 2c162737de8..b78e8536ddc 100644 --- a/games/openrct2/Makefile +++ b/games/openrct2/Makefile @@ -1,7 +1,6 @@ PORTNAME= openrct2 DISTVERSIONPREFIX= v -DISTVERSION= 0.4.1 -PORTREVISION= 2 +DISTVERSION= 0.4.2 CATEGORIES= games MAINTAINER= pkubaj@FreeBSD.org @@ -32,7 +31,7 @@ USES= cmake compiler:c++17-lang desktop-file-utils gnome gl iconv \ USE_GITHUB= yes GH_ACCOUNT= OpenRCT2 GH_PROJECT= OpenRCT2 -GH_TUPLE= OpenRCT2:objects:v1.3.2:objects \ +GH_TUPLE= OpenRCT2:objects:v1.3.5:objects \ OpenRCT2:title-sequences:v0.4.0:title_sequences USE_GL= gl USE_LDCONFIG= yes diff --git a/games/openrct2/distinfo b/games/openrct2/distinfo index c6f0778b786..cc5719a7783 100644 --- a/games/openrct2/distinfo +++ b/games/openrct2/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1657058290 -SHA256 (OpenRCT2-OpenRCT2-v0.4.1_GH0.tar.gz) = a7ef1995aca7d19d2167ae68ef3a167157582f29c1606bf90878fbb5ba9f14d6 -SIZE (OpenRCT2-OpenRCT2-v0.4.1_GH0.tar.gz) = 14307739 -SHA256 (OpenRCT2-objects-v1.3.2_GH0.tar.gz) = 9c94e479ce676076c739a05edbd9196860d1baecff8753c378043dcea8e0b63b -SIZE (OpenRCT2-objects-v1.3.2_GH0.tar.gz) = 2420884 +TIMESTAMP = 1664980141 +SHA256 (OpenRCT2-OpenRCT2-v0.4.2_GH0.tar.gz) = e313f29ad757d8c4870c166e7342accd642d1e6e7b245385d60e161ef4a0028f +SIZE (OpenRCT2-OpenRCT2-v0.4.2_GH0.tar.gz) = 16476190 +SHA256 (OpenRCT2-objects-v1.3.5_GH0.tar.gz) = 0023ba839af568ebe7300a50fdf876e2bcda5c77f85a116bf531a7eb8da5e339 +SIZE (OpenRCT2-objects-v1.3.5_GH0.tar.gz) = 2870605 SHA256 (OpenRCT2-title-sequences-v0.4.0_GH0.tar.gz) = 7ef9bcad26961fd6344e80afd07bd0a547bed9f7dab7f141cf78a4976a39e469 SIZE (OpenRCT2-title-sequences-v0.4.0_GH0.tar.gz) = 28432766 diff --git a/games/weebsay/Makefile b/games/weebsay/Makefile index 536d6088487..c4288cb9225 100644 --- a/games/weebsay/Makefile +++ b/games/weebsay/Makefile @@ -1,6 +1,6 @@ PORTNAME= weebsay PORTVERSION= 0.0.20210508 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MAINTAINER= ports@FreeBSD.org diff --git a/graphics/corrupter/Makefile b/graphics/corrupter/Makefile index 399cadef57a..be3806e7a4b 100644 --- a/graphics/corrupter/Makefile +++ b/graphics/corrupter/Makefile @@ -1,7 +1,7 @@ PORTNAME= corrupter DISTVERSIONPREFIX= v DISTVERSION= 1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile index 157350941e0..bcef8782b66 100644 --- a/graphics/gthumb/Makefile +++ b/graphics/gthumb/Makefile @@ -1,5 +1,6 @@ PORTNAME= gthumb PORTVERSION= 3.12.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -66,9 +67,9 @@ GLIB_SCHEMAS= org.gnome.gthumb.change-date.gschema.xml \ org.gnome.gthumb.catalogs.gschema.xml \ org.gnome.gthumb.terminal.gschema.xml -OPTIONS_DEFINE= BRASERO CLUTTER EXIV2 GSTREAMER RAW SECRET \ +OPTIONS_DEFINE= BRASERO CLUTTER EXIV2 GSTREAMER JXL RAW SECRET \ WEBP WEBSERVICES YELP -OPTIONS_DEFAULT= BRASERO CLUTTER EXIV2 GSTREAMER RAW SECRET \ +OPTIONS_DEFAULT= BRASERO CLUTTER EXIV2 GSTREAMER JXL RAW SECRET \ WEBP WEBSERVICES YELP OPTIONS_SUB= yes @@ -82,6 +83,8 @@ EXIV2_LIB_DEPENDS= libexiv2.so:graphics/exiv2 EXIV2_MESON_TRUE= exiv2 GSTREAMER_USES= gstreamer GSTREAMER_MESON_TRUE= gstreamer +JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl +JXL_MESON_TRUE= libjxl RAW_DESC= Raw image support via libraw RAW_LIB_DEPENDS= libraw.so:graphics/libraw RAW_MESON_TRUE= libraw diff --git a/graphics/jp/Makefile b/graphics/jp/Makefile index 230e88e81d3..19f271c5192 100644 --- a/graphics/jp/Makefile +++ b/graphics/jp/Makefile @@ -1,6 +1,6 @@ PORTNAME= jp DISTVERSION= 1.1.12 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MAINTAINER= 0mp@FreeBSD.org diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile index 83ead2d1c5c..0d05c0b5926 100644 --- a/graphics/lensfun/Makefile +++ b/graphics/lensfun/Makefile @@ -22,8 +22,7 @@ SHEBANG_FILES= apps/lensfun-add-adapter apps/lensfun-convert-lcp \ apps/lensfun-update-data USE_GNOME= glib20 USE_LDCONFIG= yes -CMAKE_ARGS= -DBUILD_AUXFUN:BOOL=ON -DBUILD_LENSTOOL:BOOL=ON \ - -DBUILD_TESTS:BOOL=ON +CMAKE_ARGS= -DBUILD_AUXFUN:BOOL=ON -DBUILD_LENSTOOL:BOOL=ON MAKE_ENV+= PYTHONDONTWRITEBYTECODE= PYTHONOPTIMIZE= OPTIONS_DEFINE= SIMD PYHELPERS @@ -38,6 +37,12 @@ PYHELPERS_CMAKE_ON= -DSTAGEDIR:STRING=${STAGEDIR} -DPYTHON:STRING=${PYTHON_CMD} PYHELPERS_CMAKE_OFF= -DINSTALL_HELPER_SCRIPTS:BOOL=OFF -DPYTHON:STRING=IGNORE PYHELPERS_USES= python:3.4+ +.include + +.if ${ARCH} == amd64 || ${ARCH} == i386 +CMAKE_ARGS+= -DBUILD_TESTS:BOOL=ON +.endif + post-patch: @${REINPLACE_CMD} -e '/#include / { x; s/^/#include /; G; }' \ ${WRKSRC}/tests/test_modifier_coord_centering_old.cpp \ diff --git a/graphics/libjxl/Makefile b/graphics/libjxl/Makefile index ffe222a76fa..cac19b6f576 100644 --- a/graphics/libjxl/Makefile +++ b/graphics/libjxl/Makefile @@ -23,7 +23,7 @@ GH_TUPLE= jbeich:skcms:6437475:skcms/third_party/skcms \ webmproject:sjpeg:868ab55:sjpeg/third_party/sjpeg \ ${NULL} CMAKE_ON= JPEGXL_ENABLE_PLUGINS -CMAKE_OFF= JPEGXL_WARNINGS_AS_ERRORS ${BENCHMARK FUZZERS TCMALLOC:L:S/^/JPEGXL_ENABLE_/} +CMAKE_OFF= ${BENCHMARK FUZZERS TCMALLOC:L:S/^/JPEGXL_ENABLE_/} CMAKE_OFF+= ${OpenGL GLUT:L:S/^/CMAKE_DISABLE_FIND_PACKAGE_/} # sjpeg CMAKE_OFF+= ${CMAKE_TESTING_ON} LDFLAGS+= -Wl,--as-needed # brotlicommon, OPENEXR/PNG deps diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 62d7fab09d6..4da4053ec3f 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= mesa -DISTVERSION= 22.2-branchpoint-3237 -DISTVERSIONSUFFIX= -g3246889fb04 +DISTVERSION= 22.2-branchpoint-3336 +DISTVERSIONSUFFIX= -gdf3fdbdeb50 CATEGORIES= graphics PKGNAMESUFFIX= -devel diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index 20d284194d8..f41937a6f35 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1664631406 -SHA256 (mesa3d-mesa-22.2-branchpoint-3237-g3246889fb04_GH0.tar.gz) = 0a5d85c527d03947f94ac06e55a1f8d9bb23fb9cd744bd4009b4b3a8262bf4c2 -SIZE (mesa3d-mesa-22.2-branchpoint-3237-g3246889fb04_GH0.tar.gz) = 26152449 +TIMESTAMP = 1665001324 +SHA256 (mesa3d-mesa-22.2-branchpoint-3336-gdf3fdbdeb50_GH0.tar.gz) = 8cd363eae2a90eaa5420758d06b9e8db018b9612c1fb31631b8afc520a9c15b6 +SIZE (mesa3d-mesa-22.2-branchpoint-3336-gdf3fdbdeb50_GH0.tar.gz) = 26149077 SHA256 (700efacda59c.patch) = f034cfbe09edff0baba67e46e7e3812fdef73ff3cf3e579050c024c95234c8d5 SIZE (700efacda59c.patch) = 981 SHA256 (50433886a3e3.patch) = 15af265e9dbb5dec7514062cfa549d1c1053f567395d9d133611c2a5138da470 diff --git a/graphics/py-colorcet/Makefile b/graphics/py-colorcet/Makefile index a0e1739d3f7..93a6c53540d 100644 --- a/graphics/py-colorcet/Makefile +++ b/graphics/py-colorcet/Makefile @@ -1,5 +1,5 @@ PORTNAME= colorcet -DISTVERSION= 3.0.0 +DISTVERSION= 3.0.1 CATEGORIES= graphics science python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,8 +11,7 @@ WWW= https://colorcet.holoviz.org/ LICENSE= CC-BY-4.0 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}param>=1.7.0:devel/py-param@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyct>=0.4.4:misc/py-pyct@${PY_FLAVOR} +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyct>=0.4.4:misc/py-pyct@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} diff --git a/graphics/py-colorcet/distinfo b/graphics/py-colorcet/distinfo index f84e284dffd..1f79ee2a344 100644 --- a/graphics/py-colorcet/distinfo +++ b/graphics/py-colorcet/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664489331 -SHA256 (colorcet-3.0.0.tar.gz) = 21c522346a7aa81a603729f2996c22ac3f7822f4c8c303c59761e27d2dfcf3db -SIZE (colorcet-3.0.0.tar.gz) = 3029130 +TIMESTAMP = 1664941465 +SHA256 (colorcet-3.0.1.tar.gz) = 51455a20353d12fac91f953772d8409f2474e6a0db1af3fa4f7005f405a2480b +SIZE (colorcet-3.0.1.tar.gz) = 3036207 diff --git a/graphics/spirv-tools/Makefile b/graphics/spirv-tools/Makefile index 6bad34a12b0..cdac9871dfb 100644 --- a/graphics/spirv-tools/Makefile +++ b/graphics/spirv-tools/Makefile @@ -19,6 +19,5 @@ GH_PROJECT= SPIRV-Tools GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-171-gb2a156e:headers/external/spirv-headers CMAKE_ON= SPIRV_SKIP_TESTS -CMAKE_OFF= SPIRV_WERROR .include diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile index 0c2a8e0380c..e7596d5ddcd 100644 --- a/graphics/vulkan-tools/Makefile +++ b/graphics/vulkan-tools/Makefile @@ -3,6 +3,9 @@ DISTVERSIONPREFIX= v DISTVERSION= 1.3.230 CATEGORIES= graphics wayland +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= be9ec70fcbb1.patch:-p1 # https://github.com/KhronosGroup/Vulkan-Tools/pull/687 + MAINTAINER= jbeich@FreeBSD.org COMMENT= Tools and demos for the Vulkan graphics API WWW= https://github.com/KhronosGroup/Vulkan-Tools diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo index 6fde974dcd9..d8adb585ccf 100644 --- a/graphics/vulkan-tools/distinfo +++ b/graphics/vulkan-tools/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1664480526 SHA256 (KhronosGroup-Vulkan-Tools-v1.3.230_GH0.tar.gz) = 5bb190d20ee8ae4e8dd157b686bd2d3162dc3a814b3d0625d90b1d84dd177dbb SIZE (KhronosGroup-Vulkan-Tools-v1.3.230_GH0.tar.gz) = 876436 +SHA256 (be9ec70fcbb1.patch) = c18bca976ddfa7481712bd473ecd2b1c6250fa287211f98a36f4c0b4a5c2e837 +SIZE (be9ec70fcbb1.patch) = 1051 diff --git a/irc/ergo/Makefile b/irc/ergo/Makefile index e0d3d19294e..44c554506bd 100644 --- a/irc/ergo/Makefile +++ b/irc/ergo/Makefile @@ -1,7 +1,7 @@ PORTNAME= ergo DISTVERSIONPREFIX= v DISTVERSION= 2.10.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= irc PKGNAMESUFFIX= -irc-server diff --git a/irc/komanda-cli/Makefile b/irc/komanda-cli/Makefile index a07ef9bce60..4d8590de699 100644 --- a/irc/komanda-cli/Makefile +++ b/irc/komanda-cli/Makefile @@ -1,6 +1,6 @@ PORTNAME= komanda-cli DISTVERSION= g20190920 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= irc MAINTAINER= lcook@FreeBSD.org diff --git a/irc/soju/Makefile b/irc/soju/Makefile index 2485d28e0e4..2f98438bec6 100644 --- a/irc/soju/Makefile +++ b/irc/soju/Makefile @@ -1,6 +1,7 @@ PORTNAME= soju DISTVERSIONPREFIX= v DISTVERSION= 0.5.2 +PORTREVISION= 1 CATEGORIES= irc MAINTAINER= ashish@FreeBSD.org diff --git a/lang/erlang-java/Makefile b/lang/erlang-java/Makefile index 2f616098d88..fb10c56e102 100644 --- a/lang/erlang-java/Makefile +++ b/lang/erlang-java/Makefile @@ -1,6 +1,6 @@ PORTNAME= erlang DISTVERSIONPREFIX= OTP- -DISTVERSION= 24.3.4.5 +DISTVERSION= 24.3.4.6 PORTEPOCH= 1 CATEGORIES= lang parallel java PKGNAMESUFFIX= -java diff --git a/lang/erlang-java/distinfo b/lang/erlang-java/distinfo index d9f7e80ce0c..3290500b94c 100644 --- a/lang/erlang-java/distinfo +++ b/lang/erlang-java/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663130946 -SHA256 (erlang/erlang-otp-OTP-24.3.4.5_GH0.tar.gz) = 4831e329ed61ee49f5a5a5e89ad52fd97468325654f17a1892c5664ea4b490f5 -SIZE (erlang/erlang-otp-OTP-24.3.4.5_GH0.tar.gz) = 59549338 +TIMESTAMP = 1664953426 +SHA256 (erlang/erlang-otp-OTP-24.3.4.6_GH0.tar.gz) = dc3d2c54eeb093e0dc9a0fe493bc69d6dfac0affbe77c9e3c935aa86c0f63cd5 +SIZE (erlang/erlang-otp-OTP-24.3.4.6_GH0.tar.gz) = 59552642 diff --git a/lang/erlang-runtime24/Makefile b/lang/erlang-runtime24/Makefile index 5c7f39e5e4a..9bab50412b7 100644 --- a/lang/erlang-runtime24/Makefile +++ b/lang/erlang-runtime24/Makefile @@ -1,6 +1,6 @@ PORTNAME= erlang DISTVERSIONPREFIX= OTP- -DISTVERSION= 24.3.4.4 +DISTVERSION= 24.3.4.6 PORTREVISION= 0 CATEGORIES= lang parallel java PKGNAMESUFFIX= -runtime24 diff --git a/lang/erlang-runtime24/distinfo b/lang/erlang-runtime24/distinfo index dfdf014a1d5..d64ac52d8e1 100644 --- a/lang/erlang-runtime24/distinfo +++ b/lang/erlang-runtime24/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1661522245 -SHA256 (erlang/erlang-otp-OTP-24.3.4.4_GH0.tar.gz) = b127aba77c4754904c642cf93f9b4b6667507ac31e8419b3131ed815e1f6827c -SIZE (erlang/erlang-otp-OTP-24.3.4.4_GH0.tar.gz) = 59543929 +TIMESTAMP = 1665031639 +SHA256 (erlang/erlang-otp-OTP-24.3.4.6_GH0.tar.gz) = dc3d2c54eeb093e0dc9a0fe493bc69d6dfac0affbe77c9e3c935aa86c0f63cd5 +SIZE (erlang/erlang-otp-OTP-24.3.4.6_GH0.tar.gz) = 59552642 SHA256 (erlang/erlang-corba-5.1_GH0.tar.gz) = 03497d71098c474b330794dd523ef19ef20a47c0e2d441009d6cf929455c468f SIZE (erlang/erlang-corba-5.1_GH0.tar.gz) = 1392861 diff --git a/lang/erlang-wx/Makefile b/lang/erlang-wx/Makefile index e6a2059a406..ef132e9e472 100644 --- a/lang/erlang-wx/Makefile +++ b/lang/erlang-wx/Makefile @@ -1,6 +1,6 @@ PORTNAME= erlang DISTVERSIONPREFIX= OTP- -DISTVERSION= 24.3.4.5 +DISTVERSION= 24.3.4.6 PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= lang parallel diff --git a/lang/erlang-wx/distinfo b/lang/erlang-wx/distinfo index 7444da13c34..0de5d1dc479 100644 --- a/lang/erlang-wx/distinfo +++ b/lang/erlang-wx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663130952 -SHA256 (erlang/erlang-otp-OTP-24.3.4.5_GH0.tar.gz) = 4831e329ed61ee49f5a5a5e89ad52fd97468325654f17a1892c5664ea4b490f5 -SIZE (erlang/erlang-otp-OTP-24.3.4.5_GH0.tar.gz) = 59549338 +TIMESTAMP = 1664953434 +SHA256 (erlang/erlang-otp-OTP-24.3.4.6_GH0.tar.gz) = dc3d2c54eeb093e0dc9a0fe493bc69d6dfac0affbe77c9e3c935aa86c0f63cd5 +SIZE (erlang/erlang-otp-OTP-24.3.4.6_GH0.tar.gz) = 59552642 diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 115818fa4a2..99b16c41c02 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -1,6 +1,6 @@ PORTNAME= erlang DISTVERSIONPREFIX= OTP- -DISTVERSION= 24.3.4.5 +DISTVERSION= 24.3.4.6 PORTREVISION= 0 PORTEPOCH= 4 CATEGORIES= lang parallel java diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo index 4f8014af188..e461e42470e 100644 --- a/lang/erlang/distinfo +++ b/lang/erlang/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1663130917 -SHA256 (erlang/erlang-otp-OTP-24.3.4.5_GH0.tar.gz) = 4831e329ed61ee49f5a5a5e89ad52fd97468325654f17a1892c5664ea4b490f5 -SIZE (erlang/erlang-otp-OTP-24.3.4.5_GH0.tar.gz) = 59549338 +TIMESTAMP = 1664953406 +SHA256 (erlang/erlang-otp-OTP-24.3.4.6_GH0.tar.gz) = dc3d2c54eeb093e0dc9a0fe493bc69d6dfac0affbe77c9e3c935aa86c0f63cd5 +SIZE (erlang/erlang-otp-OTP-24.3.4.6_GH0.tar.gz) = 59552642 SHA256 (erlang/erlang-corba-5.1_GH0.tar.gz) = 03497d71098c474b330794dd523ef19ef20a47c0e2d441009d6cf929455c468f SIZE (erlang/erlang-corba-5.1_GH0.tar.gz) = 1392861 diff --git a/lang/fennel/Makefile b/lang/fennel/Makefile index 481ea646d08..35bc343a80c 100644 --- a/lang/fennel/Makefile +++ b/lang/fennel/Makefile @@ -1,5 +1,5 @@ PORTNAME= fennel -DISTVERSION= 1.1.0 +DISTVERSION= 1.2.0 CATEGORIES= lang MASTER_SITES= https://git.sr.ht/~technomancy/${PORTNAME}/archive/${DISTVERSION}${EXTRACT_SUFX}?dummy=/ diff --git a/lang/fennel/distinfo b/lang/fennel/distinfo index 981a6ffae04..b77065de382 100644 --- a/lang/fennel/distinfo +++ b/lang/fennel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653485929 -SHA256 (fennel-1.1.0.tar.gz) = a44792698deaa57c3829d24371481d5a8674a804505f6313a570aee59941ec6c -SIZE (fennel-1.1.0.tar.gz) = 261279 +TIMESTAMP = 1665091820 +SHA256 (fennel-1.2.0.tar.gz) = 203bd7f365f1805e063fbca4876b4c0d04f3b4ac47d967a9d43d9766c2de4e55 +SIZE (fennel-1.2.0.tar.gz) = 270255 diff --git a/lang/go118/Makefile b/lang/go118/Makefile index 7922477d445..a57db5d6c2a 100644 --- a/lang/go118/Makefile +++ b/lang/go118/Makefile @@ -1,4 +1,4 @@ -DISTVERSION= 1.18.6 +DISTVERSION= 1.18.7 # Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel PORTREVISION= 0 MASTER_SITES= https://golang.org/dl/ \ diff --git a/lang/go118/distinfo b/lang/go118/distinfo index ea94da4e00c..34b489c9bbc 100644 --- a/lang/go118/distinfo +++ b/lang/go118/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1662551266 -SHA256 (go1.18.6.src.tar.gz) = a7f1d50424355dabce66d1112b1cae439b6ee5e4f15edba6f104c0a4b173e895 -SIZE (go1.18.6.src.tar.gz) = 22865753 +TIMESTAMP = 1664917074 +SHA256 (go1.18.7.src.tar.gz) = 9467e33b819f71bebb21fb0ee1dd6794fd2244ae94907a984286712f9839a944 +SIZE (go1.18.7.src.tar.gz) = 22872579 SHA256 (go-freebsd-arm64-go1.17.9.tar.xz) = d9e9180bdc5ad0eec1654679a50084ebb31ecbe9bef24f0bd8ba917db8d1830c SIZE (go-freebsd-arm64-go1.17.9.tar.xz) = 38572776 SHA256 (go-freebsd-amd64-go1.17.9.tar.xz) = fd439ad091ed57d0ad728c05fc60465aad2e46e98da96e2d5b60b0c470f2efec diff --git a/lang/gomacro/Makefile b/lang/gomacro/Makefile index dbb6dbf8491..8f919f8c440 100644 --- a/lang/gomacro/Makefile +++ b/lang/gomacro/Makefile @@ -2,7 +2,7 @@ PORTNAME= gomacro DISTVERSIONPREFIX= v DISTVERSION= 2.7-304 DISTVERSIONSUFFIX= -g2f4dc7c -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= lang MAINTAINER= dmgk@FreeBSD.org diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile index 8d8860184ea..fdef4991e9d 100644 --- a/lang/sbcl/Makefile +++ b/lang/sbcl/Makefile @@ -3,9 +3,8 @@ # pinned to exact versions of everything used to build them. PORTNAME= sbcl -DISTVERSION= 2.2.7 +DISTVERSION= 2.2.9 DISTVERSIONSUFFIX= -source -PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= lang lisp MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \ diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo index 8272614fcab..f0d14c5845c 100644 --- a/lang/sbcl/distinfo +++ b/lang/sbcl/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1659246860 -SHA256 (sbcl-2.2.7-source.tar.bz2) = ec98996fdaa68009d98b4d7db2189271f2ad455ec322ca95a9c6aebf08bead6d -SIZE (sbcl-2.2.7-source.tar.bz2) = 7269832 -SHA256 (sbcl-2.2.7-documentation-html.tar.bz2) = 58fd03df30d7db5b56482a7e0394d120a9985415aed7d1c3a3d5702e9317fae6 -SIZE (sbcl-2.2.7-documentation-html.tar.bz2) = 236509 +TIMESTAMP = 1664951415 +SHA256 (sbcl-2.2.9-source.tar.bz2) = 7ebebd6d2023fff7077b0372fa1171f880529bdec6104f20983297c2feb7c172 +SIZE (sbcl-2.2.9-source.tar.bz2) = 7258148 +SHA256 (sbcl-2.2.9-documentation-html.tar.bz2) = ca05937ae29dd69cae25f62da86bf3e71db81be1a22c809b3000b92cd8fe85c8 +SIZE (sbcl-2.2.9-documentation-html.tar.bz2) = 232759 SHA256 (sbcl-1.2.7-x86-64-freebsd-binary.tar.bz2) = c61f5e777e56921d2452d0fa6b71024ccd9b99bc659676498d398b8663176492 SIZE (sbcl-1.2.7-x86-64-freebsd-binary.tar.bz2) = 10463348 SHA256 (sbcl-1.2.7-x86-freebsd-binary.tar.bz2) = cf68bfab780a14964d9593f5b47fa3e174cf43e95ae3e558712d218f1c37bdbe diff --git a/lang/sbcl/files/patch-src_runtime_Config.x86-64-freebsd b/lang/sbcl/files/patch-src_runtime_Config.x86-64-freebsd deleted file mode 100644 index 43b2a9d39ce..00000000000 --- a/lang/sbcl/files/patch-src_runtime_Config.x86-64-freebsd +++ /dev/null @@ -1,20 +0,0 @@ -From 9de74a0d4d0f1f38db5ae7e891480d8a4b4ad8d9 Mon Sep 17 00:00:00 2001 -From: Douglas Katzman -Date: Tue, 2 Aug 2022 14:40:28 -0400 -Subject: [PATCH] Add /usr/local/include for freebsd - -https://wiki.freebsd.org/WarnerLosh/UsrLocal says something about it. - -Should fix lp#1981112. ---- src/runtime/Config.x86-64-freebsd.orig 2022-07-29 14:39:18 UTC -+++ src/runtime/Config.x86-64-freebsd -@@ -15,7 +15,8 @@ include Config.x86-64-bsd - # worked fine for most things, but LOAD-FOREIGN & friends require - # dlopen() etc., which in turn depend on dynamic linking of the - # runtime. --OS_LIBS += -lutil -+OS_LIBS += -lutil -L/usr/local/lib -+CPPFLAGS += -isystem/usr/local/include - - # use libthr (1:1 threading). libpthread (m:n threading) does not work. - ifdef LISP_FEATURE_SB_THREAD diff --git a/lang/sbcl/files/patch-src_runtime_stringspace.c b/lang/sbcl/files/patch-src_runtime_stringspace.c deleted file mode 100644 index f4c0fd029b6..00000000000 --- a/lang/sbcl/files/patch-src_runtime_stringspace.c +++ /dev/null @@ -1,16 +0,0 @@ -From 48d686f9718f98122547a9006c871cfcd50439ab Mon Sep 17 00:00:00 2001 -From: Douglas Katzman -Date: Sun, 31 Jul 2022 21:38:19 -0400 -Subject: [PATCH] Accept that value-cell-value can move to R/O space - -Fixes lp#1983218 ---- src/runtime/stringspace.c.orig 2022-07-29 14:39:18 UTC -+++ src/runtime/stringspace.c -@@ -76,6 +76,7 @@ static void visit_pointer_words(lispobj* object, lispo - widetag == RATIO_WIDETAG || widetag == COMPLEX_WIDETAG || - widetag == SIMPLE_ARRAY_WIDETAG || - (widetag >= COMPLEX_BASE_STRING_WIDETAG && widetag <= COMPLEX_ARRAY_WIDETAG) || -+ widetag == VALUE_CELL_WIDETAG || - widetag == WEAK_POINTER_WIDETAG) { - int len = object_size(object), i; - for (i=1; i -Date: Sun, 31 Jul 2022 21:38:19 -0400 -Subject: [PATCH] Accept that value-cell-value can move to R/O space - -Fixes lp#1983218 ---- tests/save1.test.sh.orig 2022-07-29 14:39:18 UTC -+++ tests/save1.test.sh -@@ -23,6 +23,11 @@ run_sbcl <=${PORTVERSION}:mail/claws-mail RUN_DEPENDS+= claws-mail>=${PORTVERSION}:mail/claws-mail -MASTERDIR= ${.CURDIR}/../../mail/claws-mail +MASTERDIR= ${.CURDIR}/../claws-mail DESCR= ${.CURDIR}/pkg-descr FILESDIR= ${.CURDIR}/files PLIST= ${NONEXISTENT} diff --git a/mail/claws-mail/Makefile.ver b/mail/claws-mail/Makefile.ver new file mode 100644 index 00000000000..251cf99d662 --- /dev/null +++ b/mail/claws-mail/Makefile.ver @@ -0,0 +1 @@ +PORTVERSION= 3.19.0 diff --git a/mail/mailhog/Makefile b/mail/mailhog/Makefile index 1d515a23750..17b215ef4ad 100644 --- a/mail/mailhog/Makefile +++ b/mail/mailhog/Makefile @@ -1,7 +1,7 @@ PORTNAME= mailhog DISTVERSIONPREFIX= v DISTVERSION= 1.0.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail devel MAINTAINER= mops@punkt.de diff --git a/mail/opensmtpd-filter-rspamd/Makefile b/mail/opensmtpd-filter-rspamd/Makefile index 2a480f01ba6..87f6a3d19b6 100644 --- a/mail/opensmtpd-filter-rspamd/Makefile +++ b/mail/opensmtpd-filter-rspamd/Makefile @@ -1,7 +1,7 @@ PORTNAME= opensmtpd-filter-rspamd PORTVERSION= 0.1.7 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= mail MAINTAINER= manu@FreeBSD.Org diff --git a/mail/opensmtpd-filter-senderscore/Makefile b/mail/opensmtpd-filter-senderscore/Makefile index 4580147b2f7..c092442250e 100644 --- a/mail/opensmtpd-filter-senderscore/Makefile +++ b/mail/opensmtpd-filter-senderscore/Makefile @@ -1,6 +1,6 @@ PORTNAME= opensmtpd-filter-senderscore PORTVERSION= 0.1.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= mail MAINTAINER= manu@FreeBSD.Org diff --git a/mail/smtprelay/Makefile b/mail/smtprelay/Makefile index 95847ee66f1..5db68cabc3e 100644 --- a/mail/smtprelay/Makefile +++ b/mail/smtprelay/Makefile @@ -1,7 +1,7 @@ PORTNAME= smtprelay DISTVERSIONPREFIX=v DISTVERSION= 1.9.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MAINTAINER= decke@FreeBSD.org diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 57135d4c7d7..669d88d40a8 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -1,6 +1,5 @@ PORTNAME= thunderbird -DISTVERSION= 102.3.1 -PORTREVISION= 1 +DISTVERSION= 102.3.2 CATEGORIES= mail news net-im wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index 64217cda66a..43c302efbf3 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664397089 -SHA256 (thunderbird-102.3.1.source.tar.xz) = 0daaac8161eb0c2b12280dcdadd7361de91674d4099b2902bc4ddea63d9666e3 -SIZE (thunderbird-102.3.1.source.tar.xz) = 502887916 +TIMESTAMP = 1665000822 +SHA256 (thunderbird-102.3.2.source.tar.xz) = 3e6c230e13ebc9a739821e76fd99a01f5c095b40f9f1c63a3d2d21af08b5bf33 +SIZE (thunderbird-102.3.2.source.tar.xz) = 500105016 diff --git a/math/cimod/Makefile b/math/cimod/Makefile index 6875e2be4f6..9e4989a51f4 100644 --- a/math/cimod/Makefile +++ b/math/cimod/Makefile @@ -1,6 +1,6 @@ PORTNAME= cimod DISTVERSIONPREFIX= v -DISTVERSION= 1.4.38 +DISTVERSION= 1.4.39 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/cimod/distinfo b/math/cimod/distinfo index e4f54f9140d..8180b57a460 100644 --- a/math/cimod/distinfo +++ b/math/cimod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664332039 -SHA256 (OpenJij-cimod-v1.4.38_GH0.tar.gz) = 999efb69138f9c730507740daee2d1ca425362e7102616b4dcb1a65357f90dc5 -SIZE (OpenJij-cimod-v1.4.38_GH0.tar.gz) = 139667 +TIMESTAMP = 1664941585 +SHA256 (OpenJij-cimod-v1.4.39_GH0.tar.gz) = dd828a2125ecf3ca198fc4a4141dadc6719e3f555ea1ea4f19ab3980a7ef781e +SIZE (OpenJij-cimod-v1.4.39_GH0.tar.gz) = 139684 diff --git a/math/cvc4/Makefile b/math/cvc4/Makefile index 0e1a4ddfe07..d556426dc33 100644 --- a/math/cvc4/Makefile +++ b/math/cvc4/Makefile @@ -16,6 +16,8 @@ WWW= https://cvc4.cs.stanford.edu/web/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN= Doesn't build, src/expr/expr_template.h:0: error: undefined replacement ${getConst_instantiations} + BUILD_DEPENDS= bash:shells/bash LIB_DEPENDS= libantlr3c.so:devel/libantlr3c \ libboost_system.so:devel/boost-libs diff --git a/math/hmat-oss/files/patch-CMakeLists.txt b/math/hmat-oss/files/patch-CMakeLists.txt new file mode 100644 index 00000000000..250754940b7 --- /dev/null +++ b/math/hmat-oss/files/patch-CMakeLists.txt @@ -0,0 +1,14 @@ +--- CMakeLists.txt.orig 2022-10-05 15:44:52 UTC ++++ CMakeLists.txt +@@ -255,9 +255,9 @@ include(CheckCCompilerFlag) + include(CheckCXXCompilerFlag) + + function(hmat_set_compiler_flags _TARGET_NAME) +- check_cxx_compiler_flag("-Werror -Wall" HAVE_COMPILER_WARNING_FLAGS) ++ check_cxx_compiler_flag("-Wall" HAVE_COMPILER_WARNING_FLAGS) + if(HAVE_COMPILER_WARNING_FLAGS) +- target_compile_options(${_TARGET_NAME} PRIVATE -Werror -Wall) ++ target_compile_options(${_TARGET_NAME} PRIVATE -Wall) + foreach(flag -Wno-sign-compare;-Wno-undefined-var-template;-Wno-unused-parameter) + string(REPLACE "-" "_" varname ${flag}) + check_cxx_compiler_flag("${flag}" CXX${varname}) diff --git a/math/maxima/Makefile b/math/maxima/Makefile index 2da5a5910ed..c9495a75f96 100644 --- a/math/maxima/Makefile +++ b/math/maxima/Makefile @@ -1,6 +1,6 @@ PORTNAME= maxima PORTVERSION= 5.46.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= math lisp tk MASTER_SITES= SF/maxima/Maxima-source/${PORTVERSION}-source diff --git a/misc/cheat/Makefile b/misc/cheat/Makefile index 689d7cc5903..278310c2f01 100644 --- a/misc/cheat/Makefile +++ b/misc/cheat/Makefile @@ -1,5 +1,6 @@ PORTNAME= cheat DISTVERSION= 4.3.3 +PORTREVISION= 1 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org diff --git a/misc/chrono/Makefile b/misc/chrono/Makefile index c72d794a740..c0232a87c6b 100644 --- a/misc/chrono/Makefile +++ b/misc/chrono/Makefile @@ -2,7 +2,7 @@ PORTNAME= chrono DISTVERSIONPREFIX= v DISTVERSION= 1.1.0-4 DISTVERSIONSUFFIX= -g70cda7f -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= misc PKGNAMESUFFIX= -time-tracking diff --git a/misc/concourse/Makefile b/misc/concourse/Makefile index 5f14b2ecbeb..1d3a774d566 100644 --- a/misc/concourse/Makefile +++ b/misc/concourse/Makefile @@ -1,7 +1,7 @@ PORTNAME= concourse DISTVERSIONPREFIX= v DISTVERSION= 6.7.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org diff --git a/misc/cryptoballot/Makefile b/misc/cryptoballot/Makefile index 4748cd4fdaf..fd8976e81e1 100644 --- a/misc/cryptoballot/Makefile +++ b/misc/cryptoballot/Makefile @@ -1,6 +1,6 @@ PORTNAME= cryptoballot DISTVERSION= g20181015 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org diff --git a/misc/dartsim/Makefile b/misc/dartsim/Makefile index f9c65285129..3cd4985b306 100644 --- a/misc/dartsim/Makefile +++ b/misc/dartsim/Makefile @@ -1,7 +1,7 @@ PORTNAME= dartsim DISTVERSIONPREFIX= v DISTVERSION= 6.12.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org @@ -28,7 +28,6 @@ LIB_DEPENDS= libassimp.so:multimedia/assimp \ libosg.so:graphics/osg34 \ libnlopt.so:math/nlopt \ libpagmo.so:science/pagmo2 \ - libtbb.so:devel/tbb \ libtinyxml2.so:textproc/tinyxml2 \ liburdfdom_world.so:devel/ros-urdfdom diff --git a/misc/dive/Makefile b/misc/dive/Makefile index d8cd29119de..13c66027e10 100644 --- a/misc/dive/Makefile +++ b/misc/dive/Makefile @@ -1,7 +1,7 @@ PORTNAME= dive DISTVERSIONPREFIX= v DISTVERSION= 0.10.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org diff --git a/misc/exercism/Makefile b/misc/exercism/Makefile index eb177a4e5e2..857cef2eb3c 100644 --- a/misc/exercism/Makefile +++ b/misc/exercism/Makefile @@ -1,7 +1,7 @@ PORTNAME= exercism DISTVERSIONPREFIX= v DISTVERSION= 3.0.13 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= misc MAINTAINER= swills@FreeBSD.org diff --git a/misc/fq/Makefile b/misc/fq/Makefile index e7f46ce31e1..1c275e8d10d 100644 --- a/misc/fq/Makefile +++ b/misc/fq/Makefile @@ -1,5 +1,5 @@ PORTNAME= fq -PORTVERSION= 0.0.9 +PORTVERSION= 0.0.10 PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= misc @@ -19,21 +19,22 @@ GH_TUPLE= \ creasty:defaults:v1.6.0:creasty_defaults/vendor/github.com/creasty/defaults \ go-check:check:8fa46927fb4f:go_check_check/vendor/gopkg.in/check.v1 \ go-yaml:yaml:v3.0.1:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \ - golang:crypto:bc19a97f63c8:golang_crypto/vendor/golang.org/x/crypto \ - golang:exp:a9213eeb770e:golang_exp/vendor/golang.org/x/exp \ - golang:net:3211cb980234:golang_net/vendor/golang.org/x/net \ + golang:crypto:eccd6366d1be:golang_crypto/vendor/golang.org/x/crypto \ + golang:exp:c76eaa363f9d:golang_exp/vendor/golang.org/x/exp \ + golang:net:f486391704dc:golang_net/vendor/golang.org/x/net \ golang:snappy:v0.0.4:golang_snappy/vendor/github.com/golang/snappy \ - golang:sys:fbc7d0a398ab:golang_sys/vendor/golang.org/x/sys \ + golang:sys:d48e67d00261:golang_sys/vendor/golang.org/x/sys \ golang:text:v0.3.7:golang_text/vendor/golang.org/x/text \ + gomarkdown:markdown:7b278df48cfb:gomarkdown_markdown/vendor/github.com/gomarkdown/markdown \ gopacket:gopacket:ee81b8c880da:gopacket_gopacket/vendor/github.com/gopacket/gopacket \ - itchyny:timefmt-go:v0.1.3:itchyny_timefmt_go/vendor/github.com/itchyny/timefmt-go \ + itchyny:timefmt-go:v0.1.4:itchyny_timefmt_go/vendor/github.com/itchyny/timefmt-go \ mitchellh:copystructure:v1.2.0:mitchellh_copystructure/vendor/github.com/mitchellh/copystructure \ mitchellh:mapstructure:v1.5.0:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \ mitchellh:reflectwalk:v1.0.2:mitchellh_reflectwalk/vendor/github.com/mitchellh/reflectwalk \ niemeyer:pretty:a10e7caefd8e:niemeyer_pretty/vendor/github.com/niemeyer/pretty \ pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ - wader:gojq:64fe65a68424:wader_gojq/vendor/github.com/wader/gojq \ - wader:readline:31be50517a56:wader_readline/vendor/github.com/wader/readline + wader:gojq:8874f5c7907c:wader_gojq/vendor/github.com/wader/gojq \ + wader:readline:732951d41240:wader_readline/vendor/github.com/wader/readline PLIST_FILES= bin/${PORTNAME} diff --git a/misc/fq/distinfo b/misc/fq/distinfo index 92b26d43721..c9cdbc9eb7d 100644 --- a/misc/fq/distinfo +++ b/misc/fq/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1661442000 -SHA256 (wader-fq-v0.0.9_GH0.tar.gz) = abcc1292af007b8405cc924e3db0dc4e1838c6a851661f6388dce1a35fa7e8b6 -SIZE (wader-fq-v0.0.9_GH0.tar.gz) = 7764844 +TIMESTAMP = 1664900941 +SHA256 (wader-fq-v0.0.10_GH0.tar.gz) = 0ba93027c8c6959f3028040f67d3d0b68812bb479680eddc950be5081fe1d6df +SIZE (wader-fq-v0.0.10_GH0.tar.gz) = 7900793 SHA256 (BurntSushi-toml-v1.2.0_GH0.tar.gz) = 9b1d4e09cc3f2e6f64245efffbd3a3b18a6a04d7e477b134d2c4fde19c922019 SIZE (BurntSushi-toml-v1.2.0_GH0.tar.gz) = 96597 SHA256 (creasty-defaults-v1.6.0_GH0.tar.gz) = 74319ab368e48c6fc9c6fb7660a7da1bd9c3f80c9c639282b98f4cfd37054a86 @@ -9,22 +9,24 @@ SHA256 (go-check-check-8fa46927fb4f_GH0.tar.gz) = 7e433178d7b915d0df0eb99300cee7 SIZE (go-check-check-8fa46927fb4f_GH0.tar.gz) = 31611 SHA256 (go-yaml-yaml-v3.0.1_GH0.tar.gz) = cf05411540d3e6ef8f1fd88434b34f94cedaceb540329031d80e23b74540c4e5 SIZE (go-yaml-yaml-v3.0.1_GH0.tar.gz) = 91173 -SHA256 (golang-crypto-bc19a97f63c8_GH0.tar.gz) = e7a09a38d37f4054944aaab6d7dcf6e355b01b304c8e8fc57fd2da56ed9b3376 -SIZE (golang-crypto-bc19a97f63c8_GH0.tar.gz) = 1631048 -SHA256 (golang-exp-a9213eeb770e_GH0.tar.gz) = 3d9df7dd70e5720726338f04c5d6c83bd8b7c76c86c59c200a58731ce4ba8b54 -SIZE (golang-exp-a9213eeb770e_GH0.tar.gz) = 1556309 -SHA256 (golang-net-3211cb980234_GH0.tar.gz) = 291e1e8c367b84a603d83fe1efe3403c7e21c439edf3809439014b4da7d66353 -SIZE (golang-net-3211cb980234_GH0.tar.gz) = 1226325 +SHA256 (golang-crypto-eccd6366d1be_GH0.tar.gz) = 62db5700a46fa0ad1f9129134dbfa98da4701f3b2cc91d569315b9d39918e145 +SIZE (golang-crypto-eccd6366d1be_GH0.tar.gz) = 1631561 +SHA256 (golang-exp-c76eaa363f9d_GH0.tar.gz) = 8953a362bd5712be838b01e5f15fdeadc18f38abeba82745439d6ba1f7253b2c +SIZE (golang-exp-c76eaa363f9d_GH0.tar.gz) = 1581462 +SHA256 (golang-net-f486391704dc_GH0.tar.gz) = 6ac67687d46393cffa58dc21d3b393df14c35e0335a26c854733048f82161687 +SIZE (golang-net-f486391704dc_GH0.tar.gz) = 1228348 SHA256 (golang-snappy-v0.0.4_GH0.tar.gz) = 77df678795596f9dfecb5744deb984633d780460a7e9a59e0c7ecfe2052b644f SIZE (golang-snappy-v0.0.4_GH0.tar.gz) = 66129 -SHA256 (golang-sys-fbc7d0a398ab_GH0.tar.gz) = 77a2c6cc6a3edb3daa808ddd2a2b62b11d051f92e7c0f526162217e07bbaad46 -SIZE (golang-sys-fbc7d0a398ab_GH0.tar.gz) = 1354045 +SHA256 (golang-sys-d48e67d00261_GH0.tar.gz) = 66a046002e0b63a911f8ce71ea5bc793e1daf4e76f6f5b71a436f97b8c3cf294 +SIZE (golang-sys-d48e67d00261_GH0.tar.gz) = 1357983 SHA256 (golang-text-v0.3.7_GH0.tar.gz) = 7cab2f6c3133ac1d422edd952b0dd2082fa55a73c2663fb2defd9bf83d649b26 SIZE (golang-text-v0.3.7_GH0.tar.gz) = 8354718 +SHA256 (gomarkdown-markdown-7b278df48cfb_GH0.tar.gz) = 07f0c555540530a7fe94fcb998bc20b2a177b05e1948134517e1f7e5af5b17e7 +SIZE (gomarkdown-markdown-7b278df48cfb_GH0.tar.gz) = 110724 SHA256 (gopacket-gopacket-ee81b8c880da_GH0.tar.gz) = 37667216b03a46340b0d59687923026c72c1bc468b6c4b0475f6f1752a8311ec SIZE (gopacket-gopacket-ee81b8c880da_GH0.tar.gz) = 957976 -SHA256 (itchyny-timefmt-go-v0.1.3_GH0.tar.gz) = 546455b1d3e13affcca36ff0e868126353e8ae77ed8565a68393f77d7f788932 -SIZE (itchyny-timefmt-go-v0.1.3_GH0.tar.gz) = 12820 +SHA256 (itchyny-timefmt-go-v0.1.4_GH0.tar.gz) = db07a99199b39fc354c9562bc15b3cd6c4e96df50162f5a1e154d93d8d614c94 +SIZE (itchyny-timefmt-go-v0.1.4_GH0.tar.gz) = 12946 SHA256 (mitchellh-copystructure-v1.2.0_GH0.tar.gz) = 0f3c6a9d91d695470c22acaba390878a03e3c106a453c4b0b8abebfb76c1a009 SIZE (mitchellh-copystructure-v1.2.0_GH0.tar.gz) = 9951 SHA256 (mitchellh-mapstructure-v1.5.0_GH0.tar.gz) = 81106cbac93000812c194b4a2069dd32913ec18819b1e99e8436595ce4939413 @@ -35,7 +37,7 @@ SHA256 (niemeyer-pretty-a10e7caefd8e_GH0.tar.gz) = 2a81e75bdd5341bd0fac76a90bb02 SIZE (niemeyer-pretty-a10e7caefd8e_GH0.tar.gz) = 9399 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398 -SHA256 (wader-gojq-64fe65a68424_GH0.tar.gz) = fc58e51229cdc828da186226df0f689899abf34f7a074392c1f5b3f6ab7bfaf6 -SIZE (wader-gojq-64fe65a68424_GH0.tar.gz) = 129455 -SHA256 (wader-readline-31be50517a56_GH0.tar.gz) = 054f5aad4f26a1b4f8c938d214cc83b402cd88992890eee7630f02a602b43ebf -SIZE (wader-readline-31be50517a56_GH0.tar.gz) = 42036 +SHA256 (wader-gojq-8874f5c7907c_GH0.tar.gz) = 769b36c8b58701670264dd89256f74a643c4c465f2ba632cbd9456388164f0e0 +SIZE (wader-gojq-8874f5c7907c_GH0.tar.gz) = 129867 +SHA256 (wader-readline-732951d41240_GH0.tar.gz) = 3d2275f2134260a46cda95096a30b2abe93b59e561fd558d21fb366ffad88d64 +SIZE (wader-readline-732951d41240_GH0.tar.gz) = 42054 diff --git a/misc/gobuster/Makefile b/misc/gobuster/Makefile index b91e10a76a4..0e1d51e785f 100644 --- a/misc/gobuster/Makefile +++ b/misc/gobuster/Makefile @@ -1,7 +1,7 @@ PORTNAME= gobuster DISTVERSIONPREFIX= v DISTVERSION= 3.1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= misc dns MAINTAINER= yuri@FreeBSD.org diff --git a/misc/lf/Makefile b/misc/lf/Makefile index 4d65c11a21b..84b33ec96b8 100644 --- a/misc/lf/Makefile +++ b/misc/lf/Makefile @@ -1,7 +1,7 @@ PORTNAME= lf DISTVERSIONPREFIX= r DISTVERSION= 27 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org diff --git a/misc/perkeep/Makefile b/misc/perkeep/Makefile index 33dbec153a0..71a29218fdf 100644 --- a/misc/perkeep/Makefile +++ b/misc/perkeep/Makefile @@ -1,6 +1,6 @@ PORTNAME= perkeep DISTVERSION= 0.11 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org diff --git a/misc/slides/Makefile b/misc/slides/Makefile index 9985a5767cc..3d8f714332d 100644 --- a/misc/slides/Makefile +++ b/misc/slides/Makefile @@ -1,6 +1,7 @@ PORTNAME= slides DISTVERSIONPREFIX= v DISTVERSION= 0.9.0 +PORTREVISION= 1 CATEGORIES= misc PKGNAMESUFFIX= -presentation-tool diff --git a/misc/timetrace/Makefile b/misc/timetrace/Makefile index 8650b438058..6dfad3b6456 100644 --- a/misc/timetrace/Makefile +++ b/misc/timetrace/Makefile @@ -1,7 +1,7 @@ PORTNAME= timetrace DISTVERSIONPREFIX= v DISTVERSION= 0.14.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= misc MAINTAINER= nc@FreeBSD.org diff --git a/misc/wego/Makefile b/misc/wego/Makefile index 4f7c9ef7730..1845692865b 100644 --- a/misc/wego/Makefile +++ b/misc/wego/Makefile @@ -1,6 +1,6 @@ PORTNAME= wego DISTVERSION= 2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MAINTAINER= pkubaj@FreeBSD.org diff --git a/multimedia/haruna/Makefile b/multimedia/haruna/Makefile index a61cea4d061..0f59892d7b8 100644 --- a/multimedia/haruna/Makefile +++ b/multimedia/haruna/Makefile @@ -1,6 +1,5 @@ PORTNAME= haruna -DISTVERSION= 0.9.1 -PORTREVISION= 1 +DISTVERSION= 0.9.2 MASTER_SITES= KDE/stable/${PORTNAME}/ CATEGORIES= multimedia kde @@ -13,7 +12,7 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ RUN_DEPENDS= kio-extras>0:devel/kio-extras \ yt-dlp:www/yt-dlp -USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz xorg +USES= cmake compiler:c++11-lang desktop-file-utils kde:5 qt:5 tar:xz xorg USE_KDE= auth bookmarks codecs completion config configwidgets coreaddons \ doctools filemetadata i18n iconthemes kirigami2 itemviews jobwidgets \ kio service solid widgetsaddons windowsystem xmlgui \ diff --git a/multimedia/haruna/distinfo b/multimedia/haruna/distinfo index 4e834a7b78f..d01efab7fb5 100644 --- a/multimedia/haruna/distinfo +++ b/multimedia/haruna/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1661537040 -SHA256 (haruna-0.9.1.tar.xz) = 9131f2d3a44332ff65c15c77b243a9897cd7acc1d7fe77d75180bb519344840d -SIZE (haruna-0.9.1.tar.xz) = 2395896 +TIMESTAMP = 1665003986 +SHA256 (haruna-0.9.2.tar.xz) = cd1d49c645e53e7cb4bb905c21c3789bae3b55532ad7e5f25c852c0f63702580 +SIZE (haruna-0.9.2.tar.xz) = 2396820 diff --git a/multimedia/livego/Makefile b/multimedia/livego/Makefile index 7bb23dc6bba..66da427e184 100644 --- a/multimedia/livego/Makefile +++ b/multimedia/livego/Makefile @@ -1,6 +1,6 @@ PORTNAME= livego DISTVERSION= 0.0.15 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia MAINTAINER= nc@FreeBSD.org diff --git a/multimedia/navidrome/Makefile b/multimedia/navidrome/Makefile index 4a85c81872f..5ea22024c67 100644 --- a/multimedia/navidrome/Makefile +++ b/multimedia/navidrome/Makefile @@ -1,7 +1,7 @@ PORTNAME= navidrome DISTVERSIONPREFIX= v DISTVERSION= 0.40.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= http://cdn.pacyworld.com/morante.net/freebsd/ports/distfiles/navidrome/:npmcache DISTFILES= ${PORTNAME}-npm-cache-${DISTVERSION}${EXTRACT_SUFX}:npmcache diff --git a/multimedia/plexmediaserver-plexpass/Makefile b/multimedia/plexmediaserver-plexpass/Makefile index d387cb9d7ee..a7eb1c35039 100644 --- a/multimedia/plexmediaserver-plexpass/Makefile +++ b/multimedia/plexmediaserver-plexpass/Makefile @@ -1,5 +1,5 @@ -PORTVERSION= 1.29.0.6219 -DISTVERSIONSUFFIX=b1b4d4871 +PORTVERSION= 1.29.1.6260 +DISTVERSIONSUFFIX=420892357 MASTER_SITES= https://downloads.plex.tv/plex-media-server-new/${DISTVERSION}-${DISTVERSIONSUFFIX}/freebsd/ PKGNAMESUFFIX= -plexpass DISTNAME= PlexMediaServer-${DISTVERSION}-${DISTVERSIONSUFFIX}-FreeBSD-${ARCH} diff --git a/multimedia/plexmediaserver-plexpass/distinfo b/multimedia/plexmediaserver-plexpass/distinfo index 32a886d7349..cd9d186f90b 100644 --- a/multimedia/plexmediaserver-plexpass/distinfo +++ b/multimedia/plexmediaserver-plexpass/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663785059 -SHA256 (PlexMediaServer-1.29.0.6219-b1b4d4871-FreeBSD-amd64.tar.bz2) = 0c5b27662b315f1492f6c6b5267b06d02b1332608f65498ce6d8b818dfed75d1 -SIZE (PlexMediaServer-1.29.0.6219-b1b4d4871-FreeBSD-amd64.tar.bz2) = 100604809 +TIMESTAMP = 1664472474 +SHA256 (PlexMediaServer-1.29.1.6260-420892357-FreeBSD-amd64.tar.bz2) = c07f36fa21ab4181d7e39572ffab9d86523ee30ff0f9d8c5572a2e4c8488deb8 +SIZE (PlexMediaServer-1.29.1.6260-420892357-FreeBSD-amd64.tar.bz2) = 100647860 diff --git a/multimedia/plexmediaserver/Makefile b/multimedia/plexmediaserver/Makefile index 7cf03156b0e..d5840344f3e 100644 --- a/multimedia/plexmediaserver/Makefile +++ b/multimedia/plexmediaserver/Makefile @@ -1,6 +1,6 @@ PORTNAME= plexmediaserver -PORTVERSION?= 1.28.2.6151 -DISTVERSIONSUFFIX?=914ddd2b3 +PORTVERSION?= 1.29.0.6244 +DISTVERSIONSUFFIX?=819d3678c CATEGORIES= multimedia MASTER_SITES?= https://downloads.plex.tv/plex-media-server-new/${DISTVERSION}-${DISTVERSIONSUFFIX}/freebsd/ DISTNAME?= PlexMediaServer-${DISTVERSION}-${DISTVERSIONSUFFIX}-FreeBSD-${ARCH} diff --git a/multimedia/plexmediaserver/distinfo b/multimedia/plexmediaserver/distinfo index 74e86d9f686..ba51cd74dae 100644 --- a/multimedia/plexmediaserver/distinfo +++ b/multimedia/plexmediaserver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662324139 -SHA256 (PlexMediaServer-1.28.2.6151-914ddd2b3-FreeBSD-amd64.tar.bz2) = 74769b73a166784da309d7537fcddfb253e19f02280bcfaebca3df3f95dc8b81 -SIZE (PlexMediaServer-1.28.2.6151-914ddd2b3-FreeBSD-amd64.tar.bz2) = 100608266 +TIMESTAMP = 1664463448 +SHA256 (PlexMediaServer-1.29.0.6244-819d3678c-FreeBSD-amd64.tar.bz2) = eadffb49d34a047727b03f23cea6ac2046b370f72f4f5d3d941c51d9898e6cad +SIZE (PlexMediaServer-1.29.0.6244-819d3678c-FreeBSD-amd64.tar.bz2) = 100539924 diff --git a/multimedia/py-soco/Makefile b/multimedia/py-soco/Makefile index 5cb903bb9cf..9bb914dbfb4 100644 --- a/multimedia/py-soco/Makefile +++ b/multimedia/py-soco/Makefile @@ -1,6 +1,6 @@ PORTNAME= soco -PORTVERSION= 0.26.0 DISTVERSIONPREFIX= v +DISTVERSION= 0.28.0 CATEGORIES= multimedia python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,20 +11,20 @@ WWW= https://github.com/SoCo/SoCo LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.rst -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ifaddr>0:net/py-ifaddr@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ifaddr>0:net/py-ifaddr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xmltodict>0:devel/py-xmltodict@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.5:devel/py-pytest@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=1.01:devel/py-mock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=2.5:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-mock>0:www/py-requests-mock@${PY_FLAVOR} -USES= python:3.6+ -USE_PYTHON= autoplist distutils - +USES= python USE_GITHUB= yes GH_ACCOUNT= SoCo GH_PROJECT= SoCo +USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/multimedia/py-soco/distinfo b/multimedia/py-soco/distinfo index 431ba9e0a18..8a8d8ee0c68 100644 --- a/multimedia/py-soco/distinfo +++ b/multimedia/py-soco/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1643377491 -SHA256 (SoCo-SoCo-v0.26.0_GH0.tar.gz) = 754e23c1cbaa1ab6bac3198a2952af31a27695dabb778c7d1c29c71c430c5f54 -SIZE (SoCo-SoCo-v0.26.0_GH0.tar.gz) = 713811 +TIMESTAMP = 1664804223 +SHA256 (SoCo-SoCo-v0.28.0_GH0.tar.gz) = 1c7c3c301f17b8519e4d66e66c538953d9fb3f14e9c6174d68f726e4591c8309 +SIZE (SoCo-SoCo-v0.28.0_GH0.tar.gz) = 718533 diff --git a/net-im/6cord/Makefile b/net-im/6cord/Makefile index a3a5a9b908d..adcd8e8741d 100644 --- a/net-im/6cord/Makefile +++ b/net-im/6cord/Makefile @@ -1,6 +1,6 @@ PORTNAME= 6cord DISTVERSION= 9.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-im MAINTAINER= lcook@FreeBSD.org diff --git a/net-im/coyim/Makefile b/net-im/coyim/Makefile index cb793393c36..40e50881b3c 100644 --- a/net-im/coyim/Makefile +++ b/net-im/coyim/Makefile @@ -1,7 +1,7 @@ PORTNAME= coyim DISTVERSIONPREFIX= v DISTVERSION= 0.3.11 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= net-im MAINTAINER= fox@FreeBSD.org diff --git a/net-im/dendrite/Makefile b/net-im/dendrite/Makefile index ae340498024..476f7e24bb9 100644 --- a/net-im/dendrite/Makefile +++ b/net-im/dendrite/Makefile @@ -1,6 +1,7 @@ PORTNAME= dendrite DISTVERSIONPREFIX= v DISTVERSION= 0.10.1 +PORTREVISION= 1 CATEGORIES= net-im MAINTAINER= ashish@FreeBSD.org diff --git a/net-im/discordo/Makefile b/net-im/discordo/Makefile index 8047047097f..08451d961a8 100644 --- a/net-im/discordo/Makefile +++ b/net-im/discordo/Makefile @@ -1,5 +1,6 @@ PORTNAME= discordo DISTVERSION= g20220909 +PORTREVISION= 1 CATEGORIES= net-im MAINTAINER= lcook@FreeBSD.org diff --git a/net-im/gomuks/Makefile b/net-im/gomuks/Makefile index 276e7eb7322..dc1ddaa0427 100644 --- a/net-im/gomuks/Makefile +++ b/net-im/gomuks/Makefile @@ -1,7 +1,7 @@ PORTNAME= gomuks PORTVERSION= 0.2.4 DISTVERSIONPREFIX= v -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net-im MAINTAINER= ehaupt@FreeBSD.org diff --git a/net-im/gotktrix/Makefile b/net-im/gotktrix/Makefile index f92881a9235..bea912cc0b9 100644 --- a/net-im/gotktrix/Makefile +++ b/net-im/gotktrix/Makefile @@ -1,7 +1,7 @@ PORTNAME= gotktrix DISTVERSIONPREFIX= v DISTVERSION= 0.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MAINTAINER= fuz@fuz.su diff --git a/net-im/gotosocial/Makefile b/net-im/gotosocial/Makefile index a86f6352746..e3f60e551e8 100644 --- a/net-im/gotosocial/Makefile +++ b/net-im/gotosocial/Makefile @@ -1,7 +1,7 @@ PORTNAME= gotosocial DISTVERSIONPREFIX= v DISTVERSION= 0.3.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im MASTER_SITES?= https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/v${DISTVERSION}/:web DISTFILES?= ${PORTNAME}_${DISTVERSION}_web-assets.tar.gz:web diff --git a/net-im/matterbridge/Makefile b/net-im/matterbridge/Makefile index eb2f8c801a9..9a72fc02157 100644 --- a/net-im/matterbridge/Makefile +++ b/net-im/matterbridge/Makefile @@ -1,7 +1,7 @@ PORTNAME= matterbridge PORTVERSION= 1.22.3 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-im MAINTAINER= swills@FreeBSD.org diff --git a/net-im/matterircd/Makefile b/net-im/matterircd/Makefile index f2d18f8f2fa..b1d01f6f3c6 100644 --- a/net-im/matterircd/Makefile +++ b/net-im/matterircd/Makefile @@ -1,7 +1,7 @@ PORTNAME= matterircd DISTVERSIONPREFIX= v DISTVERSION= 0.25.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-im irc MAINTAINER= norrland@nullbyte.se diff --git a/net-im/nextcloud-spreed-signaling/Makefile b/net-im/nextcloud-spreed-signaling/Makefile index 72320b49864..0b74591405f 100644 --- a/net-im/nextcloud-spreed-signaling/Makefile +++ b/net-im/nextcloud-spreed-signaling/Makefile @@ -1,7 +1,7 @@ PORTNAME= nextcloud-spreed-signaling DISTVERSIONPREFIX= v DISTVERSION= 0.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im MAINTAINER= jsm@FreeBSD.org diff --git a/net-im/slack-term/Makefile b/net-im/slack-term/Makefile index d6300f58b13..3e68356aa5f 100644 --- a/net-im/slack-term/Makefile +++ b/net-im/slack-term/Makefile @@ -1,7 +1,7 @@ PORTNAME= slack-term DISTVERSIONPREFIX= v DISTVERSION= 0.5.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net-im MAINTAINER= dmgk@FreeBSD.org diff --git a/net-im/ssh-chat/Makefile b/net-im/ssh-chat/Makefile index 9648d015728..6aa6871e8d3 100644 --- a/net-im/ssh-chat/Makefile +++ b/net-im/ssh-chat/Makefile @@ -1,7 +1,7 @@ PORTNAME= ssh-chat DISTVERSIONPREFIX= v DISTVERSION= 1.10.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-im MAINTAINER= yuri@FreeBSD.org diff --git a/net-im/tut/Makefile b/net-im/tut/Makefile index 8e761bb9371..6f5a9d47599 100644 --- a/net-im/tut/Makefile +++ b/net-im/tut/Makefile @@ -1,6 +1,6 @@ PORTNAME= tut DISTVERSION= 1.0.17 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MAINTAINER= lcook@FreeBSD.org diff --git a/net-im/xmpp-client/Makefile b/net-im/xmpp-client/Makefile index 9c0b8fe0c6c..29f495891d4 100644 --- a/net-im/xmpp-client/Makefile +++ b/net-im/xmpp-client/Makefile @@ -1,6 +1,6 @@ PORTNAME= xmpp-client PORTVERSION= 20170324 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-im MAINTAINER= cs@FreeBSD.org diff --git a/net-mgmt/adguard-exporter/Makefile b/net-mgmt/adguard-exporter/Makefile index a18a4c72771..4d79f56fbb9 100644 --- a/net-mgmt/adguard-exporter/Makefile +++ b/net-mgmt/adguard-exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= adguard-exporter DISTVERSIONPREFIX= v DISTVERSION= 1.14 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MAINTAINER= christer.edwards@gmail.com diff --git a/net-mgmt/alertmanager/Makefile b/net-mgmt/alertmanager/Makefile index 2d2922e64c2..da69131bf76 100644 --- a/net-mgmt/alertmanager/Makefile +++ b/net-mgmt/alertmanager/Makefile @@ -1,7 +1,7 @@ PORTNAME= alertmanager PORTVERSION= 0.23.0 DISTVERSIONPREFIX= v -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net-mgmt MAINTAINER= michal@hanu.la diff --git a/net-mgmt/bind_exporter/Makefile b/net-mgmt/bind_exporter/Makefile index 7e33c506d8c..d13cd093d9e 100644 --- a/net-mgmt/bind_exporter/Makefile +++ b/net-mgmt/bind_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= bind_exporter PORTVERSION= 0.4.0 DISTVERSIONPREFIX=v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt dns MAINTAINER= matt@mattmoriarity.com diff --git a/net-mgmt/blackbox_exporter/Makefile b/net-mgmt/blackbox_exporter/Makefile index af1f7ced57f..20dd1824af5 100644 --- a/net-mgmt/blackbox_exporter/Makefile +++ b/net-mgmt/blackbox_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= blackbox_exporter DISTVERSIONPREFIX= v DISTVERSION= 0.22.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MAINTAINER= eduardo@FreeBSD.org diff --git a/net-mgmt/bosun/Makefile b/net-mgmt/bosun/Makefile index aa5b3052186..6b82103efee 100644 --- a/net-mgmt/bosun/Makefile +++ b/net-mgmt/bosun/Makefile @@ -1,7 +1,7 @@ PORTNAME= bosun DISTVERSION= 0.9.0 DISTVERSIONSUFFIX= -preview -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MAINTAINER= langer.markus@gmail.com diff --git a/net-mgmt/carbon-relay-ng/Makefile b/net-mgmt/carbon-relay-ng/Makefile index f425fbeb2cf..f57e84bfc2e 100644 --- a/net-mgmt/carbon-relay-ng/Makefile +++ b/net-mgmt/carbon-relay-ng/Makefile @@ -1,6 +1,6 @@ PORTNAME= carbon-relay-ng DISTVERSION= 0.10.0 -PORTREVISION= 5 +PORTREVISION= 6 PORTREVISION= 1 CATEGORIES= net-mgmt diff --git a/net-mgmt/carbonzipper/Makefile b/net-mgmt/carbonzipper/Makefile index 783cbadf7d2..ff7236c605d 100644 --- a/net-mgmt/carbonzipper/Makefile +++ b/net-mgmt/carbonzipper/Makefile @@ -1,6 +1,6 @@ PORTNAME= carbonzipper DISTVERSION= 0.74 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MAINTAINER= a.andersson.thn@gmail.com diff --git a/net-mgmt/chronograf/Makefile b/net-mgmt/chronograf/Makefile index 4817e9c5995..746f32d7140 100644 --- a/net-mgmt/chronograf/Makefile +++ b/net-mgmt/chronograf/Makefile @@ -1,7 +1,7 @@ PORTNAME= chronograf DISTVERSIONPREFIX= v DISTVERSION= 1.9.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt MASTER_SITES+= https://nodejs.org/download/release/v${NODEJS_VERSION}/:node DISTFILES= yarn-cache-${PKGNAME}.tar.xz:prefetch \ diff --git a/net-mgmt/chronograf/distinfo b/net-mgmt/chronograf/distinfo index 2d4632606f2..bccf2f88b14 100644 --- a/net-mgmt/chronograf/distinfo +++ b/net-mgmt/chronograf/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1662654737 -SHA256 (go/net-mgmt_chronograf/chronograf-v1.9.4/yarn-cache-chronograf-1.9.4_4.tar.xz) = 58654865748602aea6b82c8fb4f00e332eb1328a5f2e15f0fc2be4d0ca113bcc -SIZE (go/net-mgmt_chronograf/chronograf-v1.9.4/yarn-cache-chronograf-1.9.4_4.tar.xz) = 54026976 +TIMESTAMP = 1665055382 +SHA256 (go/net-mgmt_chronograf/chronograf-v1.9.4/yarn-cache-chronograf-1.9.4_5.tar.xz) = 58654865748602aea6b82c8fb4f00e332eb1328a5f2e15f0fc2be4d0ca113bcc +SIZE (go/net-mgmt_chronograf/chronograf-v1.9.4/yarn-cache-chronograf-1.9.4_5.tar.xz) = 54026976 SHA256 (go/net-mgmt_chronograf/chronograf-v1.9.4/node-v14.18.1-headers.tar.gz) = 3352973a1a737b47f2b1822ab9fd5d401427c7ba3b538ecae9928924d06b60a5 SIZE (go/net-mgmt_chronograf/chronograf-v1.9.4/node-v14.18.1-headers.tar.gz) = 599969 SHA256 (go/net-mgmt_chronograf/chronograf-v1.9.4/v1.9.4.mod) = dd4c41519740d06d5fe56f129c0fd34ca490c4f186eda9a6c248fb5bc2c0376c diff --git a/net-mgmt/grok_exporter/Makefile b/net-mgmt/grok_exporter/Makefile index b7af8172de3..ee111bf9451 100644 --- a/net-mgmt/grok_exporter/Makefile +++ b/net-mgmt/grok_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= grok_exporter DISTVERSIONPREFIX=v DISTVERSION= 1.0.0.RC4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MAINTAINER= gasol.wu@gmail.com diff --git a/net-mgmt/intel-snap/Makefile b/net-mgmt/intel-snap/Makefile index b5375ae9519..ec0ed675676 100644 --- a/net-mgmt/intel-snap/Makefile +++ b/net-mgmt/intel-snap/Makefile @@ -1,6 +1,6 @@ PORTNAME= intel-snap PORTVERSION= 0.0.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net-mgmt MAINTAINER= ports@FreeBSD.org diff --git a/net-mgmt/kapacitor/Makefile b/net-mgmt/kapacitor/Makefile index ee36311d91f..ebbe8918e0d 100644 --- a/net-mgmt/kapacitor/Makefile +++ b/net-mgmt/kapacitor/Makefile @@ -1,7 +1,7 @@ PORTNAME= kapacitor DISTVERSIONPREFIX= v DISTVERSION= 1.5.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MAINTAINER= cheffo@freebsd-bg.org diff --git a/net-mgmt/mqtt2prometheus/Makefile b/net-mgmt/mqtt2prometheus/Makefile index 1d8ed4776ad..b0758600bab 100644 --- a/net-mgmt/mqtt2prometheus/Makefile +++ b/net-mgmt/mqtt2prometheus/Makefile @@ -1,7 +1,7 @@ PORTNAME= mqtt2prometheus DISTVERSIONPREFIX= v DISTVERSION= 0.1.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt MAINTAINER= manu@FreeBSD.org diff --git a/net-mgmt/mysqld_exporter/Makefile b/net-mgmt/mysqld_exporter/Makefile index e08bee1edee..ab95ab89696 100644 --- a/net-mgmt/mysqld_exporter/Makefile +++ b/net-mgmt/mysqld_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= mysqld_exporter PORTVERSION= 0.12.1 DISTVERSIONPREFIX=v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MAINTAINER= mr.deadlystorm@gmail.com diff --git a/net-mgmt/netdata-go/Makefile b/net-mgmt/netdata-go/Makefile index c9aaad154cf..4858b16c768 100644 --- a/net-mgmt/netdata-go/Makefile +++ b/net-mgmt/netdata-go/Makefile @@ -1,6 +1,7 @@ PORTNAME= netdata-go DISTVERSIONPREFIX= v -DISTVERSION= 0.40.2 +DISTVERSION= 0.40.3 +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= driesm@FreeBSD.org diff --git a/net-mgmt/netdata-go/distinfo b/net-mgmt/netdata-go/distinfo index 5e8f30857c7..db7fba45d67 100644 --- a/net-mgmt/netdata-go/distinfo +++ b/net-mgmt/netdata-go/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1664724946 -SHA256 (go/net-mgmt_netdata-go/netdata-go-v0.40.2/v0.40.2.mod) = e4274f2e17416f926c5ef2a648de4b6fcab5db17831da847231df10d249ee139 -SIZE (go/net-mgmt_netdata-go/netdata-go-v0.40.2/v0.40.2.mod) = 8899 -SHA256 (go/net-mgmt_netdata-go/netdata-go-v0.40.2/v0.40.2.zip) = f5585f4af07bbc8b84deaa85d53e61494bd00006b6daddd3c351a4289176289e -SIZE (go/net-mgmt_netdata-go/netdata-go-v0.40.2/v0.40.2.zip) = 1599353 +TIMESTAMP = 1665080789 +SHA256 (go/net-mgmt_netdata-go/netdata-go-v0.40.3/v0.40.3.mod) = e16c11c689a27e34bd11894c1abdb0f32f79dfe96f9c815a197271421ac8463a +SIZE (go/net-mgmt_netdata-go/netdata-go-v0.40.3/v0.40.3.mod) = 8899 +SHA256 (go/net-mgmt_netdata-go/netdata-go-v0.40.3/v0.40.3.zip) = b6af74a09e4fc8f1cf41eae9483c74a2bef90a1f003af9ba48aecf71c3b1e808 +SIZE (go/net-mgmt_netdata-go/netdata-go-v0.40.3/v0.40.3.zip) = 1603866 diff --git a/net-mgmt/nsd_exporter/Makefile b/net-mgmt/nsd_exporter/Makefile index df2c8782f6e..4ceef3c51b2 100644 --- a/net-mgmt/nsd_exporter/Makefile +++ b/net-mgmt/nsd_exporter/Makefile @@ -1,6 +1,6 @@ PORTNAME= nsd_exporter PORTVERSION= 0.1.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-mgmt MAINTAINER= zi@FreeBSD.org diff --git a/net-mgmt/nvidia_gpu_prometheus_exporter/Makefile b/net-mgmt/nvidia_gpu_prometheus_exporter/Makefile index ad246acf147..134719ea858 100644 --- a/net-mgmt/nvidia_gpu_prometheus_exporter/Makefile +++ b/net-mgmt/nvidia_gpu_prometheus_exporter/Makefile @@ -1,6 +1,6 @@ PORTNAME= nvidia_gpu_prometheus_exporter DISTVERSION= g20181028 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net-mgmt MAINTAINER= 0mp@FreeBSD.org diff --git a/net-mgmt/php-fpm_exporter/Makefile b/net-mgmt/php-fpm_exporter/Makefile index 6404429ffc5..7c358ce4574 100644 --- a/net-mgmt/php-fpm_exporter/Makefile +++ b/net-mgmt/php-fpm_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= php-fpm_exporter DISTVERSIONPREFIX=v DISTVERSION= 2.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MAINTAINER= freebsd.org@neant.ro diff --git a/net-mgmt/phpfpm_exporter/Makefile b/net-mgmt/phpfpm_exporter/Makefile index ec4ae59a7fe..391fd795fea 100644 --- a/net-mgmt/phpfpm_exporter/Makefile +++ b/net-mgmt/phpfpm_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= phpfpm_exporter PORTVERSION= 0.4.1 DISTVERSIONPREFIX=v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MAINTAINER= gasol.wu@gmail.com diff --git a/net-mgmt/ping_exporter/Makefile b/net-mgmt/ping_exporter/Makefile index 1b9eb5bc74d..4541285e18d 100644 --- a/net-mgmt/ping_exporter/Makefile +++ b/net-mgmt/ping_exporter/Makefile @@ -1,6 +1,6 @@ PORTNAME= ping_exporter DISTVERSION= 1.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MASTER_SITES= https://raw.githubusercontent.com/czerwonk/ping_exporter/${DISTVERSIONFULL}/:gomod DISTFILES= go.mod:gomod diff --git a/net-mgmt/prometheus-collectd-exporter/Makefile b/net-mgmt/prometheus-collectd-exporter/Makefile index 40561e8b7a3..fdb2e57923a 100644 --- a/net-mgmt/prometheus-collectd-exporter/Makefile +++ b/net-mgmt/prometheus-collectd-exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= prometheus-collectd-exporter PORTVERSION= 0.5.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MAINTAINER= dsp@php.net diff --git a/net-mgmt/prometheus1/Makefile b/net-mgmt/prometheus1/Makefile index a7a5f5c327d..942a971a606 100644 --- a/net-mgmt/prometheus1/Makefile +++ b/net-mgmt/prometheus1/Makefile @@ -1,7 +1,7 @@ PORTNAME= prometheus PORTVERSION= 1.8.2 DISTVERSIONPREFIX= v -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net-mgmt PKGNAMESUFFIX= 1 diff --git a/net-mgmt/prometheus2/Makefile b/net-mgmt/prometheus2/Makefile index b0cf66d646c..fd102586c19 100644 --- a/net-mgmt/prometheus2/Makefile +++ b/net-mgmt/prometheus2/Makefile @@ -1,7 +1,7 @@ PORTNAME= prometheus DISTVERSIONPREFIX= v DISTVERSION= 2.36.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod \ https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSIONFULL}/:ui diff --git a/net-mgmt/promscale/Makefile b/net-mgmt/promscale/Makefile index 7898ce64f65..11cd39eb3dd 100644 --- a/net-mgmt/promscale/Makefile +++ b/net-mgmt/promscale/Makefile @@ -1,6 +1,6 @@ PORTNAME= promscale DISTVERSION= 0.6.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MAINTAINER= kbowling@FreeBSD.org diff --git a/net-mgmt/pushgateway/Makefile b/net-mgmt/pushgateway/Makefile index 129f73cc50f..a378a8fd176 100644 --- a/net-mgmt/pushgateway/Makefile +++ b/net-mgmt/pushgateway/Makefile @@ -1,6 +1,7 @@ PORTNAME= pushgateway DISTVERSIONPREFIX= v DISTVERSION= 1.4.3 +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= 0xdutra@gmail.com diff --git a/net-mgmt/py-pyzabbix/Makefile b/net-mgmt/py-pyzabbix/Makefile index a37b9b02099..2528f052de3 100644 --- a/net-mgmt/py-pyzabbix/Makefile +++ b/net-mgmt/py-pyzabbix/Makefile @@ -1,5 +1,5 @@ PORTNAME= pyzabbix -PORTVERSION= 1.0.0 +PORTVERSION= 1.2.1 CATEGORIES= net-mgmt python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -10,11 +10,12 @@ WWW= https://github.com/lukecyca/pyzabbix LICENSE= LGPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.0:www/py-requests@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=1.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}semantic-version>=2.8.5:devel/py-semantic-version@${PY_FLAVOR} USES= python:3.6+ -USE_PYTHON= distutils autoplist +USE_PYTHON= autoplist distutils NO_ARCH= yes .include diff --git a/net-mgmt/py-pyzabbix/distinfo b/net-mgmt/py-pyzabbix/distinfo index a59c2c78bf4..877cbf59bb3 100644 --- a/net-mgmt/py-pyzabbix/distinfo +++ b/net-mgmt/py-pyzabbix/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1624565034 -SHA256 (pyzabbix-1.0.0.tar.gz) = 4bcde3944f932685dba60551725e1b63de64d463da0e1c281b3121c0805f1c71 -SIZE (pyzabbix-1.0.0.tar.gz) = 5840 +TIMESTAMP = 1664998590 +SHA256 (pyzabbix-1.2.1.tar.gz) = 43aeda2d9792941dce95d06be5a450411efa160b45d658800503b235280a7d57 +SIZE (pyzabbix-1.2.1.tar.gz) = 7138 diff --git a/net-mgmt/semaphore/Makefile b/net-mgmt/semaphore/Makefile index 53149a8223d..82201fb2e87 100644 --- a/net-mgmt/semaphore/Makefile +++ b/net-mgmt/semaphore/Makefile @@ -1,7 +1,7 @@ PORTNAME= semaphore PORTVERSION= 2.8.53 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MAINTAINER= egypcio@FreeBSD.org diff --git a/net-mgmt/thanos/Makefile b/net-mgmt/thanos/Makefile index a29fd71125c..ec72fb625db 100644 --- a/net-mgmt/thanos/Makefile +++ b/net-mgmt/thanos/Makefile @@ -1,7 +1,7 @@ PORTNAME= thanos DISTVERSIONPREFIX= v DISTVERSION= 0.28.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MAINTAINER= ler@FreeBSD.org diff --git a/net-mgmt/unbound_exporter/Makefile b/net-mgmt/unbound_exporter/Makefile index acbc273667f..e0943a766d5 100644 --- a/net-mgmt/unbound_exporter/Makefile +++ b/net-mgmt/unbound_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= unbound_exporter PORTVERSION= 0.3 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MAINTAINER= aduitsis@cpan.org diff --git a/net-mgmt/victoria-metrics/Makefile b/net-mgmt/victoria-metrics/Makefile index 826bb28cc80..631e54dc051 100644 --- a/net-mgmt/victoria-metrics/Makefile +++ b/net-mgmt/victoria-metrics/Makefile @@ -1,5 +1,6 @@ PORTNAME?= victoria-metrics PORTVERSION= 1.81.2 # don't forget to update BUILDINFO_TAG +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= net-mgmt diff --git a/net-p2p/autoscan/Makefile b/net-p2p/autoscan/Makefile index e68fa7fb9e8..d65b9b2d1f9 100644 --- a/net-p2p/autoscan/Makefile +++ b/net-p2p/autoscan/Makefile @@ -1,7 +1,7 @@ PORTNAME= autoscan DISTVERSIONPREFIX= v DISTVERSION= 1.3.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net-p2p MAINTAINER= michiel@vanbaak.eu diff --git a/net-p2p/bitmark/Makefile b/net-p2p/bitmark/Makefile index 06dbc059ffb..35b2a18948e 100644 --- a/net-p2p/bitmark/Makefile +++ b/net-p2p/bitmark/Makefile @@ -1,7 +1,7 @@ PORTNAME= bitmark DISTVERSIONPREFIX= v DISTVERSION= 0.13.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-p2p MAINTAINER= hsw@bitmark.com diff --git a/net-p2p/go-ethereum/Makefile b/net-p2p/go-ethereum/Makefile index 53f35c559ab..f896e0d16a7 100644 --- a/net-p2p/go-ethereum/Makefile +++ b/net-p2p/go-ethereum/Makefile @@ -1,6 +1,7 @@ PORTNAME= go-ethereum DISTVERSIONPREFIX= v DISTVERSION= 1.10.25 +PORTREVISION= 1 CATEGORIES= net-p2p MAINTAINER= me@enriquefynn.com diff --git a/net-p2p/go-prysm/Makefile b/net-p2p/go-prysm/Makefile index dff5c555914..2135e1f80fb 100644 --- a/net-p2p/go-prysm/Makefile +++ b/net-p2p/go-prysm/Makefile @@ -1,7 +1,7 @@ PORTNAME= go-prysm DISTVERSIONPREFIX= v DISTVERSION= 3.1.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net-p2p MAINTAINER= zi@FreeBSD.org diff --git a/net/astron/files/patch-CMakeLists.txt b/net/astron/files/patch-CMakeLists.txt index dc67f43c69f..470448dfcac 100644 --- a/net/astron/files/patch-CMakeLists.txt +++ b/net/astron/files/patch-CMakeLists.txt @@ -1,5 +1,14 @@ ---- CMakeLists.txt.orig 2021-04-06 22:45:16 UTC +--- CMakeLists.txt.orig 2020-05-21 16:39:19 UTC +++ CMakeLists.txt +@@ -75,7 +75,7 @@ endif() + # Common flags: + if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR + CMAKE_CXX_COMPILER_ID MATCHES "GNU") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-error=deprecated-declarations") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-error=deprecated-declarations") + endif() + + # Clang-specific flags: @@ -92,7 +92,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") ### Windows list(APPEND EXTRA_LIBS wsock32 ws2_32) endif() diff --git a/net/bosh-bootloader/Makefile b/net/bosh-bootloader/Makefile index 0566ba30018..bc014bb49cc 100644 --- a/net/bosh-bootloader/Makefile +++ b/net/bosh-bootloader/Makefile @@ -1,6 +1,6 @@ PORTNAME= bosh-bootloader PORTVERSION= 7.6.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net sysutils MAINTAINER= dumbbell@FreeBSD.org diff --git a/net/bosh-cli/Makefile b/net/bosh-cli/Makefile index 35b2bd8e314..327b58dc290 100644 --- a/net/bosh-cli/Makefile +++ b/net/bosh-cli/Makefile @@ -1,6 +1,6 @@ PORTNAME= bosh-cli PORTVERSION= 5.5.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net sysutils MAINTAINER= dumbbell@FreeBSD.org diff --git a/net/cf/Makefile b/net/cf/Makefile index 9fe2ad2b15d..5053bc2e49a 100644 --- a/net/cf/Makefile +++ b/net/cf/Makefile @@ -1,7 +1,7 @@ PORTNAME= cf PORTVERSION= 6.49.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MAINTAINER= dumbbell@FreeBSD.org diff --git a/net/clash/Makefile b/net/clash/Makefile index 0c0308e6915..d49ef6f1aeb 100644 --- a/net/clash/Makefile +++ b/net/clash/Makefile @@ -1,7 +1,7 @@ PORTNAME= clash DISTVERSIONPREFIX= v DISTVERSION= 1.11.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org diff --git a/net/cloudflared/Makefile b/net/cloudflared/Makefile index 9fc5d93ca69..530f3b7b85e 100644 --- a/net/cloudflared/Makefile +++ b/net/cloudflared/Makefile @@ -1,5 +1,6 @@ PORTNAME= cloudflared DISTVERSION= 2022.9.1 +PORTREVISION= 1 CATEGORIES= net www MAINTAINER= egypcio@FreeBSD.org diff --git a/net/cloudquery/Makefile b/net/cloudquery/Makefile index 8604a7eddaf..a870d14c691 100644 --- a/net/cloudquery/Makefile +++ b/net/cloudquery/Makefile @@ -1,7 +1,7 @@ PORTNAME= cloudquery DISTVERSIONPREFIX= v DISTVERSION= 0.31.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net MAINTAINER= se@FreeBSD.org diff --git a/net/concourse-fly/Makefile b/net/concourse-fly/Makefile index c44454a7ff6..241c25dd038 100644 --- a/net/concourse-fly/Makefile +++ b/net/concourse-fly/Makefile @@ -1,6 +1,6 @@ PORTNAME= concourse PORTVERSION= 6.7.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net sysutils MASTER_SITES= LOCAL/dumbbell/concourse/ PKGNAMESUFFIX= -fly diff --git a/net/croc/Makefile b/net/croc/Makefile index 089dbd0972e..f8c11716206 100644 --- a/net/croc/Makefile +++ b/net/croc/Makefile @@ -1,7 +1,7 @@ PORTNAME= croc PORTVERSION= 9.6.0 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net MAINTAINER= olgeni@FreeBSD.org diff --git a/net/drive/Makefile b/net/drive/Makefile index c3824fc9d35..ad3ff6900b4 100644 --- a/net/drive/Makefile +++ b/net/drive/Makefile @@ -1,7 +1,7 @@ PORTNAME= drive PORTVERSION= 0.4.0 DISTVERSIONPREFIX= v -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= net MAINTAINER= sunpoet@FreeBSD.org diff --git a/net/evans/Makefile b/net/evans/Makefile index 9afbbd13c37..2df7d9f26e6 100644 --- a/net/evans/Makefile +++ b/net/evans/Makefile @@ -1,6 +1,6 @@ PORTNAME= evans DISTVERSION= 0.9.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MAINTAINER= lcook@FreeBSD.org diff --git a/net/frp/Makefile b/net/frp/Makefile index 87b94ee11b0..1b6174157f4 100644 --- a/net/frp/Makefile +++ b/net/frp/Makefile @@ -1,6 +1,7 @@ PORTNAME= frp DISTVERSIONPREFIX= v DISTVERSION= 0.44.0 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org diff --git a/net/gdrive/Makefile b/net/gdrive/Makefile index 1d68742f767..59eed336ec9 100644 --- a/net/gdrive/Makefile +++ b/net/gdrive/Makefile @@ -1,6 +1,6 @@ PORTNAME= gdrive DISTVERSION= 2.1.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/net/geoipupdate/Makefile b/net/geoipupdate/Makefile index 2e6c5109243..60198f1e3c0 100644 --- a/net/geoipupdate/Makefile +++ b/net/geoipupdate/Makefile @@ -1,5 +1,6 @@ PORTNAME= geoipupdate PORTVERSION= 4.10.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= net geography diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile index 5ea6071b98d..544ad312eb2 100644 --- a/net/gitlab-agent/Makefile +++ b/net/gitlab-agent/Makefile @@ -1,7 +1,7 @@ PORTNAME= gitlab-agent PORTVERSION= 15.2.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MAINTAINER= mfechner@FreeBSD.org diff --git a/net/go-bapu/Makefile b/net/go-bapu/Makefile index 8c3b53b0aca..ae97236e3e8 100644 --- a/net/go-bapu/Makefile +++ b/net/go-bapu/Makefile @@ -1,6 +1,6 @@ PORTNAME= bapu PORTVERSION= 0.3.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MASTER_SITES= https://bitbucket.org/carlostrub/bapu/get/ PKGNAMEPREFIX= go- diff --git a/net/go-cs/Makefile b/net/go-cs/Makefile index 780f5ec22c0..65fbff3e2cb 100644 --- a/net/go-cs/Makefile +++ b/net/go-cs/Makefile @@ -1,7 +1,7 @@ PORTNAME= go-cs PORTVERSION= 0.9 DISTVERSIONPREFIX= v -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net MAINTAINER= akosela@andykosela.com diff --git a/net/gobgp/Makefile b/net/gobgp/Makefile index a03c328d024..108c1a1de19 100644 --- a/net/gobgp/Makefile +++ b/net/gobgp/Makefile @@ -1,6 +1,6 @@ PORTNAME= gobgp PORTVERSION= 3.0.0 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONPREFIX= v CATEGORIES= net DIST_SUBDIR= gobgp diff --git a/net/goreplay/Makefile b/net/goreplay/Makefile index d1f91eb88d4..c3ecc20c2eb 100644 --- a/net/goreplay/Makefile +++ b/net/goreplay/Makefile @@ -1,7 +1,7 @@ PORTNAME= goreplay PORTVERSION= 1.2.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MAINTAINER= swills@FreeBSD.org diff --git a/net/gorss/Makefile b/net/gorss/Makefile index 98665810e2e..6067affc19a 100644 --- a/net/gorss/Makefile +++ b/net/gorss/Makefile @@ -1,7 +1,7 @@ PORTNAME= gorss PORTVERSION= 0.3 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net www MAINTAINER= ports@FreeBSD.org diff --git a/net/grpcox/Makefile b/net/grpcox/Makefile index 50ef8d5cd78..ee0914c16d4 100644 --- a/net/grpcox/Makefile +++ b/net/grpcox/Makefile @@ -1,7 +1,7 @@ PORTNAME= grpcox DISTVERSIONPREFIX= v DISTVERSION= 1.0.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net www MAINTAINER= yuri@FreeBSD.org diff --git a/net/grpcui/Makefile b/net/grpcui/Makefile index f29298ca28b..3bfad3b2e7a 100644 --- a/net/grpcui/Makefile +++ b/net/grpcui/Makefile @@ -1,7 +1,7 @@ PORTNAME= grpcui DISTVERSIONPREFIX= v DISTVERSION= 1.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net www MAINTAINER= yuri@FreeBSD.org diff --git a/net/grpcurl/Makefile b/net/grpcurl/Makefile index 5512720ec0a..fe2f966f5f5 100644 --- a/net/grpcurl/Makefile +++ b/net/grpcurl/Makefile @@ -1,7 +1,7 @@ PORTNAME= grpcurl DISTVERSIONPREFIX= v DISTVERSION= 1.8.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MAINTAINER= nc@FreeBSD.org diff --git a/net/gscloud/Makefile b/net/gscloud/Makefile index ec0d7525531..177b8f89c02 100644 --- a/net/gscloud/Makefile +++ b/net/gscloud/Makefile @@ -1,7 +1,7 @@ PORTNAME= gscloud DISTVERSIONPREFIX= v DISTVERSION= 0.11.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net devel MAINTAINER= egypcio@FreeBSD.org diff --git a/net/ipinfo-cli/Makefile b/net/ipinfo-cli/Makefile index 2c86785671b..e714bf14f84 100644 --- a/net/ipinfo-cli/Makefile +++ b/net/ipinfo-cli/Makefile @@ -1,7 +1,7 @@ PORTNAME= ipinfo DISTVERSIONPREFIX= ipinfo- -DISTVERSION= 2.9.0 -PORTREVISION= 2 +DISTVERSION= 2.10.0 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= 0xdutra@gmail.com diff --git a/net/ipinfo-cli/distinfo b/net/ipinfo-cli/distinfo index a14c4dc9b41..868f756fb80 100644 --- a/net/ipinfo-cli/distinfo +++ b/net/ipinfo-cli/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1662248527 -SHA256 (ipinfo-cli-ipinfo-2.9.0_GH0.tar.gz) = 299b853300a81a6dd2c3c22bf335917368b799c2108a354cd8be4ad269753adc -SIZE (ipinfo-cli-ipinfo-2.9.0_GH0.tar.gz) = 3584764 +TIMESTAMP = 1664924953 +SHA256 (ipinfo-cli-ipinfo-2.10.0_GH0.tar.gz) = b48e69f309647d1845c36c0176cf6c07e13b59ca443269df7e4d394838b72211 +SIZE (ipinfo-cli-ipinfo-2.10.0_GH0.tar.gz) = 3586744 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 SHA256 (etcd-io-bbolt-v1.3.6_GH0.tar.gz) = a2e524f7f32c44fa0765de192ac0789c585010cadd2c2ddcf9518e858a96ec1f diff --git a/net/k6/Makefile b/net/k6/Makefile index 778a4bdefba..2987548996b 100644 --- a/net/k6/Makefile +++ b/net/k6/Makefile @@ -1,7 +1,7 @@ PORTNAME= k6 DISTVERSIONPREFIX= v DISTVERSION= 0.37.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net MAINTAINER= lcook@FreeBSD.org diff --git a/net/kube-controller-manager/Makefile b/net/kube-controller-manager/Makefile index 08274512e3b..6db2aa23a04 100644 --- a/net/kube-controller-manager/Makefile +++ b/net/kube-controller-manager/Makefile @@ -1,7 +1,7 @@ PORTNAME= kube-controller-manager PORTVERSION= 1.13.3 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MAINTAINER= loic.blot@unix-experience.fr diff --git a/net/kube-scheduler/Makefile b/net/kube-scheduler/Makefile index d28215843bc..2862fc6f3b0 100644 --- a/net/kube-scheduler/Makefile +++ b/net/kube-scheduler/Makefile @@ -1,7 +1,7 @@ PORTNAME= kube-scheduler PORTVERSION= 1.13.3 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MAINTAINER= loic.blot@unix-experience.fr diff --git a/net/librespeed-cli/Makefile b/net/librespeed-cli/Makefile index e88eb7295a9..418596c9c0b 100644 --- a/net/librespeed-cli/Makefile +++ b/net/librespeed-cli/Makefile @@ -1,7 +1,7 @@ PORTNAME= librespeed-cli DISTVERSIONPREFIX= v DISTVERSION= 1.0.10 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net www MAINTAINER= driesm@FreeBSD.org diff --git a/net/librespeed-go/Makefile b/net/librespeed-go/Makefile index 801440d93ac..bd8a98144c8 100644 --- a/net/librespeed-go/Makefile +++ b/net/librespeed-go/Makefile @@ -1,7 +1,7 @@ PORTNAME= librespeed-go DISTVERSIONPREFIX= v DISTVERSION= 1.1.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net www MAINTAINER= driesm@FreeBSD.org diff --git a/net/madonctl/Makefile b/net/madonctl/Makefile index f8edc6d2474..af7ad7f82d6 100644 --- a/net/madonctl/Makefile +++ b/net/madonctl/Makefile @@ -1,7 +1,7 @@ PORTNAME= madonctl PORTVERSION= 2.3.1 DISTVERSIONPREFIX= v -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= net MAINTAINER= sunpoet@FreeBSD.org diff --git a/net/nats-nkeys/Makefile b/net/nats-nkeys/Makefile index 98befa9faeb..4e9c16e5b75 100644 --- a/net/nats-nkeys/Makefile +++ b/net/nats-nkeys/Makefile @@ -1,7 +1,7 @@ PORTNAME= nkeys PORTVERSION= 0.3.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net PKGNAMEPREFIX= nats- diff --git a/net/nats-nsc/Makefile b/net/nats-nsc/Makefile index 1b862be249d..f2d3ef06c2e 100644 --- a/net/nats-nsc/Makefile +++ b/net/nats-nsc/Makefile @@ -1,6 +1,6 @@ PORTNAME= nsc PORTVERSION= 2.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net PKGNAMEPREFIX= nats- diff --git a/net/nats-server/Makefile b/net/nats-server/Makefile index ba3e584f574..afa24310ac7 100644 --- a/net/nats-server/Makefile +++ b/net/nats-server/Makefile @@ -1,5 +1,6 @@ PORTNAME= nats-server PORTVERSION= 2.9.2 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= net diff --git a/net/nats-streaming-server/Makefile b/net/nats-streaming-server/Makefile index 4b64cb86531..e934b8580d8 100644 --- a/net/nats-streaming-server/Makefile +++ b/net/nats-streaming-server/Makefile @@ -1,7 +1,7 @@ PORTNAME= nats-streaming-server PORTVERSION= 0.24.6 DISTVERSIONPREFIX= v -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net MAINTAINER= olgeni@FreeBSD.org diff --git a/net/nats-top/Makefile b/net/nats-top/Makefile index da04f72da81..d1a7201e9ec 100644 --- a/net/nats-top/Makefile +++ b/net/nats-top/Makefile @@ -1,6 +1,6 @@ PORTNAME= nats-top -PORTVERSION= 0.5.2 -PORTREVISION= 4 +PORTVERSION= 0.5.3 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= net @@ -13,21 +13,20 @@ LICENSE= MIT USES= go:modules USE_GITHUB= yes GH_ACCOUNT= nats-io -GH_TUPLE= davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ - gizak:termui:e62b5929642a:gizak_termui/vendor/gopkg.in/gizak/termui.v1 \ - golang:crypto:5e0467b6c7ce:golang_crypto/vendor/golang.org/x/crypto \ - golang:sys:5a964db01320:golang_sys/vendor/golang.org/x/sys \ - golang:time:f0f3c7e86c11:golang_time/vendor/golang.org/x/time \ - klauspost:compress:v1.14.4:klauspost_compress/vendor/github.com/klauspost/compress \ - mattn:go-runewidth:v0.0.13:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ +GH_TUPLE= gizak:termui:e62b5929642a:gizak_termui/vendor/gopkg.in/gizak/termui.v1 \ + golang:crypto:eccd6366d1be:golang_crypto/vendor/golang.org/x/crypto \ + golang:sys:f11e5e49a4ec:golang_sys/vendor/golang.org/x/sys \ + golang:time:f3bd1da661af:golang_time/vendor/golang.org/x/time \ + klauspost:compress:v1.15.11:klauspost_compress/vendor/github.com/klauspost/compress \ + mattn:go-runewidth:v0.0.14:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ minio:highwayhash:v1.0.2:minio_highwayhash/vendor/github.com/minio/highwayhash \ - nats-io:jwt:58e87895b296:nats_io_jwt_v2/vendor/github.com/nats-io/jwt \ - nats-io:nats-server:v2.7.4:nats_io_nats_server_v2/vendor/github.com/nats-io/nats-server/v2 \ + nats-io:jwt:v2.3.0:nats_io_jwt_v2/vendor/github.com/nats-io/jwt \ + nats-io:nats-server:v2.9.2:nats_io_nats_server_v2/vendor/github.com/nats-io/nats-server/v2 \ nats-io:nkeys:v0.3.0:nats_io_nkeys/vendor/github.com/nats-io/nkeys \ nats-io:nuid:v1.0.1:nats_io_nuid/vendor/github.com/nats-io/nuid \ nsf:termbox-go:v1.1.1:nsf_termbox_go/vendor/github.com/nsf/termbox-go \ rivo:uniseg:v0.2.0:rivo_uniseg/vendor/github.com/rivo/uniseg \ - stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify + stretchr:testify:v1.8.0:stretchr_testify/vendor/github.com/stretchr/testify GO_PKGNAME= github.com/nats-io/nats-top PLIST_FILES= bin/nats-top diff --git a/net/nats-top/distinfo b/net/nats-top/distinfo index 57983c3307f..82ab770bc4c 100644 --- a/net/nats-top/distinfo +++ b/net/nats-top/distinfo @@ -1,26 +1,24 @@ -TIMESTAMP = 1652247171 -SHA256 (nats-io-nats-top-v0.5.2_GH0.tar.gz) = 4464b37c5a6e6f5bc2ef5b6347debf0e0a5cd47f0ce99f0eeea7831d7a761fa8 -SIZE (nats-io-nats-top-v0.5.2_GH0.tar.gz) = 19884 -SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e -SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 +TIMESTAMP = 1665040475 +SHA256 (nats-io-nats-top-v0.5.3_GH0.tar.gz) = 5c2565bbe5c1ea509fef4ebc7be9a17d3aadbc0e71fead14585a0ca59a7acdd5 +SIZE (nats-io-nats-top-v0.5.3_GH0.tar.gz) = 20398 SHA256 (gizak-termui-e62b5929642a_GH0.tar.gz) = 8de172145510472f80c1a4f35ed9847cec2fc07db386924c7d601f2571c244e4 SIZE (gizak-termui-e62b5929642a_GH0.tar.gz) = 1794026 -SHA256 (golang-crypto-5e0467b6c7ce_GH0.tar.gz) = 0eee76af7c07926f13d7daf6391fea77e48ef0ef5dfd12380027970e38d6f9db -SIZE (golang-crypto-5e0467b6c7ce_GH0.tar.gz) = 1734224 -SHA256 (golang-sys-5a964db01320_GH0.tar.gz) = ab75cf42cf98e0805ae507a9e4852324f7ea88cac4baaf3053e2ec90c3f56cf0 -SIZE (golang-sys-5a964db01320_GH0.tar.gz) = 1256823 -SHA256 (golang-time-f0f3c7e86c11_GH0.tar.gz) = 421890dd6e4b7e8d5ca68cc163c8b3b08436898664534aedfefd8602e11a4e53 -SIZE (golang-time-f0f3c7e86c11_GH0.tar.gz) = 9626 -SHA256 (klauspost-compress-v1.14.4_GH0.tar.gz) = 30480619257f7d40fcbfd61b59c34fd36e85220ac2eee400c493b06c37f53740 -SIZE (klauspost-compress-v1.14.4_GH0.tar.gz) = 15502117 -SHA256 (mattn-go-runewidth-v0.0.13_GH0.tar.gz) = 9b2aeafa5d95a40b32067ba22accdf42cc83414ec5b433ea7de330791beaa196 -SIZE (mattn-go-runewidth-v0.0.13_GH0.tar.gz) = 17353 +SHA256 (golang-crypto-eccd6366d1be_GH0.tar.gz) = 62db5700a46fa0ad1f9129134dbfa98da4701f3b2cc91d569315b9d39918e145 +SIZE (golang-crypto-eccd6366d1be_GH0.tar.gz) = 1631561 +SHA256 (golang-sys-f11e5e49a4ec_GH0.tar.gz) = a2aebdb75f09abe16eeea84aa1434e9bc8db9ac13fef28d5d0ff2399a724477a +SIZE (golang-sys-f11e5e49a4ec_GH0.tar.gz) = 1358328 +SHA256 (golang-time-f3bd1da661af_GH0.tar.gz) = 9f2237ba44dadb7186cfcf84f01758e0cf89cff12bc063f3d15feef7197282d7 +SIZE (golang-time-f3bd1da661af_GH0.tar.gz) = 11111 +SHA256 (klauspost-compress-v1.15.11_GH0.tar.gz) = e79cfb490113c6983c5ba962f2e61bde4572f1cdcc02bbf9573f479c7eee5773 +SIZE (klauspost-compress-v1.15.11_GH0.tar.gz) = 36199166 +SHA256 (mattn-go-runewidth-v0.0.14_GH0.tar.gz) = 0e6a49d6a8f694154af2746a820d4c5f13fe3d9b0968bdf16fcf939dd461e034 +SIZE (mattn-go-runewidth-v0.0.14_GH0.tar.gz) = 18274 SHA256 (minio-highwayhash-v1.0.2_GH0.tar.gz) = 5a89e6f3e77cb77c818c5ce0316812d544e588456fce2e55e02f48d52fa9c5d2 SIZE (minio-highwayhash-v1.0.2_GH0.tar.gz) = 23056 -SHA256 (nats-io-jwt-58e87895b296_GH0.tar.gz) = 9bd3d924f32842fa5fcceb1cd4ff1992bee7c5c553c1f9c98a268816e9585878 -SIZE (nats-io-jwt-58e87895b296_GH0.tar.gz) = 81105 -SHA256 (nats-io-nats-server-v2.7.4_GH0.tar.gz) = 4a98e3ba5022f55341aed7c07b6c61bd93be82de76ef03758825ca9d53310e6f -SIZE (nats-io-nats-server-v2.7.4_GH0.tar.gz) = 1397275 +SHA256 (nats-io-jwt-v2.3.0_GH0.tar.gz) = 3f6d78974c16b44d8dcc5a6e8daa1d38238a69674ae01bfda27123b31a0dc4de +SIZE (nats-io-jwt-v2.3.0_GH0.tar.gz) = 82968 +SHA256 (nats-io-nats-server-v2.9.2_GH0.tar.gz) = e9d38108d2f1a57d7126a9a65dd2aedc5a7ca8fc3b1560d33b288ed1e1f43427 +SIZE (nats-io-nats-server-v2.9.2_GH0.tar.gz) = 1591437 SHA256 (nats-io-nkeys-v0.3.0_GH0.tar.gz) = ea281df5dc380b84f61c3712b367f02957cff4cb7802e73b2b0b7588e4f6b809 SIZE (nats-io-nkeys-v0.3.0_GH0.tar.gz) = 19986 SHA256 (nats-io-nuid-v1.0.1_GH0.tar.gz) = a0b4fe5b40781add2a9fdb5d723313be5f5d11c1a79ea1dd2671278826ef078d @@ -29,5 +27,5 @@ SHA256 (nsf-termbox-go-v1.1.1_GH0.tar.gz) = 05ad3261fbead5fbcd8d69a4addc50fc0a29 SIZE (nsf-termbox-go-v1.1.1_GH0.tar.gz) = 37575 SHA256 (rivo-uniseg-v0.2.0_GH0.tar.gz) = 3ad738b5c9162ede110d75b23564b6e40e52dd9150ebbced402f4f70be106197 SIZE (rivo-uniseg-v0.2.0_GH0.tar.gz) = 44036 -SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5aa2beb58ef7a94530d7724b5739a8d6 -SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073 +SHA256 (stretchr-testify-v1.8.0_GH0.tar.gz) = c31f0bc88114cc11a3d1f2e837d2c0aa7b4cd28c7b81e1946d47c158ba3e6841 +SIZE (stretchr-testify-v1.8.0_GH0.tar.gz) = 97595 diff --git a/net/natscli/Makefile b/net/natscli/Makefile index 3bfe9585e4b..489fd741730 100644 --- a/net/natscli/Makefile +++ b/net/natscli/Makefile @@ -1,5 +1,6 @@ PORTNAME= natscli PORTVERSION= 0.0.34 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= net diff --git a/net/nncp/Makefile b/net/nncp/Makefile index 7badda6632c..6f194f2c3c3 100644 --- a/net/nncp/Makefile +++ b/net/nncp/Makefile @@ -1,6 +1,6 @@ PORTNAME= nncp DISTVERSION= 8.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.nncpgo.org/download/ diff --git a/net/nsq/Makefile b/net/nsq/Makefile index d90645e141a..eeabc10804d 100644 --- a/net/nsq/Makefile +++ b/net/nsq/Makefile @@ -1,7 +1,7 @@ PORTNAME= nsq PORTVERSION= 1.2.1 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MAINTAINER= jhixson@FreeBSD.org diff --git a/net/oha/Makefile b/net/oha/Makefile index 7b1d3f2227e..81ec891629c 100644 --- a/net/oha/Makefile +++ b/net/oha/Makefile @@ -1,6 +1,6 @@ PORTNAME= oha DISTVERSIONPREFIX= v -DISTVERSION= 0.5.4 +DISTVERSION= 0.5.5 CATEGORIES= net MAINTAINER= otis@FreeBSD.org @@ -13,7 +13,7 @@ USES= cargo ssl USE_GITHUB= yes GH_ACCOUNT= hatoo -CARGO_CRATES= anyhow-1.0.62 \ +CARGO_CRATES= anyhow-1.0.65 \ assert_cmd-2.0.4 \ async-trait-0.1.57 \ atty-0.2.14 \ @@ -22,7 +22,7 @@ CARGO_CRATES= anyhow-1.0.62 \ base64-0.13.0 \ bitflags-1.3.2 \ block-buffer-0.9.0 \ - block-buffer-0.10.2 \ + block-buffer-0.10.3 \ bstr-0.2.17 \ buf_redux-0.8.4 \ bumpalo-3.11.0 \ @@ -32,68 +32,69 @@ CARGO_CRATES= anyhow-1.0.62 \ cassowary-0.3.0 \ cc-1.0.73 \ cfg-if-1.0.0 \ - clap-3.2.17 \ - clap_derive-3.2.17 \ + clap-3.2.22 \ + clap_derive-3.2.18 \ clap_lex-0.2.4 \ core-foundation-0.9.3 \ core-foundation-sys-0.8.3 \ - cpufeatures-0.2.4 \ + cpufeatures-0.2.5 \ crossterm-0.25.0 \ crossterm_winapi-0.9.0 \ crypto-common-0.1.6 \ data-encoding-2.3.2 \ difflib-0.4.0 \ digest-0.9.0 \ - digest-0.10.3 \ + digest-0.10.5 \ doc-comment-0.3.3 \ easy-cast-0.4.4 \ either-1.8.0 \ - enum-as-inner-0.4.0 \ + enum-as-inner-0.5.1 \ fastrand-1.8.0 \ float-ord-0.3.2 \ flume-0.10.14 \ fnv-1.0.7 \ foreign-types-0.3.2 \ foreign-types-shared-0.1.1 \ - form_urlencoded-1.0.1 \ - futures-0.3.23 \ - futures-channel-0.3.23 \ - futures-core-0.3.23 \ - futures-executor-0.3.23 \ - futures-io-0.3.23 \ - futures-macro-0.3.23 \ - futures-sink-0.3.23 \ - futures-task-0.3.23 \ - futures-util-0.3.23 \ + form_urlencoded-1.1.0 \ + futures-0.3.24 \ + futures-channel-0.3.24 \ + futures-core-0.3.24 \ + futures-executor-0.3.24 \ + futures-io-0.3.24 \ + futures-macro-0.3.24 \ + futures-sink-0.3.24 \ + futures-task-0.3.24 \ + futures-util-0.3.24 \ generic-array-0.14.6 \ get-port-4.0.0 \ getrandom-0.2.7 \ h2-0.3.14 \ hashbrown-0.12.3 \ - headers-0.3.7 \ + headers-0.3.8 \ headers-core-0.2.0 \ heck-0.4.0 \ hermit-abi-0.1.19 \ hostname-0.3.1 \ http-0.2.8 \ http-body-0.4.5 \ - httparse-1.7.1 \ + httparse-1.8.0 \ httpdate-1.0.2 \ humantime-2.1.0 \ hyper-0.14.20 \ idna-0.2.3 \ + idna-0.3.0 \ indexmap-1.9.1 \ instant-0.1.12 \ ipconfig-0.3.0 \ ipnet-2.5.0 \ - itertools-0.10.3 \ + itertools-0.10.4 \ itoa-1.0.3 \ - js-sys-0.3.59 \ + js-sys-0.3.60 \ lazy_static-1.4.0 \ libc-0.2.132 \ libm-0.2.5 \ linked-hash-map-0.5.6 \ - lock_api-0.4.7 \ + lock_api-0.4.8 \ log-0.4.17 \ lru-cache-0.1.2 \ match_cfg-0.1.0 \ @@ -107,7 +108,7 @@ CARGO_CRATES= anyhow-1.0.62 \ native-tls-0.2.10 \ num-traits-0.2.15 \ num_cpus-1.13.1 \ - once_cell-1.13.1 \ + once_cell-1.14.0 \ opaque-debug-0.3.0 \ openssl-0.10.41 \ openssl-macros-0.1.0 \ @@ -116,7 +117,7 @@ CARGO_CRATES= anyhow-1.0.62 \ os_str_bytes-6.3.0 \ parking_lot-0.12.1 \ parking_lot_core-0.9.3 \ - percent-encoding-2.1.0 \ + percent-encoding-2.2.0 \ pin-project-1.0.12 \ pin-project-internal-1.0.12 \ pin-project-lite-0.2.9 \ @@ -133,7 +134,7 @@ CARGO_CRATES= anyhow-1.0.62 \ quote-1.0.21 \ rand-0.8.5 \ rand_chacha-0.3.1 \ - rand_core-0.6.3 \ + rand_core-0.6.4 \ redox_syscall-0.2.16 \ regex-automata-0.1.10 \ remove_dir_all-0.5.3 \ @@ -156,38 +157,39 @@ CARGO_CRATES= anyhow-1.0.62 \ serde_json-1.0.85 \ serde_urlencoded-0.7.1 \ sha-1-0.9.8 \ - sha-1-0.10.0 \ + sha1-0.10.5 \ signal-hook-0.3.14 \ signal-hook-mio-0.2.3 \ signal-hook-registry-1.4.0 \ slab-0.4.7 \ smallvec-1.9.0 \ - socket2-0.4.6 \ + socket2-0.4.7 \ spin-0.5.2 \ spin-0.9.4 \ strsim-0.10.0 \ - syn-1.0.99 \ + syn-1.0.100 \ tempfile-3.3.0 \ termcolor-1.1.3 \ termtree-0.2.4 \ - textwrap-0.15.0 \ - thiserror-1.0.32 \ - thiserror-impl-1.0.32 \ + textwrap-0.15.1 \ + thiserror-1.0.35 \ + thiserror-impl-1.0.35 \ tinyvec-1.6.0 \ tinyvec_macros-0.1.0 \ - tokio-1.20.1 \ + tokio-1.21.1 \ tokio-macros-1.8.0 \ tokio-native-tls-0.3.0 \ tokio-rustls-0.23.4 \ - tokio-stream-0.1.9 \ + tokio-stream-0.1.10 \ tokio-tungstenite-0.15.0 \ tokio-util-0.6.10 \ - tokio-util-0.7.3 \ + tokio-util-0.7.4 \ tower-service-0.3.2 \ tracing-0.1.36 \ + tracing-attributes-0.1.22 \ tracing-core-0.1.29 \ - trust-dns-proto-0.21.2 \ - trust-dns-resolver-0.21.2 \ + trust-dns-proto-0.22.0 \ + trust-dns-resolver-0.22.0 \ try-lock-0.2.3 \ tui-0.19.0 \ tungstenite-0.14.0 \ @@ -195,12 +197,12 @@ CARGO_CRATES= anyhow-1.0.62 \ typenum-1.15.0 \ unicase-2.6.0 \ unicode-bidi-0.3.8 \ - unicode-ident-1.0.3 \ - unicode-normalization-0.1.21 \ - unicode-segmentation-1.9.0 \ - unicode-width-0.1.9 \ + unicode-ident-1.0.4 \ + unicode-normalization-0.1.22 \ + unicode-segmentation-1.10.0 \ + unicode-width-0.1.10 \ untrusted-0.7.1 \ - url-2.2.2 \ + url-2.3.1 \ utf-8-0.7.6 \ utf8-width-0.1.6 \ vcpkg-0.2.15 \ @@ -209,12 +211,12 @@ CARGO_CRATES= anyhow-1.0.62 \ want-0.3.0 \ warp-0.3.2 \ wasi-0.11.0+wasi-snapshot-preview1 \ - wasm-bindgen-0.2.82 \ - wasm-bindgen-backend-0.2.82 \ - wasm-bindgen-macro-0.2.82 \ - wasm-bindgen-macro-support-0.2.82 \ - wasm-bindgen-shared-0.2.82 \ - web-sys-0.3.59 \ + wasm-bindgen-0.2.83 \ + wasm-bindgen-backend-0.2.83 \ + wasm-bindgen-macro-0.2.83 \ + wasm-bindgen-macro-support-0.2.83 \ + wasm-bindgen-shared-0.2.83 \ + web-sys-0.3.60 \ webpki-0.22.0 \ widestring-0.5.1 \ winapi-0.3.9 \ diff --git a/net/oha/distinfo b/net/oha/distinfo index 0145544f4d6..5fc9800389e 100644 --- a/net/oha/distinfo +++ b/net/oha/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1663181700 -SHA256 (rust/crates/anyhow-1.0.62.crate) = 1485d4d2cc45e7b201ee3767015c96faa5904387c9d87c6efdd0fb511f12d305 -SIZE (rust/crates/anyhow-1.0.62.crate) = 43198 +TIMESTAMP = 1665006375 +SHA256 (rust/crates/anyhow-1.0.65.crate) = 98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602 +SIZE (rust/crates/anyhow-1.0.65.crate) = 43585 SHA256 (rust/crates/assert_cmd-2.0.4.crate) = 93ae1ddd39efd67689deb1979d80bad3bf7f2b09c6e6117c8d1f2443b5e2f83e SIZE (rust/crates/assert_cmd-2.0.4.crate) = 22581 SHA256 (rust/crates/async-trait-0.1.57.crate) = 76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f @@ -17,8 +17,8 @@ SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c9 SIZE (rust/crates/bitflags-1.3.2.crate) = 23021 SHA256 (rust/crates/block-buffer-0.9.0.crate) = 4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4 SIZE (rust/crates/block-buffer-0.9.0.crate) = 7108 -SHA256 (rust/crates/block-buffer-0.10.2.crate) = 0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324 -SIZE (rust/crates/block-buffer-0.10.2.crate) = 10258 +SHA256 (rust/crates/block-buffer-0.10.3.crate) = 69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e +SIZE (rust/crates/block-buffer-0.10.3.crate) = 10465 SHA256 (rust/crates/bstr-0.2.17.crate) = ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223 SIZE (rust/crates/bstr-0.2.17.crate) = 330350 SHA256 (rust/crates/buf_redux-0.8.4.crate) = b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f @@ -37,18 +37,18 @@ SHA256 (rust/crates/cc-1.0.73.crate) = 2fff2a6927b3bb87f9595d67196a70493f627687a SIZE (rust/crates/cc-1.0.73.crate) = 57880 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934 -SHA256 (rust/crates/clap-3.2.17.crate) = 29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b -SIZE (rust/crates/clap-3.2.17.crate) = 213699 -SHA256 (rust/crates/clap_derive-3.2.17.crate) = 13547f7012c01ab4a0e8f8967730ada8f9fdf419e8b6c792788f39cf4e46eefa -SIZE (rust/crates/clap_derive-3.2.17.crate) = 28217 +SHA256 (rust/crates/clap-3.2.22.crate) = 86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750 +SIZE (rust/crates/clap-3.2.22.crate) = 219438 +SHA256 (rust/crates/clap_derive-3.2.18.crate) = ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65 +SIZE (rust/crates/clap_derive-3.2.18.crate) = 28208 SHA256 (rust/crates/clap_lex-0.2.4.crate) = 2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5 SIZE (rust/crates/clap_lex-0.2.4.crate) = 9652 SHA256 (rust/crates/core-foundation-0.9.3.crate) = 194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146 SIZE (rust/crates/core-foundation-0.9.3.crate) = 27059 SHA256 (rust/crates/core-foundation-sys-0.8.3.crate) = 5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc SIZE (rust/crates/core-foundation-sys-0.8.3.crate) = 17519 -SHA256 (rust/crates/cpufeatures-0.2.4.crate) = dc948ebb96241bb40ab73effeb80d9f93afaad49359d159a5e61be51619fe813 -SIZE (rust/crates/cpufeatures-0.2.4.crate) = 11014 +SHA256 (rust/crates/cpufeatures-0.2.5.crate) = 28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320 +SIZE (rust/crates/cpufeatures-0.2.5.crate) = 11251 SHA256 (rust/crates/crossterm-0.25.0.crate) = e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67 SIZE (rust/crates/crossterm-0.25.0.crate) = 116533 SHA256 (rust/crates/crossterm_winapi-0.9.0.crate) = 2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c @@ -61,16 +61,16 @@ SHA256 (rust/crates/difflib-0.4.0.crate) = 6184e33543162437515c2e2b48714794e3784 SIZE (rust/crates/difflib-0.4.0.crate) = 7638 SHA256 (rust/crates/digest-0.9.0.crate) = d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066 SIZE (rust/crates/digest-0.9.0.crate) = 13247 -SHA256 (rust/crates/digest-0.10.3.crate) = f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506 -SIZE (rust/crates/digest-0.10.3.crate) = 18990 +SHA256 (rust/crates/digest-0.10.5.crate) = adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c +SIZE (rust/crates/digest-0.10.5.crate) = 19503 SHA256 (rust/crates/doc-comment-0.3.3.crate) = fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10 SIZE (rust/crates/doc-comment-0.3.3.crate) = 4123 SHA256 (rust/crates/easy-cast-0.4.4.crate) = 4bd102ee8c418348759919b83b81cdbdc933ffe29740b903df448b4bafaa348e SIZE (rust/crates/easy-cast-0.4.4.crate) = 11814 SHA256 (rust/crates/either-1.8.0.crate) = 90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797 SIZE (rust/crates/either-1.8.0.crate) = 15992 -SHA256 (rust/crates/enum-as-inner-0.4.0.crate) = 21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73 -SIZE (rust/crates/enum-as-inner-0.4.0.crate) = 11482 +SHA256 (rust/crates/enum-as-inner-0.5.1.crate) = c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116 +SIZE (rust/crates/enum-as-inner-0.5.1.crate) = 11707 SHA256 (rust/crates/fastrand-1.8.0.crate) = a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499 SIZE (rust/crates/fastrand-1.8.0.crate) = 11369 SHA256 (rust/crates/float-ord-0.3.2.crate) = 8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d @@ -83,26 +83,26 @@ SHA256 (rust/crates/foreign-types-0.3.2.crate) = f6f339eb8adc052cd2ca78910fda869 SIZE (rust/crates/foreign-types-0.3.2.crate) = 7504 SHA256 (rust/crates/foreign-types-shared-0.1.1.crate) = 00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b SIZE (rust/crates/foreign-types-shared-0.1.1.crate) = 5672 -SHA256 (rust/crates/form_urlencoded-1.0.1.crate) = 5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191 -SIZE (rust/crates/form_urlencoded-1.0.1.crate) = 8773 -SHA256 (rust/crates/futures-0.3.23.crate) = ab30e97ab6aacfe635fad58f22c2bb06c8b685f7421eb1e064a729e2a5f481fa -SIZE (rust/crates/futures-0.3.23.crate) = 51097 -SHA256 (rust/crates/futures-channel-0.3.23.crate) = 2bfc52cbddcfd745bf1740338492bb0bd83d76c67b445f91c5fb29fae29ecaa1 -SIZE (rust/crates/futures-channel-0.3.23.crate) = 31951 -SHA256 (rust/crates/futures-core-0.3.23.crate) = d2acedae88d38235936c3922476b10fced7b2b68136f5e3c03c2d5be348a1115 -SIZE (rust/crates/futures-core-0.3.23.crate) = 14605 -SHA256 (rust/crates/futures-executor-0.3.23.crate) = 1d11aa21b5b587a64682c0094c2bdd4df0076c5324961a40cc3abd7f37930528 -SIZE (rust/crates/futures-executor-0.3.23.crate) = 17744 -SHA256 (rust/crates/futures-io-0.3.23.crate) = 93a66fc6d035a26a3ae255a6d2bca35eda63ae4c5512bef54449113f7a1228e5 -SIZE (rust/crates/futures-io-0.3.23.crate) = 8906 -SHA256 (rust/crates/futures-macro-0.3.23.crate) = 0db9cce532b0eae2ccf2766ab246f114b56b9cf6d445e00c2549fbc100ca045d -SIZE (rust/crates/futures-macro-0.3.23.crate) = 11250 -SHA256 (rust/crates/futures-sink-0.3.23.crate) = ca0bae1fe9752cf7fd9b0064c674ae63f97b37bc714d745cbde0afb7ec4e6765 -SIZE (rust/crates/futures-sink-0.3.23.crate) = 7850 -SHA256 (rust/crates/futures-task-0.3.23.crate) = 842fc63b931f4056a24d59de13fb1272134ce261816e063e634ad0c15cdc5306 -SIZE (rust/crates/futures-task-0.3.23.crate) = 11825 -SHA256 (rust/crates/futures-util-0.3.23.crate) = f0828a5471e340229c11c77ca80017937ce3c58cb788a17e5f1c2d5c485a9577 -SIZE (rust/crates/futures-util-0.3.23.crate) = 155793 +SHA256 (rust/crates/form_urlencoded-1.1.0.crate) = a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8 +SIZE (rust/crates/form_urlencoded-1.1.0.crate) = 8734 +SHA256 (rust/crates/futures-0.3.24.crate) = 7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c +SIZE (rust/crates/futures-0.3.24.crate) = 51399 +SHA256 (rust/crates/futures-channel-0.3.24.crate) = 30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050 +SIZE (rust/crates/futures-channel-0.3.24.crate) = 31963 +SHA256 (rust/crates/futures-core-0.3.24.crate) = 4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf +SIZE (rust/crates/futures-core-0.3.24.crate) = 14618 +SHA256 (rust/crates/futures-executor-0.3.24.crate) = 9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab +SIZE (rust/crates/futures-executor-0.3.24.crate) = 17745 +SHA256 (rust/crates/futures-io-0.3.24.crate) = bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68 +SIZE (rust/crates/futures-io-0.3.24.crate) = 8910 +SHA256 (rust/crates/futures-macro-0.3.24.crate) = 42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17 +SIZE (rust/crates/futures-macro-0.3.24.crate) = 11252 +SHA256 (rust/crates/futures-sink-0.3.24.crate) = 21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56 +SIZE (rust/crates/futures-sink-0.3.24.crate) = 7854 +SHA256 (rust/crates/futures-task-0.3.24.crate) = a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1 +SIZE (rust/crates/futures-task-0.3.24.crate) = 11836 +SHA256 (rust/crates/futures-util-0.3.24.crate) = 44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90 +SIZE (rust/crates/futures-util-0.3.24.crate) = 155823 SHA256 (rust/crates/generic-array-0.14.6.crate) = bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9 SIZE (rust/crates/generic-array-0.14.6.crate) = 15889 SHA256 (rust/crates/get-port-4.0.0.crate) = 888123007db34fbff15b5a347d46364dfbad531d6cb43de52cc0b62558f570e2 @@ -113,8 +113,8 @@ SHA256 (rust/crates/h2-0.3.14.crate) = 5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44 SIZE (rust/crates/h2-0.3.14.crate) = 162022 SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888 SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968 -SHA256 (rust/crates/headers-0.3.7.crate) = 4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d -SIZE (rust/crates/headers-0.3.7.crate) = 67907 +SHA256 (rust/crates/headers-0.3.8.crate) = f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584 +SIZE (rust/crates/headers-0.3.8.crate) = 67904 SHA256 (rust/crates/headers-core-0.2.0.crate) = e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429 SIZE (rust/crates/headers-core-0.2.0.crate) = 2380 SHA256 (rust/crates/heck-0.4.0.crate) = 2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9 @@ -127,8 +127,8 @@ SHA256 (rust/crates/http-0.2.8.crate) = 75f43d41e26995c17e71ee126451dd3941010b05 SIZE (rust/crates/http-0.2.8.crate) = 105591 SHA256 (rust/crates/http-body-0.4.5.crate) = d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1 SIZE (rust/crates/http-body-0.4.5.crate) = 9242 -SHA256 (rust/crates/httparse-1.7.1.crate) = 496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c -SIZE (rust/crates/httparse-1.7.1.crate) = 29379 +SHA256 (rust/crates/httparse-1.8.0.crate) = d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904 +SIZE (rust/crates/httparse-1.8.0.crate) = 29954 SHA256 (rust/crates/httpdate-1.0.2.crate) = c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421 SIZE (rust/crates/httpdate-1.0.2.crate) = 10673 SHA256 (rust/crates/humantime-2.1.0.crate) = 9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4 @@ -137,6 +137,8 @@ SHA256 (rust/crates/hyper-0.14.20.crate) = 02c929dc5c39e335a03c40529272811886072 SIZE (rust/crates/hyper-0.14.20.crate) = 183885 SHA256 (rust/crates/idna-0.2.3.crate) = 418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8 SIZE (rust/crates/idna-0.2.3.crate) = 271023 +SHA256 (rust/crates/idna-0.3.0.crate) = e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6 +SIZE (rust/crates/idna-0.3.0.crate) = 271128 SHA256 (rust/crates/indexmap-1.9.1.crate) = 10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e SIZE (rust/crates/indexmap-1.9.1.crate) = 54114 SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c @@ -145,12 +147,12 @@ SHA256 (rust/crates/ipconfig-0.3.0.crate) = 723519edce41262b05d4143ceb95050e4c61 SIZE (rust/crates/ipconfig-0.3.0.crate) = 23808 SHA256 (rust/crates/ipnet-2.5.0.crate) = 879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b SIZE (rust/crates/ipnet-2.5.0.crate) = 25808 -SHA256 (rust/crates/itertools-0.10.3.crate) = a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3 -SIZE (rust/crates/itertools-0.10.3.crate) = 118661 +SHA256 (rust/crates/itertools-0.10.4.crate) = d8bf247779e67a9082a4790b45e71ac7cfd1321331a5c856a74a9faebdab78d0 +SIZE (rust/crates/itertools-0.10.4.crate) = 120812 SHA256 (rust/crates/itoa-1.0.3.crate) = 6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754 SIZE (rust/crates/itoa-1.0.3.crate) = 10481 -SHA256 (rust/crates/js-sys-0.3.59.crate) = 258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2 -SIZE (rust/crates/js-sys-0.3.59.crate) = 78849 +SHA256 (rust/crates/js-sys-0.3.60.crate) = 49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47 +SIZE (rust/crates/js-sys-0.3.60.crate) = 79257 SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443 SHA256 (rust/crates/libc-0.2.132.crate) = 8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5 @@ -159,8 +161,8 @@ SHA256 (rust/crates/libm-0.2.5.crate) = 292a948cd991e376cf75541fe5b97a1081d713c6 SIZE (rust/crates/libm-0.2.5.crate) = 113322 SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f SIZE (rust/crates/linked-hash-map-0.5.6.crate) = 15049 -SHA256 (rust/crates/lock_api-0.4.7.crate) = 327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53 -SIZE (rust/crates/lock_api-0.4.7.crate) = 25371 +SHA256 (rust/crates/lock_api-0.4.8.crate) = 9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390 +SIZE (rust/crates/lock_api-0.4.8.crate) = 25677 SHA256 (rust/crates/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e SIZE (rust/crates/log-0.4.17.crate) = 38028 SHA256 (rust/crates/lru-cache-0.1.2.crate) = 31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c @@ -187,8 +189,8 @@ SHA256 (rust/crates/num-traits-0.2.15.crate) = 578ede34cf02f8924ab9447f50c28075b SIZE (rust/crates/num-traits-0.2.15.crate) = 49262 SHA256 (rust/crates/num_cpus-1.13.1.crate) = 19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1 SIZE (rust/crates/num_cpus-1.13.1.crate) = 14752 -SHA256 (rust/crates/once_cell-1.13.1.crate) = 074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e -SIZE (rust/crates/once_cell-1.13.1.crate) = 31335 +SHA256 (rust/crates/once_cell-1.14.0.crate) = 2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0 +SIZE (rust/crates/once_cell-1.14.0.crate) = 31614 SHA256 (rust/crates/opaque-debug-0.3.0.crate) = 624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5 SIZE (rust/crates/opaque-debug-0.3.0.crate) = 5767 SHA256 (rust/crates/openssl-0.10.41.crate) = 618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0 @@ -205,8 +207,8 @@ SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff49129 SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967 SHA256 (rust/crates/parking_lot_core-0.9.3.crate) = 09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929 SIZE (rust/crates/parking_lot_core-0.9.3.crate) = 32256 -SHA256 (rust/crates/percent-encoding-2.1.0.crate) = d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e -SIZE (rust/crates/percent-encoding-2.1.0.crate) = 9748 +SHA256 (rust/crates/percent-encoding-2.2.0.crate) = 478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e +SIZE (rust/crates/percent-encoding-2.2.0.crate) = 10075 SHA256 (rust/crates/pin-project-1.0.12.crate) = ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc SIZE (rust/crates/pin-project-1.0.12.crate) = 56972 SHA256 (rust/crates/pin-project-internal-1.0.12.crate) = 069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55 @@ -239,8 +241,8 @@ SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8 SIZE (rust/crates/rand-0.8.5.crate) = 87113 SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88 SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251 -SHA256 (rust/crates/rand_core-0.6.3.crate) = d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7 -SIZE (rust/crates/rand_core-0.6.3.crate) = 21938 +SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c +SIZE (rust/crates/rand_core-0.6.4.crate) = 22666 SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012 SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132 @@ -285,8 +287,8 @@ SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e SIZE (rust/crates/serde_urlencoded-0.7.1.crate) = 12822 SHA256 (rust/crates/sha-1-0.9.8.crate) = 99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6 SIZE (rust/crates/sha-1-0.9.8.crate) = 14029 -SHA256 (rust/crates/sha-1-0.10.0.crate) = 028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f -SIZE (rust/crates/sha-1-0.10.0.crate) = 12239 +SHA256 (rust/crates/sha1-0.10.5.crate) = f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3 +SIZE (rust/crates/sha1-0.10.5.crate) = 12146 SHA256 (rust/crates/signal-hook-0.3.14.crate) = a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d SIZE (rust/crates/signal-hook-0.3.14.crate) = 49446 SHA256 (rust/crates/signal-hook-mio-0.2.3.crate) = 29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af @@ -297,58 +299,60 @@ SHA256 (rust/crates/slab-0.4.7.crate) = 4614a76b2a8be0058caa9dbbaf66d988527d86d0 SIZE (rust/crates/slab-0.4.7.crate) = 16647 SHA256 (rust/crates/smallvec-1.9.0.crate) = 2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1 SIZE (rust/crates/smallvec-1.9.0.crate) = 28396 -SHA256 (rust/crates/socket2-0.4.6.crate) = 10c98bba371b9b22a71a9414e420f92ddeb2369239af08200816169d5e2dd7aa -SIZE (rust/crates/socket2-0.4.6.crate) = 44549 +SHA256 (rust/crates/socket2-0.4.7.crate) = 02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd +SIZE (rust/crates/socket2-0.4.7.crate) = 44619 SHA256 (rust/crates/spin-0.5.2.crate) = 6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d SIZE (rust/crates/spin-0.5.2.crate) = 12004 SHA256 (rust/crates/spin-0.9.4.crate) = 7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09 SIZE (rust/crates/spin-0.9.4.crate) = 30180 SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623 SIZE (rust/crates/strsim-0.10.0.crate) = 11355 -SHA256 (rust/crates/syn-1.0.99.crate) = 58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13 -SIZE (rust/crates/syn-1.0.99.crate) = 236084 +SHA256 (rust/crates/syn-1.0.100.crate) = 52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e +SIZE (rust/crates/syn-1.0.100.crate) = 236691 SHA256 (rust/crates/tempfile-3.3.0.crate) = 5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4 SIZE (rust/crates/tempfile-3.3.0.crate) = 27578 SHA256 (rust/crates/termcolor-1.1.3.crate) = bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755 SIZE (rust/crates/termcolor-1.1.3.crate) = 17242 SHA256 (rust/crates/termtree-0.2.4.crate) = 507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b SIZE (rust/crates/termtree-0.2.4.crate) = 4416 -SHA256 (rust/crates/textwrap-0.15.0.crate) = b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb -SIZE (rust/crates/textwrap-0.15.0.crate) = 52998 -SHA256 (rust/crates/thiserror-1.0.32.crate) = f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994 -SIZE (rust/crates/thiserror-1.0.32.crate) = 17241 -SHA256 (rust/crates/thiserror-impl-1.0.32.crate) = 12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21 -SIZE (rust/crates/thiserror-impl-1.0.32.crate) = 15347 +SHA256 (rust/crates/textwrap-0.15.1.crate) = 949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16 +SIZE (rust/crates/textwrap-0.15.1.crate) = 55940 +SHA256 (rust/crates/thiserror-1.0.35.crate) = c53f98874615aea268107765aa1ed8f6116782501d18e53d08b471733bea6c85 +SIZE (rust/crates/thiserror-1.0.35.crate) = 18451 +SHA256 (rust/crates/thiserror-impl-1.0.35.crate) = f8b463991b4eab2d801e724172285ec4195c650e8ec79b149e6c2a8e6dd3f783 +SIZE (rust/crates/thiserror-impl-1.0.35.crate) = 15433 SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50 SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991 SHA256 (rust/crates/tinyvec_macros-0.1.0.crate) = cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c SIZE (rust/crates/tinyvec_macros-0.1.0.crate) = 1817 -SHA256 (rust/crates/tokio-1.20.1.crate) = 7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581 -SIZE (rust/crates/tokio-1.20.1.crate) = 590375 +SHA256 (rust/crates/tokio-1.21.1.crate) = 0020c875007ad96677dcc890298f4b942882c5d4eb7cc8f439fc3bf813dc9c95 +SIZE (rust/crates/tokio-1.21.1.crate) = 605841 SHA256 (rust/crates/tokio-macros-1.8.0.crate) = 9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484 SIZE (rust/crates/tokio-macros-1.8.0.crate) = 9346 SHA256 (rust/crates/tokio-native-tls-0.3.0.crate) = f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b SIZE (rust/crates/tokio-native-tls-0.3.0.crate) = 20759 SHA256 (rust/crates/tokio-rustls-0.23.4.crate) = c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59 SIZE (rust/crates/tokio-rustls-0.23.4.crate) = 27024 -SHA256 (rust/crates/tokio-stream-0.1.9.crate) = df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9 -SIZE (rust/crates/tokio-stream-0.1.9.crate) = 31779 +SHA256 (rust/crates/tokio-stream-0.1.10.crate) = f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af +SIZE (rust/crates/tokio-stream-0.1.10.crate) = 33880 SHA256 (rust/crates/tokio-tungstenite-0.15.0.crate) = 511de3f85caf1c98983545490c3d09685fa8eb634e57eec22bb4db271f46cbd8 SIZE (rust/crates/tokio-tungstenite-0.15.0.crate) = 28347 SHA256 (rust/crates/tokio-util-0.6.10.crate) = 36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507 SIZE (rust/crates/tokio-util-0.6.10.crate) = 71140 -SHA256 (rust/crates/tokio-util-0.7.3.crate) = cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45 -SIZE (rust/crates/tokio-util-0.7.3.crate) = 90513 +SHA256 (rust/crates/tokio-util-0.7.4.crate) = 0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740 +SIZE (rust/crates/tokio-util-0.7.4.crate) = 93424 SHA256 (rust/crates/tower-service-0.3.2.crate) = b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52 SIZE (rust/crates/tower-service-0.3.2.crate) = 6847 SHA256 (rust/crates/tracing-0.1.36.crate) = 2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307 SIZE (rust/crates/tracing-0.1.36.crate) = 73238 +SHA256 (rust/crates/tracing-attributes-0.1.22.crate) = 11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2 +SIZE (rust/crates/tracing-attributes-0.1.22.crate) = 28199 SHA256 (rust/crates/tracing-core-0.1.29.crate) = 5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7 SIZE (rust/crates/tracing-core-0.1.29.crate) = 58969 -SHA256 (rust/crates/trust-dns-proto-0.21.2.crate) = 9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d -SIZE (rust/crates/trust-dns-proto-0.21.2.crate) = 291378 -SHA256 (rust/crates/trust-dns-resolver-0.21.2.crate) = e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558 -SIZE (rust/crates/trust-dns-resolver-0.21.2.crate) = 79382 +SHA256 (rust/crates/trust-dns-proto-0.22.0.crate) = 4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26 +SIZE (rust/crates/trust-dns-proto-0.22.0.crate) = 301568 +SHA256 (rust/crates/trust-dns-resolver-0.22.0.crate) = aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe +SIZE (rust/crates/trust-dns-resolver-0.22.0.crate) = 82505 SHA256 (rust/crates/try-lock-0.2.3.crate) = 59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642 SIZE (rust/crates/try-lock-0.2.3.crate) = 4158 SHA256 (rust/crates/tui-0.19.0.crate) = ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1 @@ -363,18 +367,18 @@ SHA256 (rust/crates/unicase-2.6.0.crate) = 50f37be617794602aabbeee0be4f259dc1778 SIZE (rust/crates/unicase-2.6.0.crate) = 23478 SHA256 (rust/crates/unicode-bidi-0.3.8.crate) = 099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992 SIZE (rust/crates/unicode-bidi-0.3.8.crate) = 36575 -SHA256 (rust/crates/unicode-ident-1.0.3.crate) = c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf -SIZE (rust/crates/unicode-ident-1.0.3.crate) = 35031 -SHA256 (rust/crates/unicode-normalization-0.1.21.crate) = 854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6 -SIZE (rust/crates/unicode-normalization-0.1.21.crate) = 121745 -SHA256 (rust/crates/unicode-segmentation-1.9.0.crate) = 7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99 -SIZE (rust/crates/unicode-segmentation-1.9.0.crate) = 93241 -SHA256 (rust/crates/unicode-width-0.1.9.crate) = 3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973 -SIZE (rust/crates/unicode-width-0.1.9.crate) = 16745 +SHA256 (rust/crates/unicode-ident-1.0.4.crate) = dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd +SIZE (rust/crates/unicode-ident-1.0.4.crate) = 35491 +SHA256 (rust/crates/unicode-normalization-0.1.22.crate) = 5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921 +SIZE (rust/crates/unicode-normalization-0.1.22.crate) = 122604 +SHA256 (rust/crates/unicode-segmentation-1.10.0.crate) = 0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a +SIZE (rust/crates/unicode-segmentation-1.10.0.crate) = 93893 +SHA256 (rust/crates/unicode-width-0.1.10.crate) = c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b +SIZE (rust/crates/unicode-width-0.1.10.crate) = 18968 SHA256 (rust/crates/untrusted-0.7.1.crate) = a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a SIZE (rust/crates/untrusted-0.7.1.crate) = 7924 -SHA256 (rust/crates/url-2.2.2.crate) = a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c -SIZE (rust/crates/url-2.2.2.crate) = 68555 +SHA256 (rust/crates/url-2.3.1.crate) = 0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643 +SIZE (rust/crates/url-2.3.1.crate) = 72777 SHA256 (rust/crates/utf-8-0.7.6.crate) = 09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9 SIZE (rust/crates/utf-8-0.7.6.crate) = 10422 SHA256 (rust/crates/utf8-width-0.1.6.crate) = 5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1 @@ -391,18 +395,18 @@ SHA256 (rust/crates/warp-0.3.2.crate) = 3cef4e1e9114a4b7f1ac799f16ce71c14de57785 SIZE (rust/crates/warp-0.3.2.crate) = 113933 SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423 SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131 -SHA256 (rust/crates/wasm-bindgen-0.2.82.crate) = fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d -SIZE (rust/crates/wasm-bindgen-0.2.82.crate) = 166376 -SHA256 (rust/crates/wasm-bindgen-backend-0.2.82.crate) = 662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f -SIZE (rust/crates/wasm-bindgen-backend-0.2.82.crate) = 25764 -SHA256 (rust/crates/wasm-bindgen-macro-0.2.82.crate) = b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602 -SIZE (rust/crates/wasm-bindgen-macro-0.2.82.crate) = 11808 -SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.82.crate) = 5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da -SIZE (rust/crates/wasm-bindgen-macro-support-0.2.82.crate) = 18529 -SHA256 (rust/crates/wasm-bindgen-shared-0.2.82.crate) = 6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a -SIZE (rust/crates/wasm-bindgen-shared-0.2.82.crate) = 7197 -SHA256 (rust/crates/web-sys-0.3.59.crate) = ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1 -SIZE (rust/crates/web-sys-0.3.59.crate) = 697461 +SHA256 (rust/crates/wasm-bindgen-0.2.83.crate) = eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268 +SIZE (rust/crates/wasm-bindgen-0.2.83.crate) = 169618 +SHA256 (rust/crates/wasm-bindgen-backend-0.2.83.crate) = 4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142 +SIZE (rust/crates/wasm-bindgen-backend-0.2.83.crate) = 25620 +SHA256 (rust/crates/wasm-bindgen-macro-0.2.83.crate) = 052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810 +SIZE (rust/crates/wasm-bindgen-macro-0.2.83.crate) = 12075 +SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.83.crate) = 07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c +SIZE (rust/crates/wasm-bindgen-macro-support-0.2.83.crate) = 18530 +SHA256 (rust/crates/wasm-bindgen-shared-0.2.83.crate) = 1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f +SIZE (rust/crates/wasm-bindgen-shared-0.2.83.crate) = 7194 +SHA256 (rust/crates/web-sys-0.3.60.crate) = bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f +SIZE (rust/crates/web-sys-0.3.60.crate) = 700485 SHA256 (rust/crates/webpki-0.22.0.crate) = f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd SIZE (rust/crates/webpki-0.22.0.crate) = 58663 SHA256 (rust/crates/widestring-0.5.1.crate) = 17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983 @@ -429,5 +433,5 @@ SHA256 (rust/crates/windows_x86_64_msvc-0.36.1.crate) = c811ca4a8c853ef420abd859 SIZE (rust/crates/windows_x86_64_msvc-0.36.1.crate) = 661999 SHA256 (rust/crates/winreg-0.7.0.crate) = 0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69 SIZE (rust/crates/winreg-0.7.0.crate) = 21225 -SHA256 (hatoo-oha-v0.5.4_GH0.tar.gz) = 96b4101bbfd65453d2bd44dea10d99b2553508fff9f5552673bf76c08d8c15f8 -SIZE (hatoo-oha-v0.5.4_GH0.tar.gz) = 1057353 +SHA256 (hatoo-oha-v0.5.5_GH0.tar.gz) = 8af14d4e14373e2c0c0b6473b53e51be1ec186259f5098d11a0241817cf139a8 +SIZE (hatoo-oha-v0.5.5_GH0.tar.gz) = 553880 diff --git a/net/ooni-mini/Makefile b/net/ooni-mini/Makefile index 6e0ca22142e..7a41e1de961 100644 --- a/net/ooni-mini/Makefile +++ b/net/ooni-mini/Makefile @@ -1,7 +1,7 @@ PORTNAME= ooni-mini DISTVERSIONPREFIX= v DISTVERSION= 0.23.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net www benchmarks MAINTAINER= egypcio@FreeBSD.org diff --git a/net/ooni-probe-cli/Makefile b/net/ooni-probe-cli/Makefile index 23fd31d96a5..f0e864cbc9e 100644 --- a/net/ooni-probe-cli/Makefile +++ b/net/ooni-probe-cli/Makefile @@ -1,7 +1,7 @@ PORTNAME= ooni-probe-cli DISTVERSIONPREFIX= v DISTVERSION= 3.15.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net www benchmarks MAINTAINER= egypcio@FreeBSD.org diff --git a/net/pecl-amqp/Makefile b/net/pecl-amqp/Makefile index ce53f3a707d..c475b5ae962 100644 --- a/net/pecl-amqp/Makefile +++ b/net/pecl-amqp/Makefile @@ -1,21 +1,17 @@ PORTNAME= amqp -PORTVERSION= 1.10.2 +PORTVERSION= 1.11.0 CATEGORIES= net pear MAINTAINER= jnlin@freebsd.cs.nctu.edu.tw COMMENT= PHP extension for AMQP API WWW= https://pecl.php.net/package/amqp -# Remove these once upgraded to 1.11.0 -DEPRECATED= Requires php 7.4 which is set to expire on 2022-11-29 -EXPIRATION_DATE=2022-11-28 - LICENSE= PHP301 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= librabbitmq.so:net/rabbitmq-c-devel USES= php:pecl localbase -IGNORE_WITH_PHP= 80 81 82 +IGNORE_WITH_PHP= 82 .include diff --git a/net/pecl-amqp/distinfo b/net/pecl-amqp/distinfo index a9ad98b3375..d26f97c051f 100644 --- a/net/pecl-amqp/distinfo +++ b/net/pecl-amqp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626719833 -SHA256 (PECL/amqp-1.10.2.tgz) = 0ebc61052eb12406dddf5eabfe8749a12d52c566816b8aab04fb9916d0c26ed2 -SIZE (PECL/amqp-1.10.2.tgz) = 107350 +TIMESTAMP = 1662885400 +SHA256 (PECL/amqp-1.11.0.tgz) = dc5212b4785f59955118a219bbfbcedb7aa6ab2a91e8038a0ad1898f331c2f08 +SIZE (PECL/amqp-1.11.0.tgz) = 108493 diff --git a/net/rclone/Makefile b/net/rclone/Makefile index 47ead81dcfb..c6b77992022 100644 --- a/net/rclone/Makefile +++ b/net/rclone/Makefile @@ -1,6 +1,7 @@ PORTNAME= rclone DISTVERSIONPREFIX= v DISTVERSION= 1.59.2 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= tremere@cainites.net diff --git a/net/rospo/Makefile b/net/rospo/Makefile index 3128d18eee1..4bee75573f4 100644 --- a/net/rospo/Makefile +++ b/net/rospo/Makefile @@ -1,7 +1,7 @@ PORTNAME= rospo DISTVERSIONPREFIX= v DISTVERSION= 0.10.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net net-vpn sysutils MASTER_SITES= https://github.com/ferama/rospo/releases/download/v${DISTVERSION}/ui-artifacts.tar.gz?dummy=/:artifacts DISTFILES= ${PORTNAME}-ui-artifacts-${DISTVERSION}.tar.gz:artifacts diff --git a/net/s5cmd/Makefile b/net/s5cmd/Makefile index d560d298737..2b0e3d41a53 100644 --- a/net/s5cmd/Makefile +++ b/net/s5cmd/Makefile @@ -1,7 +1,7 @@ PORTNAME= s5cmd DISTVERSIONPREFIX= v DISTVERSION= 2.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net MAINTAINER= ehaupt@FreeBSD.org diff --git a/net/seaweedfs/Makefile b/net/seaweedfs/Makefile index 5cd9c92641a..f19b166fe7a 100644 --- a/net/seaweedfs/Makefile +++ b/net/seaweedfs/Makefile @@ -1,6 +1,6 @@ PORTNAME= seaweedfs DISTVERSION= 3.20 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net sysutils MASTER_SITES= https://raw.githubusercontent.com/${PORTNAME}/${PORTNAME}/${DISTVERSIONFULL}/:gomod DISTFILES= go.mod:gomod diff --git a/net/slackcat/Makefile b/net/slackcat/Makefile index dfab49bba94..8dd8dd064ea 100644 --- a/net/slackcat/Makefile +++ b/net/slackcat/Makefile @@ -1,6 +1,6 @@ PORTNAME= slackcat DISTVERSION= 1.7.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod DISTFILES= go.mod:gomod diff --git a/net/storj/Makefile b/net/storj/Makefile index 1b7ac8c6ccd..a041226dee3 100644 --- a/net/storj/Makefile +++ b/net/storj/Makefile @@ -1,5 +1,6 @@ PORTNAME= storj PORTVERSION= 1.64.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= net diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile index 08615f23917..e4f29ff6d30 100644 --- a/net/syncthing/Makefile +++ b/net/syncthing/Makefile @@ -1,6 +1,6 @@ PORTNAME= syncthing PORTVERSION= 1.20.1 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONPREFIX= v CATEGORIES= net MASTER_SITES= https://github.com/syncthing/syncthing/releases/download/v${PORTVERSION}/ diff --git a/net/termshark/Makefile b/net/termshark/Makefile index 616dabe363d..fa72d956d56 100644 --- a/net/termshark/Makefile +++ b/net/termshark/Makefile @@ -1,7 +1,7 @@ PORTNAME= termshark PORTVERSION= 2.4.0 DISTVERSIONPREFIX=v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MAINTAINER= zi@FreeBSD.org diff --git a/net/traefik/Makefile b/net/traefik/Makefile index 4b03a8fb0c0..881bccc3414 100644 --- a/net/traefik/Makefile +++ b/net/traefik/Makefile @@ -1,5 +1,6 @@ PORTNAME= traefik PORTVERSION= 2.8.8 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= LOCAL/riggs/${PORTNAME} diff --git a/net/tunneller/Makefile b/net/tunneller/Makefile index 65e490e8b6e..806d843c2ba 100644 --- a/net/tunneller/Makefile +++ b/net/tunneller/Makefile @@ -1,7 +1,7 @@ PORTNAME= tunneller DISTVERSIONPREFIX= release- DISTVERSION= 0.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org diff --git a/net/wireproxy/Makefile b/net/wireproxy/Makefile index fbef73a6d22..ca3d36a9934 100644 --- a/net/wireproxy/Makefile +++ b/net/wireproxy/Makefile @@ -1,7 +1,7 @@ PORTNAME= wireproxy DISTVERSIONPREFIX= v DISTVERSION= 1.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MAINTAINER= lwhsu@FreeBSD.org diff --git a/net/yggdrasil/Makefile b/net/yggdrasil/Makefile index 3484d81e62d..6dbd4e17481 100644 --- a/net/yggdrasil/Makefile +++ b/net/yggdrasil/Makefile @@ -1,7 +1,7 @@ PORTNAME= yggdrasil DISTVERSIONPREFIX= v DISTVERSION= 0.4.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MAINTAINER= freebsd@neilalexander.dev diff --git a/ports-mgmt/caronade/Makefile b/ports-mgmt/caronade/Makefile index 50d7ca172a0..2fe0641005c 100644 --- a/ports-mgmt/caronade/Makefile +++ b/ports-mgmt/caronade/Makefile @@ -1,7 +1,7 @@ PORTNAME= caronade DISTVERSIONPREFIX=v DISTVERSION= 0.5.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= ports-mgmt MAINTAINER= decke@FreeBSD.org diff --git a/ports-mgmt/fallout/Makefile b/ports-mgmt/fallout/Makefile index 71ec1c14d48..78afaf13eab 100644 --- a/ports-mgmt/fallout/Makefile +++ b/ports-mgmt/fallout/Makefile @@ -1,7 +1,7 @@ PORTNAME= fallout DISTVERSIONPREFIX= v DISTVERSION= 1.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= ports-mgmt MAINTAINER= dmgk@FreeBSD.org diff --git a/ports-mgmt/modules2tuple/Makefile b/ports-mgmt/modules2tuple/Makefile index 201a588e1a7..3025f273b09 100644 --- a/ports-mgmt/modules2tuple/Makefile +++ b/ports-mgmt/modules2tuple/Makefile @@ -1,7 +1,7 @@ PORTNAME= modules2tuple DISTVERSIONPREFIX= v DISTVERSION= 2.2.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= ports-mgmt MAINTAINER= dmgk@FreeBSD.org diff --git a/ports-mgmt/portgrep/Makefile b/ports-mgmt/portgrep/Makefile index 258ecfc5c26..befab1c9c33 100644 --- a/ports-mgmt/portgrep/Makefile +++ b/ports-mgmt/portgrep/Makefile @@ -1,7 +1,7 @@ PORTNAME= portgrep DISTVERSIONPREFIX= v DISTVERSION= 1.3.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= ports-mgmt MAINTAINER= dmgk@FreeBSD.org diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile index ace458178f0..8ffc099fa92 100644 --- a/print/lilypond-devel/Makefile +++ b/print/lilypond-devel/Makefile @@ -1,6 +1,5 @@ PORTNAME= lilypond -DISTVERSION= 2.23.11 -PORTREVISION= 1 +DISTVERSION= 2.23.13 CATEGORIES= print audio MASTER_SITES= http://lilypond.org/download/source/v${DISTVERSION:R}/ PKGNAMESUFFIX= -devel diff --git a/print/lilypond-devel/distinfo b/print/lilypond-devel/distinfo index fa76907cb1a..a7b6bae6210 100644 --- a/print/lilypond-devel/distinfo +++ b/print/lilypond-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1658915776 -SHA256 (lilypond-2.23.11.tar.gz) = e158dcb99bd19a93e6899e36cf293dc583e5b1237a904b014917b7d0ffab690f -SIZE (lilypond-2.23.11.tar.gz) = 19271435 +TIMESTAMP = 1664622707 +SHA256 (lilypond-2.23.13.tar.gz) = 17a9d1ad0ec7d1b7501b742d6b65ef371c88007537a7b8cbc9d54573270ddf0a +SIZE (lilypond-2.23.13.tar.gz) = 19352865 diff --git a/print/lilypond-devel/files/patch-configure b/print/lilypond-devel/files/patch-configure deleted file mode 100644 index fd6b0e6af92..00000000000 --- a/print/lilypond-devel/files/patch-configure +++ /dev/null @@ -1,77 +0,0 @@ ---- configure.orig 2022-05-20 13:40:50 UTC -+++ configure -@@ -8770,71 +8770,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no" - if test $? -eq 0; then - if test -n "0.9.0" -o -n ""; then - -- r="`eval echo '$'"PKG_CONFIG"`" -- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking $r version" >&5 --printf %s "checking $r version... " >&6; } -- exe=` -- ## which doesn't work in ash, if /usr/bin/which isn't installed -- ## type -p doesn't work in ash -- ## command -v doesn't work in zsh -- ## command -v "$r" 2>&1 -- ## this test should work in ash, bash, pdksh (ksh), zsh -- type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}' --` -- ver=` -- ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -- ## -- ## ARG. -- ## Workaround for broken Debian gcc version string: -- ## gcc (GCC) 3.1.1 20020606 (Debian prerelease) -- ## -- ## -V: Workaround for python -+ $PKG_CONFIG --atleast-pkgconfig-version 0.9.0 - -- #dnl -- -- ## Assume and hunt for dotted version multiplet. -- ## use eval trickery, because we cannot use multi-level $() instead of `` -- ## for compatibility reasons. -- -- ## grab the first version number in --version output. -- eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | -- grep -E '(^| )[0-9][0-9]*\.[0-9]' | -- head -n 1 | -- tr ' ' '\n' | -- sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' | -- grep -E '(^| )[0-9][0-9]*\.[0-9]' | -- head -n 1\`\" -- -- if test -z "$_ver"; then -- ## If empty, try date [fontforge] -- eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \ -- | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ -- | head -n 1 \ -- | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" -- fi -- echo "$_ver" -- #dnl --` -- num=` -- echo "$ver" | awk -F. ' -- { -- if ($3) {three = $3} -- else {three = 0} -- } -- {printf "%.0f\n", $1*1000000 + $2*1000 + three}' --` -- min=` -- echo "0.9.0" | awk -F. ' -- { -- if ($3) {three = $3} -- else {three = 0} -- } -- {printf "%.0f\n", $1*1000000 + $2*1000 + three}' --` -- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ver" >&5 --printf "%s\n" "$ver" >&6; } -- if test "$num" -lt "$min"; then -- -+ if test ! $?; then -+ ver=`$PKG_CONFIG --version` - eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\" - - fi diff --git a/print/lilypond-devel/pkg-plist b/print/lilypond-devel/pkg-plist index 2715116fc68..0d463ade6a9 100644 --- a/print/lilypond-devel/pkg-plist +++ b/print/lilypond-devel/pkg-plist @@ -262,6 +262,7 @@ share/emacs/site-lisp/lilypond-words.el %%DATADIR%%/%%DISTVERSION%%/scm/lily/chord-name.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/clip-region.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/color.scm +%%DATADIR%%/%%DISTVERSION%%/scm/lily/curried-definitions.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/define-context-properties.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/define-event-classes.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/define-grob-interfaces.scm @@ -291,6 +292,7 @@ share/emacs/site-lisp/lilypond-words.el %%DATADIR%%/%%DISTVERSION%%/scm/lily/documentation-lib.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/file-cache.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/flag-styles.scm +%%DATADIR%%/%%DISTVERSION%%/scm/lily/font-encodings.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/font.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-cairo.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-ps.scm @@ -322,8 +324,6 @@ share/emacs/site-lisp/lilypond-words.el %%DATADIR%%/%%DISTVERSION%%/scm/lily/part-combiner.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/predefined-fretboards.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/ps-to-png.scm -%%DATADIR%%/%%DISTVERSION%%/scm/lily/safe-lily.scm -%%DATADIR%%/%%DISTVERSION%%/scm/lily/safe-utility-defs.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-engravers.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-performers.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/script.scm @@ -332,6 +332,7 @@ share/emacs/site-lisp/lilypond-words.el %%DATADIR%%/%%DISTVERSION%%/scm/lily/song.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/stencil.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/tablature.scm +%%DATADIR%%/%%DISTVERSION%%/scm/lily/text-replacements.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/time-signature-settings.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/time-signature.scm %%DATADIR%%/%%DISTVERSION%%/scm/lily/titling.scm diff --git a/science/agrum/Makefile b/science/agrum/Makefile index 8a8d6ecb976..efffc428089 100644 --- a/science/agrum/Makefile +++ b/science/agrum/Makefile @@ -1,5 +1,5 @@ PORTNAME= agrum -DISTVERSION= 1.2.0 +DISTVERSION= 1.3.1 CATEGORIES= science math MAINTAINER= yuri@FreeBSD.org @@ -9,7 +9,7 @@ WWW= https://agrum.gitlab.io/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cmake compiler:c++17-lang shebangfix # the 'act' executable uses 'python' and is broken, when act is broken CMakeLists.txt builds with default configuration which is fine +USES= cmake compiler:c++20-lang shebangfix # the 'act' executable uses 'python' and is broken, when act is broken CMakeLists.txt builds with default configuration which is fine USE_LDCONFIG= yes LLD_UNSAFE= yes @@ -17,7 +17,7 @@ LLD_UNSAFE= yes USE_GITLAB= yes GL_ACCOUNT= agrumery GL_PROJECT= aGrUM -GL_COMMIT= 8141e589aaca335b9582c2ca8bbd6594bc4b174b +GL_COMMIT= cd81e3c04da2cedf5c8d02c55dfeac87b9dc82b6 SHEBANG_FILES= act diff --git a/science/agrum/distinfo b/science/agrum/distinfo index 983b684d8e9..c159719ef88 100644 --- a/science/agrum/distinfo +++ b/science/agrum/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659066434 -SHA256 (agrumery-aGrUM-8141e589aaca335b9582c2ca8bbd6594bc4b174b_GL0.tar.gz) = 0181d5ae4e90805289afa0b54b751cd0488503b3623908e1048213d553015935 -SIZE (agrumery-aGrUM-8141e589aaca335b9582c2ca8bbd6594bc4b174b_GL0.tar.gz) = 21258413 +TIMESTAMP = 1665020233 +SHA256 (agrumery-aGrUM-cd81e3c04da2cedf5c8d02c55dfeac87b9dc82b6_GL0.tar.gz) = 93426920fa54cee5253064d0ecf782ca1aef24504ccdc8ee83d61bb72acc792f +SIZE (agrumery-aGrUM-cd81e3c04da2cedf5c8d02c55dfeac87b9dc82b6_GL0.tar.gz) = 21535479 diff --git a/science/agrum/pkg-plist b/science/agrum/pkg-plist index 4242291a369..655f064778a 100644 --- a/science/agrum/pkg-plist +++ b/science/agrum/pkg-plist @@ -610,6 +610,8 @@ include/agrum/tools/database/DBTranslator4IntegerVariable.h include/agrum/tools/database/DBTranslator4IntegerVariable_inl.h include/agrum/tools/database/DBTranslator4LabelizedVariable.h include/agrum/tools/database/DBTranslator4LabelizedVariable_inl.h +include/agrum/tools/database/DBTranslator4NumericalDiscreteVariable.h +include/agrum/tools/database/DBTranslator4NumericalDiscreteVariable_inl.h include/agrum/tools/database/DBTranslator4RangeVariable.h include/agrum/tools/database/DBTranslator4RangeVariable_inl.h include/agrum/tools/database/DBTranslatorSet.h @@ -891,6 +893,8 @@ include/agrum/tools/variables/integerVariable.h include/agrum/tools/variables/integerVariable_inl.h include/agrum/tools/variables/labelizedVariable.h include/agrum/tools/variables/labelizedVariable_inl.h +include/agrum/tools/variables/numericalDiscreteVariable.h +include/agrum/tools/variables/numericalDiscreteVariable_inl.h include/agrum/tools/variables/rangeVariable.h include/agrum/tools/variables/rangeVariable_inl.h include/agrum/tools/variables/variable.h diff --git a/science/cp2k-data/Makefile b/science/cp2k-data/Makefile index bf58146e420..dbcdcc56970 100644 --- a/science/cp2k-data/Makefile +++ b/science/cp2k-data/Makefile @@ -1,6 +1,6 @@ PORTNAME= cp2k-data DISTVERSIONPREFIX= v -DISTVERSION= 2022.1 +DISTVERSION= 2022.2 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org diff --git a/science/cp2k-data/distinfo b/science/cp2k-data/distinfo index d06e526e955..cbbbf8c949d 100644 --- a/science/cp2k-data/distinfo +++ b/science/cp2k-data/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1657413233 -SHA256 (cp2k-cp2k-v2022.1_GH0.tar.gz) = 10c0e31bc67bd4871c61047c5f990eb6dac44c6237c3a0b75047a99207021986 -SIZE (cp2k-cp2k-v2022.1_GH0.tar.gz) = 76905358 +TIMESTAMP = 1665004647 +SHA256 (cp2k-cp2k-v2022.2_GH0.tar.gz) = bad6662a62dba067004a78671e183cbf2a052df3cb06c670e9b2594bbea2e341 +SIZE (cp2k-cp2k-v2022.2_GH0.tar.gz) = 76914155 diff --git a/science/cp2k/Makefile b/science/cp2k/Makefile index f772fb390b7..50458ec12b8 100644 --- a/science/cp2k/Makefile +++ b/science/cp2k/Makefile @@ -1,6 +1,6 @@ PORTNAME= cp2k DISTVERSIONPREFIX= v -DISTVERSION= 2022.1 +DISTVERSION= 2022.2 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org diff --git a/science/cp2k/distinfo b/science/cp2k/distinfo index 0f6ba719536..9bcb6548928 100644 --- a/science/cp2k/distinfo +++ b/science/cp2k/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1657410607 -SHA256 (cp2k-cp2k-v2022.1_GH0.tar.gz) = 10c0e31bc67bd4871c61047c5f990eb6dac44c6237c3a0b75047a99207021986 -SIZE (cp2k-cp2k-v2022.1_GH0.tar.gz) = 76905358 +TIMESTAMP = 1664983664 +SHA256 (cp2k-cp2k-v2022.2_GH0.tar.gz) = bad6662a62dba067004a78671e183cbf2a052df3cb06c670e9b2594bbea2e341 +SIZE (cp2k-cp2k-v2022.2_GH0.tar.gz) = 76914155 SHA256 (cp2k-dbcsr-c134996_GH0.tar.gz) = bfaed28798ce3d0312d857d09a79911fd3db0b5c8ae0a02d0f210de129d53686 SIZE (cp2k-dbcsr-c134996_GH0.tar.gz) = 2681082 SHA256 (pseewald-fprettify-71781aa_GH0.tar.gz) = 4115e800c24cc66da569245bee97ea4db18833c8a63d97769c866d2384cbbfb5 diff --git a/science/csvtk/Makefile b/science/csvtk/Makefile index 8a9d295bfe6..2853553af35 100644 --- a/science/csvtk/Makefile +++ b/science/csvtk/Makefile @@ -1,7 +1,7 @@ PORTNAME= csvtk DISTVERSIONPREFIX= v DISTVERSION= 0.24.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= science MAINTAINER= jwb@FreeBSD.org diff --git a/science/molgif/Makefile b/science/molgif/Makefile index bf6ca55dae4..0177d6a488f 100644 --- a/science/molgif/Makefile +++ b/science/molgif/Makefile @@ -1,6 +1,6 @@ PORTNAME= molgif DISTVERSION= g20180108 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org diff --git a/science/phonopy/Makefile b/science/phonopy/Makefile index 3d7e6fdfdc3..33c7a9bbbab 100644 --- a/science/phonopy/Makefile +++ b/science/phonopy/Makefile @@ -1,11 +1,8 @@ PORTNAME= phonopy DISTVERSIONPREFIX= v -DISTVERSION= 2.16.2.20220930 +DISTVERSION= 2.16.3 CATEGORIES= science python -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ -PATCHFILES= ce8db957a0cb58a6f953b192056d03107eeecdaf.patch:-p1 # fixes armv7 build - MAINTAINER= yuri@FreeBSD.org COMMENT= Package for phonon calculations at harmonic and quasi-harmonic levels WWW= https://phonopy.github.io/phonopy/ @@ -17,7 +14,6 @@ USES= cmake USE_LDCONFIG= yes USE_GITHUB= yes -GH_TAGNAME= ${DISTVERSIONFULL:R} CMAKE_ON= PHONOPY BUILD_SHARED_LIBRARIES @@ -25,6 +21,6 @@ PLIST_FILES= include/phonopy.h \ lib/libphpy.a \ lib/libphpy.so \ lib/libphpy.so.1 \ - lib/libphpy.so.${DISTVERSION:R} + lib/libphpy.so.${DISTVERSION} .include diff --git a/science/phonopy/distinfo b/science/phonopy/distinfo index c3c1819c381..8a6452f1b05 100644 --- a/science/phonopy/distinfo +++ b/science/phonopy/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1664522374 -SHA256 (phonopy-phonopy-v2.16.2.20220930-v2.16.2_GH0.tar.gz) = 247e56731f3bf51868d0f655fc40921bc73292f38e83fb79f9d20a8325a8d317 -SIZE (phonopy-phonopy-v2.16.2.20220930-v2.16.2_GH0.tar.gz) = 6566737 -SHA256 (ce8db957a0cb58a6f953b192056d03107eeecdaf.patch) = 1c6243d19b5510e319842dc30735917c7ae062d97f8d917d0812e18974077be8 -SIZE (ce8db957a0cb58a6f953b192056d03107eeecdaf.patch) = 2178 +TIMESTAMP = 1665006154 +SHA256 (phonopy-phonopy-v2.16.3_GH0.tar.gz) = b6b46bb8488ea405b2047cabe81aa7a46301b06b417404de75b8fc731c252650 +SIZE (phonopy-phonopy-v2.16.3_GH0.tar.gz) = 6567775 diff --git a/science/py-dwave-neal/Makefile b/science/py-dwave-neal/Makefile index 7390ee04d2d..2db58b0160e 100644 --- a/science/py-dwave-neal/Makefile +++ b/science/py-dwave-neal/Makefile @@ -1,5 +1,6 @@ PORTNAME= dwave-neal DISTVERSION= 0.6.0.dev0 +PORTREVISION= 1 CATEGORIES= science python # quantum-computing MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,10 +12,7 @@ WWW= https://github.com/dwavesystems/dwave-neal LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dimod>0:science/py-dimod@${PY_FLAVOR} \ - ${PYNUMPY} -BUILD_DEPENDS= ${PY_DEPENDS} -RUN_DEPENDS= ${PY_DEPENDS} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dwave-samplers>0:science/py-dwave-samplers@${PY_FLAVOR} USES= python:3.7+ USE_PYTHON= distutils autoplist unittest diff --git a/science/py-dwave-system/Makefile b/science/py-dwave-system/Makefile index b1b169f7108..119ffd7eb79 100644 --- a/science/py-dwave-system/Makefile +++ b/science/py-dwave-system/Makefile @@ -1,5 +1,5 @@ PORTNAME= dwave-system -DISTVERSION= 1.15.0 +DISTVERSION= 1.15.1 CATEGORIES= science python # quantum-computing PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -10,10 +10,10 @@ WWW= https://github.com/dwavesystems/dwave-system LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dimod>0:science/py-dimod@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dimod>=0.10.0:science/py-dimod@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dwave-cloud-client>=0.9.1,<0.11.0:science/py-dwave-cloud-client@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dwave-networkx>0:science/py-dwave-networkx@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dwave-preprocessing>0:science/py-dwave-preprocessing@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dwave-preprocessing>=0.3:science/py-dwave-preprocessing@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dwave-tabu>=0.4.2:science/py-dwave-tabu@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}homebase>=1.0.0,<2.0.0:devel/py-homebase@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}minorminer>=0.2.8,<0.3.0:math/py-minorminer@${PY_FLAVOR} \ diff --git a/science/py-dwave-system/distinfo b/science/py-dwave-system/distinfo index c463bdf9a47..1eb3f62887a 100644 --- a/science/py-dwave-system/distinfo +++ b/science/py-dwave-system/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660494303 -SHA256 (dwavesystems-dwave-system-1.15.0_GH0.tar.gz) = b5eec284a9231593e55dfe3e245fbafea80c926d5fb6d0c5ba2be1f3a84d36b5 -SIZE (dwavesystems-dwave-system-1.15.0_GH0.tar.gz) = 664932 +TIMESTAMP = 1664948001 +SHA256 (dwavesystems-dwave-system-1.15.1_GH0.tar.gz) = 346ad5ce0b3252ecc7e762b30a35beac583e9eb0ad113e068e238e22b047d812 +SIZE (dwavesystems-dwave-system-1.15.1_GH0.tar.gz) = 669254 diff --git a/science/py-phonopy/Makefile b/science/py-phonopy/Makefile index c99da180441..361d3f00eae 100644 --- a/science/py-phonopy/Makefile +++ b/science/py-phonopy/Makefile @@ -1,5 +1,5 @@ PORTNAME= phonopy -DISTVERSION= 2.16.2 +DISTVERSION= 2.16.3 CATEGORIES= science python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/science/py-phonopy/distinfo b/science/py-phonopy/distinfo index cd76b2d32db..36516576204 100644 --- a/science/py-phonopy/distinfo +++ b/science/py-phonopy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663744598 -SHA256 (phonopy-2.16.2.tar.gz) = b4e4e423bd4192a2a09d7e47af394f2d5a2148cb6b4a91ecf4fcdeb9640e562b -SIZE (phonopy-2.16.2.tar.gz) = 3682104 +TIMESTAMP = 1665006937 +SHA256 (phonopy-2.16.3.tar.gz) = c536d355156626f26e5d5fd158b03e10c4a13c461d6a02a26b05e3b6311b9d79 +SIZE (phonopy-2.16.3.tar.gz) = 3682157 diff --git a/science/py-pyqubo/Makefile b/science/py-pyqubo/Makefile index 19572e34f11..1289c91fcb3 100644 --- a/science/py-pyqubo/Makefile +++ b/science/py-pyqubo/Makefile @@ -1,5 +1,5 @@ PORTNAME= pyqubo -DISTVERSION= 1.2.0 +DISTVERSION= 1.3.0 CATEGORIES= science python # quantum-computing PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -10,14 +10,12 @@ WWW= https://pyqubo.readthedocs.io/en/latest/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}deprecated>=1.2.10:devel/py-deprecated@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}deprecated>=1.2.12:devel/py-deprecated@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dimod>=0.9.14:science/py-dimod@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dwave-neal>=0.5.7:science/py-dwave-neal@${PY_FLAVOR} \ ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}six>=1.15.0:devel/py-six@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}codecov>=2.1.9:devel/py-codecov@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}coverage>=4.5.1:devel/py-coverage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nbsphinx>=0.8.3:textproc/py-nbsphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build>=0.11.1:devel/py-scikit-build@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0.36.2:devel/py-wheel@${PY_FLAVOR} \ @@ -28,6 +26,8 @@ BUILD_DEPENDS= ${PY_DEPENDS} \ pybind11>0:devel/pybind11 \ robin-hood-hashing>0:devel/robin-hood-hashing RUN_DEPENDS= ${PY_DEPENDS} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}codecov>=2.1.9:devel/py-codecov@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}coverage>=4.5.1:devel/py-coverage@${PY_FLAVOR} USES= eigen:3 python:3.8+ USE_PYTHON= distutils cython autoplist unittest diff --git a/science/py-pyqubo/distinfo b/science/py-pyqubo/distinfo index 575f89b6f16..e47d40cb96e 100644 --- a/science/py-pyqubo/distinfo +++ b/science/py-pyqubo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660514425 -SHA256 (recruit-communications-pyqubo-1.2.0_GH0.tar.gz) = a967dc7e4f94aa6d02b21badf5f5b3a95de0dbd435ce98435cc8078e14af73bc -SIZE (recruit-communications-pyqubo-1.2.0_GH0.tar.gz) = 207142 +TIMESTAMP = 1664941978 +SHA256 (recruit-communications-pyqubo-1.3.0_GH0.tar.gz) = c5f90e8f70cf870d1a52a34b8614320e22da2788376960ae4bb7e18c91eb9da7 +SIZE (recruit-communications-pyqubo-1.3.0_GH0.tar.gz) = 208717 diff --git a/security/2fa/Makefile b/security/2fa/Makefile index f1241d58664..a0b8292512d 100644 --- a/security/2fa/Makefile +++ b/security/2fa/Makefile @@ -1,7 +1,7 @@ PORTNAME= 2fa DISTVERSIONPREFIX= v DISTVERSION= 1.2.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= security MAINTAINER= dmgk@FreeBSD.org diff --git a/security/acmetool/Makefile b/security/acmetool/Makefile index 1437bac9751..4110d873a59 100644 --- a/security/acmetool/Makefile +++ b/security/acmetool/Makefile @@ -1,7 +1,7 @@ PORTNAME= acmetool DISTVERSIONPREFIX= v DISTVERSION= 0.2.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= security MAINTAINER= samm@FreeBSD.org diff --git a/security/age/Makefile b/security/age/Makefile index 5fd2f71095a..2048e2ae857 100644 --- a/security/age/Makefile +++ b/security/age/Makefile @@ -1,7 +1,7 @@ PORTNAME= age DISTVERSIONPREFIX= v DISTVERSION= 1.0.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= security MAINTAINER= dmgk@FreeBSD.org diff --git a/security/apg/Makefile b/security/apg/Makefile index 5506f74ccfb..cbf2afff388 100644 --- a/security/apg/Makefile +++ b/security/apg/Makefile @@ -1,7 +1,7 @@ PORTNAME= apg DISTVERSIONPREFIX= v DISTVERSION= 0.4.1 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= security sysutils diff --git a/security/assh/Makefile b/security/assh/Makefile index b52e3a0074f..63dcb5e185b 100644 --- a/security/assh/Makefile +++ b/security/assh/Makefile @@ -1,7 +1,7 @@ PORTNAME= assh DISTVERSIONPREFIX= v DISTVERSION= 2.12.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MAINTAINER= ashish@FreeBSD.org diff --git a/security/aws-iam-authenticator/Makefile b/security/aws-iam-authenticator/Makefile index b7856d47c65..d8581aba5f2 100644 --- a/security/aws-iam-authenticator/Makefile +++ b/security/aws-iam-authenticator/Makefile @@ -1,7 +1,7 @@ PORTNAME= aws-iam-authenticator PORTVERSION= 0.5.2 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MAINTAINER= danilo@FreeBSD.org diff --git a/security/aws-vault/Makefile b/security/aws-vault/Makefile index 92948f3867f..78c7692b013 100644 --- a/security/aws-vault/Makefile +++ b/security/aws-vault/Makefile @@ -1,7 +1,7 @@ PORTNAME= aws-vault DISTVERSIONPREFIX= v DISTVERSION= 6.6.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security MAINTAINER= dmgk@FreeBSD.org diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile index d5f2525e375..abf97bdaa09 100644 --- a/security/boringssl/Makefile +++ b/security/boringssl/Makefile @@ -1,5 +1,6 @@ PORTNAME= boringssl PORTVERSION= 0.0.0.0.2022.09.30.01 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= osa@FreeBSD.org diff --git a/security/certmgr/Makefile b/security/certmgr/Makefile index ac1b71dd926..4e0880d2342 100644 --- a/security/certmgr/Makefile +++ b/security/certmgr/Makefile @@ -1,7 +1,7 @@ PORTNAME= certmgr DISTVERSIONPREFIX= v DISTVERSION= 3.0.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security net MAINTAINER= fuz@fuz.su diff --git a/security/cfssl/Makefile b/security/cfssl/Makefile index b0c6a44856d..79f6980946d 100644 --- a/security/cfssl/Makefile +++ b/security/cfssl/Makefile @@ -1,7 +1,7 @@ PORTNAME= cfssl DISTVERSIONPREFIX= v DISTVERSION= 1.6.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MAINTAINER= yuri@FreeBSD.org diff --git a/security/cl-md5-sbcl/Makefile b/security/cl-md5-sbcl/Makefile index 2d072147969..6247c9429b2 100644 --- a/security/cl-md5-sbcl/Makefile +++ b/security/cl-md5-sbcl/Makefile @@ -1,6 +1,6 @@ PORTNAME= md5 PORTVERSION= 1.8.5 -PORTREVISION= 71 +PORTREVISION= 72 CATEGORIES= security lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/security/crlfuzz/Makefile b/security/crlfuzz/Makefile index a085bd9b080..3494b64d591 100644 --- a/security/crlfuzz/Makefile +++ b/security/crlfuzz/Makefile @@ -1,7 +1,7 @@ PORTNAME= crlfuzz PORTVERSION= 1.4.1 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MAINTAINER= 0xdutra@gmail.com diff --git a/security/ct-submit/Makefile b/security/ct-submit/Makefile index c617d47dbcc..ad67eb6fe05 100644 --- a/security/ct-submit/Makefile +++ b/security/ct-submit/Makefile @@ -1,6 +1,6 @@ PORTNAME= ct-submit PORTVERSION= 1.1.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= security www MAINTAINER= jim@ohlste.in diff --git a/security/ffuf/Makefile b/security/ffuf/Makefile index 21d80c80258..a9bd468e11c 100644 --- a/security/ffuf/Makefile +++ b/security/ffuf/Makefile @@ -1,7 +1,7 @@ PORTNAME= ffuf DISTVERSIONPREFIX=v DISTVERSION= 1.5.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security www MAINTAINER= 0xdutra@gmail.com diff --git a/security/git-credential-gopass/Makefile b/security/git-credential-gopass/Makefile index 826f83e45ee..3d5aa95a03d 100644 --- a/security/git-credential-gopass/Makefile +++ b/security/git-credential-gopass/Makefile @@ -1,5 +1,6 @@ PORTNAME= git-credential-gopass PORTVERSION= 1.14.9 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= security diff --git a/security/gitjacker/Makefile b/security/gitjacker/Makefile index bc998724f72..6d411ac2804 100644 --- a/security/gitjacker/Makefile +++ b/security/gitjacker/Makefile @@ -1,7 +1,7 @@ PORTNAME= gitjacker DISTVERSIONPREFIX= v DISTVERSION= 0.1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MAINTAINER= yuri@FreeBSD.org diff --git a/security/go-cve-dictionary/Makefile b/security/go-cve-dictionary/Makefile index a440620cf37..bf452d17920 100644 --- a/security/go-cve-dictionary/Makefile +++ b/security/go-cve-dictionary/Makefile @@ -1,7 +1,7 @@ PORTNAME= go-cve-dictionary DISTVERSIONPREFIX= v DISTVERSION= 0.5.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MAINTAINER= iscandr@gmail.com diff --git a/security/gokart/Makefile b/security/gokart/Makefile index 3d2b77021e5..5b77258b556 100644 --- a/security/gokart/Makefile +++ b/security/gokart/Makefile @@ -1,6 +1,7 @@ PORTNAME= gokart DISTVERSIONPREFIX= v DISTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= 0xdutra@gmail.com diff --git a/security/gopass/Makefile b/security/gopass/Makefile index 38f089aa24b..9a8da0b3d8c 100644 --- a/security/gopass/Makefile +++ b/security/gopass/Makefile @@ -1,6 +1,7 @@ PORTNAME= gopass DISTVERSIONPREFIX= v DISTVERSION= 1.14.9 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= eduardo@FreeBSD.org diff --git a/security/headscale/Makefile b/security/headscale/Makefile index 5546338550a..3b615d62427 100644 --- a/security/headscale/Makefile +++ b/security/headscale/Makefile @@ -1,6 +1,6 @@ PORTNAME= headscale PORTVERSION= 0.16.4 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= security diff --git a/security/hockeypuck/Makefile b/security/hockeypuck/Makefile index d1fe0674c35..8eccc6b4280 100644 --- a/security/hockeypuck/Makefile +++ b/security/hockeypuck/Makefile @@ -1,6 +1,6 @@ PORTNAME= hockeypuck DISTVERSION= g20180725 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MAINTAINER= ports@FreeBSD.org diff --git a/security/honeytrap/Makefile b/security/honeytrap/Makefile index 9d28db0bc91..059797bfa41 100644 --- a/security/honeytrap/Makefile +++ b/security/honeytrap/Makefile @@ -1,6 +1,6 @@ PORTNAME= honeytrap DISTVERSION= g20210510 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MAINTAINER= ezri.mudde@dutchsec.com diff --git a/security/horcrux/Makefile b/security/horcrux/Makefile index 7fd77e14d7d..031b7eeeca8 100644 --- a/security/horcrux/Makefile +++ b/security/horcrux/Makefile @@ -1,7 +1,7 @@ PORTNAME= horcrux DISTVERSIONPREFIX= v DISTVERSION= 0.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MAINTAINER= lcook@FreeBSD.org diff --git a/security/keybase/Makefile b/security/keybase/Makefile index bf6db8e0999..5cee27b1409 100644 --- a/security/keybase/Makefile +++ b/security/keybase/Makefile @@ -1,6 +1,6 @@ PORTNAME= keybase PORTVERSION= 5.8.1 -PORTREVISION= 3 +PORTREVISION= 4 DISTVERSIONPREFIX= v MASTER_SITES= https://github.com/keybase/client/releases/download/v${PORTVERSION}/ CATEGORIES= security diff --git a/security/kpmenu/Makefile b/security/kpmenu/Makefile index e6319dd25e0..8612317436a 100644 --- a/security/kpmenu/Makefile +++ b/security/kpmenu/Makefile @@ -1,7 +1,7 @@ PORTNAME= kpmenu DISTVERSIONPREFIX= v DISTVERSION= 1.4.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MAINTAINER= bapt@FreeBSD.org diff --git a/security/lego/Makefile b/security/lego/Makefile index 0009ddf0d9f..dbc06cf69b0 100644 --- a/security/lego/Makefile +++ b/security/lego/Makefile @@ -1,6 +1,7 @@ PORTNAME= lego DISTVERSIONPREFIX= v DISTVERSION= 4.9.0 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= matt@matthoran.com diff --git a/security/meek/Makefile b/security/meek/Makefile index b817649c835..4511f615a3c 100644 --- a/security/meek/Makefile +++ b/security/meek/Makefile @@ -1,7 +1,7 @@ PORTNAME= meek DISTVERSIONPREFIX=v DISTVERSION= 0.37.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security net MAINTAINER= egypcio@FreeBSD.org diff --git a/security/metasploit/Makefile b/security/metasploit/Makefile index 90fa5411af3..e4975921d62 100644 --- a/security/metasploit/Makefile +++ b/security/metasploit/Makefile @@ -1,6 +1,6 @@ PORTNAME= metasploit DISTVERSION= 6.1.24 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= security MAINTAINER= tanawts@gmail.com diff --git a/security/nebula/Makefile b/security/nebula/Makefile index e6126e2f482..a16d3665b62 100644 --- a/security/nebula/Makefile +++ b/security/nebula/Makefile @@ -1,6 +1,7 @@ PORTNAME= nebula DISTVERSIONPREFIX= v DISTVERSION= 1.6.1 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= ashish@FreeBSD.org diff --git a/security/obfs4proxy-tor/Makefile b/security/obfs4proxy-tor/Makefile index 5d06967c2e4..387e9a0fc57 100644 --- a/security/obfs4proxy-tor/Makefile +++ b/security/obfs4proxy-tor/Makefile @@ -1,6 +1,6 @@ PORTNAME= obfs4proxy DISTVERSION= 0.0.13 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security net PKGNAMESUFFIX= -tor DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/security/onionscan/Makefile b/security/onionscan/Makefile index 0d7ef803733..477aafeb7ce 100644 --- a/security/onionscan/Makefile +++ b/security/onionscan/Makefile @@ -1,7 +1,7 @@ PORTNAME= onionscan DISTVERSIONPREFIX= OnionScan- DISTVERSION= 0.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= security net MAINTAINER= egypcio@FreeBSD.org diff --git a/security/picocrypt/Makefile b/security/picocrypt/Makefile index b6ba97cb884..ab1b64b66eb 100644 --- a/security/picocrypt/Makefile +++ b/security/picocrypt/Makefile @@ -1,5 +1,6 @@ PORTNAME= picocrypt DISTVERSION= 1.30 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= eduardo@FreeBSD.org diff --git a/security/s2n-tls/Makefile b/security/s2n-tls/Makefile index ddda433d184..e9bffcbac27 100644 --- a/security/s2n-tls/Makefile +++ b/security/s2n-tls/Makefile @@ -1,6 +1,6 @@ PORTNAME= s2n-tls DISTVERSIONPREFIX= v -DISTVERSION= 1.3.23 +DISTVERSION= 1.3.24 PORTEPOCH= 1 CATEGORIES= security diff --git a/security/s2n-tls/distinfo b/security/s2n-tls/distinfo index f19fa270136..f38dc0f3536 100644 --- a/security/s2n-tls/distinfo +++ b/security/s2n-tls/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664298686 -SHA256 (aws-s2n-tls-v1.3.23_GH0.tar.gz) = 6cc65c621c31ecfcb472ea151f5bd1feba48ae837f8a5bd6fd54fb22d2a84638 -SIZE (aws-s2n-tls-v1.3.23_GH0.tar.gz) = 4467143 +TIMESTAMP = 1665082545 +SHA256 (aws-s2n-tls-v1.3.24_GH0.tar.gz) = df6d2642e7b491f56110527bd73686d94ed3b186ff78d24e525cc0c3dd0d6b4b +SIZE (aws-s2n-tls-v1.3.24_GH0.tar.gz) = 4476083 diff --git a/security/snort3/Makefile b/security/snort3/Makefile index f0a59fe53ad..eaf768fee91 100644 --- a/security/snort3/Makefile +++ b/security/snort3/Makefile @@ -1,5 +1,5 @@ PORTNAME= snort -DISTVERSION= 3.1.42.0 +DISTVERSION= 3.1.43.0 PORTEPOCH= 1 CATEGORIES= security PKGNAMESUFFIX= 3 diff --git a/security/snort3/distinfo b/security/snort3/distinfo index a455e4eeec7..596b34e5bae 100644 --- a/security/snort3/distinfo +++ b/security/snort3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664226138 -SHA256 (snort3-snort3-3.1.42.0_GH0.tar.gz) = a2121b12c6961f144af5296c515452c23f8e9d583b029c4b98bddc4223742bd3 -SIZE (snort3-snort3-3.1.42.0_GH0.tar.gz) = 3165626 +TIMESTAMP = 1665083829 +SHA256 (snort3-snort3-3.1.43.0_GH0.tar.gz) = 6273cdce0714c4743042e5d9ea649f1cca933662458efb9ebff8cf29d87af159 +SIZE (snort3-snort3-3.1.43.0_GH0.tar.gz) = 3167658 diff --git a/security/snort3/pkg-plist b/security/snort3/pkg-plist index 796a08225e0..fc87240616b 100644 --- a/security/snort3/pkg-plist +++ b/security/snort3/pkg-plist @@ -48,8 +48,8 @@ include/snort/flow/flow_data.h include/snort/flow/flow_key.h include/snort/flow/flow_stash.h include/snort/flow/ha.h -include/snort/flow/stash_item.h include/snort/flow/session.h +include/snort/flow/stash_item.h include/snort/framework/api_options.h include/snort/framework/base_api.h include/snort/framework/bits.h @@ -80,6 +80,8 @@ include/snort/hash/hash_key_operations.h include/snort/hash/hashes.h %%HYPERSCAN%%include/snort/helpers/hyper_scratch_allocator.h %%HYPERSCAN%%include/snort/helpers/hyper_search.h +include/snort/helpers/process.h +include/snort/helpers/sigsafe.h include/snort/hash/lru_cache_local.h include/snort/hash/lru_cache_shared.h include/snort/hash/xhash.h @@ -89,8 +91,6 @@ include/snort/helpers/boyer_moore_search.h include/snort/helpers/buffer_data.h include/snort/helpers/json_stream.h include/snort/helpers/literal_search.h -include/snort/helpers/process.h -include/snort/helpers/sigsafe.h include/snort/helpers/scratch_allocator.h include/snort/host_tracker/cache_allocator.h include/snort/host_tracker/cache_interface.h @@ -142,12 +142,6 @@ include/snort/service_inspectors/http_inspect/http_common.h include/snort/service_inspectors/http_inspect/http_field.h include/snort/service_inspectors/http_inspect/http_inspect_base.h include/snort/service_inspectors/http_inspect/http_stream_splitter_base.h -include/snort/service_inspectors/http2_inspect/http2_huffman_state_machine.h -include/snort/service_inspectors/http2_inspect/http2_varlen_int_decode.h -include/snort/service_inspectors/http2_inspect/http2_varlen_int_decode_impl.h -include/snort/service_inspectors/http2_inspect/http2_varlen_string_decode.h -include/snort/service_inspectors/http2_inspect/http2_varlen_string_decode_impl.h -include/snort/service_inspectors/http_inspect/http_test_manager.h include/snort/network_inspectors/packet_tracer/packet_tracer.h include/snort/network_inspectors/reputation/reputation_common.h include/snort/network_inspectors/rna/rna_cpe_os.h @@ -221,6 +215,12 @@ include/snort/pub_sub/smb_events.h include/snort/pub_sub/ssh_events.h include/snort/search_engines/search_common.h include/snort/search_engines/search_tool.h +include/snort/service_inspectors/http2_inspect/http2_huffman_state_machine.h +include/snort/service_inspectors/http2_inspect/http2_varlen_int_decode.h +include/snort/service_inspectors/http2_inspect/http2_varlen_int_decode_impl.h +include/snort/service_inspectors/http2_inspect/http2_varlen_string_decode.h +include/snort/service_inspectors/http2_inspect/http2_varlen_string_decode_impl.h +include/snort/service_inspectors/http_inspect/http_test_manager.h include/snort/service_inspectors/netflow/netflow_cache.h include/snort/service_inspectors/netflow/netflow_headers.h include/snort/service_inspectors/netflow/netflow_module.h @@ -254,10 +254,8 @@ include/snort/utils/memcap_allocator.h include/snort/utils/util_ber.h include/snort/utils/primed_allocator.h include/snort/utils/safec.h -include/snort/utils/segment_mem.h include/snort/utils/sflsq.h include/snort/utils/stats.h -%%TSC%%include/snort/time/tsc_clock.h include/snort/utils/util.h include/snort/utils/util_cstring.h include/snort/utils/util_unfold.h diff --git a/security/snowflake-tor/Makefile b/security/snowflake-tor/Makefile index cefc271ca08..c83954d021c 100644 --- a/security/snowflake-tor/Makefile +++ b/security/snowflake-tor/Makefile @@ -1,7 +1,7 @@ PORTNAME= snowflake DISTVERSIONPREFIX= v PORTVERSION= 2.3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security net PKGNAMESUFFIX= -tor diff --git a/security/sops/Makefile b/security/sops/Makefile index 66ba74d00b5..7a05a31030a 100644 --- a/security/sops/Makefile +++ b/security/sops/Makefile @@ -1,7 +1,7 @@ PORTNAME= sops DISTVERSIONPREFIX= v DISTVERSION= 3.7.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security editors MAINTAINER= dmgk@FreeBSD.org diff --git a/security/ssb/Makefile b/security/ssb/Makefile index 04f39969c7e..8603f99562f 100644 --- a/security/ssb/Makefile +++ b/security/ssb/Makefile @@ -1,7 +1,7 @@ PORTNAME= ssb DISTVERSIONPREFIX= v DISTVERSION= 0.1.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MAINTAINER= nc@FreeBSD.org diff --git a/security/ssh-vault/Makefile b/security/ssh-vault/Makefile index 8c064a3db61..13e00bfd576 100644 --- a/security/ssh-vault/Makefile +++ b/security/ssh-vault/Makefile @@ -1,6 +1,6 @@ PORTNAME= ssh-vault PORTVERSION= 0.12.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MAINTAINER= nbari@tequila.io diff --git a/security/ssllabs-scan/Makefile b/security/ssllabs-scan/Makefile index e9846b374a7..ff6a1c9293c 100644 --- a/security/ssllabs-scan/Makefile +++ b/security/ssllabs-scan/Makefile @@ -1,7 +1,7 @@ PORTNAME= ssllabs-scan DISTVERSIONPREFIX= v DISTVERSION= 1.5.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security net MAINTAINER= egypcio@FreeBSD.org diff --git a/security/stegify/Makefile b/security/stegify/Makefile index 4d30d51074c..6fdbe05257a 100644 --- a/security/stegify/Makefile +++ b/security/stegify/Makefile @@ -2,7 +2,7 @@ PORTNAME= stegify DISTVERSIONPREFIX= v DISTVERSION= 1.2-2 DISTVERSIONSUFFIX= -g62518ca -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security graphics MAINTAINER= yuri@FreeBSD.org diff --git a/security/step-certificates/Makefile b/security/step-certificates/Makefile index 8e205b9dd12..204738d2faf 100644 --- a/security/step-certificates/Makefile +++ b/security/step-certificates/Makefile @@ -1,7 +1,7 @@ PORTNAME= step-certificates DISTVERSIONPREFIX= v DISTVERSION= 0.22.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MAINTAINER= mw@wipp.bayern diff --git a/security/step-cli/Makefile b/security/step-cli/Makefile index 1c3121fe674..d37243df615 100644 --- a/security/step-cli/Makefile +++ b/security/step-cli/Makefile @@ -1,7 +1,7 @@ PORTNAME= step-cli DISTVERSIONPREFIX=v DISTVERSION= 0.22.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MAINTAINER= mw@wipp.bayern diff --git a/security/tailscale/Makefile b/security/tailscale/Makefile index 2f9a453a6be..638c6b220ca 100644 --- a/security/tailscale/Makefile +++ b/security/tailscale/Makefile @@ -1,5 +1,6 @@ PORTNAME= tailscale PORTVERSION= 1.30.2 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= security net-vpn diff --git a/security/teleport/Makefile b/security/teleport/Makefile index 5292c585539..6e3442557a4 100644 --- a/security/teleport/Makefile +++ b/security/teleport/Makefile @@ -1,7 +1,7 @@ PORTNAME= teleport DISTVERSIONPREFIX= v DISTVERSION= 4.3.9 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MAINTAINER= swills@FreeBSD.org diff --git a/security/totp-cli/Makefile b/security/totp-cli/Makefile index 1bd14e2fda2..26abaae2651 100644 --- a/security/totp-cli/Makefile +++ b/security/totp-cli/Makefile @@ -1,6 +1,6 @@ PORTNAME= totp-cli PORTVERSION= 1.2.1 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONPREFIX= v CATEGORIES= security diff --git a/security/trezord/Makefile b/security/trezord/Makefile index 176997af232..c265960396e 100644 --- a/security/trezord/Makefile +++ b/security/trezord/Makefile @@ -1,7 +1,7 @@ PORTNAME= trezord DISTVERSIONPREFIX= v -DISTVERSION= 2.0.31 -PORTREVISION= 5 +DISTVERSION= 2.0.32 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= ale@FreeBSD.org diff --git a/security/trezord/distinfo b/security/trezord/distinfo index e86101bb709..26e2b56ccca 100644 --- a/security/trezord/distinfo +++ b/security/trezord/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1618212279 -SHA256 (trezor-trezord-go-v2.0.31_GH0.tar.gz) = fd834a5bf04417cc50ed4a418d40de4c257cbc86edca01b07aa01a9cf818e60e -SIZE (trezor-trezord-go-v2.0.31_GH0.tar.gz) = 5468865 +TIMESTAMP = 1665040548 +SHA256 (trezor-trezord-go-v2.0.32_GH0.tar.gz) = 4738eba87fcae0e81ab89696eca45915a8f00aaf778f784b715523baad89e4a3 +SIZE (trezor-trezord-go-v2.0.32_GH0.tar.gz) = 645142 SHA256 (felixge-httpsnoop-v1.0.1_GH0.tar.gz) = 02f506689067855a2afcbea692a63f60bcb50a3994722650339c82027d1cbe3e SIZE (felixge-httpsnoop-v1.0.1_GH0.tar.gz) = 10725 SHA256 (gorilla-csrf-v1.7.0_GH0.tar.gz) = 8cbc7df34ba5266f78c81b5d1a86b822d4107533dd4c3fd9fe16cdee4d916db5 diff --git a/security/vouch-proxy/Makefile b/security/vouch-proxy/Makefile index 878dcbcb962..f4a3be64079 100644 --- a/security/vouch-proxy/Makefile +++ b/security/vouch-proxy/Makefile @@ -1,7 +1,7 @@ PORTNAME= vouch-proxy DISTVERSIONPREFIX=v DISTVERSION= 0.37.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MAINTAINER= decke@FreeBSD.org diff --git a/security/vuls/Makefile b/security/vuls/Makefile index 4501d8b5f9e..fa3c9e97e3f 100644 --- a/security/vuls/Makefile +++ b/security/vuls/Makefile @@ -1,7 +1,7 @@ PORTNAME= vuls DISTVERSIONPREFIX= v DISTVERSION= 0.13.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MAINTAINER= iscandr@gmail.com diff --git a/security/xray-core/Makefile b/security/xray-core/Makefile index a24b56fed25..eaf6fb0f2bd 100644 --- a/security/xray-core/Makefile +++ b/security/xray-core/Makefile @@ -1,7 +1,7 @@ PORTNAME= xray-core DISTVERSIONPREFIX= v DISTVERSION= 1.5.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security MAINTAINER= nc@FreeBSD.org diff --git a/security/yubikey-agent/Makefile b/security/yubikey-agent/Makefile index 667f373f6f3..827c57eb2fa 100644 --- a/security/yubikey-agent/Makefile +++ b/security/yubikey-agent/Makefile @@ -1,7 +1,7 @@ PORTNAME= yubikey-agent DISTVERSIONPREFIX= v DISTVERSION= 0.1.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security sysutils MAINTAINER= egypcio@FreeBSD.org diff --git a/shells/antibody/Makefile b/shells/antibody/Makefile index da417ac6073..32597e753c4 100644 --- a/shells/antibody/Makefile +++ b/shells/antibody/Makefile @@ -1,7 +1,7 @@ PORTNAME= antibody PORTVERSION= 6.1.1 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= shells MAINTAINER= ports@FreeBSD.org diff --git a/shells/elvish/Makefile b/shells/elvish/Makefile index 421258c4a0d..c07caf9307c 100644 --- a/shells/elvish/Makefile +++ b/shells/elvish/Makefile @@ -1,7 +1,7 @@ PORTNAME= elvish DISTVERSIONPREFIX= v DISTVERSION= 0.17.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= shells MAINTAINER= vendion@gmail.com diff --git a/shells/envy/Makefile b/shells/envy/Makefile index 75dcb4ba913..7674c66f1d7 100644 --- a/shells/envy/Makefile +++ b/shells/envy/Makefile @@ -1,7 +1,7 @@ PORTNAME= envy DISTVERSIONPREFIX=v DISTVERSION= 0.1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= shells MAINTAINER= krion@FreeBSD.org diff --git a/sysutils/3mux/Makefile b/sysutils/3mux/Makefile index c04af83a3df..ecbfa8be594 100644 --- a/sysutils/3mux/Makefile +++ b/sysutils/3mux/Makefile @@ -1,7 +1,7 @@ PORTNAME= 3mux DISTVERSIONPREFIX= v DISTVERSION= 1.1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils MAINTAINER= lcook@FreeBSD.org diff --git a/sysutils/amazon-ssm-agent/Makefile b/sysutils/amazon-ssm-agent/Makefile index e089b34a116..82fe0769434 100644 --- a/sysutils/amazon-ssm-agent/Makefile +++ b/sysutils/amazon-ssm-agent/Makefile @@ -1,6 +1,6 @@ PORTNAME= amazon-ssm-agent PORTVERSION= 2.3.1205.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= sysutils MAINTAINER= cperciva@FreeBSD.org diff --git a/sysutils/aptly/Makefile b/sysutils/aptly/Makefile index 9098ba4650f..e11a5697475 100644 --- a/sysutils/aptly/Makefile +++ b/sysutils/aptly/Makefile @@ -1,6 +1,6 @@ PORTNAME= aptly PORTVERSION= 1.5.0 -PORTREVISION= 3 +PORTREVISION= 4 DISTVERSIONPREFIX=v CATEGORIES= sysutils diff --git a/sysutils/beats6/Makefile b/sysutils/beats6/Makefile index 06782018dde..b86b67d3e32 100644 --- a/sysutils/beats6/Makefile +++ b/sysutils/beats6/Makefile @@ -1,7 +1,7 @@ PORTNAME= beats PORTVERSION= 6.8.16 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils PKGNAMESUFFIX= 6 diff --git a/sysutils/brename/Makefile b/sysutils/brename/Makefile index d961772717c..9111fdb28fb 100644 --- a/sysutils/brename/Makefile +++ b/sysutils/brename/Makefile @@ -1,7 +1,7 @@ PORTNAME= brename DISTVERSIONPREFIX= v DISTVERSION= 2.11.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org diff --git a/sysutils/cbsd-mq-api/Makefile b/sysutils/cbsd-mq-api/Makefile index af65ed08d5f..b233696ded9 100644 --- a/sysutils/cbsd-mq-api/Makefile +++ b/sysutils/cbsd-mq-api/Makefile @@ -1,6 +1,6 @@ PORTNAME= cbsd-mq-api PORTVERSION= 0.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= olevole@olevole.ru diff --git a/sysutils/cbsd-mq-router/Makefile b/sysutils/cbsd-mq-router/Makefile index 4c8bbb88f38..76f9c1c59af 100644 --- a/sysutils/cbsd-mq-router/Makefile +++ b/sysutils/cbsd-mq-router/Makefile @@ -1,6 +1,6 @@ PORTNAME= cbsd-mq-router PORTVERSION= 0.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= olevole@olevole.ru diff --git a/sysutils/chaoskube/Makefile b/sysutils/chaoskube/Makefile index 58f6d1025d8..d76580bdf18 100644 --- a/sysutils/chaoskube/Makefile +++ b/sysutils/chaoskube/Makefile @@ -1,6 +1,6 @@ PORTNAME= chaoskube PORTVERSION= 0.24.0 -PORTREVISION= 3 +PORTREVISION= 4 DISTVERSIONPREFIX= v CATEGORIES= sysutils diff --git a/sysutils/chezmoi/Makefile b/sysutils/chezmoi/Makefile index 8dd3b8a86ef..c4cb9a61296 100644 --- a/sysutils/chezmoi/Makefile +++ b/sysutils/chezmoi/Makefile @@ -1,6 +1,7 @@ PORTNAME= chezmoi DISTVERSIONPREFIX= v DISTVERSION= 2.24.0 +PORTREVISION= 1 CATEGORIES= sysutils EXTRACT_ONLY= ${_DISTFILES:N*.js} diff --git a/sysutils/choria/Makefile b/sysutils/choria/Makefile index 089bef94310..485d775affb 100644 --- a/sysutils/choria/Makefile +++ b/sysutils/choria/Makefile @@ -1,6 +1,6 @@ PORTNAME= choria PORTVERSION= 0.26.0 -PORTREVISION= 3 +PORTREVISION= 4 DISTVERSIONPREFIX=v CATEGORIES= sysutils diff --git a/sysutils/conan/Makefile b/sysutils/conan/Makefile index 88a299aaf38..37e7644591c 100644 --- a/sysutils/conan/Makefile +++ b/sysutils/conan/Makefile @@ -1,5 +1,5 @@ PORTNAME= conan -DISTVERSION= 1.52.0 +DISTVERSION= 1.53.0 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP @@ -18,7 +18,7 @@ PY_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}distro>=1.0.2:sysutils/py-distro@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fasteners>=0.14.1:devel/py-fasteners@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.16.0<0.19.0:devel/py-future@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.9:devel/py-Jinja2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}node-semver>=0.6.1:devel/py-node-semver@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}patch-ng>=1.17.4<1.18:devel/py-patch-ng@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pluginbase>=0.5:devel/py-pluginbase@${PY_FLAVOR} \ diff --git a/sysutils/conan/distinfo b/sysutils/conan/distinfo index baed48d8cb8..d054fb07509 100644 --- a/sysutils/conan/distinfo +++ b/sysutils/conan/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664512346 -SHA256 (conan-1.52.0.tar.gz) = 184761f16d00fde17615e60125d2f14fca692ffba7666cc7d6d834fc3858cf82 -SIZE (conan-1.52.0.tar.gz) = 770524 +TIMESTAMP = 1665019950 +SHA256 (conan-1.53.0.tar.gz) = b0775c4f7e11744165aa8f57db4d817ae6de6d4df7d86f4934a85280f83d953a +SIZE (conan-1.53.0.tar.gz) = 772341 diff --git a/sysutils/consul-alerts/Makefile b/sysutils/consul-alerts/Makefile index 5b1dd497a47..a02135d9c5b 100644 --- a/sysutils/consul-alerts/Makefile +++ b/sysutils/consul-alerts/Makefile @@ -1,7 +1,7 @@ PORTNAME= consul-alerts PORTVERSION= 0.6.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= jhixson@FreeBSD.org diff --git a/sysutils/consul-replicate/Makefile b/sysutils/consul-replicate/Makefile index af34d3c7f0a..770cd8be0ea 100644 --- a/sysutils/consul-replicate/Makefile +++ b/sysutils/consul-replicate/Makefile @@ -1,7 +1,7 @@ PORTNAME= consul-replicate PORTVERSION= 0.4.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= jhixson@FreeBSD.org diff --git a/sysutils/consul_exporter/Makefile b/sysutils/consul_exporter/Makefile index c5ad490be72..0f60a84c2e5 100644 --- a/sysutils/consul_exporter/Makefile +++ b/sysutils/consul_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= consul_exporter PORTVERSION= 0.3.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= t.tom@succont.de diff --git a/sysutils/container-diff/Makefile b/sysutils/container-diff/Makefile index 9acf8ba6595..ab69dc9a47b 100644 --- a/sysutils/container-diff/Makefile +++ b/sysutils/container-diff/Makefile @@ -1,7 +1,7 @@ PORTNAME= container-diff PORTVERSION= 0.17.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= sunpoet@FreeBSD.org diff --git a/sysutils/containerd/Makefile b/sysutils/containerd/Makefile index 32ee99e0bde..3731e702e9c 100644 --- a/sysutils/containerd/Makefile +++ b/sysutils/containerd/Makefile @@ -1,7 +1,7 @@ PORTNAME= containerd DISTVERSIONPREFIX=v DISTVERSION= 1.6.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= decke@FreeBSD.org diff --git a/sysutils/coreos-ct/Makefile b/sysutils/coreos-ct/Makefile index e43915958c5..396a75f9520 100644 --- a/sysutils/coreos-ct/Makefile +++ b/sysutils/coreos-ct/Makefile @@ -1,7 +1,7 @@ PORTNAME= coreos-ct PORTVERSION= 0.9.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= fabian.freyer@physik.tu-berlin.de diff --git a/sysutils/ctop/Makefile b/sysutils/ctop/Makefile index 9a397967b43..c125f64d48a 100644 --- a/sysutils/ctop/Makefile +++ b/sysutils/ctop/Makefile @@ -1,7 +1,7 @@ PORTNAME= ctop DISTVERSIONPREFIX= v DISTVERSION= 0.7.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MAINTAINER= dmgk@FreeBSD.org diff --git a/sysutils/datadog-agent/Makefile b/sysutils/datadog-agent/Makefile index 694bd4fc0db..93d7da1cce0 100644 --- a/sysutils/datadog-agent/Makefile +++ b/sysutils/datadog-agent/Makefile @@ -1,6 +1,6 @@ PORTNAME= datadog-agent DISTVERSION= 7.24.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils net www MAINTAINER= uros@gruber.si diff --git a/sysutils/direnv/Makefile b/sysutils/direnv/Makefile index 57fffd95b67..03d491a247d 100644 --- a/sysutils/direnv/Makefile +++ b/sysutils/direnv/Makefile @@ -1,7 +1,7 @@ PORTNAME= direnv PORTVERSION= 2.27.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= swills@FreeBSD.org diff --git a/sysutils/docker-credential-pass/Makefile b/sysutils/docker-credential-pass/Makefile index 7f4d7eb63e6..85f6b4355d3 100644 --- a/sysutils/docker-credential-pass/Makefile +++ b/sysutils/docker-credential-pass/Makefile @@ -1,7 +1,7 @@ PORTNAME= docker-credential-pass DISTVERSIONPREFIX= v DISTVERSION= 0.6.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= dmgk@FreeBSD.org diff --git a/sysutils/docker-machine/Makefile b/sysutils/docker-machine/Makefile index 3748ef7bb35..0f7a81412b6 100644 --- a/sysutils/docker-machine/Makefile +++ b/sysutils/docker-machine/Makefile @@ -1,7 +1,7 @@ PORTNAME= docker-machine PORTVERSION= 0.16.2 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= ports@FreeBSD.org diff --git a/sysutils/docker-registry/Makefile b/sysutils/docker-registry/Makefile index 480b15ae2b0..4d3a44bcf33 100644 --- a/sysutils/docker-registry/Makefile +++ b/sysutils/docker-registry/Makefile @@ -1,7 +1,7 @@ PORTNAME= docker-registry PORTVERSION= 2.7.1 DISTVERSIONPREFIX=v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= freebsd@yapsoft.it diff --git a/sysutils/docker/Makefile b/sysutils/docker/Makefile index 5041083a0f9..cb8d4eb6f19 100644 --- a/sysutils/docker/Makefile +++ b/sysutils/docker/Makefile @@ -1,7 +1,7 @@ PORTNAME= docker PORTVERSION= 18.09.5 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= ports@FreeBSD.org diff --git a/sysutils/doctl/Makefile b/sysutils/doctl/Makefile index 29fe31e3041..3565363465d 100644 --- a/sysutils/doctl/Makefile +++ b/sysutils/doctl/Makefile @@ -1,6 +1,5 @@ PORTNAME= doctl -DISTVERSION= 1.79.0 -PORTREVISION= 1 +DISTVERSION= 1.82.2 CATEGORIES= sysutils MASTER_SITES= https://github.com/digitalocean/${PORTNAME}/releases/download/v${DISTVERSION}/ DISTNAME= ${PORTNAME}-${DISTVERSION}-source diff --git a/sysutils/doctl/distinfo b/sysutils/doctl/distinfo index 2cbe37da308..2d208a0ddb0 100644 --- a/sysutils/doctl/distinfo +++ b/sysutils/doctl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1661488736 -SHA256 (doctl-1.79.0-source.tar.gz) = d7bb22aa06b9bdefcbfc9e6c5435d46c8c1e6d8a468110bb1a0733181c8c5b1f -SIZE (doctl-1.79.0-source.tar.gz) = 5659241 +TIMESTAMP = 1665087245 +SHA256 (doctl-1.82.2-source.tar.gz) = 59b8bb4c54093ae601bc92da5483363ebc3577cd0f9f984d4e5393b32afffffd +SIZE (doctl-1.82.2-source.tar.gz) = 7347885 diff --git a/sysutils/duf/Makefile b/sysutils/duf/Makefile index cfdd0ce58f2..59368587b28 100644 --- a/sysutils/duf/Makefile +++ b/sysutils/duf/Makefile @@ -1,7 +1,7 @@ PORTNAME= duf DISTVERSIONPREFIX= v DISTVERSION= 0.8.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= lcook@FreeBSD.org diff --git a/sysutils/eksctl/Makefile b/sysutils/eksctl/Makefile index 08975de6430..c738759182a 100644 --- a/sysutils/eksctl/Makefile +++ b/sysutils/eksctl/Makefile @@ -1,6 +1,6 @@ PORTNAME= eksctl PORTVERSION= 0.94.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MASTER_SITES= LOCAL/danilo diff --git a/sysutils/envconsul/Makefile b/sysutils/envconsul/Makefile index d44a1e3bb86..d6b2255653e 100644 --- a/sysutils/envconsul/Makefile +++ b/sysutils/envconsul/Makefile @@ -1,7 +1,7 @@ PORTNAME= envconsul PORTVERSION= 0.11.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= swills@FreeBSD.org diff --git a/sysutils/epazote/Makefile b/sysutils/epazote/Makefile index 1ef4422d1d6..94a104700ea 100644 --- a/sysutils/epazote/Makefile +++ b/sysutils/epazote/Makefile @@ -1,6 +1,6 @@ PORTNAME= epazote PORTVERSION= 2.1.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= nbari@tequila.io diff --git a/sysutils/equinix-metal-cli/Makefile b/sysutils/equinix-metal-cli/Makefile index a4e7da1eac9..d160346dcc2 100644 --- a/sysutils/equinix-metal-cli/Makefile +++ b/sysutils/equinix-metal-cli/Makefile @@ -1,7 +1,7 @@ PORTNAME= equinix-metal-cli DISTVERSIONPREFIX= v DISTVERSION= 0.7.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MAINTAINER= dch@FreeBSD.org diff --git a/sysutils/f2/Makefile b/sysutils/f2/Makefile index fa4eb2557ef..f82f0380b12 100644 --- a/sysutils/f2/Makefile +++ b/sysutils/f2/Makefile @@ -1,7 +1,7 @@ PORTNAME= f2 DISTVERSIONPREFIX= v DISTVERSION= 1.8.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org diff --git a/sysutils/fusefs-webdavfs/Makefile b/sysutils/fusefs-webdavfs/Makefile index 7f42c77e1e7..6eb49d1794e 100644 --- a/sysutils/fusefs-webdavfs/Makefile +++ b/sysutils/fusefs-webdavfs/Makefile @@ -1,6 +1,6 @@ PORTNAME= fusefs-webdavfs DISTVERSION= g20200520 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils MAINTAINER= eugen@FreeBSD.org diff --git a/sysutils/fx/Makefile b/sysutils/fx/Makefile index babbfb94aec..0b2df3f54c8 100644 --- a/sysutils/fx/Makefile +++ b/sysutils/fx/Makefile @@ -1,6 +1,6 @@ PORTNAME= fx DISTVERSION= 24.0.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MAINTAINER= 0xdutra@gmail.com diff --git a/sysutils/gcp-ops-agent/Makefile b/sysutils/gcp-ops-agent/Makefile index f088ce8a991..07529091a11 100644 --- a/sysutils/gcp-ops-agent/Makefile +++ b/sysutils/gcp-ops-agent/Makefile @@ -1,5 +1,5 @@ PORTNAME= ops-agent -DISTVERSION= 2.20.0 +DISTVERSION= 2.22.0 CATEGORIES= sysutils PKGNAMEPREFIX= gcp- diff --git a/sysutils/gcp-ops-agent/distinfo b/sysutils/gcp-ops-agent/distinfo index 9c7573751c7..f99bc5cf118 100644 --- a/sysutils/gcp-ops-agent/distinfo +++ b/sysutils/gcp-ops-agent/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1663625292 -SHA256 (GoogleCloudPlatform-ops-agent-2.20.0_GH0.tar.gz) = c223e8707f11976fd2670d737480cad5674bb2d61a701ce2ffa555a7563bc348 -SIZE (GoogleCloudPlatform-ops-agent-2.20.0_GH0.tar.gz) = 873387 +TIMESTAMP = 1665093488 +SHA256 (GoogleCloudPlatform-ops-agent-2.22.0_GH0.tar.gz) = d46e2782b963a7211a732b59653417bd9d05d478e7cc4e58a37a736d1e9f408e +SIZE (GoogleCloudPlatform-ops-agent-2.22.0_GH0.tar.gz) = 886285 SHA256 (StackExchange-wmi-v1.2.1_GH0.tar.gz) = a90126aa4c4defa7455be9610e84b0606972eccfa4111c2ec97179691d240b5a SIZE (StackExchange-wmi-v1.2.1_GH0.tar.gz) = 12449 SHA256 (blang-semver-v3.5.1_GH0.tar.gz) = 3d9da53f4c2d3169bfa9b25f2f36f301a37556a47259c870881524c643c69c57 diff --git a/sysutils/gdu/Makefile b/sysutils/gdu/Makefile index 309e1ea22b1..a4c9a9f2d18 100644 --- a/sysutils/gdu/Makefile +++ b/sysutils/gdu/Makefile @@ -1,6 +1,7 @@ PORTNAME= gdu DISTVERSIONPREFIX= v DISTVERSION= 5.18.1 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= lcook@FreeBSD.org diff --git a/sysutils/glow/Makefile b/sysutils/glow/Makefile index 4542a935102..90309f4c83a 100644 --- a/sysutils/glow/Makefile +++ b/sysutils/glow/Makefile @@ -1,7 +1,7 @@ PORTNAME= glow DISTVERSIONPREFIX= v DISTVERSION= 1.4.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils MAINTAINER= lcook@FreeBSD.org diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 705b7dd297f..1003dce061d 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -1,5 +1,5 @@ PORTNAME= gnome-control-center -PORTVERSION= 42.3 +PORTVERSION= 43.0 CATEGORIES= sysutils gnome MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/} DIST_SUBDIR= gnome diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index 760f8829858..3e86516b694 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1658340077 -SHA256 (gnome/gnome-control-center-42.3.tar.xz) = ce0ae3650de2af7ebcb0a7e1fc9912eddb6eff8d257f3fe50ff8b29c19341c7e -SIZE (gnome/gnome-control-center-42.3.tar.xz) = 6242028 +TIMESTAMP = 1664984062 +SHA256 (gnome/gnome-control-center-43.0.tar.xz) = 988c933592cbdc4e7f0dba9a93262e617b739e25927aa16e177960c754e31c48 +SIZE (gnome/gnome-control-center-43.0.tar.xz) = 5693880 diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index 3f5851b0b7c..9f91da96ede 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -12,10 +12,10 @@ share/applications/gnome-datetime-panel.desktop share/applications/gnome-default-apps-panel.desktop share/applications/gnome-diagnostics-panel.desktop share/applications/gnome-display-panel.desktop +share/applications/gnome-firmware-security-panel.desktop share/applications/gnome-info-overview-panel.desktop share/applications/gnome-keyboard-panel.desktop share/applications/gnome-location-panel.desktop -share/applications/gnome-lock-panel.desktop share/applications/gnome-microphone-panel.desktop share/applications/gnome-mouse-panel.desktop share/applications/gnome-multitasking-panel.desktop @@ -25,6 +25,7 @@ share/applications/gnome-power-panel.desktop share/applications/gnome-printers-panel.desktop share/applications/gnome-region-panel.desktop share/applications/gnome-removable-media-panel.desktop +share/applications/gnome-screen-panel.desktop share/applications/gnome-search-panel.desktop share/applications/gnome-sharing-panel.desktop share/applications/gnome-sound-panel.desktop @@ -69,7 +70,7 @@ share/icons/hicolor/scalable/apps/org.gnome.Settings-power-symbolic.svg share/icons/hicolor/scalable/apps/org.gnome.Settings-printers-symbolic.svg share/icons/hicolor/scalable/apps/org.gnome.Settings-region-symbolic.svg share/icons/hicolor/scalable/apps/org.gnome.Settings-removable-media-symbolic.svg -share/icons/hicolor/scalable/apps/org.gnome.Settings-screen-lock-symbolic.svg +share/icons/hicolor/scalable/apps/org.gnome.Settings-screen-symbolic.svg share/icons/hicolor/scalable/apps/org.gnome.Settings-search-symbolic.svg share/icons/hicolor/scalable/apps/org.gnome.Settings-sharing-symbolic.svg share/icons/hicolor/scalable/apps/org.gnome.Settings-sound-symbolic.svg @@ -79,6 +80,7 @@ share/icons/hicolor/scalable/apps/org.gnome.Settings.Devel.svg share/icons/hicolor/scalable/apps/org.gnome.Settings.svg share/icons/hicolor/scalable/status/info-symbolic.svg share/icons/hicolor/symbolic/apps/org.gnome.Settings-symbolic.svg +share/locale/ab/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/af/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/am/LC_MESSAGES/gnome-control-center-2.0-timezones.mo share/locale/am/LC_MESSAGES/gnome-control-center-2.0.mo @@ -322,7 +324,7 @@ share/polkit-1/actions/org.gnome.controlcenter.datetime.policy share/polkit-1/actions/org.gnome.controlcenter.remote-login-helper.policy share/polkit-1/actions/org.gnome.controlcenter.user-accounts.policy share/polkit-1/rules.d/gnome-control-center.rules -share/sounds/gnome/default/alerts/bark.ogg -share/sounds/gnome/default/alerts/drip.ogg -share/sounds/gnome/default/alerts/glass.ogg -share/sounds/gnome/default/alerts/sonar.ogg +share/sounds/gnome/default/alerts/click.ogg +share/sounds/gnome/default/alerts/hum.ogg +share/sounds/gnome/default/alerts/string.ogg +share/sounds/gnome/default/alerts/swing.ogg diff --git a/sysutils/go-wtf/Makefile b/sysutils/go-wtf/Makefile index 178f051a73a..734daa2dfe2 100644 --- a/sysutils/go-wtf/Makefile +++ b/sysutils/go-wtf/Makefile @@ -1,7 +1,7 @@ PORTNAME= wtf PORTVERSION= 0.41.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils PKGNAMEPREFIX= go- diff --git a/sysutils/goawk/Makefile b/sysutils/goawk/Makefile index b6dc7b945cc..c70d6520083 100644 --- a/sysutils/goawk/Makefile +++ b/sysutils/goawk/Makefile @@ -1,7 +1,7 @@ PORTNAME= goawk DISTVERSIONPREFIX= v DISTVERSION= 1.20.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org diff --git a/sysutils/gomi/Makefile b/sysutils/gomi/Makefile index 6f79fe498b7..95b9146641f 100644 --- a/sysutils/gomi/Makefile +++ b/sysutils/gomi/Makefile @@ -1,6 +1,6 @@ PORTNAME= gomi PORTVERSION= 1.1.3 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONPREFIX= v CATEGORIES= sysutils diff --git a/sysutils/gomplate/Makefile b/sysutils/gomplate/Makefile index 0ca1dd223df..93c3d1ca242 100644 --- a/sysutils/gomplate/Makefile +++ b/sysutils/gomplate/Makefile @@ -1,6 +1,7 @@ PORTNAME= gomplate DISTVERSIONPREFIX= v DISTVERSION= 3.11.3 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= eduardo@FreeBSD.org diff --git a/sysutils/gotop/Makefile b/sysutils/gotop/Makefile index eb4365fb401..6b2d2df6581 100644 --- a/sysutils/gotop/Makefile +++ b/sysutils/gotop/Makefile @@ -1,7 +1,7 @@ PORTNAME= gotop DISTVERSIONPREFIX= v DISTVERSION= 4.1.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org diff --git a/sysutils/govmomi/Makefile b/sysutils/govmomi/Makefile index cfa71442836..7fcfe5cf6d0 100644 --- a/sysutils/govmomi/Makefile +++ b/sysutils/govmomi/Makefile @@ -1,7 +1,7 @@ PORTNAME= govmomi DISTVERSIONPREFIX= v DISTVERSION= 0.29.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MAINTAINER= alex@i.org.ua diff --git a/sysutils/hared/Makefile b/sysutils/hared/Makefile index 51a6578a956..3cb1e64810b 100644 --- a/sysutils/hared/Makefile +++ b/sysutils/hared/Makefile @@ -1,7 +1,7 @@ PORTNAME= hared DISTVERSION= 1.0-45 DISTVERSIONSUFFIX= -g8341d8a -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils MAINTAINER= 0mp@FreeBSD.org diff --git a/sysutils/hcloud/Makefile b/sysutils/hcloud/Makefile index c16a781b7e5..23b14d3b61e 100644 --- a/sysutils/hcloud/Makefile +++ b/sysutils/hcloud/Makefile @@ -1,7 +1,7 @@ PORTNAME= hcloud DISTVERSIONPREFIX= v DISTVERSION= 1.21.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= uzsolt@uzsolt.hu diff --git a/sysutils/helm/Makefile b/sysutils/helm/Makefile index 594f30afc5c..354b7ffe615 100644 --- a/sysutils/helm/Makefile +++ b/sysutils/helm/Makefile @@ -1,7 +1,7 @@ PORTNAME= helm PORTVERSION= 3.7.2 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= danilo@FreeBSD.org diff --git a/sysutils/helmfile/Makefile b/sysutils/helmfile/Makefile index 1e56f3e01d5..1ebcbbc3d42 100644 --- a/sysutils/helmfile/Makefile +++ b/sysutils/helmfile/Makefile @@ -1,7 +1,7 @@ PORTNAME= helmfile DISTVERSIONPREFIX= v DISTVERSION= 0.142.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils MAINTAINER= timp87@gmail.com diff --git a/sysutils/hostctl/Makefile b/sysutils/hostctl/Makefile index 2bb492effd8..e51c643136b 100644 --- a/sysutils/hostctl/Makefile +++ b/sysutils/hostctl/Makefile @@ -1,7 +1,7 @@ PORTNAME= hostctl DISTVERSIONPREFIX= v DISTVERSION= 1.1.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MAINTAINER= lcook@FreeBSD.org diff --git a/sysutils/immortal/Makefile b/sysutils/immortal/Makefile index 2710ed9cedc..a0a5871485e 100644 --- a/sysutils/immortal/Makefile +++ b/sysutils/immortal/Makefile @@ -1,5 +1,6 @@ PORTNAME= immortal PORTVERSION= 0.24.4 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= nbari@tequila.io diff --git a/sysutils/ipfs-go-fs-repo-migrations/Makefile b/sysutils/ipfs-go-fs-repo-migrations/Makefile index 983090c1968..367df7a7adc 100644 --- a/sysutils/ipfs-go-fs-repo-migrations/Makefile +++ b/sysutils/ipfs-go-fs-repo-migrations/Makefile @@ -1,7 +1,7 @@ PORTNAME= ipfs-go-fs-repo-migrations DISTVERSIONPREFIX= v DISTVERSION= 1.7.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MASTER_SITES= https://github.com/ipfs/fs-repo-migrations/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ diff --git a/sysutils/ipfs-go/Makefile b/sysutils/ipfs-go/Makefile index 5e688c891bb..383a078af76 100644 --- a/sysutils/ipfs-go/Makefile +++ b/sysutils/ipfs-go/Makefile @@ -1,7 +1,7 @@ PORTNAME= ipfs DISTVERSIONPREFIX= v DISTVERSION= 0.13.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= https://github.com/ipfs/go-ipfs/releases/download/v${DISTVERSION}/ PKGNAMESUFFIX= -go diff --git a/sysutils/ipget/Makefile b/sysutils/ipget/Makefile index cb9d4a482ed..fe09fa60702 100644 --- a/sysutils/ipget/Makefile +++ b/sysutils/ipget/Makefile @@ -1,7 +1,7 @@ PORTNAME= ipget DISTVERSIONPREFIX= v DISTVERSION= 0.9.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org diff --git a/sysutils/istio/Makefile b/sysutils/istio/Makefile index da0bf583e57..45fd60c7cd6 100644 --- a/sysutils/istio/Makefile +++ b/sysutils/istio/Makefile @@ -1,6 +1,6 @@ PORTNAME= istio PORTVERSION= 1.7.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= danilo@FreeBSD.org diff --git a/sysutils/jest/Makefile b/sysutils/jest/Makefile index ed579e56c05..66fffdd7166 100644 --- a/sysutils/jest/Makefile +++ b/sysutils/jest/Makefile @@ -1,6 +1,6 @@ PORTNAME= jest DISTVERSION= 3.0.16 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org diff --git a/sysutils/k9s/Makefile b/sysutils/k9s/Makefile index 6b80f17ddbf..2965dfdb502 100644 --- a/sysutils/k9s/Makefile +++ b/sysutils/k9s/Makefile @@ -1,7 +1,7 @@ PORTNAME= k9s PORTVERSION= 0.24.10 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= gogolok@gmail.com diff --git a/sysutils/kopia/Makefile b/sysutils/kopia/Makefile index 20376eb1d2d..fd8b4236aaa 100644 --- a/sysutils/kopia/Makefile +++ b/sysutils/kopia/Makefile @@ -1,6 +1,7 @@ PORTNAME= kopia DISTVERSIONPREFIX= v DISTVERSION= 0.12.1 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= eduardo@FreeBSD.org diff --git a/sysutils/kops/Makefile b/sysutils/kops/Makefile index 219d42f75ba..54e0c2ab73f 100644 --- a/sysutils/kops/Makefile +++ b/sysutils/kops/Makefile @@ -1,6 +1,6 @@ PORTNAME= kops PORTVERSION= 1.24.1 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= sysutils diff --git a/sysutils/kubectl/Makefile b/sysutils/kubectl/Makefile index 7e9911bed2d..eaacadb7b11 100644 --- a/sysutils/kubectl/Makefile +++ b/sysutils/kubectl/Makefile @@ -1,6 +1,6 @@ PORTNAME= kubectl PORTVERSION= 1.24.4 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= sysutils diff --git a/sysutils/logstash-forwarder/Makefile b/sysutils/logstash-forwarder/Makefile index adeff4714f3..7fa3327cc37 100644 --- a/sysutils/logstash-forwarder/Makefile +++ b/sysutils/logstash-forwarder/Makefile @@ -1,6 +1,6 @@ PORTNAME= logstash-forwarder PORTVERSION= 0.4.0.20150507 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= sysutils MAINTAINER= cheffo@freebsd-bg.org diff --git a/sysutils/loki/Makefile b/sysutils/loki/Makefile index f9cf432cdba..bbc0478b30f 100644 --- a/sysutils/loki/Makefile +++ b/sysutils/loki/Makefile @@ -1,7 +1,7 @@ PORTNAME= loki DISTVERSIONPREFIX= v DISTVERSION= 2.6.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils PKGNAMEPREFIX= grafana- diff --git a/sysutils/mackerel-agent/Makefile b/sysutils/mackerel-agent/Makefile index 9a380fa9531..13b85c7c0a4 100644 --- a/sysutils/mackerel-agent/Makefile +++ b/sysutils/mackerel-agent/Makefile @@ -1,6 +1,7 @@ PORTNAME= mackerel-agent DISTVERSIONPREFIX= v DISTVERSION= 0.73.1 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= meta@FreeBSD.org diff --git a/sysutils/minikube/Makefile b/sysutils/minikube/Makefile index 48117a1ae8d..ca082a3add3 100644 --- a/sysutils/minikube/Makefile +++ b/sysutils/minikube/Makefile @@ -1,6 +1,6 @@ PORTNAME= minikube PORTVERSION= 1.25.2 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONPREFIX= v CATEGORIES= sysutils diff --git a/sysutils/nerdctl/Makefile b/sysutils/nerdctl/Makefile index e1f8994ccbd..5a0a22edb25 100644 --- a/sysutils/nerdctl/Makefile +++ b/sysutils/nerdctl/Makefile @@ -1,6 +1,7 @@ PORTNAME= nerdctl DISTVERSIONPREFIX=v DISTVERSION= 0.23.0 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= woodsb02@FreeBSD.org diff --git a/sysutils/nomad-pot-driver/Makefile b/sysutils/nomad-pot-driver/Makefile index d9723804ed3..c91ab8f0f67 100644 --- a/sysutils/nomad-pot-driver/Makefile +++ b/sysutils/nomad-pot-driver/Makefile @@ -1,7 +1,7 @@ PORTNAME= nomad-pot-driver DISTVERSIONPREFIX= v DISTVERSION= 0.9.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= pizzamig@FreeBSD.org diff --git a/sysutils/nomad/Makefile b/sysutils/nomad/Makefile index db5d9b1afcd..1848cfc9f18 100644 --- a/sysutils/nomad/Makefile +++ b/sysutils/nomad/Makefile @@ -1,7 +1,7 @@ PORTNAME= nomad DISTVERSIONPREFIX= v DISTVERSION= 1.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= jhixson@FreeBSD.org diff --git a/sysutils/oc/Makefile b/sysutils/oc/Makefile index 1c187b57376..fd07a6d28ef 100644 --- a/sysutils/oc/Makefile +++ b/sysutils/oc/Makefile @@ -1,7 +1,7 @@ PORTNAME= oc PORTVERSION= 4.9 DISTVERSIONPREFIX= release- -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= jhixson@freebsd.org diff --git a/sysutils/opa/Makefile b/sysutils/opa/Makefile index c0f95b127f1..2c38bdd98de 100644 --- a/sysutils/opa/Makefile +++ b/sysutils/opa/Makefile @@ -1,7 +1,7 @@ PORTNAME= opa DISTVERSIONPREFIX= v DISTVERSION= 0.41.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org diff --git a/sysutils/openshift-install/Makefile b/sysutils/openshift-install/Makefile index 943d892ffca..2ef440369c2 100644 --- a/sysutils/openshift-install/Makefile +++ b/sysutils/openshift-install/Makefile @@ -1,7 +1,7 @@ PORTNAME= openshift-install PORTVERSION= 4.9 DISTVERSIONPREFIX= release- -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= jhixson@freebsd.org diff --git a/sysutils/packer/Makefile b/sysutils/packer/Makefile index b73770d15f4..fb6c24553a7 100644 --- a/sysutils/packer/Makefile +++ b/sysutils/packer/Makefile @@ -1,7 +1,7 @@ PORTNAME= packer PORTVERSION= 1.7.10 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= brad@facefault.org diff --git a/sysutils/paladin/Makefile b/sysutils/paladin/Makefile index 0259da4042b..cdb190b4ecf 100644 --- a/sysutils/paladin/Makefile +++ b/sysutils/paladin/Makefile @@ -1,6 +1,6 @@ PORTNAME= paladin PORTVERSION= 2.0.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= rwestlun@gmail.com diff --git a/sysutils/rest-server/Makefile b/sysutils/rest-server/Makefile index 9ef82848865..00856259878 100644 --- a/sysutils/rest-server/Makefile +++ b/sysutils/rest-server/Makefile @@ -1,7 +1,7 @@ PORTNAME= rest-server DISTVERSIONPREFIX= v DISTVERSION= 0.11.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= dch@FreeBSD.org diff --git a/sysutils/restic/Makefile b/sysutils/restic/Makefile index a1482266945..d5fdd8c9dc3 100644 --- a/sysutils/restic/Makefile +++ b/sysutils/restic/Makefile @@ -1,7 +1,7 @@ PORTNAME= restic DISTVERSIONPREFIX= v DISTVERSION= 0.14.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= eduardo@FreeBSD.org diff --git a/sysutils/runj/Makefile b/sysutils/runj/Makefile index b88ed002827..2c7177e95da 100644 --- a/sysutils/runj/Makefile +++ b/sysutils/runj/Makefile @@ -1,6 +1,6 @@ PORTNAME= runj DISTVERSION= g20211119 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= dch@FreeBSD.org diff --git a/sysutils/rush/Makefile b/sysutils/rush/Makefile index b42026840d8..f538da39d25 100644 --- a/sysutils/rush/Makefile +++ b/sysutils/rush/Makefile @@ -1,7 +1,7 @@ PORTNAME= rush DISTVERSIONPREFIX= v DISTVERSION= 0.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils PKGNAMESUFFIX= -parallelization-tool diff --git a/sysutils/sensu-go/Makefile b/sysutils/sensu-go/Makefile index 2d541873f5d..92f84b1f28e 100644 --- a/sysutils/sensu-go/Makefile +++ b/sysutils/sensu-go/Makefile @@ -1,6 +1,6 @@ PORTNAME= sensu-go DISTVERSION= 5.11.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= jp+ports@supplntr.io diff --git a/sysutils/serf/Makefile b/sysutils/serf/Makefile index 79258345ee1..ec05949867d 100644 --- a/sysutils/serf/Makefile +++ b/sysutils/serf/Makefile @@ -1,7 +1,7 @@ PORTNAME= serf PORTVERSION= 0.8.5 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils PKGNAMEPREFIX= hashicorp- diff --git a/sysutils/siegfried/Makefile b/sysutils/siegfried/Makefile index 8107c6b2479..a37ca9cfbdf 100644 --- a/sysutils/siegfried/Makefile +++ b/sysutils/siegfried/Makefile @@ -1,6 +1,7 @@ PORTNAME= siegfried DISTVERSIONPREFIX= v DISTVERSION= 1.9.5 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= eduardo@FreeBSD.org diff --git a/sysutils/smug/Makefile b/sysutils/smug/Makefile index 13d6645d7c5..5133901d0e5 100644 --- a/sysutils/smug/Makefile +++ b/sysutils/smug/Makefile @@ -1,7 +1,7 @@ PORTNAME= smug DISTVERSIONPREFIX= v DISTVERSION= 0.3.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MAINTAINER= lcook@FreeBSD.org diff --git a/sysutils/snmp_exporter/Makefile b/sysutils/snmp_exporter/Makefile index 2764247e81c..5fdc7a975ca 100644 --- a/sysutils/snmp_exporter/Makefile +++ b/sysutils/snmp_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= snmp_exporter PORTVERSION= 0.20.0 DISTVERSIONPREFIX=v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= fabian.freyer@physik.tu-berlin.de diff --git a/sysutils/sockaddr/Makefile b/sysutils/sockaddr/Makefile index 490331967d0..d353fc14e33 100644 --- a/sysutils/sockaddr/Makefile +++ b/sysutils/sockaddr/Makefile @@ -1,7 +1,7 @@ PORTNAME= sockaddr DISTVERSIONPREFIX= v DISTVERSION= 1.0.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= ports@FreeBSD.org diff --git a/sysutils/stressdisk/Makefile b/sysutils/stressdisk/Makefile index 450191d6ea5..31eda1baa46 100644 --- a/sysutils/stressdisk/Makefile +++ b/sysutils/stressdisk/Makefile @@ -1,7 +1,7 @@ PORTNAME= stressdisk DISTVERSIONPREFIX= v DISTVERSION= 1.0.12 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= eduardo@FreeBSD.org diff --git a/sysutils/terraform-docs/Makefile b/sysutils/terraform-docs/Makefile index 50ed401d62d..2d2ee3c6939 100644 --- a/sysutils/terraform-docs/Makefile +++ b/sysutils/terraform-docs/Makefile @@ -1,7 +1,7 @@ PORTNAME= terraform-docs DISTVERSIONPREFIX= v DISTVERSION= 0.16.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils textproc MAINTAINER= 0xdutra@gmail.com diff --git a/sysutils/terraform-provider-gridscale/Makefile b/sysutils/terraform-provider-gridscale/Makefile index dfcd05fd6a7..c3cf38bbe76 100644 --- a/sysutils/terraform-provider-gridscale/Makefile +++ b/sysutils/terraform-provider-gridscale/Makefile @@ -1,7 +1,7 @@ PORTNAME= terraform-provider-gridscale PORTVERSION= 1.6.2 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= egypcio@FreeBSD.org diff --git a/sysutils/terraform-provider-vultr/Makefile b/sysutils/terraform-provider-vultr/Makefile index 83f6c7e359e..94b017e22d1 100644 --- a/sysutils/terraform-provider-vultr/Makefile +++ b/sysutils/terraform-provider-vultr/Makefile @@ -1,7 +1,7 @@ PORTNAME= terraform-provider-vultr PORTVERSION= 0.1.10 DISTVERSIONPREFIX= v -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils MAINTAINER= ports@FreeBSD.org diff --git a/sysutils/terraform-switcher/Makefile b/sysutils/terraform-switcher/Makefile index 65914d06b95..a8e9e3917b2 100644 --- a/sysutils/terraform-switcher/Makefile +++ b/sysutils/terraform-switcher/Makefile @@ -1,5 +1,6 @@ PORTNAME= terraform-switcher DISTVERSION= 0.13.1288 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= 0xdutra@gmail.com diff --git a/sysutils/terraform/Makefile b/sysutils/terraform/Makefile index d6b7fef4833..f6984289037 100644 --- a/sysutils/terraform/Makefile +++ b/sysutils/terraform/Makefile @@ -1,7 +1,7 @@ PORTNAME= terraform DISTVERSIONPREFIX= v DISTVERSION= 1.1.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MASTER_SITES= LOCAL/0mp:tencentcloud_tencentcloud_sdk_go diff --git a/sysutils/terragrunt/Makefile b/sysutils/terragrunt/Makefile index 2519a41fc79..2dc5cacea88 100644 --- a/sysutils/terragrunt/Makefile +++ b/sysutils/terragrunt/Makefile @@ -1,6 +1,7 @@ PORTNAME= terragrunt DISTVERSIONPREFIX= v DISTVERSION= 0.38.12 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= 0xdutra@gmail.com diff --git a/sysutils/tflint/Makefile b/sysutils/tflint/Makefile index 03b0d7d5078..48eb9d106b3 100644 --- a/sysutils/tflint/Makefile +++ b/sysutils/tflint/Makefile @@ -1,6 +1,7 @@ PORTNAME= tflint DISTVERSIONPREFIX= v -DISTVERSION= 0.40.1 +DISTVERSION= 0.41.0 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= 0xdutra@gmail.com diff --git a/sysutils/tflint/distinfo b/sysutils/tflint/distinfo index 93f6fc0ac57..e1af8272d0d 100644 --- a/sysutils/tflint/distinfo +++ b/sysutils/tflint/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1663806204 -SHA256 (go/sysutils_tflint/tflint-v0.40.1/v0.40.1.mod) = 1cc792c51ae6b8f1d6bf9a7328cfe0a1d89ecd195afb172e3703afb0b3b121cf -SIZE (go/sysutils_tflint/tflint-v0.40.1/v0.40.1.mod) = 3831 -SHA256 (go/sysutils_tflint/tflint-v0.40.1/v0.40.1.zip) = fb153cc18c5450d1a214678db7b47f4e6be4a2b4f44b86c60bb419b29fc0311e -SIZE (go/sysutils_tflint/tflint-v0.40.1/v0.40.1.zip) = 1455475 +TIMESTAMP = 1665024340 +SHA256 (go/sysutils_tflint/tflint-v0.41.0/v0.41.0.mod) = cac71dc5a149a0e2753745b970a8284023f70483a57c3b3f6276d403c75b50d1 +SIZE (go/sysutils_tflint/tflint-v0.41.0/v0.41.0.mod) = 3831 +SHA256 (go/sysutils_tflint/tflint-v0.41.0/v0.41.0.zip) = c18f98f7168bd57f1008571555eea1012764a99d16ff5be38b29570d3087d144 +SIZE (go/sysutils_tflint/tflint-v0.41.0/v0.41.0.zip) = 1448125 diff --git a/sysutils/vagrant/Makefile b/sysutils/vagrant/Makefile index bbd4d80e264..2588a87151d 100644 --- a/sysutils/vagrant/Makefile +++ b/sysutils/vagrant/Makefile @@ -1,7 +1,7 @@ PORTNAME= vagrant PORTVERSION= 2.2.19 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils rubygems devel MAINTAINER= joe@thrallingpenguin.com @@ -70,7 +70,10 @@ BASH_PLIST_FILES= share/bash-completion/completions/vagrant ZSH_PLIST_FILES= share/share/zsh/site-functions/_vagrant post-patch: - @${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' ${WRKSRC}/bin/vagrant + @${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' \ + ${WRKSRC}/bin/vagrant \ + ${WRKSRC}/plugins/providers/virtualbox/action/network.rb \ + ${WRKSRC}/templates/locales/en.yml do-build: (cd ${WRKSRC}; (${ECHO_CMD} -e "install:\n\techo\n") > Makefile) diff --git a/sysutils/vagrant/files/patch-plugins_providers_virtualbox_action_network.rb b/sysutils/vagrant/files/patch-plugins_providers_virtualbox_action_network.rb new file mode 100644 index 00000000000..b56e62d6909 --- /dev/null +++ b/sysutils/vagrant/files/patch-plugins_providers_virtualbox_action_network.rb @@ -0,0 +1,11 @@ +--- plugins/providers/virtualbox/action/network.rb.orig 2021-11-05 21:15:44 UTC ++++ plugins/providers/virtualbox/action/network.rb +@@ -18,7 +18,7 @@ module VagrantPlugins + class Network + + # Location of the VirtualBox networks configuration file +- VBOX_NET_CONF = "/etc/vbox/networks.conf".freeze ++ VBOX_NET_CONF = "@PREFIX@/etc/vbox/networks.conf".freeze + # Version of VirtualBox that introduced hostonly network range restrictions + HOSTONLY_VALIDATE_VERSION = Gem::Version.new("6.1.28") + # Default valid range for hostonly networks diff --git a/sysutils/vagrant/files/patch-templates_locales_en.yml b/sysutils/vagrant/files/patch-templates_locales_en.yml new file mode 100644 index 00000000000..01d2cceffd3 --- /dev/null +++ b/sysutils/vagrant/files/patch-templates_locales_en.yml @@ -0,0 +1,11 @@ +--- templates/locales/en.yml.orig 2021-11-05 21:15:44 UTC ++++ templates/locales/en.yml +@@ -1863,7 +1863,7 @@ en: + Address: %{address} + Ranges: %{ranges} + +- Valid ranges can be modified in the /etc/vbox/networks.conf file. For ++ Valid ranges can be modified in the @PREFIX@/etc/vbox/networks.conf file. For + more information including valid format see: + + https://www.virtualbox.org/manual/ch06.html#network_hostonly diff --git a/sysutils/viddy/Makefile b/sysutils/viddy/Makefile index cf393d27e8c..c8f57dd2ec9 100644 --- a/sysutils/viddy/Makefile +++ b/sysutils/viddy/Makefile @@ -1,7 +1,7 @@ PORTNAME= viddy DISTVERSIONPREFIX= v DISTVERSION= 0.3.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MASTER_SITES= diff --git a/sysutils/zfs-snap-diff/Makefile b/sysutils/zfs-snap-diff/Makefile index 1ee2e64f8f7..196fe41eb20 100644 --- a/sysutils/zfs-snap-diff/Makefile +++ b/sysutils/zfs-snap-diff/Makefile @@ -1,7 +1,7 @@ PORTNAME= zfs-snap-diff PORTVERSION= 1.1.3 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= ben@lavery-griffiths.com diff --git a/sysutils/zrepl/Makefile b/sysutils/zrepl/Makefile index d5ed42bbe18..3928c52af8f 100644 --- a/sysutils/zrepl/Makefile +++ b/sysutils/zrepl/Makefile @@ -1,7 +1,7 @@ PORTNAME= zrepl DISTVERSIONPREFIX= v DISTVERSION= 0.5.0-8 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONSUFFIX= -g19b2deb CATEGORIES= sysutils diff --git a/textproc/cl-meta-sbcl/Makefile b/textproc/cl-meta-sbcl/Makefile index eca1c04a62f..03c4f68fd54 100644 --- a/textproc/cl-meta-sbcl/Makefile +++ b/textproc/cl-meta-sbcl/Makefile @@ -1,6 +1,6 @@ PORTNAME= meta PORTVERSION= 0.1 -PORTREVISION= 72 +PORTREVISION= 73 PORTEPOCH= 1 CATEGORIES= textproc lisp PKGNAMEPREFIX= cl- diff --git a/textproc/cl-ppcre-sbcl/Makefile b/textproc/cl-ppcre-sbcl/Makefile index 72cdce4ebc4..1490f7dffcc 100644 --- a/textproc/cl-ppcre-sbcl/Makefile +++ b/textproc/cl-ppcre-sbcl/Makefile @@ -1,6 +1,6 @@ PORTNAME= cl-ppcre PORTVERSION= 2.1.1 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= textproc lisp DISTFILES= # none diff --git a/textproc/codesearch/Makefile b/textproc/codesearch/Makefile index 65da1f0a4da..86516cd5237 100644 --- a/textproc/codesearch/Makefile +++ b/textproc/codesearch/Makefile @@ -1,7 +1,7 @@ PORTNAME= codesearch DISTVERSIONPREFIX= v DISTVERSION= 1.1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc MAINTAINER= eborisch@gmail.com diff --git a/textproc/consul-template/Makefile b/textproc/consul-template/Makefile index 7d480a81416..2f559f4f85b 100644 --- a/textproc/consul-template/Makefile +++ b/textproc/consul-template/Makefile @@ -1,5 +1,6 @@ PORTNAME= consul-template PORTVERSION= 0.29.4 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= textproc diff --git a/textproc/csvq/Makefile b/textproc/csvq/Makefile index 585d46a1230..f3de2c6d8b2 100644 --- a/textproc/csvq/Makefile +++ b/textproc/csvq/Makefile @@ -1,7 +1,7 @@ PORTNAME= csvq DISTVERSIONPREFIX= v DISTVERSION= 1.17.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= lcook@FreeBSD.org diff --git a/textproc/dasel/Makefile b/textproc/dasel/Makefile index 29fcba464be..5f30e119fa1 100644 --- a/textproc/dasel/Makefile +++ b/textproc/dasel/Makefile @@ -1,7 +1,7 @@ PORTNAME= dasel DISTVERSIONPREFIX= v DISTVERSION= 1.26.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= lcook@FreeBSD.org diff --git a/textproc/fzf/Makefile b/textproc/fzf/Makefile index a377c76532c..c0feab86771 100644 --- a/textproc/fzf/Makefile +++ b/textproc/fzf/Makefile @@ -1,5 +1,6 @@ PORTNAME= fzf DISTVERSION= 0.34.0 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod DISTFILES= go.mod:gomod diff --git a/textproc/gh-grep/Makefile b/textproc/gh-grep/Makefile index 4ce68a9b5e7..2a275bf1411 100644 --- a/textproc/gh-grep/Makefile +++ b/textproc/gh-grep/Makefile @@ -1,7 +1,7 @@ PORTNAME= gh-grep DISTVERSIONPREFIX= v DISTVERSION= 0.11.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc MAINTAINER= lcook@FreeBSD.org diff --git a/textproc/git-chglog/Makefile b/textproc/git-chglog/Makefile index 46cc5983fb0..cfa258bae60 100644 --- a/textproc/git-chglog/Makefile +++ b/textproc/git-chglog/Makefile @@ -1,7 +1,7 @@ PORTNAME= git-chglog DISTVERSIONPREFIX= v DISTVERSION= 0.15.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc MAINTAINER= lcook@FreeBSD.org diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile index 1d1d661b93e..42c6bf2c872 100644 --- a/textproc/gitlab-elasticsearch-indexer/Makefile +++ b/textproc/gitlab-elasticsearch-indexer/Makefile @@ -1,7 +1,7 @@ PORTNAME= gitlab-elasticsearch-indexer PORTVERSION= 3.0.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= mfechner@FreeBSD.org diff --git a/textproc/go-md2man/Makefile b/textproc/go-md2man/Makefile index 838ad86681b..ea4a908f2a9 100644 --- a/textproc/go-md2man/Makefile +++ b/textproc/go-md2man/Makefile @@ -1,7 +1,7 @@ PORTNAME= go-md2man DISTVERSIONPREFIX= v DISTVERSION= 2.0.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc MAINTAINER= mateusz@serveraptor.com diff --git a/textproc/go-yq/Makefile b/textproc/go-yq/Makefile index 4b2ad537fa0..ffde74ffe63 100644 --- a/textproc/go-yq/Makefile +++ b/textproc/go-yq/Makefile @@ -1,7 +1,7 @@ PORTNAME= go-yq DISTVERSIONPREFIX= v DISTVERSION= 4.25.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc MAINTAINER= timp87@gmail.com diff --git a/textproc/gojq/Makefile b/textproc/gojq/Makefile index 0316493311e..ee3cb731b21 100644 --- a/textproc/gojq/Makefile +++ b/textproc/gojq/Makefile @@ -1,7 +1,7 @@ PORTNAME= gojq DISTVERSIONPREFIX= v DISTVERSION= 0.12.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MAINTAINER= nork@ninth-nine.com diff --git a/textproc/gron/Makefile b/textproc/gron/Makefile index 315d43366d4..df40adbe62a 100644 --- a/textproc/gron/Makefile +++ b/textproc/gron/Makefile @@ -1,6 +1,6 @@ PORTNAME= gron PORTVERSION= 0.6.1 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONPREFIX= v CATEGORIES= textproc diff --git a/textproc/htmltest/Makefile b/textproc/htmltest/Makefile index d0711dc653e..34dce15d739 100644 --- a/textproc/htmltest/Makefile +++ b/textproc/htmltest/Makefile @@ -1,7 +1,7 @@ PORTNAME= htmltest DISTVERSIONPREFIX= v DISTVERSION= 0.16.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc MAINTAINER= dbaio@FreeBSD.org diff --git a/textproc/jid/Makefile b/textproc/jid/Makefile index 0b982a38175..251b7f497ad 100644 --- a/textproc/jid/Makefile +++ b/textproc/jid/Makefile @@ -1,7 +1,7 @@ PORTNAME= jid PORTVERSION= 0.7.6 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc MAINTAINER= sbz@FreeBSD.org diff --git a/textproc/jql/Makefile b/textproc/jql/Makefile index c420757a568..448aa8b45fc 100644 --- a/textproc/jql/Makefile +++ b/textproc/jql/Makefile @@ -1,6 +1,6 @@ PORTNAME= jql DISTVERSIONPREFIX= v -DISTVERSION= 5.0.2 +DISTVERSION= 5.1.0 CATEGORIES= textproc MAINTAINER= yuri@FreeBSD.org @@ -16,8 +16,7 @@ USE_GITHUB= yes GH_ACCOUNT= yamafaktory CARGO_CRATES= anes-0.1.6 \ - ansi_term-0.12.1 \ - anyhow-1.0.64 \ + anyhow-1.0.65 \ async-attributes-1.1.2 \ async-channel-1.6.1 \ async-executor-1.4.1 \ @@ -43,8 +42,10 @@ CARGO_CRATES= anes-0.1.6 \ ciborium-io-0.2.0 \ ciborium-ll-0.2.0 \ clap-3.2.20 \ + clap-4.0.8 \ clap_lex-0.2.3 \ - colored_json-2.1.0 \ + clap_lex-0.3.0 \ + colored_json-3.0.1 \ concurrent-queue-1.2.2 \ cpufeatures-0.2.2 \ criterion-0.4.0 \ @@ -55,7 +56,7 @@ CARGO_CRATES= anes-0.1.6 \ crossbeam-utils-0.8.8 \ crypto-common-0.1.6 \ ctor-0.1.22 \ - digest-0.10.3 \ + digest-0.10.5 \ either-1.6.1 \ event-listener-2.5.2 \ fastrand-1.7.0 \ @@ -85,10 +86,10 @@ CARGO_CRATES= anes-0.1.6 \ oorandom-11.1.3 \ os_str_bytes-6.0.0 \ parking-2.0.0 \ - pest-2.3.0 \ - pest_derive-2.3.0 \ - pest_generator-2.3.0 \ - pest_meta-2.3.0 \ + pest-2.4.0 \ + pest_derive-2.4.0 \ + pest_generator-2.4.0 \ + pest_meta-2.4.0 \ pin-project-lite-0.2.8 \ pin-utils-0.1.0 \ plotters-0.3.1 \ @@ -107,7 +108,7 @@ CARGO_CRATES= anes-0.1.6 \ serde-1.0.136 \ serde_derive-1.0.136 \ serde_json-1.0.85 \ - sha-1-0.10.0 \ + sha1-0.10.5 \ signal-hook-0.3.13 \ signal-hook-registry-1.4.0 \ slab-0.4.5 \ @@ -137,8 +138,8 @@ CARGO_CRATES= anes-0.1.6 \ winapi-0.3.9 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-util-0.1.5 \ - winapi-x86_64-pc-windows-gnu-0.4.0 - + winapi-x86_64-pc-windows-gnu-0.4.0 \ + yansi-0.5.1 PLIST_FILES= bin/${PORTNAME} post-install: diff --git a/textproc/jql/distinfo b/textproc/jql/distinfo index 6bfb460ca39..a9f1f86f577 100644 --- a/textproc/jql/distinfo +++ b/textproc/jql/distinfo @@ -1,10 +1,8 @@ -TIMESTAMP = 1662955031 +TIMESTAMP = 1664950012 SHA256 (rust/crates/anes-0.1.6.crate) = 4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299 SIZE (rust/crates/anes-0.1.6.crate) = 23857 -SHA256 (rust/crates/ansi_term-0.12.1.crate) = d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2 -SIZE (rust/crates/ansi_term-0.12.1.crate) = 24838 -SHA256 (rust/crates/anyhow-1.0.64.crate) = b9a8f622bcf6ff3df478e9deba3e03e4e04b300f8e6a139e192c05fa3490afc7 -SIZE (rust/crates/anyhow-1.0.64.crate) = 43549 +SHA256 (rust/crates/anyhow-1.0.65.crate) = 98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602 +SIZE (rust/crates/anyhow-1.0.65.crate) = 43585 SHA256 (rust/crates/async-attributes-1.1.2.crate) = a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5 SIZE (rust/crates/async-attributes-1.1.2.crate) = 11431 SHA256 (rust/crates/async-channel-1.6.1.crate) = 2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319 @@ -55,10 +53,14 @@ SHA256 (rust/crates/ciborium-ll-0.2.0.crate) = 213030a2b5a4e0c0892b6652260cf6cca SIZE (rust/crates/ciborium-ll-0.2.0.crate) = 10740 SHA256 (rust/crates/clap-3.2.20.crate) = 23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd SIZE (rust/crates/clap-3.2.20.crate) = 214114 +SHA256 (rust/crates/clap-4.0.8.crate) = 5840cd9093aabeabf7fd932754c435b7674520fc3ddc935c397837050f0f1e4b +SIZE (rust/crates/clap-4.0.8.crate) = 202185 SHA256 (rust/crates/clap_lex-0.2.3.crate) = 87eba3c8c7f42ef17f6c659fc7416d0f4758cd3e58861ee63c5fa4a4dde649e4 SIZE (rust/crates/clap_lex-0.2.3.crate) = 9638 -SHA256 (rust/crates/colored_json-2.1.0.crate) = 1fd32eb54d016e203b7c2600e3a7802c75843a92e38ccc4869aefeca21771a64 -SIZE (rust/crates/colored_json-2.1.0.crate) = 12336 +SHA256 (rust/crates/clap_lex-0.3.0.crate) = 0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8 +SIZE (rust/crates/clap_lex-0.3.0.crate) = 9671 +SHA256 (rust/crates/colored_json-3.0.1.crate) = 633215cdbb84194508d4c07c08d06e92ee9d489d54e68d17913d8d1bacfcfdeb +SIZE (rust/crates/colored_json-3.0.1.crate) = 12606 SHA256 (rust/crates/concurrent-queue-1.2.2.crate) = 30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3 SIZE (rust/crates/concurrent-queue-1.2.2.crate) = 15859 SHA256 (rust/crates/cpufeatures-0.2.2.crate) = 59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b @@ -79,8 +81,8 @@ SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760 SHA256 (rust/crates/ctor-0.1.22.crate) = f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c SIZE (rust/crates/ctor-0.1.22.crate) = 9311 -SHA256 (rust/crates/digest-0.10.3.crate) = f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506 -SIZE (rust/crates/digest-0.10.3.crate) = 18990 +SHA256 (rust/crates/digest-0.10.5.crate) = adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c +SIZE (rust/crates/digest-0.10.5.crate) = 19503 SHA256 (rust/crates/either-1.6.1.crate) = e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457 SIZE (rust/crates/either-1.6.1.crate) = 13641 SHA256 (rust/crates/event-listener-2.5.2.crate) = 77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71 @@ -139,14 +141,14 @@ SHA256 (rust/crates/os_str_bytes-6.0.0.crate) = 8e22443d1643a904602595ba1cd8f7d8 SIZE (rust/crates/os_str_bytes-6.0.0.crate) = 21046 SHA256 (rust/crates/parking-2.0.0.crate) = 427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72 SIZE (rust/crates/parking-2.0.0.crate) = 9714 -SHA256 (rust/crates/pest-2.3.0.crate) = 4b0560d531d1febc25a3c9398a62a71256c0178f2e3443baedd9ad4bb8c9deb4 -SIZE (rust/crates/pest-2.3.0.crate) = 85156 -SHA256 (rust/crates/pest_derive-2.3.0.crate) = 905708f7f674518498c1f8d644481440f476d39ca6ecae83319bba7c6c12da91 -SIZE (rust/crates/pest_derive-2.3.0.crate) = 14254 -SHA256 (rust/crates/pest_generator-2.3.0.crate) = 5803d8284a629cc999094ecd630f55e91b561a1d1ba75e233b00ae13b91a69ad -SIZE (rust/crates/pest_generator-2.3.0.crate) = 14370 -SHA256 (rust/crates/pest_meta-2.3.0.crate) = 1538eb784f07615c6d9a8ab061089c6c54a344c5b4301db51990ca1c241e8c04 -SIZE (rust/crates/pest_meta-2.3.0.crate) = 28812 +SHA256 (rust/crates/pest-2.4.0.crate) = dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a +SIZE (rust/crates/pest-2.4.0.crate) = 89629 +SHA256 (rust/crates/pest_derive-2.4.0.crate) = 60b75706b9642ebcb34dab3bc7750f811609a0eb1dd8b88c2d15bf628c1c65b2 +SIZE (rust/crates/pest_derive-2.4.0.crate) = 16956 +SHA256 (rust/crates/pest_generator-2.4.0.crate) = f4f9272122f5979a6511a749af9db9bfc810393f63119970d7085fed1c4ea0db +SIZE (rust/crates/pest_generator-2.4.0.crate) = 14593 +SHA256 (rust/crates/pest_meta-2.4.0.crate) = 4c8717927f9b79515e565a64fe46c38b8cd0427e64c40680b14a7365ab09ac8d +SIZE (rust/crates/pest_meta-2.4.0.crate) = 28821 SHA256 (rust/crates/pin-project-lite-0.2.8.crate) = e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c SIZE (rust/crates/pin-project-lite-0.2.8.crate) = 27847 SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184 @@ -183,8 +185,8 @@ SHA256 (rust/crates/serde_derive-1.0.136.crate) = 08597e7152fcd306f41838ed3e37be SIZE (rust/crates/serde_derive-1.0.136.crate) = 54776 SHA256 (rust/crates/serde_json-1.0.85.crate) = e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44 SIZE (rust/crates/serde_json-1.0.85.crate) = 144635 -SHA256 (rust/crates/sha-1-0.10.0.crate) = 028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f -SIZE (rust/crates/sha-1-0.10.0.crate) = 12239 +SHA256 (rust/crates/sha1-0.10.5.crate) = f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3 +SIZE (rust/crates/sha1-0.10.5.crate) = 12146 SHA256 (rust/crates/signal-hook-0.3.13.crate) = 647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d SIZE (rust/crates/signal-hook-0.3.13.crate) = 49252 SHA256 (rust/crates/signal-hook-registry-1.4.0.crate) = e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0 @@ -245,5 +247,7 @@ SHA256 (rust/crates/winapi-util-0.1.5.crate) = 70ec6ce85bb158151cae5e5c87f95a8e9 SIZE (rust/crates/winapi-util-0.1.5.crate) = 10164 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998 -SHA256 (yamafaktory-jql-v5.0.2_GH0.tar.gz) = 2a18c18752f8ca1acb1f955beef89ed7cedd7b4eabde32e65c27ffe3d52cc370 -SIZE (yamafaktory-jql-v5.0.2_GH0.tar.gz) = 421031 +SHA256 (rust/crates/yansi-0.5.1.crate) = 09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec +SIZE (rust/crates/yansi-0.5.1.crate) = 16525 +SHA256 (yamafaktory-jql-v5.1.0_GH0.tar.gz) = b0e6228be3363ccfd7aa2400b253529768d9bea476fe6428f249a02925e2a296 +SIZE (yamafaktory-jql-v5.1.0_GH0.tar.gz) = 422029 diff --git a/textproc/kepubify/Makefile b/textproc/kepubify/Makefile index 64f2e361411..48a0075cab2 100644 --- a/textproc/kepubify/Makefile +++ b/textproc/kepubify/Makefile @@ -1,7 +1,7 @@ PORTNAME= kepubify DISTVERSIONPREFIX= v DISTVERSION= 4.0.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc converters MAINTAINER= fuz@fuz.su diff --git a/textproc/markdownfmt/Makefile b/textproc/markdownfmt/Makefile index d0626b6f07c..36c4a3ceabc 100644 --- a/textproc/markdownfmt/Makefile +++ b/textproc/markdownfmt/Makefile @@ -2,7 +2,7 @@ PORTNAME= markdownfmt DISTVERSIONPREFIX= v DISTVERSION= 1.1-67 DISTVERSIONSUFFIX= -g3438a10 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc MAINTAINER= 0mp@FreeBSD.org diff --git a/textproc/mergestat/Makefile b/textproc/mergestat/Makefile index b82dd578846..dcb8af6d3d1 100644 --- a/textproc/mergestat/Makefile +++ b/textproc/mergestat/Makefile @@ -1,7 +1,7 @@ PORTNAME= mergestat DISTVERSIONPREFIX= v DISTVERSION= 0.5.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc MAINTAINER= lcook@FreeBSD.org diff --git a/textproc/ov/Makefile b/textproc/ov/Makefile index 18167244305..6b807b297d5 100644 --- a/textproc/ov/Makefile +++ b/textproc/ov/Makefile @@ -1,7 +1,7 @@ PORTNAME= ov DISTVERSIONPREFIX= v DISTVERSION= 0.11.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc MAINTAINER= lcook@FreeBSD.org diff --git a/textproc/peco/Makefile b/textproc/peco/Makefile index beb83bd3eb1..32ae0f8b18a 100644 --- a/textproc/peco/Makefile +++ b/textproc/peco/Makefile @@ -1,7 +1,7 @@ PORTNAME= peco PORTVERSION= 0.4.4 DISTVERSIONPREFIX= v -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc MASTER_SITES= LOCAL/knu diff --git a/textproc/pup/Makefile b/textproc/pup/Makefile index deb73d240b5..ac962c5ac2d 100644 --- a/textproc/pup/Makefile +++ b/textproc/pup/Makefile @@ -2,7 +2,7 @@ PORTNAME= pup DISTVERSIONPREFIX= v DISTVERSION= 0.4.0-10 DISTVERSIONSUFFIX= -g681d7bb -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc PATCH_SITES= https://github.com/ericchiang/pup/pull/ PATCHFILES= 107.patch:-p1 \ diff --git a/textproc/py-citeproc-py-styles/files/patch-setup.py b/textproc/py-citeproc-py-styles/files/patch-setup.py new file mode 100644 index 00000000000..bcc2ddb8b4b --- /dev/null +++ b/textproc/py-citeproc-py-styles/files/patch-setup.py @@ -0,0 +1,13 @@ +- fix the problem that Python thinks that the version 2.6.2 is greater than 6.0.0 for pytest-runner + +--- setup.py.orig 2022-10-05 06:44:42 UTC ++++ setup.py +@@ -27,7 +27,7 @@ for reqs in extras_require.values(): + extras_require['all'].extend(reqs) + + setup_requires = [ +- 'pytest-runner>=2.6.2', ++ 'pytest-runner', + ] + + install_requires = [ diff --git a/textproc/py-sphinx-autoapi/Makefile b/textproc/py-sphinx-autoapi/Makefile index 26219eac26a..a406f3a3844 100644 --- a/textproc/py-sphinx-autoapi/Makefile +++ b/textproc/py-sphinx-autoapi/Makefile @@ -1,5 +1,5 @@ PORTNAME= sphinx-autoapi -DISTVERSION= 1.9.0 +DISTVERSION= 2.0.0 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +15,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAV RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astroid>=2.7:devel/py-astroid@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sphinx>=3.0:textproc/py-sphinx@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>=4.0:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}unidecode>0:converters/py-unidecode@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} diff --git a/textproc/py-sphinx-autoapi/distinfo b/textproc/py-sphinx-autoapi/distinfo index fc146353c11..4f85135f72d 100644 --- a/textproc/py-sphinx-autoapi/distinfo +++ b/textproc/py-sphinx-autoapi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1658827293 -SHA256 (sphinx-autoapi-1.9.0.tar.gz) = c897ea337df16ad0cde307cbdfe2bece207788dde1587fa4fc8b857d1fc5dcba -SIZE (sphinx-autoapi-1.9.0.tar.gz) = 42158275 +TIMESTAMP = 1664733439 +SHA256 (sphinx-autoapi-2.0.0.tar.gz) = 97dcf1b5b54cd0d8efef867594e4a4f3e2d3a2c0ec1e5a891e0a61bc77046006 +SIZE (sphinx-autoapi-2.0.0.tar.gz) = 42160811 diff --git a/textproc/sift/Makefile b/textproc/sift/Makefile index 50d0d5b3d8e..39a0f20cb42 100644 --- a/textproc/sift/Makefile +++ b/textproc/sift/Makefile @@ -1,7 +1,7 @@ PORTNAME= sift PORTVERSION= 0.9.0 DISTVERSIONPREFIX= v -PORTREVISION= 25 +PORTREVISION= 26 CATEGORIES= textproc MAINTAINER= sunpoet@FreeBSD.org diff --git a/textproc/spiff/Makefile b/textproc/spiff/Makefile index c2027657182..3db1429286f 100644 --- a/textproc/spiff/Makefile +++ b/textproc/spiff/Makefile @@ -1,7 +1,7 @@ PORTNAME= spiff PORTVERSION= 1.0.8 DISTVERSIONPREFIX= v -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc MAINTAINER= swills@FreeBSD.org diff --git a/textproc/termshot/Makefile b/textproc/termshot/Makefile index ae488f7df82..7ac9bd71fe4 100644 --- a/textproc/termshot/Makefile +++ b/textproc/termshot/Makefile @@ -1,6 +1,7 @@ PORTNAME= termshot DISTVERSIONPREFIX= v DISTVERSION= 0.2.4 +PORTREVISION= 1 CATEGORIES= textproc graphics MAINTAINER= lbartoletti@FreeBSD.org diff --git a/textproc/textnote/Makefile b/textproc/textnote/Makefile index 94fbd6dff80..c2bdeddf64b 100644 --- a/textproc/textnote/Makefile +++ b/textproc/textnote/Makefile @@ -1,7 +1,7 @@ PORTNAME= textnote DISTVERSIONPREFIX= v DISTVERSION= 1.3.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc MAINTAINER= 0mp@FreeBSD.org diff --git a/textproc/textql/Makefile b/textproc/textql/Makefile index a9c9fa0188d..3819721a19f 100644 --- a/textproc/textql/Makefile +++ b/textproc/textql/Makefile @@ -1,6 +1,6 @@ PORTNAME= textql PORTVERSION= g20200203 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc MAINTAINER= ume@FreeBSD.org diff --git a/textproc/trdsql/Makefile b/textproc/trdsql/Makefile index 1bfe1e843a6..60d228fac3d 100644 --- a/textproc/trdsql/Makefile +++ b/textproc/trdsql/Makefile @@ -1,7 +1,7 @@ PORTNAME= trdsql DISTVERSIONPREFIX= v DISTVERSION= 0.10.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc MAINTAINER= lcook@FreeBSD.org diff --git a/textproc/uni/Makefile b/textproc/uni/Makefile index 6f810df5811..74e267d807e 100644 --- a/textproc/uni/Makefile +++ b/textproc/uni/Makefile @@ -1,6 +1,6 @@ PORTNAME= uni PORTVERSION= 2.5.1 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONPREFIX= v CATEGORIES= textproc diff --git a/textproc/up/Makefile b/textproc/up/Makefile index 3931d0e87b7..796efecc804 100644 --- a/textproc/up/Makefile +++ b/textproc/up/Makefile @@ -1,7 +1,7 @@ PORTNAME= up DISTVERSIONPREFIX= v DISTVERSION= 0.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc MAINTAINER= 0mp@FreeBSD.org diff --git a/textproc/vale/Makefile b/textproc/vale/Makefile index cd41aa31fb7..ffd000d6f88 100644 --- a/textproc/vale/Makefile +++ b/textproc/vale/Makefile @@ -1,6 +1,6 @@ PORTNAME= vale PORTVERSION= 2.20.1 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONPREFIX= v CATEGORIES= textproc diff --git a/textproc/vgrep/Makefile b/textproc/vgrep/Makefile index 6dadbda0d90..aa4cd897fbe 100644 --- a/textproc/vgrep/Makefile +++ b/textproc/vgrep/Makefile @@ -1,7 +1,7 @@ PORTNAME= vgrep DISTVERSIONPREFIX= v DISTVERSION= 2.6.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc MAINTAINER= lcook@FreeBSD.org diff --git a/textproc/zed/Makefile b/textproc/zed/Makefile index 595b021de6c..9dd50182297 100644 --- a/textproc/zed/Makefile +++ b/textproc/zed/Makefile @@ -1,7 +1,7 @@ PORTNAME?= zed DISTVERSIONPREFIX= v DISTVERSION= 1.2.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= meta@FreeBSD.org diff --git a/www/Makefile b/www/Makefile index fa7369c33f5..91cac07f79e 100644 --- a/www/Makefile +++ b/www/Makefile @@ -60,6 +60,7 @@ SUBDIR += c-icap-modules SUBDIR += cadaver SUBDIR += caddy + SUBDIR += caddy-custom SUBDIR += calamaris SUBDIR += calamaris-devel SUBDIR += caldavzap diff --git a/www/R-cran-webshot/Makefile b/www/R-cran-webshot/Makefile index 6200248de0d..299b19a4c76 100644 --- a/www/R-cran-webshot/Makefile +++ b/www/R-cran-webshot/Makefile @@ -1,11 +1,11 @@ PORTNAME= webshot -DISTVERSION= 0.5.3 +DISTVERSION= 0.5.4 CATEGORIES= www DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= ygy@FreeBSD.org COMMENT= Take Screenshots of Web Pages -WWW= https://wch.github.io/webshot/ +WWW= http://wch.github.io/webshot/ LICENSE= GPLv2 diff --git a/www/R-cran-webshot/distinfo b/www/R-cran-webshot/distinfo index 7b3cba8cde6..cbb8d15bfba 100644 --- a/www/R-cran-webshot/distinfo +++ b/www/R-cran-webshot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650493567 -SHA256 (webshot_0.5.3.tar.gz) = b7c4f2be61c8c4730202a9c3604072478e30cb85b423b7497cd703cc3f49dbc0 -SIZE (webshot_0.5.3.tar.gz) = 159427 +TIMESTAMP = 1664943943 +SHA256 (webshot_0.5.4.tar.gz) = 3dc2b9baef7855e1deea060276b9ccc6375eee36b7100987cbb1f8e5cd7a8f24 +SIZE (webshot_0.5.4.tar.gz) = 159902 diff --git a/www/adguardhome/Makefile b/www/adguardhome/Makefile index 97bd78342c7..e9261eec718 100644 --- a/www/adguardhome/Makefile +++ b/www/adguardhome/Makefile @@ -1,6 +1,7 @@ PORTNAME= adguardhome DISTVERSIONPREFIX= v -DISTVERSION= 0.107.14 +DISTVERSION= 0.107.15 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= yuri@FreeBSD.org diff --git a/www/adguardhome/distinfo b/www/adguardhome/distinfo index 30798da6c3a..0a8eccc2da9 100644 --- a/www/adguardhome/distinfo +++ b/www/adguardhome/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1664767027 -SHA256 (go/www_adguardhome/adguardhome-v0.107.14/adguardhome-html-build-0.107.14.tar.gz) = 313249b7f2597617e775da4e3dee25efa65d40234a3b6b8b179e245f3a7b94c9 -SIZE (go/www_adguardhome/adguardhome-v0.107.14/adguardhome-html-build-0.107.14.tar.gz) = 2614457 -SHA256 (go/www_adguardhome/adguardhome-v0.107.14/adguardhome-html-build2-0.107.14.tar.gz) = f05b2b50be72d6b4bcfbb5c77e039e28a4bc50e6c3e49876b86a0f43e7dea199 -SIZE (go/www_adguardhome/adguardhome-v0.107.14/adguardhome-html-build2-0.107.14.tar.gz) = 2414409 -SHA256 (go/www_adguardhome/adguardhome-v0.107.14/v0.107.14.mod) = ab98ff4705fa273d1dd74d916a494253fee62be3bddb9b6d7084a7ee55c7ec49 -SIZE (go/www_adguardhome/adguardhome-v0.107.14/v0.107.14.mod) = 2731 -SHA256 (go/www_adguardhome/adguardhome-v0.107.14/v0.107.14.zip) = 962752cb418890ab632bb211e1a54cddec3348f8fc010fc01877ceb5df3e6f3b -SIZE (go/www_adguardhome/adguardhome-v0.107.14/v0.107.14.zip) = 2390499 +TIMESTAMP = 1664983870 +SHA256 (go/www_adguardhome/adguardhome-v0.107.15/adguardhome-html-build-0.107.15.tar.gz) = 0cb96c994f3d4424c6b1b1b15321ff883b7a4ef51884360f8d7648de675c1ce2 +SIZE (go/www_adguardhome/adguardhome-v0.107.15/adguardhome-html-build-0.107.15.tar.gz) = 2613058 +SHA256 (go/www_adguardhome/adguardhome-v0.107.15/adguardhome-html-build2-0.107.15.tar.gz) = 04351b5e34f22778271926c1ac04d417af2a6cd9db74c433a786fd3dbee36b74 +SIZE (go/www_adguardhome/adguardhome-v0.107.15/adguardhome-html-build2-0.107.15.tar.gz) = 2414271 +SHA256 (go/www_adguardhome/adguardhome-v0.107.15/v0.107.15.mod) = 84b710f63ae6c291d965379c4cd1f970e6027c290629ebe9986055edcade7b45 +SIZE (go/www_adguardhome/adguardhome-v0.107.15/v0.107.15.mod) = 2828 +SHA256 (go/www_adguardhome/adguardhome-v0.107.15/v0.107.15.zip) = e9ca3041e8190b1d43224320798450040c6eeb80c7c7c42ced3be30028ab2fa6 +SIZE (go/www_adguardhome/adguardhome-v0.107.15/v0.107.15.zip) = 2392581 diff --git a/www/amfora/Makefile b/www/amfora/Makefile index 99d3b196fd7..c37fd1cbc78 100644 --- a/www/amfora/Makefile +++ b/www/amfora/Makefile @@ -1,7 +1,7 @@ PORTNAME= amfora DISTVERSIONPREFIX= v DISTVERSION= 1.9.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www MAINTAINER= lcook@FreeBSD.org diff --git a/www/aquatone/Makefile b/www/aquatone/Makefile index a3a03218323..4ede8c6a538 100644 --- a/www/aquatone/Makefile +++ b/www/aquatone/Makefile @@ -1,7 +1,7 @@ PORTNAME= aquatone DISTVERSIONPREFIX= v DISTVERSION= 1.7.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www security MAINTAINER= yuri@FreeBSD.org diff --git a/www/authelia/Makefile b/www/authelia/Makefile index afe73357bf0..0bdf70e0309 100644 --- a/www/authelia/Makefile +++ b/www/authelia/Makefile @@ -1,6 +1,7 @@ PORTNAME= authelia DISTVERSIONPREFIX= v DISTVERSION= 4.36.9 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://github.com/authelia/authelia/releases/download/v${DISTVERSION}/:public_html DISTFILES= authelia-${DISTVERSIONFULL}-public_html${EXTRACT_SUFX}:public_html # html root directory needs to be built in a special way diff --git a/www/bacula-web/Makefile b/www/bacula-web/Makefile index dda94458594..e0bf3515f01 100644 --- a/www/bacula-web/Makefile +++ b/www/bacula-web/Makefile @@ -1,6 +1,6 @@ PORTNAME= bacula-web DISTVERSIONPREFIX= v -DISTVERSION= 8.5.5 +DISTVERSION= 8.6.0 PORTREVISION= 1 CATEGORIES= www sysutils PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} diff --git a/www/bacula-web/distinfo b/www/bacula-web/distinfo index 6de6aa325c4..cbc8dd18496 100644 --- a/www/bacula-web/distinfo +++ b/www/bacula-web/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1654375504 -SHA256 (bacula-web-bacula-web-v8.5.5_GH0.tar.gz) = d55b8f4f3b350cd7fad2922547f0d1932bbbb4651df82a489a67d3c054f848ec -SIZE (bacula-web-bacula-web-v8.5.5_GH0.tar.gz) = 4557944 +TIMESTAMP = 1665069302 +SHA256 (bacula-web-bacula-web-v8.6.0_GH0.tar.gz) = 1e3bc603595ae66074afcceca62559474a88c3d68cb6e1195de77902256aaa3b +SIZE (bacula-web-bacula-web-v8.6.0_GH0.tar.gz) = 4567209 diff --git a/www/bacula-web/pkg-plist b/www/bacula-web/pkg-plist index 1d94747ab99..73a6cbe8ce8 100644 --- a/www/bacula-web/pkg-plist +++ b/www/bacula-web/pkg-plist @@ -1,7 +1,7 @@ -@group www -@owner www @dir(,,744) %%WWWDIR%%/application/assets/protected @dir(,,744) %%WWWDIR%%/application/views/cache +@group www +@owner www %%WWWDIR%%/.codeclimate.yml %%WWWDIR%%/.csslintrc %%WWWDIR%%/.eslintignore @@ -10,9 +10,12 @@ %%WWWDIR%%/.github/workflows/build.yml %%WWWDIR%%/.htaccess %%WWWDIR%%/.readthedocs.yaml +%%WWWDIR%%/.tx/config %%WWWDIR%%/CONTRIBUTING.md %%WWWDIR%%/LICENSE %%WWWDIR%%/README.md +%%WWWDIR%%/application/Entity/log.php +%%WWWDIR%%/application/Entity/user.php %%WWWDIR%%/application/assets/css/default.css %%WWWDIR%%/application/assets/images/bacula-web-logo.png %%WWWDIR%%/application/assets/js/default.js @@ -21,8 +24,12 @@ %%WWWDIR%%/application/config/.htaccess %%WWWDIR%%/application/config/application.php %%WWWDIR%%/application/libs/fileconfig.class.php +%%WWWDIR%%/application/locale/be/LC_MESSAGES/messages.mo +%%WWWDIR%%/application/locale/be/LC_MESSAGES/messages.po %%WWWDIR%%/application/locale/be_BY/LC_MESSAGES/messages.mo %%WWWDIR%%/application/locale/be_BY/LC_MESSAGES/messages.po +%%WWWDIR%%/application/locale/ca/LC_MESSAGES/messages.mo +%%WWWDIR%%/application/locale/ca/LC_MESSAGES/messages.po %%WWWDIR%%/application/locale/ca_ES/LC_MESSAGES/messages.mo %%WWWDIR%%/application/locale/ca_ES/LC_MESSAGES/messages.po %%WWWDIR%%/application/locale/de_DE/LC_MESSAGES/messages.mo @@ -41,23 +48,29 @@ %%WWWDIR%%/application/locale/nl_NL/LC_MESSAGES/messages.po %%WWWDIR%%/application/locale/no_NO/LC_MESSAGES/messages.mo %%WWWDIR%%/application/locale/no_NO/LC_MESSAGES/messages.po +%%WWWDIR%%/application/locale/pl/LC_MESSAGES/messages.mo +%%WWWDIR%%/application/locale/pl/LC_MESSAGES/messages.po %%WWWDIR%%/application/locale/pl_PL/LC_MESSAGES/messages.mo %%WWWDIR%%/application/locale/pl_PL/LC_MESSAGES/messages.po %%WWWDIR%%/application/locale/pt_BR/LC_MESSAGES/messages.mo %%WWWDIR%%/application/locale/pt_BR/LC_MESSAGES/messages.po +%%WWWDIR%%/application/locale/ro_RO/LC_MESSAGES/messages.mo +%%WWWDIR%%/application/locale/ro_RO/LC_MESSAGES/messages.po %%WWWDIR%%/application/locale/ru_RU/LC_MESSAGES/messages.mo %%WWWDIR%%/application/locale/ru_RU/LC_MESSAGES/messages.po %%WWWDIR%%/application/locale/sv_SE/LC_MESSAGES/messages.mo %%WWWDIR%%/application/locale/sv_SE/LC_MESSAGES/messages.po %%WWWDIR%%/application/locale/zh_CN/LC_MESSAGES/messages.mo %%WWWDIR%%/application/locale/zh_CN/LC_MESSAGES/messages.po -%%WWWDIR%%/application/models/clients.model.php -%%WWWDIR%%/application/models/database.model.php -%%WWWDIR%%/application/models/filesets.model.php -%%WWWDIR%%/application/models/jobfiles.model.php -%%WWWDIR%%/application/models/jobs.model.php -%%WWWDIR%%/application/models/pools.model.php -%%WWWDIR%%/application/models/volumes.model.php +%%WWWDIR%%/application/tables/CatalogTable.php +%%WWWDIR%%/application/tables/ClientTable.php +%%WWWDIR%%/application/tables/FileSetTable.php +%%WWWDIR%%/application/tables/JobFileTable.php +%%WWWDIR%%/application/tables/JobTable.php +%%WWWDIR%%/application/tables/LogTable.php +%%WWWDIR%%/application/tables/PoolTable.php +%%WWWDIR%%/application/tables/UserTable.php +%%WWWDIR%%/application/tables/VolumeTable.php %%WWWDIR%%/application/views/backupjob.view.php %%WWWDIR%%/application/views/cache/README %%WWWDIR%%/application/views/client.view.php @@ -93,22 +106,22 @@ %%WWWDIR%%/composer.json %%WWWDIR%%/composer.lock %%WWWDIR%%/console.php +%%WWWDIR%%/core/Exception/NotAuthorizedException.php +%%WWWDIR%%/core/Exception/PageNotFoundException.php %%WWWDIR%%/core/app/cerrorhandler.class.php -%%WWWDIR%%/core/app/cmodel.class.php %%WWWDIR%%/core/app/cview.class.php %%WWWDIR%%/core/app/userauth.class.php %%WWWDIR%%/core/app/webapplication.class.php -%%WWWDIR%%/core/bweb.class.php +%%WWWDIR%%/core/bootstrap.php %%WWWDIR%%/core/const.inc.php -%%WWWDIR%%/core/db/cdb.class.php +%%WWWDIR%%/core/db/Database.php +%%WWWDIR%%/core/db/DatabaseFactory.php +%%WWWDIR%%/core/db/Table.php %%WWWDIR%%/core/db/cdbpagination.class.php %%WWWDIR%%/core/db/cdbquery.class.php -%%WWWDIR%%/core/db/cdbresult.class.php -%%WWWDIR%%/core/db/cdbutils.class.php -%%WWWDIR%%/core/global.inc.php %%WWWDIR%%/core/graph/chart.class.php +%%WWWDIR%%/core/helpers/sanitizer.php %%WWWDIR%%/core/i18n/ctranslation.class.php -%%WWWDIR%%/core/utils/chttprequest.class.php %%WWWDIR%%/core/utils/cutils.class.php %%WWWDIR%%/core/utils/datetimeutil.class.php %%WWWDIR%%/core/utils/file.class.php @@ -157,6 +170,11 @@ %%WWWDIR%%/docs/source/_static/bacula-web-volumes.jpg %%WWWDIR%%/docs/source/conf.py %%WWWDIR%%/docs/source/index.rst -%%WWWDIR%%/index.php +%%WWWDIR%%/public/.htaccess +%%WWWDIR%%/public/css/.gitkeep +%%WWWDIR%%/public/fonts/.gitkeep +%%WWWDIR%%/public/img/.gitkeep +%%WWWDIR%%/public/index.php +%%WWWDIR%%/public/js/.gitkeep %%WWWDIR%%/sonar-project.properties @sample %%WWWDIR%%/application/config/config.php.sample diff --git a/www/beehive/Makefile b/www/beehive/Makefile index b320a156a1c..5b38075d0c8 100644 --- a/www/beehive/Makefile +++ b/www/beehive/Makefile @@ -1,7 +1,7 @@ PORTNAME= beehive DISTVERSIONPREFIX= v DISTVERSION= 0.4.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www MAINTAINER= lcook@FreeBSD.org diff --git a/www/bugzilla2atom/Makefile b/www/bugzilla2atom/Makefile index c23fbf23af3..3048193f6f1 100644 --- a/www/bugzilla2atom/Makefile +++ b/www/bugzilla2atom/Makefile @@ -1,6 +1,6 @@ PORTNAME= bugzilla2atom PORTVERSION= g20190711 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www MAINTAINER= ports@FreeBSD.org diff --git a/www/caddy-custom/Makefile b/www/caddy-custom/Makefile new file mode 100644 index 00000000000..ead426cc20b --- /dev/null +++ b/www/caddy-custom/Makefile @@ -0,0 +1,48 @@ +# READ pkg-descr FOR INSTRUCTIONS! +# This port will NOT build in poudriere without (simple) manual +# intervention. + +PORTNAME= caddy-custom +PORTVERSION= ${CADDY_VERSION}.${XCADDY_VERSION} +CATEGORIES= www +DISTFILES= # none + +MAINTAINER= adamw@FreeBSD.org +COMMENT= Caddy (www/caddy) with customized plugins +WWW= https://caddyserver.com + +LICENSE= APACHE20 + +BUILD_DEPENDS= xcaddy:www/xcaddy + +USES= go:no_targets + +NO_PACKAGE= Requires network access (see pkg-descr) + +CONFLICTS_INSTALL= caddy + +USE_RC_SUBR= caddy +SUB_FILES= caddy + +PLIST_FILES= bin/caddy + +CADDY_VERSION!= ${MAKE} -C ${.CURDIR}/../caddy -V '$${DISTVERSION}.$${PORTREVISION}' +XCADDY_VERSION!=${MAKE} -C ${.CURDIR}/../xcaddy -V '$${DISTVERSION}.$${PORTREVISION}' + +.for plugin in ${CADDY_CUSTOM_PLUGINS} +PLUGINS+= --with ${plugin} +.endfor + +XCADDY_GO_BUILD_FLAGS?= ${GO_BUILDFLAGS} + +XCADDY_ENV+= XCADDY_WHICH_GO="${GO_CMD}" \ + XCADDY_GO_BUILD_FLAGS="${XCADDY_GO_BUILD_FLAGS}" + +do-build: + ${MKDIR} ${WRKSRC} + cd ${WRKSRC} && ${XCADDY_ENV} ${LOCALBASE}/bin/xcaddy build ${PLUGINS} + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/caddy ${STAGEDIR}${PREFIX}/bin + +.include diff --git a/www/xcaddy/files/caddy.in b/www/caddy-custom/files/caddy.in similarity index 100% rename from www/xcaddy/files/caddy.in rename to www/caddy-custom/files/caddy.in diff --git a/www/caddy-custom/pkg-descr b/www/caddy-custom/pkg-descr new file mode 100644 index 00000000000..c5983d9a92a --- /dev/null +++ b/www/caddy-custom/pkg-descr @@ -0,0 +1,32 @@ +This port will build a customized version of the caddy webserver +using plugins of your choice. You will need to rebuild this port +manually if one of your plugins gets updated. + +Caddy is a high-performance webserver with a simple config format, +out-of-the-box HTTP/3 support, and automatica transparent ACME +certificate provisioning. + +NOTE: THIS PORT BYPASSES EVERY SINGLE ONE OF FREEBSD'S CHECKSUM- +BASED DISTFILE TAMPERING DETECTION MECHANISMS. USE THIS AT YOUR +OWN PERIL (though the peril is exactly the same as using the +xcaddy port). + +To make this work: + +1) In /usr/local/etc/poudriere.conf, add the following: + + ALLOW_NETWORKING_PACKAGES="caddy-custom" + + You can skip this step if you're not building in poudriere. + +2) Put your plugin list into make.conf (or + /usr/local/etc/poudriere.conf/make.conf): + + .if ${.CURDIR:M*/www/caddy-custom*} + CADDY_CUSTOM_PLUGINS= github.com/caddy-dns/rfc2136 github.com/greenpau/caddy-security + .endif + + If you have any other xcaddy build flags you want to set, put + them in XCADDY_ENV. + +3) Profit diff --git a/www/caddy/Makefile b/www/caddy/Makefile index 996886ebdf0..6fef82b70af 100644 --- a/www/caddy/Makefile +++ b/www/caddy/Makefile @@ -1,7 +1,7 @@ PORTNAME= caddy DISTVERSIONPREFIX= v DISTVERSION= 2.6.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www DIST_SUBDIR= caddy @@ -18,7 +18,7 @@ CPE_VENDOR= caddyserver USE_RC_SUBR= caddy SUB_FILES= Caddyfile.sample caddy pkg-message -CONFLICTS_INSTALL= xcaddy +CONFLICTS_INSTALL= caddy-custom PLIST_FILES= bin/${PORTNAME} \ "@sample ${ETCDIR_REL}/Caddyfile.sample" diff --git a/www/carbonapi/Makefile b/www/carbonapi/Makefile index 697d6d03db0..f0d54f3441b 100644 --- a/www/carbonapi/Makefile +++ b/www/carbonapi/Makefile @@ -1,6 +1,6 @@ PORTNAME= carbonapi DISTVERSION= 0.14.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MAINTAINER= a.andersson.thn@gmail.com diff --git a/www/chisel/Makefile b/www/chisel/Makefile index f2388f03b32..b8000bebd27 100644 --- a/www/chisel/Makefile +++ b/www/chisel/Makefile @@ -1,7 +1,7 @@ PORTNAME= chisel DISTVERSIONPREFIX= v DISTVERSION= 1.7.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MAINTAINER= lcook@FreeBSD.org diff --git a/www/cl-lml-sbcl/Makefile b/www/cl-lml-sbcl/Makefile index 70804c0f907..f54fef45092 100644 --- a/www/cl-lml-sbcl/Makefile +++ b/www/cl-lml-sbcl/Makefile @@ -1,6 +1,6 @@ PORTNAME= lml PORTVERSION= 2.5.7 -PORTREVISION= 69 +PORTREVISION= 70 CATEGORIES= www textproc PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/www/colly/Makefile b/www/colly/Makefile index 6e545b98bb7..aef2e10cce0 100644 --- a/www/colly/Makefile +++ b/www/colly/Makefile @@ -1,7 +1,7 @@ PORTNAME= colly DISTVERSIONPREFIX= v DISTVERSION= 2.1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MAINTAINER= yuri@FreeBSD.org diff --git a/www/darkhttpd/Makefile b/www/darkhttpd/Makefile index f190671eeb2..06b933fec0e 100644 --- a/www/darkhttpd/Makefile +++ b/www/darkhttpd/Makefile @@ -1,6 +1,7 @@ PORTNAME= darkhttpd DISTVERSIONPREFIX= v DISTVERSION= 1.13 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= henrichartzer@tuta.io @@ -13,12 +14,24 @@ USES= cpe CPE_VENDOR= darkhttpd_project +USE_RC_SUBR= darkhttpd USE_GITHUB= yes GH_ACCOUNT= emikulic -PLIST_FILES= bin/darkhttpd +USERS= darkhttpd +GROUPS= darkhttpd + +SUB_LIST= USER=${USERS:[1]} \ + GROUP=${GROUPS:[1]} + +PLIST_SUB= USER=${USERS:[1]} \ + GROUP=${GROUPS:[1]} do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${LOCALBASE}/bin +post-install: + ${INSTALL} -d ${STAGEDIR}${WWWDIR} + ${INSTALL} -d ${STAGEDIR}/var/run/darkhttpd + .include diff --git a/www/darkhttpd/files/darkhttpd.in b/www/darkhttpd/files/darkhttpd.in new file mode 100644 index 00000000000..43b7e3d23fb --- /dev/null +++ b/www/darkhttpd/files/darkhttpd.in @@ -0,0 +1,31 @@ +#!/bin/sh + +# PROVIDE: darkhttpd +# REQUIRE: LOGIN +# KEYWORD: shutdown +# +# Configuration settings for darkhttpd in /etc/rc.conf +# +# darkhttpd_enable (bool): Enable darkhttpd. (default=NO) +# darkhttpd_dir (str): WWW root directory. (default=%%WWWDIR%%) +# darkhttpd_flags (str): Flags used for darkhttpd. (default=--uid %%USER%% --gid %%GROUP%%) +# + +. /etc/rc.subr + +name="darkhttpd" +rcvar="${name}_enable" + +load_rc_config $name + +: ${darkhttpd_enable:="NO"} +: ${darkhttpd_dir:=%%WWWDIR%%} +: ${darkhttpd_flags=--uid %%USER%% --gid %%GROUP%%} + +darkhttpd_flags="${darkhttpd_dir} ${darkhttpd_flags}" + +command="%%LOCALBASE%%/bin/darkhttpd" +pidfile="/var/run/darkhttpd/darkhttpd.pid" +command_args="--daemon --pidfile ${pidfile}" + +run_rc_command "$1" diff --git a/www/darkhttpd/pkg-plist b/www/darkhttpd/pkg-plist new file mode 100644 index 00000000000..b4cfa3a1eb4 --- /dev/null +++ b/www/darkhttpd/pkg-plist @@ -0,0 +1,3 @@ +bin/darkhttpd +@dir %%WWWDIR%% +@dir(%%USER%%,%%GROUP%%,755) /var/run/darkhttpd diff --git a/www/devd/Makefile b/www/devd/Makefile index 51ec76d657c..97c33f022d7 100644 --- a/www/devd/Makefile +++ b/www/devd/Makefile @@ -1,7 +1,7 @@ PORTNAME= devd DISTVERSIONPREFIX= v DISTVERSION= 0.9 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= www devel MAINTAINER= yuri@FreeBSD.org diff --git a/www/eden/Makefile b/www/eden/Makefile index e9a2cdd435b..1a995d1cb31 100644 --- a/www/eden/Makefile +++ b/www/eden/Makefile @@ -1,7 +1,7 @@ PORTNAME= eden PORTVERSION= 0.7.4 DISTVERSIONPREFIX= v -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= www PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/www/fabio/Makefile b/www/fabio/Makefile index 5a99609d1f9..28c17c77b78 100644 --- a/www/fabio/Makefile +++ b/www/fabio/Makefile @@ -1,6 +1,6 @@ PORTNAME= fabio PORTVERSION= 1.6.0 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONPREFIX= v CATEGORIES= www diff --git a/www/filtron/Makefile b/www/filtron/Makefile index d4d8da17429..c47b00a335a 100644 --- a/www/filtron/Makefile +++ b/www/filtron/Makefile @@ -1,6 +1,6 @@ PORTNAME= filtron PORTVERSION= g20180218 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www MAINTAINER= yuri@FreeBSD.org diff --git a/www/gitea/Makefile b/www/gitea/Makefile index 54d87d0c248..05cf7187b03 100644 --- a/www/gitea/Makefile +++ b/www/gitea/Makefile @@ -1,6 +1,7 @@ PORTNAME= gitea DISTVERSIONPREFIX= v DISTVERSION= 1.17.2 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://github.com/go-gitea/gitea/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ \ https://dl.gitea.io/gitea/${DISTVERSION}/ diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index c0aad6d00ba..190c23998c2 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitlab-ce PORTVERSION= 15.3.4 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile index 38d1b0067a3..1084405c8f0 100644 --- a/www/gitlab-pages/Makefile +++ b/www/gitlab-pages/Makefile @@ -1,7 +1,7 @@ PORTNAME= gitlab-pages PORTVERSION= 1.61.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MAINTAINER= swills@FreeBSD.org diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index a31964a5d94..c446bff6411 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,5 +1,6 @@ PORTNAME= gitlab-workhorse PORTVERSION= 15.3.4 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= www diff --git a/www/go-www/Makefile b/www/go-www/Makefile index 99d4d7e218f..bfa22058ab7 100644 --- a/www/go-www/Makefile +++ b/www/go-www/Makefile @@ -1,6 +1,6 @@ PORTNAME= www PORTVERSION= 2.0.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www PKGNAMEPREFIX= go- diff --git a/www/gobuffalo/Makefile b/www/gobuffalo/Makefile index 7c9c27c1838..f43384ef9ed 100644 --- a/www/gobuffalo/Makefile +++ b/www/gobuffalo/Makefile @@ -1,7 +1,7 @@ PORTNAME= gobuffalo PORTVERSION= 0.16.27 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MAINTAINER= dmgk@FreeBSD.org diff --git a/www/gohugo/Makefile b/www/gohugo/Makefile index 700ce143d1a..8d7d02e8483 100644 --- a/www/gohugo/Makefile +++ b/www/gohugo/Makefile @@ -1,6 +1,7 @@ PORTNAME= hugo DISTVERSIONPREFIX= v -DISTVERSION= 0.104.2 +DISTVERSION= 0.104.3 +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= go DIST_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME} diff --git a/www/gohugo/distinfo b/www/gohugo/distinfo index 9f273033038..f49a3f21cc7 100644 --- a/www/gohugo/distinfo +++ b/www/gohugo/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1664726673 -SHA256 (go/www_gohugo/hugo-v0.104.2/v0.104.2.mod) = 2d99636ec486624b3af9a80bbdaa43a5b70cd09c6f1e2c6949e66ae037f1fc57 -SIZE (go/www_gohugo/hugo-v0.104.2/v0.104.2.mod) = 5538 -SHA256 (go/www_gohugo/hugo-v0.104.2/v0.104.2.zip) = 7fc5b86802be2284c09e0f5602323d53a9b26a6fc40f66f9c4bba2517a676079 -SIZE (go/www_gohugo/hugo-v0.104.2/v0.104.2.zip) = 5980658 +TIMESTAMP = 1664914461 +SHA256 (go/www_gohugo/hugo-v0.104.3/v0.104.3.mod) = 2d99636ec486624b3af9a80bbdaa43a5b70cd09c6f1e2c6949e66ae037f1fc57 +SIZE (go/www_gohugo/hugo-v0.104.3/v0.104.3.mod) = 5538 +SHA256 (go/www_gohugo/hugo-v0.104.3/v0.104.3.zip) = d204be83c97184d0c448f886b71b44e70bd7d3c1b21ae016a835d90907092dd1 +SIZE (go/www_gohugo/hugo-v0.104.3/v0.104.3.zip) = 5983005 diff --git a/www/gotty/Makefile b/www/gotty/Makefile index 4fae9b2cfc2..9248d5a02c3 100644 --- a/www/gotty/Makefile +++ b/www/gotty/Makefile @@ -1,7 +1,7 @@ PORTNAME= gotty PORTVERSION= 1.0.1 DISTVERSIONPREFIX= v -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= www net MAINTAINER= ehaupt@FreeBSD.org diff --git a/www/grafana7/Makefile b/www/grafana7/Makefile index 29f3349243c..4bb2d1270f5 100644 --- a/www/grafana7/Makefile +++ b/www/grafana7/Makefile @@ -1,7 +1,7 @@ PORTNAME= grafana DISTVERSIONPREFIX= v DISTVERSION= 7.5.15 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MASTER_SITES+= https://dl.grafana.com/oss/release/:public \ https://gitea.com/xorm/builder/archive/:builder \ @@ -20,6 +20,9 @@ WWW= https://github.com/grafana/grafana LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE +DEPRECATED= EOLed upstream, unfixed vulnerabilities +EXPIRATION_DATE= 2022-11-06 + ONLY_FOR_ARCHS= aarch64 amd64 i386 RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss diff --git a/www/grafana8/Makefile b/www/grafana8/Makefile index ee67924e3c7..cbbddb4d44a 100644 --- a/www/grafana8/Makefile +++ b/www/grafana8/Makefile @@ -1,6 +1,7 @@ PORTNAME= grafana DISTVERSIONPREFIX= v DISTVERSION= 8.5.13 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://dl.grafana.com/oss/release/:public PKGNAMESUFFIX= ${DISTVERSION:C/([0-9]).*/\1/1} diff --git a/www/grafana9/Makefile b/www/grafana9/Makefile index a550f5c8d23..b9c2dad51c3 100644 --- a/www/grafana9/Makefile +++ b/www/grafana9/Makefile @@ -1,6 +1,7 @@ PORTNAME= grafana DISTVERSIONPREFIX= v DISTVERSION= 9.1.6 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://dl.grafana.com/oss/release/:public \ https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod diff --git a/www/gurl/Makefile b/www/gurl/Makefile index 0e9111281be..07fcf1decbb 100644 --- a/www/gurl/Makefile +++ b/www/gurl/Makefile @@ -1,7 +1,7 @@ PORTNAME= gurl DISTVERSIONPREFIX= v DISTVERSION= 0.2.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MAINTAINER= dch@FreeBSD.org diff --git a/www/iridium/Makefile b/www/iridium/Makefile index 5721873952a..d97ef304ab1 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -1,6 +1,5 @@ PORTNAME= iridium -PORTVERSION= 2022.04.100.0 -PORTREVISION= 6 +PORTVERSION= 2022.10.106 CATEGORIES= www wayland MASTER_SITES= https://downloads.iridiumbrowser.de/source/ PKGNAMESUFFIX= -browser @@ -15,6 +14,9 @@ LICENSE_COMB= multi ONLY_FOR_ARCHS= aarch64 amd64 i386 +PATCH_SITES= https://raw.githubusercontent.com/ungoogled-software/ungoogled-chromium/master/patches/core/ungoogled-chromium/ +PATCHFILES+= disable-privacy-sandbox.patch:-p1 + BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ @@ -64,8 +66,9 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic -USES= bison compiler:c++17-lang cpe desktop-file-utils gl gnome jpeg localbase:ldflags \ - ninja perl5 pkgconfig python:3.7+,build shebangfix tar:xz xorg +USES= bison compiler:c++17-lang cpe desktop-file-utils gl gnome iconv jpeg \ + localbase:ldflags ninja perl5 pkgconfig python:3.7+,build shebangfix \ + tar:xz xorg CPE_VENDOR= google CPE_PRODUCT= chrome @@ -89,13 +92,13 @@ BINARY_ALIAS= python3=${PYTHON_CMD} # replace_gn_files.py script, some parts just turned on/off for target host # OS "target_os == is_bsd", like libusb, libpci. GN_ARGS+= clang_use_chrome_plugins=false \ + chrome_pgo_phase=0 \ enable_hangout_services_extension=true \ enable_js_type_check=false \ enable_nacl=false \ - enable_one_click_signin=true \ enable_remoting=false \ - enable_wmax_tokens=false \ fatal_linker_warnings=false \ + icu_use_data_file=false \ is_clang=true \ optimize_webui=true \ toolkit_views=true \ @@ -110,6 +113,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \ use_system_freetype=false \ use_system_harfbuzz=true \ use_system_libjpeg=true \ + use_system_libwayland=true \ use_system_wayland_scanner=true \ use_udev=false \ extra_cxxflags="${CXXFLAGS}" \ @@ -192,7 +196,7 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base .endif -.if ${COMPILER_VERSION} < 130 +.if ${COMPILER_VERSION} != 130 LLVM_DEFAULT= 13 BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ @@ -234,7 +238,7 @@ pre-configure: #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ - flac fontconfig freetype harfbuzz-ng libdrm libevent libpng \ + flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \ libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE} # Iridium uses an unreleased version of FFmpeg, so configure it .for brand in Chrome Chromium @@ -278,7 +282,7 @@ do-install: .for d in protoc mksnapshot ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor -.for d in icudtl.dat snapshot_blob.bin v8_context_snapshot.bin +.for d in snapshot_blob.bin v8_context_snapshot.bin ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \ @@ -304,10 +308,6 @@ do-install: .if ${ARCH} != aarch64 @${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvk_swiftshader.so ${STAGEDIR}${DATADIR} -.for g in libEGL.so libGLESv2.so - ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \ - ${STAGEDIR}${DATADIR}/swiftshader -.endfor .endif post-install-DEBUG-on: diff --git a/www/iridium/distinfo b/www/iridium/distinfo index 4d2cc8c84a2..2d60e811af3 100644 --- a/www/iridium/distinfo +++ b/www/iridium/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1648800090 -SHA256 (iridium-browser-2022.04.100.0.tar.xz) = 1a111c3ac3f50e81a3120a9936941682bb66bd5a5287d92a2ccf0158a0cf2b1e -SIZE (iridium-browser-2022.04.100.0.tar.xz) = 1323781188 +TIMESTAMP = 1664950159 +SHA256 (iridium-browser-2022.10.106.tar.xz) = ec141f4dad5b16ce8f8d30400673242932f2857d684fb67c956f10effedb1cfa +SIZE (iridium-browser-2022.10.106.tar.xz) = 1333488380 +SHA256 (disable-privacy-sandbox.patch) = 71196aab024da3db1c078e42599311e39f5e7760657461f07cc212bb17e0cd52 +SIZE (disable-privacy-sandbox.patch) = 4772 diff --git a/www/iridium/files/patch-BUILD.gn b/www/iridium/files/patch-BUILD.gn index b8f84eb8025..41a0ab1bfd1 100644 --- a/www/iridium/files/patch-BUILD.gn +++ b/www/iridium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ BUILD.gn @@ -53,7 +53,7 @@ declare_args() { root_extra_deps = [] @@ -9,7 +9,15 @@ # An official (maximally optimized!) component (optimized for build times) # build doesn't make sense and usually doesn't work. assert(!is_component_build) -@@ -452,7 +452,7 @@ group("gn_all") { +@@ -83,7 +83,6 @@ group("gn_all") { + "//codelabs", + "//components:components_unittests", + "//components/gwp_asan:gwp_asan_unittests", +- "//infra/orchestrator:orchestrator_all", + "//net:net_unittests", + "//sandbox:sandbox_unittests", + "//services:services_unittests", +@@ -441,7 +440,7 @@ group("gn_all") { ] } @@ -18,8 +26,8 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -636,6 +636,15 @@ group("gn_all") { - } +@@ -642,6 +641,15 @@ group("gn_all") { + deps += [ "//gpu/tools/compositor_model_bench" ] } + if (is_bsd) { @@ -34,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:crash_inspector", -@@ -685,7 +694,7 @@ group("gn_all") { +@@ -690,7 +698,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -43,7 +51,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1147,7 +1156,7 @@ if (!is_ios) { +@@ -1202,7 +1210,7 @@ if (!is_ios) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -52,7 +60,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1156,7 +1165,7 @@ if (!is_ios) { +@@ -1211,7 +1219,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -61,12 +69,12 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1531,7 +1540,7 @@ group("chromium_builder_perf") { +@@ -1654,7 +1662,7 @@ group("chromium_builder_perf") { + data_deps += [ "//chrome/test:performance_browser_tests" ] + } - if (is_win) { - data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] -- } else { -+ } else if (!is_bsd) { +- if (!is_win) { ++ if (!is_win && !is_bsd) { data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } diff --git a/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc index 0105a9cf775..244858d6b19 100644 --- a/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc +++ b/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc @@ -1,6 +1,6 @@ ---- apps/ui/views/app_window_frame_view.cc.orig 2022-03-28 18:11:04 UTC +--- apps/ui/views/app_window_frame_view.cc.orig 2022-10-05 07:34:01 UTC +++ apps/ui/views/app_window_frame_view.cc -@@ -138,7 +138,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient +@@ -137,7 +137,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient gfx::Rect window_bounds = client_bounds; // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/iridium/files/patch-base_BUILD.gn b/www/iridium/files/patch-base_BUILD.gn index 4d25c3a44f3..ae3b1f61ce4 100644 --- a/www/iridium/files/patch-base_BUILD.gn +++ b/www/iridium/files/patch-base_BUILD.gn @@ -1,15 +1,24 @@ ---- base/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- base/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ base/BUILD.gn -@@ -999,7 +999,7 @@ mixed_component("base") { +@@ -162,7 +162,7 @@ buildflag_header("ios_cronet_buildflags") { + flags = [ "CRONET_BUILD=$is_cronet_build" ] + } + +-enable_message_pump_epoll = is_linux || is_chromeos || is_android ++enable_message_pump_epoll = (is_linux || is_chromeos || is_android) && !is_bsd + buildflag_header("message_pump_buildflags") { + header = "message_pump_buildflags.h" + header_dir = "base/message_loop" +@@ -1031,7 +1031,7 @@ mixed_component("base") { "timer/hi_res_timer_manager_posix.cc", ] - if (!is_nacl && !is_apple) { + if (!is_nacl && !is_apple && !is_bsd) { sources += [ - "cpu_affinity_posix.cc", - "cpu_affinity_posix.h", -@@ -1010,6 +1010,12 @@ mixed_component("base") { + "profiler/stack_copier_signal.cc", + "profiler/stack_copier_signal.h", +@@ -1040,6 +1040,12 @@ mixed_component("base") { "profiler/thread_delegate_posix.h", ] } @@ -22,12 +31,12 @@ } if (is_win) { -@@ -1478,11 +1484,23 @@ mixed_component("base") { +@@ -1541,11 +1547,23 @@ mixed_component("base") { + # Needed for if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. - if (!use_sysroot && -- (is_android || ((is_linux || is_chromeos) && !is_chromecast)) && -+ (is_android || ((is_linux || is_chromeos) && !is_chromecast && !is_bsd)) && +- if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) && ++ if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos && !is_bsd)) && host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } @@ -47,7 +56,7 @@ if (use_allocator_shim) { sources += [ "allocator/allocator_shim.cc", -@@ -1506,7 +1524,7 @@ mixed_component("base") { +@@ -1573,7 +1591,7 @@ mixed_component("base") { ] configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ] } @@ -56,22 +65,22 @@ sources += [ "allocator/allocator_shim_override_cpp_symbols.h", "allocator/allocator_shim_override_glibc_weak_symbols.h", -@@ -1563,7 +1581,7 @@ mixed_component("base") { +@@ -1629,7 +1647,7 @@ mixed_component("base") { + # Allow more direct string conversions on platforms with native utf8 # strings - # TODO(crbug/1052397): Consider replacing is_ash with is_chromeos once lacros switches to target_os=chromeos -- if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia) { -+ if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia || is_bsd) { +- if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia) { ++ if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia || is_bsd) { defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2243,6 +2261,42 @@ mixed_component("base") { +@@ -2211,6 +2229,42 @@ mixed_component("base") { } } + if (is_bsd) { + sources -= [ -+ "files/file_path_watcher_linux.cc", ++ "files/file_path_watcher_inotify.cc", + "files/file_util_linux.cc", + "files/scoped_file_linux.cc", + "process/memory_linux.cc", @@ -108,7 +117,16 @@ # iOS if (is_ios) { sources -= [ -@@ -3495,7 +3549,7 @@ test("base_unittests") { +@@ -2310,7 +2364,7 @@ mixed_component("base") { + } + + if (dep_libevent) { +- deps += [ "//third_party/libevent" ] ++ public_deps += [ "//third_party/libevent" ] + } + + if (use_libevent) { +@@ -3545,7 +3599,7 @@ test("base_unittests") { } } @@ -117,25 +135,25 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3543,7 +3597,7 @@ test("base_unittests") { +@@ -3593,7 +3647,7 @@ test("base_unittests") { + "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", - "task/thread_pool/task_tracker_posix_unittest.cc", ] - if (!is_nacl && !is_apple) { + if (!is_nacl && !is_apple && !is_bsd) { sources += [ - "cpu_affinity_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3555,7 +3609,7 @@ test("base_unittests") { + "profiler/thread_delegate_posix_unittest.cc", +@@ -3603,7 +3657,7 @@ test("base_unittests") { + # Allow more direct string conversions on platforms with native utf8 # strings - # TODO(crbug/1052397): Consider replacing is_ash with is_chromeos once lacros switches to target_os=chromeos -- if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia) { -+ if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia || is_bsd) { +- if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia) { ++ if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia || is_bsd) { defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3724,7 +3778,7 @@ test("base_unittests") { +@@ -3791,7 +3845,7 @@ test("base_unittests") { } } diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_address__space__randomization.h b/www/iridium/files/patch-base_allocator_partition__allocator_address__space__randomization.h index c222fc02950..bd62431db8a 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_address__space__randomization.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_address__space__randomization.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/address_space_randomization.h.orig 2022-03-28 18:11:04 UTC +--- base/allocator/partition_allocator/address_space_randomization.h.orig 2022-10-05 07:34:01 UTC +++ base/allocator/partition_allocator/address_space_randomization.h @@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) { @@ -9,3 +9,12 @@ // We shouldn't allocate system pages at all for sanitizer builds. However, // we do, and if random hint addresses interfere with address ranges +@@ -128,7 +128,7 @@ AslrMask(uintptr_t bits) { + return AslrAddress(0x20000000ULL); + } + +- #elif BUILDFLAG(IS_LINUX) ++ #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + // Linux on arm64 can use 39, 42, 48, or 52-bit user space, depending on + // page size and number of levels of translation pages used. We use diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator.h b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator.h index a9fd643b080..92e7ce5dca0 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator.h @@ -1,9 +1,9 @@ ---- base/allocator/partition_allocator/page_allocator.h.orig 2022-03-28 18:11:04 UTC +--- base/allocator/partition_allocator/page_allocator.h.orig 2022-10-05 07:34:01 UTC +++ base/allocator/partition_allocator/page_allocator.h -@@ -194,7 +194,7 @@ BASE_EXPORT void DecommitAndZeroSystemPages(void* addr - // Whether decommitted memory is guaranteed to be zeroed when it is +@@ -206,7 +206,7 @@ void DecommitAndZeroSystemPages(void* address, size_t // recommitted. Do not assume that this will not change over time. - constexpr BASE_EXPORT bool DecommittedMemoryIsAlwaysZeroed() { + constexpr PA_COMPONENT_EXPORT( + PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() { -#if BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) return false; diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h new file mode 100644 index 00000000000..6b5bc2f5fec --- /dev/null +++ b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h @@ -0,0 +1,38 @@ +--- base/allocator/partition_allocator/page_allocator_constants.h.orig 2022-10-05 07:34:01 UTC ++++ base/allocator/partition_allocator/page_allocator_constants.h +@@ -25,7 +25,7 @@ + // elimination. + #define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const)) + +-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) + // This should work for all POSIX (if needed), but currently all other + // supported OS/architecture combinations use either hard-coded values + // (such as x86) or have means to determine these values without needing +@@ -81,7 +81,7 @@ PageAllocationGranularityShift() { + return 14; // 16kB + #elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS) + return static_cast(vm_page_shift); +-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) + // arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16) + // page sizes. Retrieve from or initialize cache. + size_t shift = page_characteristics.shift.load(std::memory_order_relaxed); +@@ -102,7 +102,7 @@ PageAllocationGranularity() { + // This is literally equivalent to |1 << PageAllocationGranularityShift()| + // below, but was separated out for IS_APPLE to avoid << on a non-constexpr. + return vm_page_size; +-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) + // arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or + // initialize cache. + size_t size = page_characteristics.size.load(std::memory_order_relaxed); +@@ -141,7 +141,7 @@ SystemPageShift() { + PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t + SystemPageSize() { + #if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ +- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) ++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)) + // This is literally equivalent to |1 << SystemPageShift()| below, but was + // separated out for 64-bit IS_APPLE and arm64 on Linux to avoid << on a + // non-constexpr. diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index 59f1794594a..7e2fb6dea88 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-04-01 07:48:30 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-10-05 07:34:01 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -352,8 +352,12 @@ bool TryRecommitSystemPagesInternal( +@@ -347,8 +347,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { void* ptr = reinterpret_cast(address); diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__address__space.cc b/www/iridium/files/patch-base_allocator_partition__allocator_partition__address__space.cc new file mode 100644 index 00000000000..7a16a6f8547 --- /dev/null +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__address__space.cc @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-10-05 07:34:01 UTC ++++ base/allocator/partition_allocator/partition_address_space.cc +@@ -238,7 +238,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT + setup_.configurable_pool_ = 0; + } + +-#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) + + PageCharacteristics page_characteristics; + diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.cc b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.cc index cafa2b6ed79..5ffea8d6979 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.cc @@ -1,15 +1,17 @@ ---- base/allocator/partition_allocator/partition_alloc.cc.orig 2022-03-28 18:11:04 UTC +--- base/allocator/partition_allocator/partition_alloc.cc.orig 2022-10-05 07:34:01 UTC +++ base/allocator/partition_allocator/partition_alloc.cc -@@ -56,7 +56,12 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me +@@ -63,8 +63,14 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me "maximum direct mapped allocation"); // Check that some of our zanier calculations worked out as expected. +#if defined(__i386__) && defined(OS_FREEBSD) + // alignof(std::max_align_t) is only 4 on FreeBSD/i386 -+ static_assert(kSmallestBucket >= kAlignment, "generic smallest bucket"); ++ static_assert(internal::kSmallestBucket >= internal::kAlignment, ++ "generic smallest bucket"); +#else - static_assert(kSmallestBucket == kAlignment, "generic smallest bucket"); + static_assert(internal::kSmallestBucket == internal::kAlignment, + "generic smallest bucket"); +#endif - static_assert(kMaxBucketed == 917504, "generic max bucketed"); + static_assert(internal::kMaxBucketed == 917504, "generic max bucketed"); STATIC_ASSERT_OR_PA_CHECK( - MaxSystemPagesPerRegularSlotSpan() <= 16, + internal::MaxSystemPagesPerRegularSlotSpan() <= 16, diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc new file mode 100644 index 00000000000..27caa9d573a --- /dev/null +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc @@ -0,0 +1,13 @@ +--- base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig 2022-10-05 07:34:01 UTC ++++ base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc +@@ -86,6 +86,10 @@ void RandBytes(void* output, size_t output_length) { + if (getentropy(output, output_length) == 0) { + return; + } ++#elif BUILDFLAG(IS_BSD) ++ if (getentropy(output, output_length) == 0) { ++ return; ++ } + #endif + + // If the OS-specific mechanisms didn't work, fall through to reading from diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__internal__posix.h b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__internal__posix.h new file mode 100644 index 00000000000..314a3557e86 --- /dev/null +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__internal__posix.h @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h.orig 2022-10-05 07:34:01 UTC ++++ base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h +@@ -10,7 +10,7 @@ + + namespace partition_alloc::internal::base::internal { + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Current thread id is cached in thread local storage for performance reasons. + // In some rare cases it's important to invalidate that cache explicitly (e.g. + // after going through clone() syscall which does not call pthread_atfork() diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc new file mode 100644 index 00000000000..44ffb0c58ad --- /dev/null +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc.orig 2022-10-05 07:34:01 UTC ++++ base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc +@@ -17,7 +17,7 @@ + #include "base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h" + #include "build/build_config.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include + #include + #endif diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h index 4a1da70acf5..00bceb14ac9 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-04-01 07:48:30 UTC +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-10-05 07:34:01 UTC +++ base/allocator/partition_allocator/partition_alloc_config.h -@@ -59,7 +59,7 @@ static_assert(sizeof(void*) != 8, ""); +@@ -76,7 +76,7 @@ static_assert(sizeof(void*) != 8, ""); // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific // features such as futex(2). @@ -9,7 +9,7 @@ #define PA_HAS_LINUX_KERNEL #endif -@@ -179,7 +179,7 @@ constexpr bool kUseLazyCommit = false; +@@ -195,7 +195,7 @@ constexpr bool kUseLazyCommit = false; // On these platforms, lock all the partitions before fork(), and unlock after. // This may be required on more platforms in the future. @@ -18,3 +18,12 @@ #define PA_HAS_ATFORK_HANDLER #endif +@@ -235,7 +235,7 @@ constexpr bool kUseLazyCommit = false; + // + // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to + // larger slot spans. +-#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) ++#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD) + #define PA_PREFER_SMALLER_SLOT_SPANS + #endif // BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) + diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h new file mode 100644 index 00000000000..847dbd39091 --- /dev/null +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h @@ -0,0 +1,20 @@ +--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-10-05 07:34:01 UTC ++++ base/allocator/partition_allocator/partition_alloc_constants.h +@@ -91,7 +91,7 @@ PartitionPageShift() { + return 18; // 256 KiB + } + #elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ +- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) ++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)) + PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t + PartitionPageShift() { + return PageAllocationGranularityShift() + 2; +@@ -270,7 +270,7 @@ constexpr size_t kNumPools = 3; + // Special-case Android and iOS, which incur test failures with larger + // GigaCage. Regardless, allocating >8GiB with malloc() on these platforms is + // unrealistic as of 2022. +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + constexpr size_t kPoolMaxSize = 8 * kGiB; + #else + constexpr size_t kPoolMaxSize = 16 * kGiB; diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__page.h b/www/iridium/files/patch-base_allocator_partition__allocator_partition__page.h index d508f6fa4ee..3b248067a37 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__page.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__page.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_page.h.orig 2022-04-01 07:48:30 UTC +--- base/allocator/partition_allocator/partition_page.h.orig 2022-10-05 07:34:01 UTC +++ base/allocator/partition_allocator/partition_page.h -@@ -128,7 +128,8 @@ struct __attribute__((packed)) SlotSpanMetadata { +@@ -131,13 +131,14 @@ struct SlotSpanMetadata { PartitionBucket* const bucket = nullptr; // CHECK()ed in AllocNewSlotSpan(). @@ -10,7 +10,14 @@ // System page size is not a constant on Apple OSes, but is either 4 or 16kiB // (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And // PartitionPageSize() is 4 times the OS page size. -@@ -142,7 +143,9 @@ struct __attribute__((packed)) SlotSpanMetadata { + static constexpr size_t kMaxSlotsPerSlotSpan = + 4 * (1 << 14) / kSmallestBucket; +-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) + // System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is + // currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code, + // so we use the 16 kiB maximum (64 kiB will crash). +@@ -151,7 +152,9 @@ struct SlotSpanMetadata { #endif // defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE) // The maximum number of bits needed to cover all currently supported OSes. static constexpr size_t kMaxSlotsPerSlotSpanBits = 13; diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc new file mode 100644 index 00000000000..96b13ce784d --- /dev/null +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc @@ -0,0 +1,38 @@ +--- base/allocator/partition_allocator/partition_root.cc.orig 2022-10-05 07:34:01 UTC ++++ base/allocator/partition_allocator/partition_root.cc +@@ -33,7 +33,7 @@ + #include "wow64apiset.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include + #endif + +@@ -230,7 +230,7 @@ void PartitionAllocMallocInitOnce() { + if (!g_global_init_called.compare_exchange_strong(expected, true)) + return; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // When fork() is called, only the current thread continues to execute in the + // child process. If the lock is held, but *not* by this thread when fork() is + // called, we have a deadlock. +@@ -321,7 +321,7 @@ static size_t PartitionPurgeSlotSpan( + constexpr size_t kMaxSlotCount = + (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / + MaxPurgeableSlotSize(); +-#elif BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) ++#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) && defined(ARCH_CPU_ARM64)) + // It's better for slot_usage to be stack-allocated and fixed-size, which + // demands that its size be constexpr. On IS_APPLE and Linux on arm64, + // PartitionPageSize() is always SystemPageSize() << 2, so regardless of +@@ -709,7 +709,7 @@ void PartitionRoot::Init(PartitionOptions + // apple OSes. + PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || + (internal::SystemPageSize() == (size_t{1} << 14))); +-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) + // Check runtime pagesize. Though the code is currently the same, it is + // not merged with the IS_APPLE case above as a 1 << 16 case needs to be + // added here in the future, to allow 64 kiB pagesize. That is only diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.h b/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.h deleted file mode 100644 index 7c08bb141fe..00000000000 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/partition_allocator/partition_root.h.orig 2022-04-01 07:48:30 UTC -+++ base/allocator/partition_allocator/partition_root.h -@@ -1071,7 +1071,7 @@ ALWAYS_INLINE void PartitionRoot::FreeNoH - // essentially). - #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && \ - ((BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMECAST)) || \ -- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_64_BITS))) -+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_64_BITS))) - PA_CHECK(IsManagedByPartitionAlloc(object_addr)); - #endif - diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc b/www/iridium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc index f675fd1534c..d5db4456a6f 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-03-28 18:11:04 UTC +--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-10-05 07:34:01 UTC +++ base/allocator/partition_allocator/spinning_mutex.cc -@@ -17,7 +17,15 @@ +@@ -18,7 +18,15 @@ #if defined(PA_HAS_LINUX_KERNEL) #include @@ -16,7 +16,7 @@ #include #include #endif // defined(PA_HAS_LINUX_KERNEL) -@@ -85,8 +93,13 @@ void SpinningMutex::FutexWait() { +@@ -107,8 +115,13 @@ void SpinningMutex::FutexWait() { // |kLockedContended| anymore. Note that even without spurious wakeups, the // value of |state_| is not guaranteed when this returns, as another thread // may get the lock before we get to run. @@ -30,7 +30,7 @@ if (err) { // These are programming error, check them. -@@ -98,8 +111,14 @@ void SpinningMutex::FutexWait() { +@@ -120,8 +133,14 @@ void SpinningMutex::FutexWait() { void SpinningMutex::FutexWake() { int saved_errno = errno; diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc b/www/iridium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc index 6868d146b14..7e8ee0d6a65 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2022-03-28 18:11:04 UTC +--- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2022-10-05 07:34:01 UTC +++ base/allocator/partition_allocator/starscan/stack/stack.cc @@ -17,6 +17,10 @@ #include @@ -11,7 +11,7 @@ #if defined(LIBC_GLIBC) extern "C" void* __libc_stack_end; #endif -@@ -48,6 +52,36 @@ void* GetStackTop() { +@@ -47,6 +51,36 @@ void* GetStackTop() { void* GetStackTop() { return pthread_get_stackaddr_np(pthread_self()); diff --git a/www/iridium/files/patch-base_atomicops.h b/www/iridium/files/patch-base_atomicops.h index 5796114dc6e..77c162f6773 100644 --- a/www/iridium/files/patch-base_atomicops.h +++ b/www/iridium/files/patch-base_atomicops.h @@ -1,6 +1,6 @@ ---- base/atomicops.h.orig 2022-03-28 18:11:04 UTC +--- base/atomicops.h.orig 2022-10-05 07:34:01 UTC +++ base/atomicops.h -@@ -57,7 +57,11 @@ typedef intptr_t Atomic64; +@@ -56,7 +56,11 @@ typedef intptr_t Atomic64; // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or // Atomic64 routines below, depending on your architecture. diff --git a/www/iridium/files/patch-base_base__paths__posix.cc b/www/iridium/files/patch-base_base__paths__posix.cc index 987a604ae0a..afa43100961 100644 --- a/www/iridium/files/patch-base_base__paths__posix.cc +++ b/www/iridium/files/patch-base_base__paths__posix.cc @@ -1,4 +1,4 @@ ---- base/base_paths_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/base_paths_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/base_paths_posix.cc @@ -15,6 +15,7 @@ #include @@ -84,10 +84,10 @@ + kvm_close(kd); + if (!ret) { +#endif -+ if ((cpath = getenv("IRIDIUM_EXE_PATH")) != NULL) ++ if ((cpath = getenv("CHROME_EXE_PATH")) != NULL) + *result = FilePath(cpath); + else -+ *result = FilePath("/usr/local/iridium/iridium"); ++ *result = FilePath("/usr/local/chrome/chrome"); + return true; +#if !BUILDFLAG(IS_AIX) + } diff --git a/www/iridium/files/patch-base_base__switches.cc b/www/iridium/files/patch-base_base__switches.cc index 0a4df69fd3e..a1d655c5e64 100644 --- a/www/iridium/files/patch-base_base__switches.cc +++ b/www/iridium/files/patch-base_base__switches.cc @@ -1,4 +1,4 @@ ---- base/base_switches.cc.orig 2022-03-28 18:11:04 UTC +--- base/base_switches.cc.orig 2022-10-05 07:34:01 UTC +++ base/base_switches.cc @@ -170,7 +170,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria @@ -6,6 +6,6 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Controls whether or not retired instruction counts are surfaced for threads - // in trace events on Linux. - // + // TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when + // Crashpad is fully enabled on Linux. Indicates that Crashpad should be + // enabled. diff --git a/www/iridium/files/patch-base_base__switches.h b/www/iridium/files/patch-base_base__switches.h index 6852515855b..044813bf69b 100644 --- a/www/iridium/files/patch-base_base__switches.h +++ b/www/iridium/files/patch-base_base__switches.h @@ -1,4 +1,4 @@ ---- base/base_switches.h.orig 2022-03-28 18:11:04 UTC +--- base/base_switches.h.orig 2022-10-05 07:34:01 UTC +++ base/base_switches.h @@ -60,7 +60,7 @@ extern const char kEnableIdleTracing[]; extern const char kForceFieldTrialParams[]; @@ -6,6 +6,6 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - extern const char kEnableThreadInstructionCount[]; - // TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when + // Crashpad is fully enabled on Linux. + extern const char kEnableCrashpad[]; diff --git a/www/iridium/files/patch-base_debug_debugger__posix.cc b/www/iridium/files/patch-base_debug_debugger__posix.cc index 0bbf28da981..76478dfc3fd 100644 --- a/www/iridium/files/patch-base_debug_debugger__posix.cc +++ b/www/iridium/files/patch-base_debug_debugger__posix.cc @@ -1,6 +1,6 @@ ---- base/debug/debugger_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/debug/debugger_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/debug/debugger_posix.cc -@@ -36,6 +36,10 @@ +@@ -35,6 +35,10 @@ #include #endif @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_FREEBSD) #include #endif -@@ -96,32 +100,51 @@ bool BeingDebugged() { +@@ -95,32 +99,51 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. @@ -24,7 +24,7 @@ +#endif #if BUILDFLAG(IS_OPENBSD) - if (sysctl(mib, base::size(mib), NULL, &info_size, NULL, 0) < 0) + if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0) return -1; mib[5] = (info_size / sizeof(struct kinfo_proc)); @@ -34,11 +34,11 @@ + return being_debugged; + } + -+ int sysctl_result = sysctl(mib, base::size(mib), info, &info_size, NULL, 0); ++ int sysctl_result = sysctl(mib, std::size(mib), info, &info_size, NULL, 0); #endif +#if !BUILDFLAG(IS_OPENBSD) - int sysctl_result = sysctl(mib, base::size(mib), &info, &info_size, NULL, 0); + int sysctl_result = sysctl(mib, std::size(mib), &info, &info_size, NULL, 0); +#endif DCHECK_EQ(sysctl_result, 0); if (sysctl_result != 0) { diff --git a/www/iridium/files/patch-base_debug_elf__reader.cc b/www/iridium/files/patch-base_debug_elf__reader.cc index 7f943f061d6..5c597a968c1 100644 --- a/www/iridium/files/patch-base_debug_elf__reader.cc +++ b/www/iridium/files/patch-base_debug_elf__reader.cc @@ -1,6 +1,6 @@ ---- base/debug/elf_reader.cc.orig 2022-03-28 18:11:04 UTC +--- base/debug/elf_reader.cc.orig 2022-10-05 07:34:01 UTC +++ base/debug/elf_reader.cc -@@ -76,6 +76,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, +@@ -78,6 +78,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, bool found = false; while (current_section < section_end) { current_note = reinterpret_cast(current_section); @@ -8,11 +8,11 @@ if (current_note->n_type == NT_GNU_BUILD_ID) { StringPiece note_name(current_section + sizeof(Nhdr), current_note->n_namesz); -@@ -85,6 +86,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, +@@ -87,6 +88,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, break; } } +#endif - size_t section_size = bits::AlignUp(current_note->n_namesz, 4) + - bits::AlignUp(current_note->n_descsz, 4) + + size_t section_size = bits::AlignUp(current_note->n_namesz, 4u) + + bits::AlignUp(current_note->n_descsz, 4u) + diff --git a/www/iridium/files/patch-base_debug_stack__trace__posix.cc b/www/iridium/files/patch-base_debug_stack__trace__posix.cc index fa26b7473e4..a4b5269bca6 100644 --- a/www/iridium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/iridium/files/patch-base_debug_stack__trace__posix.cc @@ -1,6 +1,6 @@ ---- base/debug/stack_trace_posix.cc.orig 2022-04-01 07:48:30 UTC +--- base/debug/stack_trace_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/debug/stack_trace_posix.cc -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ #include #endif @@ -9,7 +9,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -695,6 +695,9 @@ class SandboxSymbolizeHelper { +@@ -698,6 +698,9 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -19,7 +19,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -712,6 +715,7 @@ class SandboxSymbolizeHelper { +@@ -715,6 +718,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; @@ -27,7 +27,7 @@ } // Opens all object files and caches their file descriptors. -@@ -868,7 +872,7 @@ size_t CollectStackTrace(void** trace, size_t count) { +@@ -871,7 +875,7 @@ size_t CollectStackTrace(void** trace, size_t count) { // If we do not have unwind tables, then try tracing using frame pointers. return base::debug::TraceStackFramePointers(const_cast(trace), count, 0); @@ -35,4 +35,4 @@ +#elif !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD) // Though the backtrace API man page does not list any possible negative // return values, we take no chance. - return base::saturated_cast(backtrace(trace, count)); + return base::saturated_cast( diff --git a/www/iridium/files/patch-base_files_dir__reader__linux.h b/www/iridium/files/patch-base_files_dir__reader__linux.h new file mode 100644 index 00000000000..e119fcf240d --- /dev/null +++ b/www/iridium/files/patch-base_files_dir__reader__linux.h @@ -0,0 +1,39 @@ +--- base/files/dir_reader_linux.h.orig 2022-10-05 07:34:01 UTC ++++ base/files/dir_reader_linux.h +@@ -16,10 +16,16 @@ + #include "base/logging.h" + #include "base/posix/eintr_wrapper.h" + ++#include "build/build_config.h" ++ + // See the comments in dir_reader_posix.h about this. + + namespace base { + ++#if BUILDFLAG(IS_BSD) ++#include ++typedef struct dirent linux_dirent; ++#else + struct linux_dirent { + uint64_t d_ino; + int64_t d_off; +@@ -27,6 +33,7 @@ struct linux_dirent { + unsigned char d_type; + char d_name[0]; + }; ++#endif + + class DirReaderLinux { + public: +@@ -61,7 +68,11 @@ class DirReaderLinux { + if (offset_ != size_) + return true; + ++#if BUILDFLAG(IS_BSD) ++ const int r = getdents(fd_, reinterpret_cast(buf_), sizeof(buf_)); ++#else + const long r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_)); ++#endif + if (r == 0) + return false; + if (r < 0) { diff --git a/www/iridium/files/patch-base_files_dir__reader__posix.h b/www/iridium/files/patch-base_files_dir__reader__posix.h new file mode 100644 index 00000000000..ade769e0df7 --- /dev/null +++ b/www/iridium/files/patch-base_files_dir__reader__posix.h @@ -0,0 +1,20 @@ +--- base/files/dir_reader_posix.h.orig 2022-10-05 07:34:01 UTC ++++ base/files/dir_reader_posix.h +@@ -17,7 +17,7 @@ + // seems worse than falling back to enumerating all file descriptors so we will + // probably never implement this on the Mac. + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + #include "base/files/dir_reader_linux.h" + #else + #include "base/files/dir_reader_fallback.h" +@@ -25,7 +25,7 @@ + + namespace base { + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + typedef DirReaderLinux DirReaderPosix; + #else + typedef DirReaderFallback DirReaderPosix; diff --git a/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc b/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc index dab339e3660..ffb671dbc74 100644 --- a/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc +++ b/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -450,7 +450,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -498,7 +498,7 @@ TEST_F(FilePathWatcherTest, MAYBE_WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; ASSERT_TRUE(WaitForEvents()); @@ -9,7 +9,7 @@ // Mac implementation does not detect files modified in a directory. ASSERT_TRUE(WriteFile(file1, "content v2")); VLOG(1) << "Waiting for file1 modification"; -@@ -1038,7 +1038,7 @@ enum Permission { +@@ -1118,7 +1118,7 @@ enum Permission { Execute }; @@ -18,7 +18,7 @@ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -1069,7 +1069,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -1149,7 +1149,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi } #endif // BUILDFLAG(IS_APPLE) diff --git a/www/iridium/files/patch-base_files_file__util__posix.cc b/www/iridium/files/patch-base_files_file__util__posix.cc index aeefc0cf196..45679a464d0 100644 --- a/www/iridium/files/patch-base_files_file__util__posix.cc +++ b/www/iridium/files/patch-base_files_file__util__posix.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/files/file_util_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/files/file_util_posix.cc -@@ -694,32 +694,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p +@@ -700,32 +700,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p File::Error* error) { ScopedBlockingCall scoped_blocking_call( FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir(). @@ -21,29 +21,29 @@ } // Iterate through the parents and create the missing ones. - for (auto i = subpaths.rbegin(); i != subpaths.rend(); ++i) { -- if (DirectoryExists(*i)) + for (const FilePath& subpath : base::Reversed(subpaths)) { +- if (DirectoryExists(subpath)) - continue; -- if (mkdir(i->value().c_str(), 0700) == 0) +- if (mkdir(subpath.value().c_str(), 0700) == 0) - continue; - // Mkdir failed, but it might have failed with EEXIST, or some other error - // due to the directory appearing out of thin air. This can occur if - // two processes are trying to create the same file system tree at the same - // time. Check to see if it exists and make sure it is a directory. - int saved_errno = errno; -- if (!DirectoryExists(*i)) { +- if (!DirectoryExists(subpath)) { - if (error) - *error = File::OSErrorToFileError(saved_errno); - return false; -+ if (!PathExists(*i)) { -+ if ((mkdir(i->value().c_str(), 0700) == -1) && -+ ((full_path != *i) ? (errno != ENOENT) : (-1))) { ++ if (!PathExists(subpath)) { ++ if ((mkdir(subpath.value().c_str(), 0700) == -1) && ++ ((full_path != subpath) ? (errno != ENOENT) : (-1))) { + int saved_errno = errno; + if (error) + *error = File::OSErrorToFileError(saved_errno); + return false; + } -+ } else if (!DirectoryExists(*i)) { ++ } else if (!DirectoryExists(subpath)) { + if (error) + *error = File::OSErrorToFileError(ENOTDIR); + return false; diff --git a/www/iridium/files/patch-base_files_file__util__unittest.cc b/www/iridium/files/patch-base_files_file__util__unittest.cc index 2bd4cf51270..68bd0ae7868 100644 --- a/www/iridium/files/patch-base_files_file__util__unittest.cc +++ b/www/iridium/files/patch-base_files_file__util__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- base/files/file_util_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ base/files/file_util_unittest.cc -@@ -3524,7 +3524,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3522,7 +3522,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -4240,7 +4240,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles +@@ -4245,7 +4245,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles NULL); #else size_t bytes_written = diff --git a/www/iridium/files/patch-base_i18n_icu__util.cc b/www/iridium/files/patch-base_i18n_icu__util.cc index 536e41c3e97..e3900550db3 100644 --- a/www/iridium/files/patch-base_i18n_icu__util.cc +++ b/www/iridium/files/patch-base_i18n_icu__util.cc @@ -1,20 +1,20 @@ ---- base/i18n/icu_util.cc.orig 2022-03-28 18:11:04 UTC +--- base/i18n/icu_util.cc.orig 2022-10-05 07:34:01 UTC +++ base/i18n/icu_util.cc -@@ -52,7 +52,7 @@ +@@ -53,7 +53,7 @@ + #include "third_party/icu/source/common/unicode/unistr.h" #endif - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ -- ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ - !BUILDFLAG(IS_CHROMECAST)) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) || \ + BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -346,7 +346,7 @@ void InitializeIcuTimeZone() { +@@ -325,7 +325,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); --#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ - !BUILDFLAG(IS_CHROMECAST) +-#elif BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) ++#elif BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD) // To respond to the time zone change properly, the default time zone // cache in ICU has to be populated on starting up. + // See TimeZoneMonitorLinux::NotifyClientsFromImpl(). diff --git a/www/iridium/files/patch-base_linux__util.cc b/www/iridium/files/patch-base_linux__util.cc index ffc58a7c865..a0b489c99ea 100644 --- a/www/iridium/files/patch-base_linux__util.cc +++ b/www/iridium/files/patch-base_linux__util.cc @@ -1,4 +1,4 @@ ---- base/linux_util.cc.orig 2022-03-28 18:11:04 UTC +--- base/linux_util.cc.orig 2022-10-05 07:34:01 UTC +++ base/linux_util.cc @@ -15,6 +15,7 @@ @@ -6,9 +6,9 @@ #include +#include + #include "base/base_export.h" #include "base/files/dir_reader_posix.h" - #include "base/files/file_util.h" -@@ -134,6 +135,9 @@ void SetLinuxDistro(const std::string& distro) { +@@ -135,6 +136,9 @@ void SetLinuxDistro(const std::string& distro) { } bool GetThreadsForProcess(pid_t pid, std::vector* tids) { @@ -18,7 +18,7 @@ // 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22 char buf[25]; strings::SafeSPrintf(buf, "/proc/%d/task", pid); -@@ -153,6 +157,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector #endif -@@ -552,14 +552,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -574,14 +574,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; diff --git a/www/iridium/files/patch-base_memory_discardable__memory.cc b/www/iridium/files/patch-base_memory_discardable__memory.cc index fa94ad078f0..6a302b8004a 100644 --- a/www/iridium/files/patch-base_memory_discardable__memory.cc +++ b/www/iridium/files/patch-base_memory_discardable__memory.cc @@ -1,6 +1,6 @@ ---- base/memory/discardable_memory.cc.orig 2022-03-28 18:11:04 UTC +--- base/memory/discardable_memory.cc.orig 2022-10-05 07:34:01 UTC +++ base/memory/discardable_memory.cc -@@ -24,7 +24,7 @@ const base::Feature kMadvFreeDiscardableMemory{ +@@ -25,7 +25,7 @@ const base::Feature kMadvFreeDiscardableMemory{ "MadvFreeDiscardableMemory", base::FEATURE_DISABLED_BY_DEFAULT}; #endif // BUILDFLAG(IS_POSIX) @@ -9,7 +9,7 @@ const base::Feature kDiscardableMemoryBackingTrial{ "DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -49,7 +49,7 @@ const base::FeatureParam +@@ -50,7 +50,7 @@ const base::FeatureParam namespace { @@ -18,7 +18,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { DiscardableMemoryTrialGroup trial_group = -@@ -68,7 +68,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { +@@ -69,7 +69,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { } // namespace @@ -27,7 +27,7 @@ // Probe capabilities of this device to determine whether we should participate // in the discardable memory backing trial. -@@ -98,7 +98,7 @@ DiscardableMemory::DiscardableMemory() = default; +@@ -99,7 +99,7 @@ DiscardableMemory::DiscardableMemory() = default; DiscardableMemory::~DiscardableMemory() = default; DiscardableMemoryBacking GetDiscardableMemoryBacking() { diff --git a/www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc b/www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc index 2bcb51efe8a..efa72b31867 100644 --- a/www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc +++ b/www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc @@ -1,6 +1,6 @@ ---- base/memory/madv_free_discardable_memory_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/memory/madv_free_discardable_memory_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/memory/madv_free_discardable_memory_posix.cc -@@ -294,6 +294,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT +@@ -295,6 +295,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT bool MadvFreeDiscardableMemoryPosix::IsResident() const { DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_); @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_APPLE) std::vector vec(allocated_pages_); #else -@@ -309,6 +313,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons +@@ -310,6 +314,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons return false; } return true; diff --git a/www/iridium/files/patch-base_memory_platform__shared__memory__region.h b/www/iridium/files/patch-base_memory_platform__shared__memory__region.h index c5e43cd552c..5cfb8d4a0d7 100644 --- a/www/iridium/files/patch-base_memory_platform__shared__memory__region.h +++ b/www/iridium/files/patch-base_memory_platform__shared__memory__region.h @@ -1,15 +1,15 @@ ---- base/memory/platform_shared_memory_region.h.orig 2022-03-28 18:11:04 UTC +--- base/memory/platform_shared_memory_region.h.orig 2022-10-05 07:34:01 UTC +++ base/memory/platform_shared_memory_region.h -@@ -23,7 +23,7 @@ - #include "base/files/scoped_file.h" - #endif +@@ -16,7 +16,7 @@ + + #include -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) namespace content { class SandboxIPCHandler; } -@@ -116,7 +116,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -83,7 +83,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE }; @@ -18,7 +18,7 @@ // Structure to limit access to executable region creation. struct ExecutableRegion { private: -@@ -263,7 +263,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -211,7 +211,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { CheckPlatformHandlePermissionsCorrespondToMode); static PlatformSharedMemoryRegion Create(Mode mode, size_t size diff --git a/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc b/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc index 62629e981c6..7de0fcfe7f2 100644 --- a/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc +++ b/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc @@ -1,15 +1,15 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/memory/platform_shared_memory_region_posix.cc -@@ -70,7 +70,7 @@ FDPair ScopedFDPair::get() const { - return {fd.get(), readonly_fd.get()}; - } +@@ -55,7 +55,7 @@ bool CheckFDAccessMode(int fd, int expected_mode) { + + } // namespace -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // static ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { PlatformSharedMemoryRegion region = -@@ -204,7 +204,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o +@@ -171,7 +171,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() { // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, size_t size @@ -18,7 +18,7 @@ , bool executable #endif -@@ -233,7 +233,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: +@@ -200,7 +200,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: // flag. FilePath directory; if (!GetShmemTempDir( diff --git a/www/iridium/files/patch-base_message__loop_message__pump__glib.cc b/www/iridium/files/patch-base_message__loop_message__pump__glib.cc index a8efb5f100e..d200475045c 100644 --- a/www/iridium/files/patch-base_message__loop_message__pump__glib.cc +++ b/www/iridium/files/patch-base_message__loop_message__pump__glib.cc @@ -1,4 +1,4 @@ ---- base/message_loop/message_pump_glib.cc.orig 2022-03-28 18:11:04 UTC +--- base/message_loop/message_pump_glib.cc.orig 2022-10-05 07:34:01 UTC +++ base/message_loop/message_pump_glib.cc @@ -8,6 +8,11 @@ #include @@ -10,9 +10,9 @@ +#endif + #include "base/logging.h" + #include "base/memory/raw_ptr.h" #include "base/notreached.h" - #include "base/numerics/safe_conversions.h" -@@ -50,9 +55,13 @@ int GetTimeIntervalMilliseconds(TimeTicks next_task_ti +@@ -51,9 +56,13 @@ int GetTimeIntervalMilliseconds(TimeTicks next_task_ti } bool RunningOnMainThread() { diff --git a/www/iridium/files/patch-base_native__library__posix.cc b/www/iridium/files/patch-base_native__library__posix.cc index 13756477b10..2814e4b4b73 100644 --- a/www/iridium/files/patch-base_native__library__posix.cc +++ b/www/iridium/files/patch-base_native__library__posix.cc @@ -1,6 +1,6 @@ ---- base/native_library_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/native_library_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/native_library_posix.cc -@@ -32,7 +32,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP +@@ -33,7 +33,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892, // and http://crbug.com/40794. int flags = RTLD_LAZY; diff --git a/www/iridium/files/patch-base_posix_unix__domain__socket.cc b/www/iridium/files/patch-base_posix_unix__domain__socket.cc index a7c600b307d..83330924383 100644 --- a/www/iridium/files/patch-base_posix_unix__domain__socket.cc +++ b/www/iridium/files/patch-base_posix_unix__domain__socket.cc @@ -1,6 +1,6 @@ ---- base/posix/unix_domain_socket.cc.orig 2022-03-28 18:11:04 UTC +--- base/posix/unix_domain_socket.cc.orig 2022-10-05 07:34:01 UTC +++ base/posix/unix_domain_socket.cc -@@ -50,7 +50,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { +@@ -51,7 +51,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { // static bool UnixDomainSocket::EnableReceiveProcessId(int fd) { @@ -9,7 +9,7 @@ const int enable = 1; return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0; #else -@@ -140,7 +140,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -149,7 +149,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, const size_t kControlBufferSize = CMSG_SPACE(sizeof(int) * kMaxFileDescriptors) @@ -18,7 +18,7 @@ // macOS does not support ucred. // macOS supports xucred, but this structure is insufficient. + CMSG_SPACE(sizeof(struct ucred)) -@@ -168,7 +168,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -177,7 +177,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, wire_fds = reinterpret_cast(CMSG_DATA(cmsg)); wire_fds_len = payload_len / sizeof(int); } @@ -27,7 +27,7 @@ // macOS does not support SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS) { -@@ -202,6 +202,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -211,6 +211,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, socklen_t pid_size = sizeof(pid); if (getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &pid, &pid_size) != 0) pid = -1; diff --git a/www/iridium/files/patch-base_process_kill.h b/www/iridium/files/patch-base_process_kill.h index e66726c65de..7f6d5b957ac 100644 --- a/www/iridium/files/patch-base_process_kill.h +++ b/www/iridium/files/patch-base_process_kill.h @@ -1,6 +1,6 @@ ---- base/process/kill.h.orig 2022-03-28 18:11:04 UTC +--- base/process/kill.h.orig 2022-10-05 07:34:01 UTC +++ base/process/kill.h -@@ -112,7 +112,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro +@@ -113,7 +113,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( ProcessHandle handle, int* exit_code); diff --git a/www/iridium/files/patch-base_process_kill__posix.cc b/www/iridium/files/patch-base_process_kill__posix.cc index 15228ccbd54..d0da11564e7 100644 --- a/www/iridium/files/patch-base_process_kill__posix.cc +++ b/www/iridium/files/patch-base_process_kill__posix.cc @@ -1,6 +1,6 @@ ---- base/process/kill_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/process/kill_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/kill_posix.cc -@@ -159,7 +159,7 @@ void EnsureProcessTerminated(Process process) { +@@ -158,7 +158,7 @@ void EnsureProcessTerminated(Process process) { 0, new BackgroundReaper(std::move(process), Seconds(2))); } diff --git a/www/iridium/files/patch-base_process_launch.h b/www/iridium/files/patch-base_process_launch.h index 22aac90ca89..0edde543cab 100644 --- a/www/iridium/files/patch-base_process_launch.h +++ b/www/iridium/files/patch-base_process_launch.h @@ -1,6 +1,6 @@ ---- base/process/launch.h.orig 2022-03-28 18:11:04 UTC +--- base/process/launch.h.orig 2022-10-05 07:34:01 UTC +++ base/process/launch.h -@@ -195,7 +195,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -198,7 +198,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) diff --git a/www/iridium/files/patch-base_process_memory.cc b/www/iridium/files/patch-base_process_memory.cc index c7b047e640c..db25f3dd4dc 100644 --- a/www/iridium/files/patch-base_process_memory.cc +++ b/www/iridium/files/patch-base_process_memory.cc @@ -1,15 +1,6 @@ ---- base/process/memory.cc.orig 2022-03-28 18:11:04 UTC +--- base/process/memory.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/memory.cc -@@ -65,14 +65,16 @@ NOINLINE void OnNoMemoryInternal(size_t size) { - - } // namespace internal - -+#if !BUILDFLAG(IS_BSD) - void TerminateBecauseOutOfMemory(size_t size) { - internal::OnNoMemoryInternal(size); - } -+#endif - +@@ -29,7 +29,7 @@ namespace base { // Defined in memory_mac.mm for macOS + use_allocator="none". In case of // USE_PARTITION_ALLOC_AS_MALLOC, no need to route the call to the system // default calloc of macOS. diff --git a/www/iridium/files/patch-base_process_process__handle__freebsd.cc b/www/iridium/files/patch-base_process_process__handle__freebsd.cc index 097ee458c17..be6873bb249 100644 --- a/www/iridium/files/patch-base_process_process__handle__freebsd.cc +++ b/www/iridium/files/patch-base_process_process__handle__freebsd.cc @@ -1,12 +1,14 @@ ---- base/process/process_handle_freebsd.cc.orig 2022-03-28 18:11:04 UTC +--- base/process/process_handle_freebsd.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_handle_freebsd.cc -@@ -12,15 +12,19 @@ - #include +@@ -3,6 +3,7 @@ + // found in the LICENSE file. - #include "base/cxx17_backports.h" -+#include "base/files/file_path.h" + #include "base/process/process_handle.h" ++#include "base/files/file_util.h" - namespace base { + #include + #include +@@ -15,10 +16,13 @@ namespace base { ProcessId GetParentProcessId(ProcessHandle process) { struct kinfo_proc info; @@ -14,7 +16,7 @@ + size_t length = sizeof(struct kinfo_proc); int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process }; - if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0) + if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) + return -1; + + if (length < sizeof(struct kinfo_proc)) diff --git a/www/iridium/files/patch-base_process_process__handle__openbsd.cc b/www/iridium/files/patch-base_process_process__handle__openbsd.cc index ce55d295fe4..cfde3ae9716 100644 --- a/www/iridium/files/patch-base_process_process__handle__openbsd.cc +++ b/www/iridium/files/patch-base_process_process__handle__openbsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_handle_openbsd.cc.orig 2022-03-28 18:11:04 UTC +--- base/process/process_handle_openbsd.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_handle_openbsd.cc @@ -3,8 +3,11 @@ // found in the LICENSE file. @@ -12,7 +12,7 @@ #include #include #include -@@ -14,39 +17,59 @@ +@@ -12,39 +15,59 @@ namespace base { ProcessId GetParentProcessId(ProcessHandle process) { @@ -23,16 +23,16 @@ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process, sizeof(struct kinfo_proc), 0 }; - if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0) + if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) return -1; + info = (struct kinfo_proc *)malloc(length); + mib[5] = (length / sizeof(struct kinfo_proc)); -- if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0) +- if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) - return -1; -+ if (sysctl(mib, base::size(mib), info, &length, NULL, 0) < 0) { ++ if (sysctl(mib, std::size(mib), info, &length, NULL, 0) < 0) { + ppid = -1; + goto out; + } @@ -54,11 +54,11 @@ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process, sizeof(struct kinfo_proc), 0 }; -- if (sysctl(mib, base::size(mib), NULL, &len, NULL, 0) == -1) -+ if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) == -1) +- if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) == -1) ++ if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) == -1) return FilePath(); - mib[5] = (len / sizeof(struct kinfo_proc)); -- if (sysctl(mib, base::size(mib), &kp, &len, NULL, 0) < 0) +- if (sysctl(mib, std::size(mib), &kp, &len, NULL, 0) < 0) - return FilePath(); - if ((kp.p_flag & P_SYSTEM) != 0) - return FilePath(); @@ -70,7 +70,7 @@ + + mib[5] = (length / sizeof(struct kinfo_proc)); + -+ if (sysctl(mib, base::size(mib), info, &length, NULL, 0) < 0) ++ if (sysctl(mib, std::size(mib), info, &length, NULL, 0) < 0) + goto out; + + if ((info->p_flag & P_SYSTEM) != 0) diff --git a/www/iridium/files/patch-base_process_process__iterator__freebsd.cc b/www/iridium/files/patch-base_process_process__iterator__freebsd.cc index a319a4f0a1f..204c3440c56 100644 --- a/www/iridium/files/patch-base_process_process__iterator__freebsd.cc +++ b/www/iridium/files/patch-base_process_process__iterator__freebsd.cc @@ -1,6 +1,6 @@ ---- base/process/process_iterator_freebsd.cc.orig 2022-03-28 18:11:04 UTC +--- base/process/process_iterator_freebsd.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_iterator_freebsd.cc -@@ -21,7 +21,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -20,7 +20,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* : index_of_kinfo_proc_(), filter_(filter) { @@ -9,25 +9,25 @@ bool done = false; int try_num = 1; -@@ -40,7 +40,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -39,7 +39,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* num_of_kinfo_proc += 16; kinfo_procs_.resize(num_of_kinfo_proc); len = num_of_kinfo_proc * sizeof(struct kinfo_proc); -- if (sysctl(mib, base::size(mib), &kinfo_procs_[0], &len, NULL, 0) < 0) { -+ if (sysctl(mib, base::size(mib), kinfo_procs_.data(), &len, NULL, 0) < 0) { +- if (sysctl(mib, std::size(mib), &kinfo_procs_[0], &len, NULL, 0) < 0) { ++ if (sysctl(mib, std::size(mib), kinfo_procs_.data(), &len, NULL, 0) < 0) { // If we get a mem error, it just means we need a bigger buffer, so // loop around again. Anything else is a real error and give up. if (errno != ENOMEM) { -@@ -50,7 +50,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -49,7 +49,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* } } else { // Got the list, just make sure we're sized exactly right - size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc); -+ num_of_kinfo_proc = len / sizeof(struct kinfo_proc); ++ num_of_kinfo_proc = len / sizeof(struct kinfo_proc); kinfo_procs_.resize(num_of_kinfo_proc); done = true; } -@@ -72,18 +72,13 @@ bool ProcessIterator::CheckForNextProcess() { +@@ -71,18 +71,13 @@ bool ProcessIterator::CheckForNextProcess() { for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) { size_t length; struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_]; @@ -38,7 +38,7 @@ continue; - length = 0; -- if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0) { +- if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) { - LOG(ERROR) << "failed to figure out the buffer size for a command line"; - continue; - } @@ -47,5 +47,5 @@ + data.resize(ARG_MAX); + length = ARG_MAX; - if (sysctl(mib, base::size(mib), &data[0], &length, NULL, 0) < 0) { + if (sysctl(mib, std::size(mib), &data[0], &length, NULL, 0) < 0) { LOG(ERROR) << "failed to fetch a commandline"; diff --git a/www/iridium/files/patch-base_process_process__iterator__openbsd.cc b/www/iridium/files/patch-base_process_process__iterator__openbsd.cc index 4749dc067a0..ad384cf7d96 100644 --- a/www/iridium/files/patch-base_process_process__iterator__openbsd.cc +++ b/www/iridium/files/patch-base_process_process__iterator__openbsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_iterator_openbsd.cc.orig 2022-03-28 18:11:04 UTC +--- base/process/process_iterator_openbsd.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_iterator_openbsd.cc @@ -6,6 +6,9 @@ @@ -9,8 +9,8 @@ +#include #include - #include "base/cxx17_backports.h" -@@ -19,12 +22,13 @@ ProcessIterator::ProcessIterator(const ProcessFilter* + #include "base/logging.h" +@@ -18,12 +21,13 @@ ProcessIterator::ProcessIterator(const ProcessFilter* : index_of_kinfo_proc_(), filter_(filter) { @@ -25,7 +25,7 @@ do { size_t len = 0; -@@ -33,7 +37,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -32,7 +36,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* kinfo_procs_.resize(0); done = true; } else { @@ -34,7 +34,7 @@ // Leave some spare room for process table growth (more could show up // between when we check and now) num_of_kinfo_proc += 16; -@@ -49,7 +53,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -48,7 +52,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* } } else { // Got the list, just make sure we're sized exactly right diff --git a/www/iridium/files/patch-base_process_process__metrics.cc b/www/iridium/files/patch-base_process_process__metrics.cc index 9b622318206..2398f6259a1 100644 --- a/www/iridium/files/patch-base_process_process__metrics.cc +++ b/www/iridium/files/patch-base_process_process__metrics.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics.cc.orig 2022-03-28 18:11:04 UTC +--- base/process/process_metrics.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_metrics.cc -@@ -18,7 +18,7 @@ namespace base { +@@ -17,7 +17,7 @@ namespace base { namespace { #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ int CalculateEventsPerSecond(uint64_t event_count, uint64_t* last_event_count, base::TimeTicks* last_calculated) { -@@ -55,7 +55,7 @@ SystemMetrics SystemMetrics::Sample() { +@@ -54,7 +54,7 @@ SystemMetrics SystemMetrics::Sample() { SystemMetrics system_metrics; system_metrics.committed_memory_ = GetSystemCommitCharge(); @@ -18,7 +18,7 @@ GetSystemMemoryInfo(&system_metrics.memory_info_); GetVmStatInfo(&system_metrics.vmstat_info_); GetSystemDiskInfo(&system_metrics.disk_info_); -@@ -74,7 +74,7 @@ Value SystemMetrics::ToValue() const { +@@ -73,7 +73,7 @@ Value SystemMetrics::ToValue() const { Value res(Value::Type::DICTIONARY); res.SetIntKey("committed_memory", static_cast(committed_memory_)); @@ -27,17 +27,17 @@ Value meminfo = memory_info_.ToValue(); Value vmstat = vmstat_info_.ToValue(); meminfo.MergeDictionary(&vmstat); -@@ -100,7 +100,7 @@ std::unique_ptr ProcessMetrics::Create +@@ -99,7 +99,7 @@ std::unique_ptr ProcessMetrics::Create #endif // !BUILDFLAG(IS_MAC) } -#if !BUILDFLAG(IS_FREEBSD) || !BUILDFLAG(IS_POSIX) -+#if !BUILDFLAG(IS_BSD) || !BUILDFLAG(IS_POSIX) ++#if !BUILDFLAG(IS_FREEBSD) double ProcessMetrics::GetPlatformIndependentCPUUsage() { TimeDelta cumulative_cpu = GetCumulativeCPUUsage(); TimeTicks time = TimeTicks::Now(); -@@ -126,7 +126,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( - #endif +@@ -150,7 +150,7 @@ double ProcessMetrics::GetPreciseCPUUsage() { + #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_AIX) diff --git a/www/iridium/files/patch-base_process_process__metrics.h b/www/iridium/files/patch-base_process_process__metrics.h index e0e9cf4639d..27bdfe62aaa 100644 --- a/www/iridium/files/patch-base_process_process__metrics.h +++ b/www/iridium/files/patch-base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2022-03-28 18:11:04 UTC +--- base/process/process_metrics.h.orig 2022-10-05 07:34:01 UTC +++ base/process/process_metrics.h @@ -36,7 +36,7 @@ #endif @@ -27,8 +27,8 @@ // Resident Set Size is a Linux/Android specific memory concept. Do not // attempt to extend this to other platforms. BASE_EXPORT size_t GetResidentSetSize() const; -@@ -134,7 +134,7 @@ class BASE_EXPORT ProcessMetrics { - [[nodiscard]] TimeDelta GetCumulativeCPUUsage(); +@@ -155,7 +155,7 @@ class BASE_EXPORT ProcessMetrics { + #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_AIX) @@ -36,7 +36,7 @@ // Emits the cumulative CPU usage for all currently active threads since they // were started into the output parameter (replacing its current contents). // Threads that have already terminated will not be reported. Thus, the sum of -@@ -217,7 +217,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -238,7 +238,7 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // BUILDFLAG(IS_POSIX) @@ -45,7 +45,7 @@ // Bytes of swap as reported by /proc/[pid]/status. uint64_t GetVmSwapBytes() const; -@@ -238,7 +238,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -259,7 +259,7 @@ class BASE_EXPORT ProcessMetrics { #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -54,17 +54,27 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if BUILDFLAG(IS_APPLE) -@@ -249,7 +249,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -270,7 +270,7 @@ class BASE_EXPORT ProcessMetrics { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_AIX) + BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) - CPU::CoreType GetCoreType(int core_index); + CPU::CoreType GetCoreType(uint32_t core_index); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) -@@ -274,7 +274,7 @@ class BASE_EXPORT ProcessMetrics { - uint64_t last_cumulative_disk_usage_ = 0; +@@ -284,9 +284,7 @@ class BASE_EXPORT ProcessMetrics { + // Used to store the previous times and CPU usage counts so we can + // compute the CPU usage between calls. + TimeTicks last_cpu_time_; +-#if !BUILDFLAG(IS_FREEBSD) || !BUILDFLAG(IS_POSIX) + TimeDelta last_cumulative_cpu_; +-#endif + + #if BUILDFLAG(IS_WIN) + TimeTicks last_cpu_time_for_precise_cpu_usage_; +@@ -294,7 +292,7 @@ class BASE_EXPORT ProcessMetrics { + #endif #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_AIX) @@ -72,7 +82,7 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -317,7 +317,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -337,7 +335,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \ @@ -81,7 +91,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -352,7 +352,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -372,7 +370,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -90,7 +100,7 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -367,7 +367,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -387,7 +385,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -99,7 +109,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -404,7 +404,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -424,7 +422,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -108,7 +118,7 @@ // Parse the data found in /proc//stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. -@@ -591,7 +591,7 @@ class BASE_EXPORT SystemMetrics { +@@ -611,7 +609,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; diff --git a/www/iridium/files/patch-base_process_process__metrics__freebsd.cc b/www/iridium/files/patch-base_process_process__metrics__freebsd.cc index 7b7633d05bd..c0ed225bef1 100644 --- a/www/iridium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/iridium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics_freebsd.cc.orig 2022-03-28 20:16:21 UTC +--- base/process/process_metrics_freebsd.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_metrics_freebsd.cc -@@ -3,21 +3,41 @@ +@@ -3,20 +3,39 @@ // found in the LICENSE file. #include "base/process/process_metrics.h" @@ -16,18 +16,16 @@ +#include +#include + - #include "base/cxx17_backports.h" #include "base/memory/ptr_util.h" #include "base/process/process_metrics_iocounters.h" +#include "base/values.h" namespace base { +namespace { - +int GetPageShift() { + int pagesize = getpagesize(); + int pageshift = 0; -+ + + while (pagesize > 1) { + pageshift++; + pagesize >>= 1; @@ -44,7 +42,7 @@ // static std::unique_ptr ProcessMetrics::CreateProcessMetrics( -@@ -27,17 +47,18 @@ std::unique_ptr ProcessMetrics::Create +@@ -26,17 +45,18 @@ std::unique_ptr ProcessMetrics::Create double ProcessMetrics::GetPlatformIndependentCPUUsage() { struct kinfo_proc info; @@ -52,9 +50,9 @@ - size_t length = sizeof(info); + size_t length = sizeof(struct kinfo_proc); -+ int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ }; ++ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ }; + - if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0) + if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) - return 0; + return 0.0; @@ -68,11 +66,11 @@ return TimeDelta(); } -@@ -68,4 +89,221 @@ size_t GetSystemCommitCharge() { +@@ -67,4 +87,221 @@ size_t GetSystemCommitCharge() { return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); } -+int GetNumberOfThreads(ProcessHandle process) { ++int64_t GetNumberOfThreads(ProcessHandle process) { + // Taken from FreeBSD top (usr.bin/top/machine.c) + + kvm_t* kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "kvm_open"); @@ -145,7 +143,7 @@ + + length = sizeof(total_count); + -+ if (sysctl(mib, base::size(mib), &total_count, &length, NULL, 0) < 0) { ++ if (sysctl(mib, std::size(mib), &total_count, &length, NULL, 0) < 0) { + total_count = -1; + } + diff --git a/www/iridium/files/patch-base_process_process__metrics__openbsd.cc b/www/iridium/files/patch-base_process_process__metrics__openbsd.cc index f23c76752eb..15b11af28d1 100644 --- a/www/iridium/files/patch-base_process_process__metrics__openbsd.cc +++ b/www/iridium/files/patch-base_process_process__metrics__openbsd.cc @@ -1,20 +1,7 @@ ---- base/process/process_metrics_openbsd.cc.orig 2022-04-01 07:48:30 UTC +--- base/process/process_metrics_openbsd.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_metrics_openbsd.cc -@@ -4,17 +4,36 @@ +@@ -6,14 +6,23 @@ - #include "base/process/process_metrics.h" - -+#include "base/files/file_util.h" -+#include "base/logging.h" -+#include "base/process/internal_linux.h" -+#include "base/strings/string_number_conversions.h" -+#include "base/strings/string_split.h" -+#include "base/strings/string_tokenizer.h" -+#include "base/strings/string_util.h" -+#include "base/system/sys_info.h" -+#include "base/threading/thread_restrictions.h" -+#include "base/notreached.h" -+ #include #include +#include @@ -24,10 +11,10 @@ +#include + - #include "base/cxx17_backports.h" #include "base/memory/ptr_util.h" #include "base/process/process_metrics_iocounters.h" +#include "base/values.h" ++#include "base/notreached.h" namespace base { @@ -37,33 +24,34 @@ // static std::unique_ptr ProcessMetrics::CreateProcessMetrics( ProcessHandle process) { -@@ -25,49 +44,24 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun +@@ -24,49 +33,23 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun return false; } -static int GetProcessCPU(pid_t pid) { -+double ProcessMetrics::GetPlatformIndependentCPUUsage() { ++TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { struct kinfo_proc info; - size_t length; - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid, - sizeof(struct kinfo_proc), 0 }; + size_t length = sizeof(struct kinfo_proc); ++ struct timeval tv; -- if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0) +- if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) - return -1; + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_, + sizeof(struct kinfo_proc), 1 }; - mib[5] = (length / sizeof(struct kinfo_proc)); -+ if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) -+ return 0.0; - -- if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0) -- return 0; - + if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) +- return 0; ++ return TimeDelta(); + - return info.p_pctcpu; -+ return static_cast((info.p_pctcpu * 100.0) / FSCALE); - } +-} ++ tv.tv_sec = info.p_rtime_sec; ++ tv.tv_usec = info.p_rtime_usec; -double ProcessMetrics::GetPlatformIndependentCPUUsage() { - TimeTicks time = TimeTicks::Now(); @@ -80,13 +68,14 @@ - double percentage = static_cast((cpu * 100.0) / FSCALE); - - return percentage; --} -- - TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { - NOTREACHED(); - return TimeDelta(); ++ return Microseconds(TimeValToMicroseconds(tv)); } +-TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { +- NOTREACHED(); +- return TimeDelta(); +-} +- -ProcessMetrics::ProcessMetrics(ProcessHandle process) - : process_(process), - last_cpu_(0) {} @@ -94,16 +83,7 @@ size_t GetSystemCommitCharge() { int mib[] = { CTL_VM, VM_METER }; int pagesize; -@@ -75,7 +69,7 @@ size_t GetSystemCommitCharge() { - unsigned long mem_total, mem_free, mem_inactive; - size_t len = sizeof(vmtotal); - -- if (sysctl(mib, base::size(mib), &vmtotal, &len, NULL, 0) < 0) -+ if (sysctl(mib, std::size(mib), &vmtotal, &len, NULL, 0) < 0) - return 0; - - mem_total = vmtotal.t_vm; -@@ -85,6 +79,129 @@ size_t GetSystemCommitCharge() { +@@ -84,6 +67,129 @@ size_t GetSystemCommitCharge() { pagesize = getpagesize(); return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); diff --git a/www/iridium/files/patch-base_process_process__metrics__posix.cc b/www/iridium/files/patch-base_process_process__metrics__posix.cc index d44f4b8d236..265511141d4 100644 --- a/www/iridium/files/patch-base_process_process__metrics__posix.cc +++ b/www/iridium/files/patch-base_process_process__metrics__posix.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/process/process_metrics_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_metrics_posix.cc @@ -20,6 +20,8 @@ @@ -9,7 +9,7 @@ #else #include #endif -@@ -133,7 +135,7 @@ size_t ProcessMetrics::GetMallocUsage() { +@@ -135,7 +137,7 @@ size_t ProcessMetrics::GetMallocUsage() { return stats.size_in_use; #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) return GetMallocUsageMallinfo(); diff --git a/www/iridium/files/patch-base_process_process__metrics__unittest.cc b/www/iridium/files/patch-base_process_process__metrics__unittest.cc new file mode 100644 index 00000000000..570e0546750 --- /dev/null +++ b/www/iridium/files/patch-base_process_process__metrics__unittest.cc @@ -0,0 +1,20 @@ +--- base/process/process_metrics_unittest.cc.orig 2022-10-05 07:34:01 UTC ++++ base/process/process_metrics_unittest.cc +@@ -44,7 +44,7 @@ namespace debug { + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + + namespace { + +@@ -347,7 +347,7 @@ TEST_F(SystemMetricsTest, ParseVmstat) { + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + + // Test that ProcessMetrics::GetPlatformIndependentCPUUsage() doesn't return + // negative values when the number of threads running on the process decreases diff --git a/www/iridium/files/patch-base_process_process__posix.cc b/www/iridium/files/patch-base_process_process__posix.cc index fad21c5cbcd..6387e90f381 100644 --- a/www/iridium/files/patch-base_process_process__posix.cc +++ b/www/iridium/files/patch-base_process_process__posix.cc @@ -1,6 +1,6 @@ ---- base/process/process_posix.cc.orig 2022-04-01 07:48:30 UTC +--- base/process/process_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_posix.cc -@@ -23,10 +23,15 @@ +@@ -25,10 +25,15 @@ #include "build/build_config.h" #include "third_party/abseil-cpp/absl/types/optional.h" @@ -35,7 +35,7 @@ // On Mac we can wait on non child processes. return WaitForSingleNonChildProcess(handle, timeout); #else -@@ -356,7 +361,55 @@ void Process::Exited(int exit_code) const {} +@@ -392,7 +397,55 @@ void Process::Exited(int exit_code) const { int Process::GetPriority() const { DCHECK(IsValid()); @@ -43,7 +43,7 @@ +#if defined(OS_BSD) + return 0; +#else - return getpriority(PRIO_PROCESS, process_); + return getpriority(PRIO_PROCESS, static_cast(process_)); +#endif +} + @@ -58,14 +58,14 @@ + Time ct = Time(); + +#if !defined(OS_BSD) -+ if (sysctl(mib, base::size(mib), NULL, &info_size, NULL, 0) < 0) ++ if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0) + goto out; + + mib[5] = (info_size / sizeof(struct kinfo_proc)); + if ((info = reinterpret_cast(malloc(info_size))) == NULL) + goto out; + -+ if (sysctl(mib, base::size(mib), info, &info_size, NULL, 0) < 0) ++ if (sysctl(mib, std::size(mib), info, &info_size, NULL, 0) < 0) + goto out; + + ct = Time::FromTimeT(info->p_ustart_sec); diff --git a/www/iridium/files/patch-base_process_process__unittest.cc b/www/iridium/files/patch-base_process_process__unittest.cc index 14d9b1c397c..aaa7950d511 100644 --- a/www/iridium/files/patch-base_process_process__unittest.cc +++ b/www/iridium/files/patch-base_process_process__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/process_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- base/process/process_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_unittest.cc -@@ -140,7 +140,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { +@@ -193,7 +193,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { // was spawned and a time recorded after it was spawned. However, since the // base::Time and process creation clocks don't match, tolerate some error. constexpr base::TimeDelta kTolerance = diff --git a/www/iridium/files/patch-base_profiler_module__cache.cc b/www/iridium/files/patch-base_profiler_module__cache.cc new file mode 100644 index 00000000000..10cb6f73f09 --- /dev/null +++ b/www/iridium/files/patch-base_profiler_module__cache.cc @@ -0,0 +1,11 @@ +--- base/profiler/module_cache.cc.orig 2022-10-05 07:34:01 UTC ++++ base/profiler/module_cache.cc +@@ -34,7 +34,7 @@ struct ModuleAddressCompare { + + std::string TransformModuleIDToBreakpadFormat(StringPiece module_id) { + std::string mangled_id(module_id); +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Linux ELF module IDs are 160bit integers, which we need to mangle + // down to 128bit integers to match the id that Breakpad outputs. + // Example on version '66.0.3359.170' x64: diff --git a/www/iridium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc b/www/iridium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc index fa3b6e11c0c..fd49d6fc321 100644 --- a/www/iridium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc +++ b/www/iridium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_test_util.cc.orig 2022-03-28 18:11:04 UTC +--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2022-10-05 07:34:01 UTC +++ base/profiler/stack_sampling_profiler_test_util.cc -@@ -32,7 +32,7 @@ +@@ -39,7 +39,7 @@ // Fortunately, it provides _alloca, which functions identically. #include #define alloca _alloca diff --git a/www/iridium/files/patch-base_rand__util.h b/www/iridium/files/patch-base_rand__util.h index ec7e3e73a06..34547895ab2 100644 --- a/www/iridium/files/patch-base_rand__util.h +++ b/www/iridium/files/patch-base_rand__util.h @@ -1,11 +1,11 @@ ---- base/rand_util.h.orig 2022-04-01 07:48:30 UTC +--- base/rand_util.h.orig 2022-10-05 07:34:01 UTC +++ base/rand_util.h -@@ -81,7 +81,7 @@ void RandomShuffle(Itr first, Itr last) { +@@ -80,7 +80,7 @@ void RandomShuffle(Itr first, Itr last) { std::shuffle(first, last, RandomBitGenerator()); } -#if BUILDFLAG(IS_POSIX) -+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_BSD) BASE_EXPORT int GetUrandomFD(); #endif diff --git a/www/iridium/files/patch-base_rand__util__posix.cc b/www/iridium/files/patch-base_rand__util__posix.cc index 7fd63f41875..7802c8f0446 100644 --- a/www/iridium/files/patch-base_rand__util__posix.cc +++ b/www/iridium/files/patch-base_rand__util__posix.cc @@ -1,7 +1,7 @@ ---- base/rand_util_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/rand_util_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/rand_util_posix.cc -@@ -17,7 +17,7 @@ - #include "base/posix/eintr_wrapper.h" +@@ -22,7 +22,7 @@ + #include "base/time/time.h" #include "build/build_config.h" -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) @@ -9,31 +9,36 @@ #include "third_party/lss/linux_syscall_support.h" #elif BUILDFLAG(IS_MAC) // TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK. -@@ -34,6 +34,7 @@ static constexpr int kOpenFlags = O_RDONLY; +@@ -39,6 +39,7 @@ static constexpr int kOpenFlags = O_RDONLY; static constexpr int kOpenFlags = O_RDONLY | O_CLOEXEC; #endif -+#if !BUILDFLAG(IS_OPENBSD) ++#if !BUILDFLAG(IS_BSD) // We keep the file descriptor for /dev/urandom around so we don't need to // reopen it (which is expensive), and since we may not even be able to reopen // it if we are later put in a sandbox. This class wraps the file descriptor so -@@ -51,6 +52,7 @@ class URandomFd { +@@ -56,10 +57,11 @@ class URandomFd { private: const int fd_; }; +#endif - } // namespace - -@@ -62,6 +64,7 @@ namespace base { + #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + BUILDFLAG(IS_ANDROID)) && \ +- !BUILDFLAG(IS_NACL) ++ !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) + // TODO(pasko): Unify reading kernel version numbers in: + // mojo/core/channel_linux.cc + // chrome/browser/android/seccomp_support_detector.cc +@@ -144,6 +146,7 @@ void ConfigureRandBytesFieldTrial() { // (https://chromium-review.googlesource.com/c/chromium/src/+/1545096) and land // it or some form of it. void RandBytes(void* output, size_t output_length) { -+#if !BUILDFLAG(IS_OPENBSD) - #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) - // We have to call `getrandom` via Linux Syscall Support, rather than through - // the libc wrapper, because we might not have an up-to-date libc (e.g. on -@@ -93,11 +96,16 @@ void RandBytes(void* output, size_t output_length) { ++#if !BUILDFLAG(IS_BSD) + #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + BUILDFLAG(IS_ANDROID)) && \ + !BUILDFLAG(IS_NACL) +@@ -172,11 +175,16 @@ void RandBytes(void* output, size_t output_length) { const bool success = ReadFromFD(urandom_fd, static_cast(output), output_length); CHECK(success); @@ -42,7 +47,7 @@ +#endif } -+#if !BUILDFLAG(IS_OPENBSD) ++#if !BUILDFLAG(IS_BSD) int GetUrandomFD() { static NoDestructor urandom_fd; return urandom_fd->fd(); diff --git a/www/iridium/files/patch-base_strings_safe__sprintf__unittest.cc b/www/iridium/files/patch-base_strings_safe__sprintf__unittest.cc index 4c9c6535d3a..c3eb254f522 100644 --- a/www/iridium/files/patch-base_strings_safe__sprintf__unittest.cc +++ b/www/iridium/files/patch-base_strings_safe__sprintf__unittest.cc @@ -1,6 +1,6 @@ ---- base/strings/safe_sprintf_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- base/strings/safe_sprintf_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ base/strings/safe_sprintf_unittest.cc -@@ -731,6 +731,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { +@@ -732,6 +732,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { #endif } @@ -8,7 +8,7 @@ TEST(SafeSPrintfTest, EmitNULL) { char buf[40]; #if defined(__GNUC__) -@@ -747,6 +748,7 @@ TEST(SafeSPrintfTest, EmitNULL) { +@@ -748,6 +749,7 @@ TEST(SafeSPrintfTest, EmitNULL) { #pragma GCC diagnostic pop #endif } diff --git a/www/iridium/files/patch-base_synchronization_lock__impl.h b/www/iridium/files/patch-base_synchronization_lock__impl.h index 6e3d7c31cac..18c7f2e03d9 100644 --- a/www/iridium/files/patch-base_synchronization_lock__impl.h +++ b/www/iridium/files/patch-base_synchronization_lock__impl.h @@ -1,4 +1,4 @@ ---- base/synchronization/lock_impl.h.orig 2022-03-28 18:11:04 UTC +--- base/synchronization/lock_impl.h.orig 2022-10-05 07:34:01 UTC +++ base/synchronization/lock_impl.h @@ -107,6 +107,10 @@ void LockImpl::Unlock() { } @@ -9,11 +9,11 @@ +#pragma GCC diagnostic ignored "-Wthread-safety-analysis" +#endif - BASE_EXPORT std::string SystemErrorCodeToString(int error_code); - -@@ -121,6 +125,9 @@ void LockImpl::Unlock() { - int rv = pthread_mutex_unlock(&native_handle_); - DCHECK_EQ(rv, 0) << ". " << strerror(rv); + #if DCHECK_IS_ON() + BASE_EXPORT void dcheck_trylock_result(int rv); +@@ -127,6 +131,9 @@ void LockImpl::Unlock() { + dcheck_unlock_result(rv); + #endif } +#if BUILDFLAG(IS_FREEBSD) +#pragma GCC diagnostic pop diff --git a/www/iridium/files/patch-base_system_sys__info.cc b/www/iridium/files/patch-base_system_sys__info.cc index f9e54ea0272..3578f2ba09b 100644 --- a/www/iridium/files/patch-base_system_sys__info.cc +++ b/www/iridium/files/patch-base_system_sys__info.cc @@ -1,11 +1,11 @@ ---- base/system/sys_info.cc.orig 2022-03-28 18:11:04 UTC +--- base/system/sys_info.cc.orig 2022-10-05 07:34:01 UTC +++ base/system/sys_info.cc -@@ -100,7 +100,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback callback) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + constexpr base::TaskTraits kTraits = {base::MayBlock()}; + #else + constexpr base::TaskTraits kTraits = {}; diff --git a/www/iridium/files/patch-base_system_sys__info.h b/www/iridium/files/patch-base_system_sys__info.h index d8fcacba9d2..bd0fd5af06c 100644 --- a/www/iridium/files/patch-base_system_sys__info.h +++ b/www/iridium/files/patch-base_system_sys__info.h @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2022-03-28 18:11:04 UTC +--- base/system/sys_info.h.orig 2022-10-05 07:34:01 UTC +++ base/system/sys_info.h -@@ -212,6 +212,8 @@ class BASE_EXPORT SysInfo { +@@ -211,6 +211,8 @@ class BASE_EXPORT SysInfo { // On Desktop this returns true when memory <= 2GB. static bool IsLowEndDevice(); @@ -9,12 +9,12 @@ private: FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); -@@ -222,7 +224,7 @@ class BASE_EXPORT SysInfo { +@@ -221,7 +223,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_AIX) + BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) - static int64_t AmountOfAvailablePhysicalMemory( + static uint64_t AmountOfAvailablePhysicalMemory( const SystemMemoryInfoKB& meminfo); #endif diff --git a/www/iridium/files/patch-base_system_sys__info__freebsd.cc b/www/iridium/files/patch-base_system_sys__info__freebsd.cc index 5b3e2081df7..d77a0e55a00 100644 --- a/www/iridium/files/patch-base_system_sys__info__freebsd.cc +++ b/www/iridium/files/patch-base_system_sys__info__freebsd.cc @@ -1,4 +1,4 @@ ---- base/system/sys_info_freebsd.cc.orig 2022-03-28 20:16:21 UTC +--- base/system/sys_info_freebsd.cc.orig 2022-10-05 07:34:01 UTC +++ base/system/sys_info_freebsd.cc @@ -9,30 +9,106 @@ #include @@ -9,19 +9,20 @@ namespace base { +-int64_t SysInfo::AmountOfPhysicalMemoryImpl() { +- int pages, page_size; +int SysInfo::NumberOfProcessors() { + int mib[] = {CTL_HW, HW_NCPU}; + int ncpu; + size_t size = sizeof(ncpu); -+ if (sysctl(mib, base::size(mib), &ncpu, &size, NULL, 0) < 0) { ++ if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) { + NOTREACHED(); + return 1; + } + return ncpu; +} + - int64_t SysInfo::AmountOfPhysicalMemoryImpl() { -- int pages, page_size; ++uint64_t SysInfo::AmountOfPhysicalMemoryImpl() { + int pages, page_size, r = 0; size_t size = sizeof(pages); - sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); @@ -37,11 +38,12 @@ NOTREACHED(); return 0; } +- return static_cast(pages) * page_size; + - return static_cast(pages) * page_size; ++ return static_cast(pages) * page_size; } -+int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { ++uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { + int page_size, r = 0; + unsigned int pgfree, pginact, pgcache; + size_t size = sizeof(page_size); @@ -61,12 +63,12 @@ + return 0; + } + -+ return static_cast((pgfree + pginact + pgcache) * page_size); ++ return static_cast((pgfree + pginact + pgcache) * page_size); +} + // static -+int64_t SysInfo::AmountOfAvailablePhysicalMemory(const SystemMemoryInfoKB& info) { -+ int64_t res_kb = info.available != 0 ++uint64_t SysInfo::AmountOfAvailablePhysicalMemory(const SystemMemoryInfoKB& info) { ++ uint64_t res_kb = info.available != 0 + ? info.available - info.active_file + : info.free + info.reclaimable + info.inactive_file; + return res_kb * 1024; @@ -76,9 +78,9 @@ +std::string SysInfo::CPUModelName() { + int mib[] = { CTL_HW, HW_MODEL }; + char name[256]; -+ size_t size = base::size(name); ++ size_t size = std::size(name); + -+ if (sysctl(mib, base::size(mib), &name, &size, NULL, 0) == 0) { ++ if (sysctl(mib, std::size(mib), &name, &size, NULL, 0) == 0) { + return name; + } + diff --git a/www/iridium/files/patch-base_system_sys__info__openbsd.cc b/www/iridium/files/patch-base_system_sys__info__openbsd.cc index 61fad82c015..2173b6657c6 100644 --- a/www/iridium/files/patch-base_system_sys__info__openbsd.cc +++ b/www/iridium/files/patch-base_system_sys__info__openbsd.cc @@ -1,14 +1,14 @@ ---- base/system/sys_info_openbsd.cc.orig 2022-03-28 18:11:04 UTC +--- base/system/sys_info_openbsd.cc.orig 2022-10-05 07:34:01 UTC +++ base/system/sys_info_openbsd.cc -@@ -12,6 +12,7 @@ +@@ -11,6 +11,7 @@ + #include - #include "base/cxx17_backports.h" #include "base/notreached.h" +#include "base/strings/string_util.h" namespace { -@@ -29,9 +30,15 @@ int64_t AmountOfMemory(int pages_name) { +@@ -26,9 +27,15 @@ uint64_t AmountOfMemory(int pages_name) { namespace base { @@ -24,11 +24,11 @@ + int mib[] = {CTL_HW, HW_NCPUONLINE}; int ncpu; size_t size = sizeof(ncpu); - if (sysctl(mib, base::size(mib), &ncpu, &size, NULL, 0) < 0) { -@@ -43,38 +50,62 @@ int SysInfo::NumberOfProcessors() { + if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) { +@@ -40,10 +47,26 @@ int SysInfo::NumberOfProcessors() { // static - int64_t SysInfo::AmountOfPhysicalMemoryImpl() { + uint64_t SysInfo::AmountOfPhysicalMemoryImpl() { - return AmountOfMemory(_SC_PHYS_PAGES); + // pledge(2) + if (!aofpmem) @@ -36,24 +36,13 @@ + return aofpmem; } - // static - int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { - // We should add inactive file-backed memory also but there is no such - // information from OpenBSD unfortunately. -- return AmountOfMemory(_SC_AVPHYS_PAGES); -+ // pledge(2) -+ if (!aofapmem) -+ aofapmem = AmountOfMemory(_SC_AVPHYS_PAGES); -+ return aofapmem; - } - // static +std::string SysInfo::CPUModelName() { + int mib[] = {CTL_HW, HW_MODEL}; -+ size_t len = base::size(cpumodel); ++ size_t len = std::size(cpumodel); + + if (cpumodel[0] == '\0') { -+ if (sysctl(mib, base::size(mib), cpumodel, &len, NULL, 0) < 0) ++ if (sysctl(mib, std::size(mib), cpumodel, &len, NULL, 0) < 0) + return std::string(); + } + @@ -61,14 +50,17 @@ +} + +// static - uint64_t SysInfo::MaxSharedMemorySize() { + uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { + // We should add inactive file-backed memory also but there is no such + // information from OpenBSD unfortunately. +@@ -55,23 +78,28 @@ uint64_t SysInfo::MaxSharedMemorySize() { int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX}; size_t limit; size_t size = sizeof(limit); + // pledge(2) + if (shmmax) + goto out; - if (sysctl(mib, base::size(mib), &limit, &size, NULL, 0) < 0) { + if (sysctl(mib, std::size(mib), &limit, &size, NULL, 0) < 0) { NOTREACHED(); return 0; } @@ -82,8 +74,8 @@ -std::string SysInfo::CPUModelName() { - int mib[] = {CTL_HW, HW_MODEL}; - char name[256]; -- size_t len = base::size(name); -- if (sysctl(mib, base::size(mib), name, &len, NULL, 0) < 0) { +- size_t len = std::size(name); +- if (sysctl(mib, std::size(mib), name, &len, NULL, 0) < 0) { - NOTREACHED(); - return std::string(); - } diff --git a/www/iridium/files/patch-base_system_sys__info__posix.cc b/www/iridium/files/patch-base_system_sys__info__posix.cc index dd2fa9a623b..71fd898b27b 100644 --- a/www/iridium/files/patch-base_system_sys__info__posix.cc +++ b/www/iridium/files/patch-base_system_sys__info__posix.cc @@ -1,4 +1,4 @@ ---- base/system/sys_info_posix.cc.orig 2022-03-28 20:16:21 UTC +--- base/system/sys_info_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/system/sys_info_posix.cc @@ -37,7 +37,7 @@ @@ -16,9 +16,9 @@ -#endif // !BUILDFLAG(IS_OPENBSD) +#endif // !BUILDFLAG(IS_BSD) - int64_t AmountOfVirtualMemory() { + uint64_t AmountOfVirtualMemory() { struct rlimit limit; -@@ -143,11 +143,11 @@ bool GetDiskSpaceInfo(const base::FilePath& path, +@@ -144,11 +144,11 @@ bool GetDiskSpaceInfo(const base::FilePath& path, namespace base { @@ -31,8 +31,8 @@ +#endif // !BUILDFLAG(IS_BSD) // static - int64_t SysInfo::AmountOfVirtualMemory() { -@@ -239,6 +239,8 @@ std::string SysInfo::OperatingSystemArchitecture() { + uint64_t SysInfo::AmountOfVirtualMemory() { +@@ -238,6 +238,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; diff --git a/www/iridium/files/patch-base_system_sys__info__unittest.cc b/www/iridium/files/patch-base_system_sys__info__unittest.cc index ee7a0ff79e3..04c9153a61a 100644 --- a/www/iridium/files/patch-base_system_sys__info__unittest.cc +++ b/www/iridium/files/patch-base_system_sys__info__unittest.cc @@ -1,11 +1,12 @@ ---- base/system/sys_info_unittest.cc.orig 2022-04-01 07:48:30 UTC +--- base/system/sys_info_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ base/system/sys_info_unittest.cc -@@ -234,12 +234,15 @@ TEST_F(SysInfoTest, GetHardwareInfo) { +@@ -234,12 +234,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) { EXPECT_TRUE(IsStringUTF8(hardware_info->model)); bool empty_result_expected = #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ ++ BUILDFLAG(IS_BSD) false; #else true; diff --git a/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc index 910875d4507..b8f261c4747 100644 --- a/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc +++ b/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc @@ -1,11 +1,11 @@ ---- base/task/thread_pool/environment_config_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- base/task/thread_pool/environment_config_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ base/task/thread_pool/environment_config_unittest.cc @@ -15,7 +15,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) - EXPECT_TRUE(CanUseBackgroundPriorityForWorkerThread()); + EXPECT_TRUE(CanUseBackgroundThreadTypeForWorkerThread()); #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD) - EXPECT_FALSE(CanUseBackgroundPriorityForWorkerThread()); + EXPECT_FALSE(CanUseBackgroundThreadTypeForWorkerThread()); #else #error Platform doesn't match any block diff --git a/www/iridium/files/patch-base_test_launcher_test__launcher.cc b/www/iridium/files/patch-base_test_launcher_test__launcher.cc index 366b37facec..0a84917716c 100644 --- a/www/iridium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/iridium/files/patch-base_test_launcher_test__launcher.cc @@ -1,7 +1,7 @@ ---- base/test/launcher/test_launcher.cc.orig 2022-03-28 18:11:04 UTC +--- base/test/launcher/test_launcher.cc.orig 2022-10-05 07:34:01 UTC +++ base/test/launcher/test_launcher.cc -@@ -63,6 +63,7 @@ - #include "testing/gtest/include/gtest/gtest.h" +@@ -65,6 +65,7 @@ + #include "third_party/libxml/chromium/libxml_utils.h" #if BUILDFLAG(IS_POSIX) +#include diff --git a/www/iridium/files/patch-base_threading_platform__thread.h b/www/iridium/files/patch-base_threading_platform__thread.h index 4b73c3095a5..cf922ccae69 100644 --- a/www/iridium/files/patch-base_threading_platform__thread.h +++ b/www/iridium/files/patch-base_threading_platform__thread.h @@ -1,11 +1,11 @@ ---- base/threading/platform_thread.h.orig 2022-03-28 18:11:04 UTC +--- base/threading/platform_thread.h.orig 2022-10-05 07:34:01 UTC +++ base/threading/platform_thread.h -@@ -205,7 +205,7 @@ class BASE_EXPORT PlatformThread { +@@ -253,7 +253,7 @@ class BASE_EXPORT PlatformThread { // Returns a realtime period provided by `delegate`. static TimeDelta GetRealtimePeriod(Delegate* delegate); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Toggles a specific thread's priority at runtime. This can be used to + // Toggles a specific thread's type at runtime. This can be used to // change the priority of a thread in a different process and will fail // if the calling process does not have proper permissions. The diff --git a/www/iridium/files/patch-base_threading_platform__thread__linux.cc b/www/iridium/files/patch-base_threading_platform__thread__linux.cc index 73ba928f2ec..cda41bdd934 100644 --- a/www/iridium/files/patch-base_threading_platform__thread__linux.cc +++ b/www/iridium/files/patch-base_threading_platform__thread__linux.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_linux.cc.orig 2022-03-28 18:11:04 UTC +--- base/threading/platform_thread_linux.cc.orig 2022-10-05 07:34:01 UTC +++ base/threading/platform_thread_linux.cc @@ -29,7 +29,9 @@ @@ -10,16 +10,16 @@ #include #include #include -@@ -132,7 +134,7 @@ int sched_setattr(pid_t pid, +@@ -132,7 +134,7 @@ long sched_setattr(pid_t pid, #endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) - #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) + #endif // BUILDFLAG(IS_CHROMEOS) -#if !BUILDFLAG(IS_NACL) +#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) const FilePath::CharType kCgroupDirectory[] = FILE_PATH_LITERAL("/sys/fs/cgroup"); -@@ -286,7 +288,7 @@ void SetThreadCgroupsForThreadPriority(PlatformThreadI +@@ -304,7 +306,7 @@ void SetThreadCgroupsForThreadType(PlatformThreadId th namespace internal { namespace { @@ -28,34 +28,34 @@ const struct sched_param kRealTimePrio = {8}; #endif } // namespace -@@ -299,7 +301,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN +@@ -330,7 +332,7 @@ const ThreadTypeToNiceValuePair kThreadTypeToNiceValue }; - bool CanSetThreadPriorityToRealtimeAudio() { + bool CanSetThreadTypeToRealtimeAudio() { -#if !BUILDFLAG(IS_NACL) +#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke - // pthread_setschedparam in SetCurrentThreadPriorityForPlatform(). + // pthread_setschedparam in SetCurrentThreadTypeForPlatform(). struct rlimit rlim; -@@ -310,7 +312,7 @@ bool CanSetThreadPriorityToRealtimeAudio() { - } +@@ -342,7 +344,7 @@ bool CanSetThreadTypeToRealtimeAudio() { - bool SetCurrentThreadPriorityForPlatform(ThreadPriority priority) { + bool SetCurrentThreadTypeForPlatform(ThreadType thread_type, + MessagePumpType pump_type_hint) { -#if !BUILDFLAG(IS_NACL) +#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) // For legacy schedtune interface - SetThreadCgroupsForThreadPriority(PlatformThread::CurrentId(), priority); + SetThreadCgroupsForThreadType(PlatformThread::CurrentId(), thread_type); -@@ -328,7 +330,7 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit - } +@@ -361,7 +363,7 @@ bool SetCurrentThreadTypeForPlatform(ThreadType thread - absl::optional GetCurrentThreadPriorityForPlatform() { + absl::optional + GetCurrentThreadPriorityForPlatformForTest() { -#if !BUILDFLAG(IS_NACL) +#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) int maybe_sched_rr = 0; struct sched_param maybe_realtime_prio = {0}; if (pthread_getschedparam(pthread_self(), &maybe_sched_rr, -@@ -347,7 +349,7 @@ absl::optional GetCurrentThreadPriorit +@@ -380,7 +382,7 @@ GetCurrentThreadPriorityForPlatformForTest() { void PlatformThread::SetName(const std::string& name) { ThreadIdNameManager::GetInstance()->SetName(name); @@ -64,14 +64,14 @@ // On linux we can get the thread names to show up in the debugger by setting // the process name for the LWP. We don't want to do this for the main // thread because that would rename the process, causing tools like killall -@@ -377,8 +379,10 @@ void PlatformThread::SetThreadPriority(ProcessId proce +@@ -410,8 +412,10 @@ void PlatformThread::SetThreadType(ProcessId process_i // priority. CHECK_NE(thread_id, process_id); +#if !BUILDFLAG(IS_BSD) // For legacy schedtune interface - SetThreadCgroupsForThreadPriority(thread_id, priority); + SetThreadCgroupsForThreadType(thread_id, thread_type); +#endif - #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) + #if BUILDFLAG(IS_CHROMEOS) // For upstream uclamp interface. We try both legacy (schedtune, as done diff --git a/www/iridium/files/patch-base_threading_platform__thread__posix.cc b/www/iridium/files/patch-base_threading_platform__thread__posix.cc index a1da3065d37..26de09a430f 100644 --- a/www/iridium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/iridium/files/patch-base_threading_platform__thread__posix.cc @@ -1,21 +1,21 @@ ---- base/threading/platform_thread_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/threading/platform_thread_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/threading/platform_thread_posix.cc -@@ -75,7 +75,7 @@ void* ThreadFunc(void* params) { +@@ -76,7 +76,7 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) base::DisallowSingleton(); -#if !BUILDFLAG(IS_NACL) +#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) - internal::PCScan::NotifyThreadCreated(internal::GetStackPointer()); - #endif -@@ -362,6 +362,9 @@ bool PlatformThread::CanChangeThreadPriority(ThreadPri - // static - void PlatformThread::SetCurrentThreadPriorityImpl(ThreadPriority priority) { + partition_alloc::internal::PCScan::NotifyThreadCreated( + partition_alloc::internal::GetStackPointer()); +@@ -371,6 +371,9 @@ namespace internal { + void SetCurrentThreadTypeImpl(ThreadType thread_type, + MessagePumpType pump_type_hint) { #if BUILDFLAG(IS_NACL) + NOTIMPLEMENTED(); +// avoid pledge(2) violation +#elif BUILDFLAG(IS_BSD) NOTIMPLEMENTED(); #else - if (internal::SetCurrentThreadPriorityForPlatform(priority)) + if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint)) diff --git a/www/iridium/files/patch-base_threading_platform__thread__unittest.cc b/www/iridium/files/patch-base_threading_platform__thread__unittest.cc index 63ece48accf..ff2ce9c6629 100644 --- a/www/iridium/files/patch-base_threading_platform__thread__unittest.cc +++ b/www/iridium/files/patch-base_threading_platform__thread__unittest.cc @@ -1,6 +1,6 @@ ---- base/threading/platform_thread_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- base/threading/platform_thread_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ base/threading/platform_thread_unittest.cc -@@ -30,7 +30,7 @@ +@@ -31,7 +31,7 @@ #include "base/time/time.h" #endif @@ -9,16 +9,16 @@ #include #include #include -@@ -319,7 +319,7 @@ TEST(PlatformThreadTest, +@@ -417,7 +417,7 @@ TEST(PlatformThreadTest, // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this // proprerty changes for a given platform. - TEST(PlatformThreadTest, CanChangeThreadPriority) { + TEST(PlatformThreadTest, CanChangeThreadType) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be // able to increase priority to any level. constexpr bool kCanIncreasePriority = false; -@@ -417,7 +417,7 @@ TEST(PlatformThreadTest, SetHugeThreadName) { +@@ -523,7 +523,7 @@ TEST(PlatformThreadTest, SetHugeThreadName) { TEST(PlatformThreadTest, GetDefaultThreadStackSize) { size_t stack_size = PlatformThread::GetDefaultThreadStackSize(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || \ @@ -27,7 +27,7 @@ !defined(THREAD_SANITIZER)) || \ (BUILDFLAG(IS_ANDROID) && !defined(ADDRESS_SANITIZER)) EXPECT_EQ(0u, stack_size); -@@ -578,12 +578,16 @@ INSTANTIATE_TEST_SUITE_P( +@@ -684,12 +684,16 @@ INSTANTIATE_TEST_SUITE_P( #endif // BUILDFLAG(IS_APPLE) diff --git a/www/iridium/files/patch-base_time_time.cc b/www/iridium/files/patch-base_time_time.cc deleted file mode 100644 index 55fa87eab2a..00000000000 --- a/www/iridium/files/patch-base_time_time.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/time/time.cc.orig 2022-03-28 18:11:04 UTC -+++ base/time/time.cc -@@ -6,7 +6,7 @@ - - #include "build/build_config.h" - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // time.h is a widely included header and its size impacts build time. - // Try not to raise this limit unless necessary. See - // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md diff --git a/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc index f63ff384e6c..51351ba7b88 100644 --- a/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,6 +1,6 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2022-03-28 18:11:04 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2022-10-05 07:34:01 UTC +++ base/trace_event/malloc_dump_provider.cc -@@ -23,6 +23,8 @@ +@@ -24,6 +24,8 @@ #if BUILDFLAG(IS_APPLE) #include @@ -9,7 +9,16 @@ #else #include #endif -@@ -220,6 +222,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -185,7 +187,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, + + #if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \ + (!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \ +- !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA)) ++ !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)) + void ReportMallinfoStats(ProcessMemoryDump* pmd, + size_t* total_virtual_size, + size_t* resident_size, +@@ -356,6 +358,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump &allocated_objects_count); #elif BUILDFLAG(IS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. @@ -17,5 +26,5 @@ + total_virtual_size = 0; + allocated_objects_size = 0; #else - #if defined(__GLIBC__) && defined(__GLIBC_PREREQ) - #if __GLIBC_PREREQ(2, 33) + ReportMallinfoStats(/*pmd=*/nullptr, &total_virtual_size, &resident_size, + &allocated_objects_size, &allocated_objects_count); diff --git a/www/iridium/files/patch-base_trace__event_process__memory__dump.cc b/www/iridium/files/patch-base_trace__event_process__memory__dump.cc index 08e934edeaf..9229adeb572 100644 --- a/www/iridium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/iridium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,6 +1,6 @@ ---- base/trace_event/process_memory_dump.cc.orig 2022-03-28 18:11:04 UTC +--- base/trace_event/process_memory_dump.cc.orig 2022-10-05 07:34:01 UTC +++ base/trace_event/process_memory_dump.cc -@@ -105,7 +105,7 @@ absl::optional ProcessMemoryDump::CountResiden +@@ -112,7 +112,7 @@ absl::optional ProcessMemoryDump::CountResiden #if BUILDFLAG(IS_WIN) std::unique_ptr vec( new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); @@ -9,12 +9,12 @@ std::unique_ptr vec(new char[max_vec_size]); #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) std::unique_ptr vec(new unsigned char[max_vec_size]); -@@ -130,7 +130,7 @@ absl::optional ProcessMemoryDump::CountResiden +@@ -134,7 +134,7 @@ absl::optional ProcessMemoryDump::CountResiden for (size_t i = 0; i < page_count; i++) resident_page_count += vec[i].VirtualAttributes.Valid; -#elif BUILDFLAG(IS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // TODO(fuchsia): Port, see https://crbug.com/706592. - #elif BUILDFLAG(IS_APPLE) - // mincore in MAC does not fail with EAGAIN. + // TODO(crbug.com/851760): Implement counting resident bytes. + // For now, log and avoid unused variable warnings. + NOTIMPLEMENTED_LOG_ONCE(); diff --git a/www/iridium/files/patch-build_config_BUILD.gn b/www/iridium/files/patch-build_config_BUILD.gn index 64b201f66c3..fb4eefa994c 100644 --- a/www/iridium/files/patch-build_config_BUILD.gn +++ b/www/iridium/files/patch-build_config_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- build/config/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ build/config/BUILD.gn -@@ -218,13 +218,17 @@ config("default_libs") { +@@ -215,13 +215,17 @@ config("default_libs") { "CoreText.framework", "Foundation.framework", ] diff --git a/www/iridium/files/patch-build_config_BUILDCONFIG.gn b/www/iridium/files/patch-build_config_BUILDCONFIG.gn index c209822d3d1..5cc6d67c416 100644 --- a/www/iridium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/iridium/files/patch-build_config_BUILDCONFIG.gn @@ -1,4 +1,4 @@ ---- build/config/BUILDCONFIG.gn.orig 2022-03-28 18:11:04 UTC +--- build/config/BUILDCONFIG.gn.orig 2022-10-05 07:34:01 UTC +++ build/config/BUILDCONFIG.gn @@ -136,7 +136,8 @@ declare_args() { is_official_build = false @@ -10,7 +10,7 @@ (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64" && -@@ -218,6 +219,10 @@ if (host_toolchain == "") { +@@ -220,6 +221,10 @@ if (host_toolchain == "") { host_toolchain = "//build/toolchain/aix:$host_cpu" } else if (host_os == "zos") { host_toolchain = "//build/toolchain/zos:$host_cpu" @@ -21,7 +21,7 @@ } else { assert(false, "Unsupported host_os: $host_os") } -@@ -262,6 +267,8 @@ if (target_os == "android") { +@@ -264,6 +269,8 @@ if (target_os == "android") { _default_toolchain = "//build/toolchain/aix:$target_cpu" } else if (target_os == "zos") { _default_toolchain = "//build/toolchain/zos:$target_cpu" @@ -30,7 +30,7 @@ } else { assert(false, "Unsupported target_os: $target_os") } -@@ -296,7 +303,11 @@ is_android = current_os == "android" +@@ -298,7 +305,11 @@ is_android = current_os == "android" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" diff --git a/www/iridium/files/patch-build_config_compiler_BUILD.gn b/www/iridium/files/patch-build_config_compiler_BUILD.gn index b63f65a970f..6b6d36614eb 100644 --- a/www/iridium/files/patch-build_config_compiler_BUILD.gn +++ b/www/iridium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- build/config/compiler/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ build/config/compiler/BUILD.gn -@@ -236,13 +236,16 @@ config("default_include_dirs") { +@@ -222,13 +222,16 @@ config("default_include_dirs") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. config("no_unresolved_symbols") { @@ -18,7 +18,7 @@ } # compiler --------------------------------------------------------------------- -@@ -291,7 +294,9 @@ config("compiler") { +@@ -274,7 +277,9 @@ config("compiler") { configs += [ # See the definitions below. @@ -38,35 +38,35 @@ + # Linux-specific compiler flags setup. # ------------------------------------ - if ((is_posix || is_fuchsia) && !is_apple && use_lld) { -@@ -879,7 +888,7 @@ config("compiler_cpu_abi") { + if (use_gold) { +@@ -862,7 +871,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { -- if (is_clang && !is_android && !is_nacl) { -+ if (is_clang && !is_android && !is_nacl && !is_bsd) { +- if (is_clang && !is_android && !is_nacl && ++ if (is_clang && !is_android && !is_nacl && !is_bsd && + !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] - } -@@ -893,7 +902,7 @@ config("compiler_cpu_abi") { - cflags += [ "-mtune=$arm_tune" ] +@@ -878,7 +887,7 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm64") { -- if (is_clang && !is_android && !is_nacl && !is_fuchsia) { -+ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd) { + if (is_clang && !is_android && !is_nacl && !is_fuchsia && +- !(is_chromeos_lacros && is_chromeos_device)) { ++ !(is_chromeos_lacros && is_chromeos_device) && !is_bsd) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1465,7 +1474,7 @@ config("default_warnings") { - "-Wno-ignored-pragma-optimize", - ] - -- if (is_chromeos || default_toolchain == "//build/toolchain/cros:target") { -+ if (is_chromeos || default_toolchain == "//build/toolchain/cros:target" || is_bsd) { - # TODO(https://crbug.com/1016945): Re-enable once ChromeOS toolchain is up to date - cflags += [ "-Wno-builtin-assume-aligned-alignment" ] +@@ -1464,7 +1473,7 @@ config("default_warnings") { + ] } -@@ -1644,7 +1653,7 @@ config("no_chromium_code") { + +- if (!is_nacl) { ++ if (!is_nacl && !is_bsd) { + cflags += [ + # TODO(crbug.com/1343975) Evaluate and possibly enable. + "-Wno-deprecated-builtins", +@@ -1623,7 +1632,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -75,7 +75,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -1956,8 +1965,7 @@ config("default_stack_frames") { +@@ -1935,8 +1944,7 @@ config("default_stack_frames") { } # Default "optimization on" config. @@ -85,7 +85,7 @@ if (is_win) { if (chrome_pgo_phase != 2) { # Favor size over speed, /O1 must be before the common flags. -@@ -1995,8 +2003,7 @@ config("xoptimize") { +@@ -1974,8 +1982,7 @@ config("xoptimize") { } # Turn off optimizations. @@ -95,7 +95,7 @@ if (is_win) { cflags = [ "/Od", # Disable optimization. -@@ -2036,8 +2043,7 @@ config("xno_optimize") { +@@ -2015,8 +2022,7 @@ config("xno_optimize") { # Turns up the optimization level. On Windows, this implies whole program # optimization and link-time code generation which is very expensive and should # be used sparingly. @@ -105,7 +105,7 @@ if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2070,8 +2076,7 @@ config("xoptimize_max") { +@@ -2049,8 +2055,7 @@ config("xoptimize_max") { # # TODO(crbug.com/621335) - rework how all of these configs are related # so that we don't need this disclaimer. @@ -115,7 +115,7 @@ if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2097,8 +2102,7 @@ config("xoptimize_speed") { +@@ -2076,8 +2081,7 @@ config("xoptimize_speed") { } } @@ -125,7 +125,7 @@ cflags = [ "-O1" ] + common_optimize_on_cflags rustflags = [ "-Copt-level=1" ] ldflags = common_optimize_on_ldflags -@@ -2163,7 +2167,7 @@ config("afdo_optimize_size") { +@@ -2142,7 +2146,7 @@ config("afdo_optimize_size") { # There are some targeted places that AFDO regresses, so we provide a separate # config to allow AFDO to be disabled per-target. config("afdo") { @@ -134,7 +134,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2179,7 +2183,7 @@ config("afdo") { +@@ -2158,7 +2162,7 @@ config("afdo") { cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ] inputs = [ _clang_sample_profile ] } @@ -143,7 +143,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2217,8 +2221,7 @@ config("win_pdbaltpath") { +@@ -2196,8 +2200,7 @@ config("win_pdbaltpath") { } # Full symbols. @@ -153,7 +153,7 @@ if (is_win) { if (is_clang) { cflags = [ "/Z7" ] # Debug information in the .obj files. -@@ -2323,7 +2326,8 @@ config("xsymbols") { +@@ -2299,7 +2302,8 @@ config("xsymbols") { } } @@ -163,7 +163,7 @@ if (is_apple) { # TODO(https://crbug.com/1050118): Investigate missing debug info on mac. # Make sure we don't use constructor homing on mac. -@@ -2346,8 +2350,7 @@ config("xsymbols") { +@@ -2322,8 +2326,7 @@ config("xsymbols") { # Minimal symbols. # This config guarantees to hold symbol for stack trace which are shown to user # when crash happens in unittests running on buildbot. @@ -173,7 +173,7 @@ if (is_win) { # Functions, files, and line tables only. cflags = [] -@@ -2420,8 +2423,7 @@ config("xminimal_symbols") { +@@ -2395,8 +2398,7 @@ config("xminimal_symbols") { # This configuration contains function names only. That is, the compiler is # told to not generate debug information and the linker then just puts function # names in the final debug information. diff --git a/www/iridium/files/patch-build_config_compiler_pgo_pgo.gni b/www/iridium/files/patch-build_config_compiler_pgo_pgo.gni deleted file mode 100644 index 1cb2d3dcfbe..00000000000 --- a/www/iridium/files/patch-build_config_compiler_pgo_pgo.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- build/config/compiler/pgo/pgo.gni.orig 2022-03-28 18:11:04 UTC -+++ build/config/compiler/pgo/pgo.gni -@@ -16,7 +16,7 @@ declare_args() { - # TODO(crbug.com/1052397): Remove chromeos_is_browser_only once - # target_os switch for lacros-chrome is completed. - (is_win || is_mac || -- (is_linux && !chromeos_is_browser_only && !is_chromecast))) { -+ (is_linux && !chromeos_is_browser_only && !is_chromecast && !is_bsd))) { - chrome_pgo_phase = 2 - } - diff --git a/www/iridium/files/patch-build_config_linux_BUILD.gn b/www/iridium/files/patch-build_config_linux_BUILD.gn index 36d2ec257d7..57a77d064bb 100644 --- a/www/iridium/files/patch-build_config_linux_BUILD.gn +++ b/www/iridium/files/patch-build_config_linux_BUILD.gn @@ -1,9 +1,9 @@ ---- build/config/linux/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- build/config/linux/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ build/config/linux/BUILD.gn -@@ -42,7 +42,7 @@ config("runtime_library") { +@@ -41,7 +41,7 @@ config("runtime_library") { + } - if ((!(is_chromeos_ash || is_chromeos_lacros) || - default_toolchain != "//build/toolchain/cros:target") && + if ((!is_chromeos || default_toolchain != "//build/toolchain/cros:target") && - (!use_custom_libcxx || current_cpu == "mipsel")) { + (!use_custom_libcxx || current_cpu == "mipsel") && !is_bsd) { libs = [ "atomic" ] diff --git a/www/iridium/files/patch-build_config_ozone.gni b/www/iridium/files/patch-build_config_ozone.gni index 75e60dc7adf..118645d394a 100644 --- a/www/iridium/files/patch-build_config_ozone.gni +++ b/www/iridium/files/patch-build_config_ozone.gni @@ -1,6 +1,6 @@ ---- build/config/ozone.gni.orig 2022-03-31 09:38:28 UTC +--- build/config/ozone.gni.orig 2022-10-05 07:34:01 UTC +++ build/config/ozone.gni -@@ -91,7 +91,15 @@ declare_args() { +@@ -87,7 +87,15 @@ declare_args() { } else if (is_chromeos_lacros) { ozone_platform = "wayland" ozone_platform_wayland = true diff --git a/www/iridium/files/patch-build_config_rust.gni b/www/iridium/files/patch-build_config_rust.gni index d4cd8961aa4..b74a05428eb 100644 --- a/www/iridium/files/patch-build_config_rust.gni +++ b/www/iridium/files/patch-build_config_rust.gni @@ -1,6 +1,6 @@ ---- build/config/rust.gni.orig 2022-04-01 07:48:30 UTC +--- build/config/rust.gni.orig 2022-10-05 07:34:01 UTC +++ build/config/rust.gni -@@ -116,7 +116,7 @@ if (enable_rust) { +@@ -124,7 +124,7 @@ if (enable_rust) { rust_sysroot = "//third_party/rust-toolchain" use_unverified_rust_toolchain = false } else { diff --git a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni index 16f24db9ab6..450d35ba5c6 100644 --- a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2022-04-01 07:48:30 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2022-10-05 07:34:01 UTC +++ build/toolchain/gcc_toolchain.gni @@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -14,11 +14,20 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -771,13 +778,12 @@ template("gcc_toolchain") { +@@ -786,22 +793,12 @@ template("gcc_toolchain") { # use_gold too. template("clang_toolchain") { gcc_toolchain(target_name) { -- prefix = rebase_path("$clang_base_path/bin", root_build_dir) +- _path = "$clang_base_path/bin" +- _is_path_absolute = get_path_info(_path, "abspath") == _path +- +- # Preserve absolute paths for tools like distcc. +- if (_is_path_absolute && filter_include([ _path ], [ "//*" ]) == []) { +- prefix = _path +- } else { +- prefix = rebase_path(_path, root_build_dir) +- } +- - cc = "${prefix}/clang" - cxx = "${prefix}/clang++" + cc = "cc" diff --git a/www/iridium/files/patch-chrome_app_app__management__strings.grdp b/www/iridium/files/patch-chrome_app_app__management__strings.grdp new file mode 100644 index 00000000000..c2eda39438e --- /dev/null +++ b/www/iridium/files/patch-chrome_app_app__management__strings.grdp @@ -0,0 +1,11 @@ +--- chrome/app/app_management_strings.grdp.orig 2022-10-05 07:34:01 UTC ++++ chrome/app/app_management_strings.grdp +@@ -173,7 +173,7 @@ + You can open and edit supported files with this app from Finder or other apps. To control which files open this app by default, <a href="#">learn how to set default apps on your device</a>. + + +- ++ + + You can open and edit supported files with this app from your file browser or other apps. To control which files open this app by default, <a href="#">learn how to set default apps on your device</a>. + diff --git a/www/iridium/files/patch-chrome_app_chrome__command__ids.h b/www/iridium/files/patch-chrome_app_chrome__command__ids.h index e9a80bec224..fdb4318a26d 100644 --- a/www/iridium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/iridium/files/patch-chrome_app_chrome__command__ids.h @@ -1,6 +1,6 @@ ---- chrome/app/chrome_command_ids.h.orig 2022-03-28 18:11:04 UTC +--- chrome/app/chrome_command_ids.h.orig 2022-10-05 07:34:01 UTC +++ chrome/app/chrome_command_ids.h -@@ -66,7 +66,7 @@ +@@ -67,7 +67,7 @@ #define IDC_NAME_WINDOW 34049 // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_app_chrome__main.cc b/www/iridium/files/patch-chrome_app_chrome__main.cc index a393724a942..c08821e823b 100644 --- a/www/iridium/files/patch-chrome_app_chrome__main.cc +++ b/www/iridium/files/patch-chrome_app_chrome__main.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/app/chrome_main.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/app/chrome_main.cc -@@ -25,7 +25,7 @@ +@@ -26,7 +26,7 @@ #include "chrome/app/notification_metrics.h" #endif @@ -9,7 +9,7 @@ #include "base/base_switches.h" #endif -@@ -146,7 +146,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -152,7 +152,7 @@ int ChromeMain(int argc, const char** argv) { headless::SetUpCommandLine(command_line); } else { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc index 7f48959c413..57b083bc2b2 100644 --- a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,7 +1,7 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -114,7 +114,7 @@ - #include "chrome/app/chrome_crash_reporter_client.h" +@@ -126,7 +126,7 @@ + #include "components/about_ui/credit_utils.h" #endif -#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -158,12 +158,12 @@ +@@ -169,16 +169,16 @@ #include "v8/include/v8.h" #endif @@ -18,13 +18,18 @@ #include "base/environment.h" #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + #include "base/message_loop/message_pump_libevent.h" + #endif + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -311,7 +311,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -329,7 +329,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -33,7 +38,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -351,7 +351,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -415,7 +415,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -42,7 +47,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -415,7 +415,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -506,7 +506,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -51,7 +56,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -499,7 +499,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -589,7 +589,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -60,7 +65,7 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::RecordStartupProcessCreationTime( -@@ -680,6 +680,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization( +@@ -767,6 +767,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() { // not always enabled on Linux/ChromeOS. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled(); @@ -69,17 +74,26 @@ #else bool enable_gwp_asan = true; #endif -@@ -815,7 +817,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi - } - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. +@@ -826,7 +828,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { + base::internal::TimerBase::InitializeFeatures(); + base::InitializeCpuReductionExperiment(); + base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + base::MessagePumpLibevent::InitializeFeatures(); + #elif BUILDFLAG(IS_MAC) + base::PlatformThread::InitializeOptimizedRealtimeThreadingFeature(); +@@ -916,7 +918,7 @@ absl::optional ChromeMainDelegate::BasicStartupCo + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag + // switch of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -846,7 +848,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi - #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -946,7 +948,7 @@ absl::optional ChromeMainDelegate::BasicStartupCo + #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif -#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) @@ -87,19 +101,19 @@ nacl::RegisterPathProvider(); #endif -@@ -1161,7 +1163,7 @@ void ChromeMainDelegate::PreSandboxStartup() { - locale; +@@ -1336,7 +1338,7 @@ void ChromeMainDelegate::PreSandboxStartup() { + CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { - #if BUILDFLAG(IS_ANDROID) -@@ -1237,7 +1239,7 @@ absl::variant Chrome + if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) { +@@ -1412,7 +1414,7 @@ absl::variant Chrome - // This entry is not needed on Linux, where the NaCl loader - // process is launched via nacl_helper instead. + // This entry is not needed on Linux, where the NaCl loader + // process is launched via nacl_helper instead. -#if BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) {switches::kNaClLoaderProcess, NaClMain}, diff --git a/www/iridium/files/patch-chrome_app_chromium__strings.grd b/www/iridium/files/patch-chrome_app_chromium__strings.grd index 804d6dd668d..b090c666b5f 100644 --- a/www/iridium/files/patch-chrome_app_chromium__strings.grd +++ b/www/iridium/files/patch-chrome_app_chromium__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/chromium_strings.grd.orig 2022-04-01 07:48:30 UTC +--- chrome/app/chromium_strings.grd.orig 2022-10-05 07:34:01 UTC +++ chrome/app/chromium_strings.grd -@@ -298,7 +298,7 @@ If you update this file, be sure also to update google +@@ -296,7 +296,7 @@ If you update this file, be sure also to update google Welcome to Iridium; new browser window opened @@ -9,21 +9,12 @@ Welcome to Iridium -@@ -818,7 +818,7 @@ Permissions you've already given to websites and apps +@@ -410,7 +410,7 @@ If you update this file, be sure also to update google + The browser may not function correctly because it is no longer supported on Windows XP or Windows Vista + - - -- -+ - - Your system administrator has configured the browser to open an alternative browser to access $1example.com. - -@@ -944,7 +944,7 @@ Permissions you've already given to websites and apps - - - -- -+ - - The profile appears to be in use by another browsr process ($112345) on another computer ($2example.com). The browser has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch the browser. +- ++ + + The browser may not function correctly because it is no longer supported on this Linux distribution diff --git a/www/iridium/files/patch-chrome_app_generated__resources.grd b/www/iridium/files/patch-chrome_app_generated__resources.grd index d0137ece6f1..413eb5ad552 100644 --- a/www/iridium/files/patch-chrome_app_generated__resources.grd +++ b/www/iridium/files/patch-chrome_app_generated__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/generated_resources.grd.orig 2022-04-01 07:48:30 UTC +--- chrome/app/generated_resources.grd.orig 2022-10-05 07:34:01 UTC +++ chrome/app/generated_resources.grd @@ -2,7 +2,7 @@ @@ -9,16 +9,7 @@ for making strings OS specific. Other platform defines such as use_titlecase are declared in tools/grit/grit_rule.gni. --> -@@ -298,7 +298,7 @@ are declared in tools/grit/grit_rule.gni. - - - -- -+ - - - -@@ -2833,7 +2833,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3069,7 +3069,7 @@ are declared in tools/grit/grit_rule.gni. @@ -27,30 +18,57 @@ Device Credentials -@@ -5686,7 +5686,7 @@ Keep your key file in a safe place. You will need it t - - - -- -+ - - Legacy Browser Support +@@ -4802,7 +4802,7 @@ are declared in tools/grit/grit_rule.gni. + Read information about your browser, OS, device, installed software, registry values and files + + +- ++ + + Read information about your browser, OS, device, installed software and files + +@@ -5439,7 +5439,7 @@ Keep your key file in a safe place. You will need it t + Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app. -@@ -8217,7 +8217,7 @@ Keep your key file in a safe place. You will need it t + +- ++ + + Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app. + +@@ -5467,7 +5467,7 @@ Keep your key file in a safe place. You will need it t + Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available. + + +- ++ + + Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available. + +@@ -8964,7 +8964,7 @@ Check your passwords anytime in -+ +- ++ Use system title bar and borders -@@ -9372,7 +9372,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -10148,7 +10148,7 @@ Please help our engineers fix this problem. Tell us wh Set as default -- -+ +- ++ Minimize +@@ -12211,7 +12211,7 @@ Please help our engineers fix this problem. Tell us wh + Open Anyway + + +- ++ + + System Signals Utilities + diff --git a/www/iridium/files/patch-chrome_app_google__chrome__strings.grd b/www/iridium/files/patch-chrome_app_google__chrome__strings.grd index 90ca9b7127f..3895d1d1e29 100644 --- a/www/iridium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/iridium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/google_chrome_strings.grd.orig 2022-04-01 07:48:30 UTC +--- chrome/app/google_chrome_strings.grd.orig 2022-10-05 07:34:01 UTC +++ chrome/app/google_chrome_strings.grd -@@ -303,7 +303,7 @@ chromium_strings.grd. --> +@@ -301,7 +301,7 @@ chromium_strings.grd. --> Welcome to Chrome; new browser window opened @@ -9,21 +9,12 @@ Welcome to Google Chrome -@@ -863,7 +863,7 @@ Permissions you've already given to websites and apps +@@ -438,7 +438,7 @@ chromium_strings.grd. --> + This computer will no longer receive Google Chrome updates because Windows XP and Windows Vista are no longer supported + - - -- -+ - - Your system administrator has configured Google Chrome to open an alternative browser to access $1example.com. - -@@ -1012,7 +1012,7 @@ Permissions you've already given to websites and apps - - - -- -+ - - The profile appears to be in use by another Google Chrome process ($112345) on another computer ($2example.com). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome. +- ++ + + Google Chrome may not function correctly because it is no longer supported on this Linux distribution diff --git a/www/iridium/files/patch-chrome_app_settings__strings.grdp b/www/iridium/files/patch-chrome_app_settings__strings.grdp index caaa01f9783..a956f79d391 100644 --- a/www/iridium/files/patch-chrome_app_settings__strings.grdp +++ b/www/iridium/files/patch-chrome_app_settings__strings.grdp @@ -1,20 +1,20 @@ ---- chrome/app/settings_strings.grdp.orig 2022-03-28 18:11:04 UTC +--- chrome/app/settings_strings.grdp.orig 2022-10-05 07:34:01 UTC +++ chrome/app/settings_strings.grdp -@@ -131,7 +131,7 @@ +@@ -134,7 +134,7 @@ Theme -- -+ +- ++ GTK+ -@@ -145,7 +145,7 @@ +@@ -148,7 +148,7 @@ Use Classic -- -+ +- ++ Reset to default diff --git a/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd b/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd index 77c8bf474b6..ab7eb9bd7ba 100644 --- a/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd +++ b/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2022-04-01 07:48:30 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2022-10-05 07:34:01 UTC +++ chrome/app/theme/chrome_unscaled_resources.grd @@ -15,12 +15,12 @@ @@ -15,7 +15,7 @@ -@@ -52,12 +52,12 @@ +@@ -53,12 +53,12 @@ diff --git a/www/iridium/files/patch-chrome_app_theme_theme__resources.grd b/www/iridium/files/patch-chrome_app_theme_theme__resources.grd index 1bfe0269b3f..d19441f84c1 100644 --- a/www/iridium/files/patch-chrome_app_theme_theme__resources.grd +++ b/www/iridium/files/patch-chrome_app_theme_theme__resources.grd @@ -1,11 +1,34 @@ ---- chrome/app/theme/theme_resources.grd.orig 2022-03-28 18:11:04 UTC +--- chrome/app/theme/theme_resources.grd.orig 2022-10-05 07:34:01 UTC +++ chrome/app/theme/theme_resources.grd -@@ -25,7 +25,7 @@ - -- -+ - +@@ -130,11 +130,11 @@ + - + +- ++ + + + +- ++ + + + +@@ -142,7 +142,7 @@ + + + +- ++ + + + +@@ -150,7 +150,7 @@ + + + +- ++ + + + diff --git a/www/iridium/files/patch-chrome_browser_about__flags.cc b/www/iridium/files/patch-chrome_browser_about__flags.cc index ae127b2d48f..fdf0ba9fcb2 100644 --- a/www/iridium/files/patch-chrome_browser_about__flags.cc +++ b/www/iridium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/about_flags.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/about_flags.cc -@@ -206,7 +206,7 @@ +@@ -212,7 +212,7 @@ #include "ui/native_theme/native_theme_features.h" #include "ui/ui_features.h" @@ -9,8 +9,8 @@ #include "base/allocator/buildflags.h" #endif -@@ -275,7 +275,7 @@ - #include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h" +@@ -287,7 +287,7 @@ + #include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h" // nogncheck #endif // ENABLE_SUPERVISED_USERS -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) @@ -18,8 +18,8 @@ #include "ui/ozone/buildflags.h" #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -362,7 +362,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = { - gl::kANGLEImplementationMetalName}}; +@@ -392,7 +392,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap + {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif -#if BUILDFLAG(IS_LINUX) @@ -27,7 +27,7 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -976,7 +976,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot +@@ -1262,7 +1262,7 @@ const FeatureEntry::FeatureVariation }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -36,8 +36,8 @@ const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, {"DocumentUseClientScore", "false"}, -@@ -3424,7 +3424,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(chromeos::kLacrosTtsSupport)}, +@@ -3923,7 +3923,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(base::kOneGroupPerRenderer)}, #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) @@ -45,16 +45,7 @@ { "enable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, -@@ -3838,7 +3838,7 @@ const FeatureEntry kFeatureEntries[] = { - {"enable-login-detection", flag_descriptions::kEnableLoginDetectionName, - flag_descriptions::kEnableLoginDetectionDescription, kOsAll, - FEATURE_VALUE_TYPE(login_detection::kLoginDetection)}, --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - {"enable-navigation-predictor", - flag_descriptions::kEnableNavigationPredictorName, - flag_descriptions::kEnableNavigationPredictorDescription, -@@ -4031,7 +4031,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4549,7 +4549,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -63,7 +54,7 @@ {"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName, flag_descriptions::kOzonePlatformHintDescription, kOsLinux, MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)}, -@@ -4050,7 +4050,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4568,7 +4568,7 @@ const FeatureEntry kFeatureEntries[] = { password_manager::features::kForceInitialSyncWhenDecryptionFails)}, #endif // BUILDFLAG(IS_LINUX) @@ -72,8 +63,17 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -4760,7 +4760,7 @@ const FeatureEntry kFeatureEntries[] = { - "OmniboxBundledExperimentV1")}, +@@ -4822,7 +4822,7 @@ const FeatureEntry kFeatureEntries[] = { + "FeedCloseRefresh")}, + #endif // BUILDFLAG(IS_ANDROID) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, + flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, + FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, +@@ -5336,7 +5336,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(omnibox::kZeroSuggestPrefetchingOnWeb)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) @@ -81,17 +81,17 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -5158,7 +5158,7 @@ const FeatureEntry kFeatureEntries[] = { - #endif // BUILDFLAG(IS_ANDROID) +@@ -5873,7 +5873,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kPointerLockOptionsDescription, kOsDesktop, + FEATURE_VALUE_TYPE(features::kPointerLockOptions)}, - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - {"webui-feedback", flag_descriptions::kWebuiFeedbackName, - flag_descriptions::kWebuiFeedbackDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kWebUIFeedback)}, -@@ -6198,7 +6198,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)}, +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + {"enable-async-dns", flag_descriptions::kAsyncDnsName, + flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, + FEATURE_VALUE_TYPE(features::kAsyncDns)}, +@@ -6791,7 +6791,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -99,25 +99,16 @@ {"global-media-controls-modern-ui", flag_descriptions::kGlobalMediaControlsModernUIName, flag_descriptions::kGlobalMediaControlsModernUIDescription, -@@ -6912,7 +6912,7 @@ const FeatureEntry kFeatureEntries[] = { - #endif - - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - {"incognito-clear-browsing-data-dialog-for-desktop", - flag_descriptions::kIncognitoClearBrowsingDataDialogForDesktopName, - flag_descriptions::kIncognitoClearBrowsingDataDialogForDesktopDescription, -@@ -7037,7 +7037,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7651,7 +7651,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - {"commander", flag_descriptions::kCommanderName, - flag_descriptions::kCommanderDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kCommander)}, -@@ -7291,7 +7291,7 @@ const FeatureEntry kFeatureEntries[] = { + {"quick-commands", flag_descriptions::kQuickCommandsName, + flag_descriptions::kQuickCommandsDescription, kOsDesktop, + FEATURE_VALUE_TYPE(features::kQuickCommands)}, +@@ -7950,7 +7950,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -126,3 +117,12 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, +@@ -8530,7 +8530,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + {"document-picture-in-picture-api", + flag_descriptions::kDocumentPictureInPictureApiName, + flag_descriptions::kDocumentPictureInPictureApiDescription, diff --git a/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc index aa489bc5dfa..319c2721ae3 100644 --- a/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc +++ b/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc @@ -1,16 +1,7 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/after_startup_task_utils.cc -@@ -25,7 +25,7 @@ - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - #include "ui/views/linux_ui/linux_ui.h" - #endif - -@@ -111,7 +111,7 @@ void SetBrowserStartupIsComplete() { - +@@ -107,7 +107,7 @@ void SetBrowserStartupIsComplete() { + TRACE_EVENT0("startup", "SetBrowserStartupIsComplete"); g_startup_complete_flag.Get().Set(); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -18,12 +9,3 @@ // Process::Current().CreationTime() is not available on all platforms. const base::Time process_creation_time = base::Process::Current().CreationTime(); -@@ -130,7 +130,7 @@ void SetBrowserStartupIsComplete() { - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - // Make sure we complete the startup notification sequence, or launchers will - // get confused by not receiving the expected message from the main process. - views::LinuxUI* linux_ui = views::LinuxUI::instance(); diff --git a/www/iridium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc b/www/iridium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc deleted file mode 100644 index 644ba8794a0..00000000000 --- a/www/iridium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc +++ /dev/null @@ -1,71 +0,0 @@ ---- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2022-03-28 18:11:04 UTC -+++ chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc -@@ -4,6 +4,15 @@ - - #include "chrome/browser/apps/platform_apps/api/music_manager_private/device_id.h" - -+#include "build/build_config.h" -+ -+#if defined(OS_BSD) -+#include -+#include -+#include -+#include -+#endif -+ - #include - #include - #include -@@ -106,11 +115,33 @@ class MacAddressProcessor { - const char* const prefixes[], - size_t prefixes_count) { - const int MAC_LENGTH = 6; -+#if defined(OS_BSD) -+ struct ifaddrs *ifap, *ifinfo; -+#else - struct ifreq ifinfo; -+#endif - - memset(&ifinfo, 0, sizeof(ifinfo)); -- strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1); - -+#if defined(OS_BSD) -+ int result = getifaddrs(&ifap); -+ if (result != 0) -+ return true; -+ result = 1; // no MAC found yet -+ for (ifinfo = ifap; ifinfo != NULL; ifinfo = ifinfo->ifa_next) { -+ struct sockaddr* sa = ifinfo->ifa_addr; -+ if (sa->sa_family == AF_LINK && -+ !strncmp(ifinfo->ifa_name, ifaddr->ifa_name, -+ sizeof(ifinfo->ifa_name) - 1)) { -+ result = 0; -+ break; -+ } -+ } -+ -+ char mac_address[6]; -+ strncpy(mac_address, (const char*)LLADDR((struct sockaddr_dl*)ifinfo->ifa_addr), sizeof(mac_address)); -+#else -+ strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1); - int sd = socket(AF_INET, SOCK_DGRAM, 0); - int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo); - close(sd); -@@ -120,11 +151,17 @@ class MacAddressProcessor { - - const char* mac_address = - static_cast(ifinfo.ifr_hwaddr.sa_data); -+#endif - if (!is_valid_mac_address_.Run(mac_address, MAC_LENGTH)) - return true; - -+#if defined(OS_BSD) -+ if (!IsValidPrefix(ifinfo->ifa_name, prefixes, prefixes_count)) -+ return true; -+#else - if (!IsValidPrefix(ifinfo.ifr_name, prefixes, prefixes_count)) - return true; -+#endif - - // Got one! - found_mac_address_ = diff --git a/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc b/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc index a4f222095c5..27d9c6172e7 100644 --- a/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc +++ b/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc @@ -1,20 +1,20 @@ ---- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/apps/platform_apps/platform_app_launch.cc -@@ -18,7 +18,7 @@ - #include "extensions/common/constants.h" +@@ -20,7 +20,7 @@ #include "extensions/common/extension.h" --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_window.h" -@@ -121,7 +121,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con - return app_tab != nullptr; +@@ -124,7 +124,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con } --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) bool OpenDeprecatedApplicationPrompt(Profile* profile, const std::string& app_id) { if (!extensions::IsExtensionUnsupportedDeprecatedApp(profile, app_id)) diff --git a/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc b/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc index a0dd415e5b8..e1f056d7142 100644 --- a/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc +++ b/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc @@ -1,6 +1,6 @@ ---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc -@@ -90,7 +90,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch +@@ -91,7 +91,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch return metrics::OmniboxInputType::QUERY; case ExternalProtocolHandler::UNKNOWN: { diff --git a/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc index 590e8a3dc38..f1d83589da2 100644 --- a/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc +++ b/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -1,15 +1,6 @@ ---- chrome/browser/background/background_mode_manager.cc.orig 2022-04-03 12:23:22 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/background/background_mode_manager.cc -@@ -376,7 +376,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistry - registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false); - registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false); - #endif -- registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, false); -+ registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, true); - } - - void BackgroundModeManager::RegisterProfile(Profile* profile) { -@@ -899,7 +899,7 @@ gfx::ImageSkia GetStatusTrayIcon() { +@@ -894,7 +894,7 @@ gfx::ImageSkia GetStatusTrayIcon() { return gfx::ImageSkia(); return family->CreateExact(size).AsImageSkia(); diff --git a/www/iridium/files/patch-chrome_browser_browser__features.cc b/www/iridium/files/patch-chrome_browser_browser__features.cc index 94453af65c3..9f627c06d17 100644 --- a/www/iridium/files/patch-chrome_browser_browser__features.cc +++ b/www/iridium/files/patch-chrome_browser_browser__features.cc @@ -1,8 +1,8 @@ ---- chrome/browser/browser_features.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/browser_features.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/browser_features.cc @@ -29,7 +29,7 @@ const base::Feature kColorProviderRedirectionForThemeP // the browser exits. - const base::Feature kDestroyProfileOnBrowserClose{ + const base::Feature kDestroyProfileOnBrowserClose { "DestroyProfileOnBrowserClose", -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc index 74057c941fd..95cee6f52e6 100644 --- a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/browser_process_impl.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/browser_process_impl.cc -@@ -208,7 +208,7 @@ +@@ -211,7 +211,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #endif -@@ -1157,7 +1157,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1167,7 +1167,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -18,7 +18,7 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1412,7 +1412,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1426,7 +1426,7 @@ void BrowserProcessImpl::Unpin() { // Mac is currently not supported. // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/iridium/files/patch-chrome_browser_browser__process__impl.h b/www/iridium/files/patch-chrome_browser_browser__process__impl.h index 9e5a00c89bc..15444c6285c 100644 --- a/www/iridium/files/patch-chrome_browser_browser__process__impl.h +++ b/www/iridium/files/patch-chrome_browser_browser__process__impl.h @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.h.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/browser_process_impl.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/browser_process_impl.h -@@ -367,7 +367,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -363,7 +363,7 @@ class BrowserProcessImpl : public BrowserProcess, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_browser__resources.grd b/www/iridium/files/patch-chrome_browser_browser__resources.grd new file mode 100644 index 00000000000..d8bff188f73 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_browser__resources.grd @@ -0,0 +1,11 @@ +--- chrome/browser/browser_resources.grd.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/browser_resources.grd +@@ -120,7 +120,7 @@ + + + +- ++ + + + diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index 2a946f8a478..494c4e4dca4 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -96,13 +96,13 @@ +@@ -113,13 +113,13 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -16,7 +16,7 @@ #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h" #endif -@@ -172,7 +172,7 @@ +@@ -188,7 +188,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -25,8 +25,8 @@ #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" #include "chrome/browser/ui/webui/discards/site_data.mojom.h" -@@ -665,7 +665,7 @@ void PopulateChromeFrameBinders( - #endif +@@ -780,7 +780,7 @@ void PopulateChromeFrameBinders( + #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -34,16 +34,16 @@ if (!render_frame_host->GetParent()) { map->Add( base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed)); -@@ -673,7 +673,7 @@ void PopulateChromeFrameBinders( +@@ -788,7 +788,7 @@ void PopulateChromeFrameBinders( #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && - !render_frame_host->GetParent()) { + render_frame_host->IsInPrimaryMainFrame()) { map->Add( -@@ -714,14 +714,14 @@ void PopulateChromeWebUIFrameBinders( +@@ -843,14 +843,14 @@ void PopulateChromeWebUIFrameBinders( SegmentationInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -60,8 +60,8 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1040,7 +1040,7 @@ void PopulateChromeWebUIFrameBinders( - #endif +@@ -1235,7 +1235,7 @@ void PopulateChromeWebUIFrameBinders( + #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc index 8d1ec7ac986..c08f0e35173 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -231,11 +231,11 @@ +@@ -239,11 +239,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -14,17 +14,17 @@ #include "components/crash/core/app/breakpad_linux.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -270,7 +270,7 @@ - +@@ -279,7 +279,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h" -@@ -1007,7 +1007,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { - AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); + #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" +@@ -1025,7 +1025,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { + browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -32,7 +32,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1020,7 +1020,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1038,7 +1038,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) @@ -41,12 +41,12 @@ // Set the product channel for crash reports. if (!crash_reporter::IsCrashpadEnabled()) { breakpad::SetChannelCrashKey( -@@ -1041,7 +1041,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { - +@@ -1060,7 +1060,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); + TouchModeStatsTracker::Initialize( diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc index 51261e2c314..639795f4c9f 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,20 +1,28 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -57,7 +57,7 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi +@@ -57,13 +57,15 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi } void ChromeBrowserMainPartsLinux::PostCreateMainMessageLoop() { --#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // No-op: Ash and Lacros Bluetooth DBusManager initialization depend on // FeatureList, and is done elsewhere. - #else -@@ -122,7 +122,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { + #endif // BUILDFLAG(IS_CHROMEOS) + + #if !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_BSD) + bluez::BluezDBusManager::Initialize(nullptr /* system_bus */); ++#endif + + // Set up crypt config. This needs to be done before anything starts the + // network service, as the raw encryption key needs to be shared with the +@@ -123,7 +125,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { #endif // defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS) void ChromeBrowserMainPartsLinux::PostDestroyThreads() { --#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // No-op; per PostBrowserStart() comment, this is done elsewhere. #else bluez::BluezDBusManager::Shutdown(); diff --git a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc index e95e330eed4..efd7b9f3a34 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,15 +1,15 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -374,7 +374,7 @@ +@@ -386,7 +386,7 @@ + #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" #include "storage/browser/file_system/external_mount_points.h" - #include "third_party/cros_system_api/switches/chrome_switches.h" -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "chrome/browser/chrome_browser_main_linux.h" #elif BUILDFLAG(IS_ANDROID) #include "base/android/application_status_listener.h" -@@ -444,17 +444,17 @@ +@@ -467,17 +467,17 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -30,7 +30,7 @@ #if !BUILDFLAG(IS_ANDROID) #include "base/debug/leak_annotations.h" #include "components/crash/core/app/breakpad_linux.h" -@@ -462,12 +462,12 @@ +@@ -485,12 +485,12 @@ #include "components/crash/content/browser/crash_handler_host_linux.h" #endif @@ -45,7 +45,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -489,11 +489,11 @@ +@@ -514,11 +514,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -59,7 +59,7 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif defined(USE_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -880,7 +880,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo +@@ -927,7 +927,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo int GetCrashSignalFD(const base::CommandLine& command_line) { return crashpad::CrashHandlerHost::Get()->GetDeathSignalSocket(); } @@ -68,16 +68,16 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -1376,7 +1376,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1475,7 +1475,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique( - std::move(parameters), &startup_data_); + is_integration_test, &startup_data_); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) main_parts = std::make_unique( - std::move(parameters), &startup_data_); + is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1410,7 +1410,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1514,7 +1514,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -86,7 +86,7 @@ main_parts->AddParts( std::make_unique()); #else -@@ -1427,7 +1427,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1535,7 +1535,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique()); #endif @@ -95,16 +95,7 @@ main_parts->AddParts(std::make_unique()); #elif defined(USE_OZONE) main_parts->AddParts(std::make_unique()); -@@ -2101,7 +2101,7 @@ bool ChromeContentBrowserClient::AreDirectSocketsAllow - Profile* profile = Profile::FromBrowserContext(context); - return profile && profile->GetPrefs()->GetBoolean( - policy::policy_prefs::kEnableDirectSockets); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // There are currently no reliable way to determine managed status on Linux. - return false; - #elif BUILDFLAG(IS_MAC) -@@ -2190,6 +2190,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2304,6 +2304,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin #elif BUILDFLAG(IS_POSIX) #if BUILDFLAG(IS_ANDROID) bool enable_crash_reporter = true; @@ -113,16 +104,16 @@ #else bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -2498,7 +2500,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2653,7 +2655,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Processes may only query perf_event_open with the BPF sandbox disabled. - if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) && - command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) { -@@ -3880,7 +3882,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + // Opt into a hardened stack canary mitigation if it hasn't already been + // force-disabled. + if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { +@@ -4096,7 +4098,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -131,7 +122,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4292,14 +4294,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4540,14 +4542,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -148,7 +139,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -4332,7 +4334,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4580,7 +4582,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h index 775dde2be90..645762e2451 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -417,7 +417,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -436,7 +436,7 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; diff --git a/www/iridium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc b/www/iridium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc index a5772ad4a0f..dfd8e3465e2 100644 --- a/www/iridium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc +++ b/www/iridium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc @@ -1,11 +1,11 @@ ---- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/crash_upload_list/crash_upload_list.cc -@@ -52,7 +52,7 @@ scoped_refptr CreateCrashUploadList() { +@@ -50,7 +50,7 @@ scoped_refptr CreateCrashUploadList() { + // which isn't compatible with CrashUploadListCrashpad. crash_sender continues // to log uploads in CrashUploadList::kReporterLogFilename. // Linux is handled below. - #if !(BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- BUILDFLAG(IS_LINUX)) -+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) +-#if !(BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) ++#if !(BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) if (crash_reporter::IsCrashpadEnabled()) { return new CrashUploadListCrashpad(); } diff --git a/www/iridium/files/patch-chrome_browser_defaults.cc b/www/iridium/files/patch-chrome_browser_defaults.cc index daff6ce7a40..209dcd00c76 100644 --- a/www/iridium/files/patch-chrome_browser_defaults.cc +++ b/www/iridium/files/patch-chrome_browser_defaults.cc @@ -1,6 +1,6 @@ ---- chrome/browser/defaults.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/defaults.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/defaults.cc -@@ -48,7 +48,7 @@ const bool kSyncAutoStarts = true; +@@ -52,7 +52,7 @@ const bool kSyncAutoStarts = true; const bool kSyncAutoStarts = false; #endif diff --git a/www/iridium/files/patch-chrome_browser_dev__ui__browser__resources.grd b/www/iridium/files/patch-chrome_browser_dev__ui__browser__resources.grd index f7a7469be70..c2588411092 100644 --- a/www/iridium/files/patch-chrome_browser_dev__ui__browser__resources.grd +++ b/www/iridium/files/patch-chrome_browser_dev__ui__browser__resources.grd @@ -1,11 +1,11 @@ ---- chrome/browser/dev_ui_browser_resources.grd.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/dev_ui_browser_resources.grd.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/dev_ui_browser_resources.grd -@@ -46,7 +46,7 @@ This file specifies browser resources for developer-fa - - +@@ -36,7 +36,7 @@ This file specifies browser resources for developer-fa + + -- -+ +- ++ - + diff --git a/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index 211cb0a1028..0c9cd7e4aac 100644 --- a/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,15 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1541,7 +1541,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe - target_info->is_filetype_handled_safely) - DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (item->GetOriginalMimeType() == "application/x-x509-user-cert") - DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); - #endif -@@ -1610,7 +1610,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1552,7 +1552,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +9,7 @@ if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); } -@@ -1718,7 +1718,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1668,7 +1668,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow content::CheckDownloadAllowedCallback check_download_allowed_cb) { DCHECK_CURRENTLY_ON(BrowserThread::UI); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +18,7 @@ // Don't download pdf if it is a file URL, as that might cause an infinite // download loop if Chrome is not the system pdf viewer. if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) { -@@ -1760,7 +1760,7 @@ std::unique_ptr +@@ -1710,7 +1710,7 @@ std::unique_ptr ChromeDownloadManagerDelegate::GetRenameHandlerForDownload( download::DownloadItem* download_item) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -36,12 +27,12 @@ return enterprise_connectors::FileSystemRenameHandler::CreateIfNeeded( download_item); #else -@@ -1776,7 +1776,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -1726,7 +1726,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl DCHECK(download_item->IsSavePackageDownload()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_MAC) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - if (!base::FeatureList::IsEnabled( - download::features::kAllowSavePackageScanning)) { - std::move(callback).Run(true); + absl::optional settings = + safe_browsing::DeepScanningRequest::ShouldUploadBinary(download_item); + diff --git a/www/iridium/files/patch-chrome_browser_download_download__commands.cc b/www/iridium/files/patch-chrome_browser_download_download__commands.cc index 3ba98e4147e..f12179ed595 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__commands.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/download/download_commands.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/download/download_commands.cc -@@ -27,7 +27,7 @@ +@@ -26,7 +26,7 @@ #include "ui/base/clipboard/scoped_clipboard_writer.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" -@@ -168,7 +168,7 @@ void DownloadCommands::ExecuteCommand(Command command) +@@ -167,7 +167,7 @@ void DownloadCommands::ExecuteCommand(Command command) } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_download_download__commands.h b/www/iridium/files/patch-chrome_browser_download_download__commands.h index 98a6891d7a2..48fb7e08c9b 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__commands.h +++ b/www/iridium/files/patch-chrome_browser_download_download__commands.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.h.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/download/download_commands.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/download/download_commands.h -@@ -54,7 +54,7 @@ class DownloadCommands { +@@ -55,7 +55,7 @@ class DownloadCommands { void ExecuteCommand(Command command); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc b/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc new file mode 100644 index 00000000000..9b9a3e9b3e0 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc @@ -0,0 +1,20 @@ +--- chrome/browser/download/download_file_picker.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/download/download_file_picker.cc +@@ -16,7 +16,7 @@ + #include "content/public/browser/download_manager.h" + #include "content/public/browser/web_contents.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/browser_list.h" + #include "chrome/browser/ui/browser_window.h" + #include "ui/aura/window.h" +@@ -84,7 +84,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl + // dialog in Linux (See SelectFileImpl() in select_file_dialog_linux_gtk.cc). + // and windows.Here we make owning_window host to browser current active + // window if it is null. https://crbug.com/1301898 +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + if (!owning_window || !owning_window->GetHost()) { + owning_window = BrowserList::GetInstance() + ->GetLastActive() diff --git a/www/iridium/files/patch-chrome_browser_download_download__item__model.cc b/www/iridium/files/patch-chrome_browser_download_download__item__model.cc index 49f14ac3274..8d188458ea4 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/download/download_item_model.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/download/download_item_model.cc -@@ -640,7 +640,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -731,7 +731,7 @@ bool DownloadItemModel::IsCommandChecked( download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -681,7 +681,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -773,7 +773,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,3 +18,12 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); +@@ -1087,7 +1087,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe + return; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (download_->GetOriginalMimeType() == "application/x-x509-user-cert") { + SetShouldPreferOpeningInBrowser(true); + return; diff --git a/www/iridium/files/patch-chrome_browser_download_download__prefs.cc b/www/iridium/files/patch-chrome_browser_download_download__prefs.cc index fc8510595e7..154af636eda 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/download/download_prefs.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/download/download_prefs.cc @@ -13,6 +13,7 @@ #include "base/callback_helpers.h" @@ -8,7 +8,7 @@ #include "base/feature_list.h" #include "base/files/file_util.h" #include "base/no_destructor.h" -@@ -60,6 +61,10 @@ +@@ -61,6 +62,10 @@ #include "chrome/browser/ui/pdf/adobe_reader_info_win.h" #endif @@ -19,7 +19,7 @@ using content::BrowserContext; using content::BrowserThread; using content::DownloadManager; -@@ -70,7 +75,7 @@ namespace { +@@ -71,7 +76,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and // to the desktop on any platform. bool DownloadPathIsDangerous(const base::FilePath& download_path) { @@ -28,7 +28,7 @@ base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; -@@ -168,7 +173,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi +@@ -182,7 +187,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -37,34 +37,16 @@ should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif -@@ -287,7 +292,7 @@ void DownloadPrefs::RegisterProfilePrefs( - registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, - default_download_path); +@@ -302,7 +307,7 @@ void DownloadPrefs::RegisterProfilePrefs( + registry->RegisterTimePref(prefs::kDownloadLastCompleteTime, + /*default_value=*/base::Time()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_MAC) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif #if BUILDFLAG(IS_ANDROID) -@@ -421,7 +426,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { - - bool DownloadPrefs::IsAutoOpenByUserUsed() const { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - if (ShouldOpenPdfInSystemReader()) - return true; - #endif -@@ -436,7 +441,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url, - DCHECK(extension[0] == base::FilePath::kExtensionSeparator); - extension.erase(0, 1); - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - if (base::FilePath::CompareEqualIgnoreCase(extension, - FILE_PATH_LITERAL("pdf")) && - ShouldOpenPdfInSystemReader()) -@@ -491,7 +496,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -483,7 +488,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -73,7 +55,7 @@ void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) return; -@@ -513,7 +518,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -515,7 +520,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons void DownloadPrefs::ResetAutoOpenByUser() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -82,7 +64,16 @@ SetShouldOpenPdfInSystemReader(false); #endif auto_open_by_user_.clear(); -@@ -653,7 +658,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa +@@ -546,7 +551,7 @@ void DownloadPrefs::SaveAutoOpenState() { + bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const { + #if BUILDFLAG(IS_CHROMEOS) + return false; // There is no UI for auto-open on ChromeOS. +-#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + return ShouldOpenPdfInSystemReader(); + #else + return false; +@@ -670,7 +675,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa #else // If the stored download directory is an absolute path, we presume it's // correct; there's not really much more validation we can do here. diff --git a/www/iridium/files/patch-chrome_browser_download_download__prefs.h b/www/iridium/files/patch-chrome_browser_download_download__prefs.h index 05fb541074b..e920f9239b1 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__prefs.h +++ b/www/iridium/files/patch-chrome_browser_download_download__prefs.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_prefs.h.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/download/download_prefs.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/download/download_prefs.h -@@ -122,7 +122,7 @@ class DownloadPrefs { +@@ -125,7 +125,7 @@ class DownloadPrefs { void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ // Store the user preference to disk. If |should_open| is true, also disable // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin. void SetShouldOpenPdfInSystemReader(bool should_open); -@@ -181,7 +181,7 @@ class DownloadPrefs { +@@ -185,7 +185,7 @@ class DownloadPrefs { std::unique_ptr auto_open_allowed_by_urls_; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc new file mode 100644 index 00000000000..e6d1c49f570 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc @@ -0,0 +1,16 @@ +--- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc +@@ -142,11 +142,11 @@ AnalysisServiceSettings::AnalysisServiceSettings( + const char* verification_key = kKeyWindowsVerification; + #elif BUILDFLAG(IS_MAC) + const char* verification_key = kKeyMacVerification; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char* verification_key = kKeyLinuxVerification; + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const base::Value::Dict& dict = settings_value.GetDict(); + const base::Value::List* signatures = + dict.FindListByDottedPath(verification_key); diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc index 1a745951bc9..f5bb819f956 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc @@ -1,15 +1,20 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc -@@ -12,7 +12,7 @@ - #include "components/keyed_service/content/browser_context_dependency_manager.h" +@@ -11,11 +11,11 @@ + #include "chrome/browser/profiles/profile.h" #include "components/keyed_service/core/keyed_service.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "chrome/browser/browser_process.h" + #if BUILDFLAG(IS_MAC) + #include "chrome/browser/enterprise/connectors/device_trust/browser/mac_device_trust_connector_service.h" +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/connectors/device_trust/browser/browser_device_trust_connector_service.h" + #endif // BUILDFLAG(IS_MAC) #include "chrome/browser/policy/chrome_browser_policy_connector.h" -@@ -37,7 +37,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi +@@ -40,7 +40,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi bool DeviceTrustConnectorServiceFactory::ServiceIsCreatedWithBrowserContext() const { @@ -18,7 +23,7 @@ return IsDeviceTrustConnectorFeatureEnabled(); #else return false; -@@ -58,7 +58,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil +@@ -59,7 +59,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil DeviceTrustConnectorService* service = nullptr; @@ -27,3 +32,12 @@ if (IsDeviceTrustConnectorFeatureEnabled()) { auto* key_manager = g_browser_process->browser_policy_connector() ->chrome_browser_cloud_management_controller() +@@ -67,7 +67,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil + #if BUILDFLAG(IS_MAC) + service = new MacDeviceTrustConnectorService( + key_manager, profile->GetPrefs(), g_browser_process->local_state()); +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + service = new BrowserDeviceTrustConnectorService(key_manager, + profile->GetPrefs()); + #endif // BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc index 6f4bd21ea23..4fc9d6baf8d 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc @@ -1,7 +1,7 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc -@@ -21,7 +21,7 @@ - #include "components/policy/content/policy_blocklist_service.h" +@@ -22,7 +22,7 @@ + #include "components/policy/core/common/management/management_service.h" #include "content/public/browser/browser_context.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc new file mode 100644 index 00000000000..f1f86114fc4 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc @@ -0,0 +1,20 @@ +--- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc +@@ -13,7 +13,7 @@ + + #if BUILDFLAG(IS_WIN) + #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.h" +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.h" + #elif BUILDFLAG(IS_MAC) + #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.h" +@@ -45,7 +45,7 @@ std::unique_ptr KeyRotationCommand + scoped_refptr url_loader_factory) { + #if BUILDFLAG(IS_WIN) + return std::make_unique(); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return std::make_unique(url_loader_factory); + #elif BUILDFLAG(IS_MAC) + return std::make_unique(url_loader_factory); diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc index bed7ce93460..60b3857d4ab 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc @@ -1,20 +1,20 @@ ---- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc -@@ -14,7 +14,7 @@ - #include "chrome/browser/enterprise/connectors/device_trust/signals/signals_service_impl.h" +@@ -15,7 +15,7 @@ #include "chrome/browser/profiles/profile.h" + #include "components/policy/core/common/management/management_service.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "base/check.h" #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" -@@ -44,7 +44,7 @@ std::unique_ptr CreateSignalsService( +@@ -52,7 +52,7 @@ std::unique_ptr CreateSignalsService( decorators.push_back( std::make_unique(policy_blocklist_service)); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - policy::ChromeBrowserPolicyConnector* browser_policy_connector = - g_browser_process->browser_policy_connector(); - DCHECK(browser_policy_connector); + policy::CloudPolicyStore* store = nullptr; + + // Managed device. diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc new file mode 100644 index 00000000000..aca8bb196f9 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc @@ -0,0 +1,19 @@ +--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc +@@ -18,14 +18,14 @@ + #include "chrome/common/chrome_paths.h" + #include "components/version_info/version_info.h" + +-#if !BUILDFLAG(IS_FUCHSIA) ++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD) + #include "components/crash/core/app/crashpad.h" + #include "third_party/crashpad/crashpad/client/crash_report_database.h" + #endif // !BUILDFLAG(IS_FUCHSIA) + + namespace enterprise_connectors { + +-#if !BUILDFLAG(IS_FUCHSIA) ++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD) + namespace { + // key names used when building the dictionary to pass to the real-time + // reporting API diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h new file mode 100644 index 00000000000..8b0d9351057 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h @@ -0,0 +1,20 @@ +--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h +@@ -22,7 +22,7 @@ class BrowserCrashEventRouter + BrowserCrashEventRouter& operator=(const BrowserCrashEventRouter&) = delete; + ~BrowserCrashEventRouter() override; + +-#if !BUILDFLAG(IS_FUCHSIA) ++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD) + void OnCloudReportingLaunched( + enterprise_reporting::ReportScheduler* report_scheduler) override; + #endif // !BUILDFLAG(IS_FUCHSIA) +@@ -32,7 +32,7 @@ class BrowserCrashEventRouter + nullptr; + raw_ptr controller_ = nullptr; + +-#if !BUILDFLAG(IS_FUCHSIA) ++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD) + // ReportCrashes() checks the enterprise policy settings, retrieves crash + // reports from the crashpad local database and sends reports that have not + // been sent to the reporting server. diff --git a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn index 37560db6f1c..d390d215f8b 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1299,6 +1299,10 @@ static_library("extensions") { +@@ -1332,6 +1332,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc index 71c1a272861..bb8fb75590c 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc @@ -24,7 +24,7 @@ #include "base/win/registry.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -208,7 +208,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -256,7 +256,7 @@ base::FilePath GetEndpointVerificationDir() { bool got_path = false; #if BUILDFLAG(IS_WIN) got_path = base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path); @@ -18,7 +18,7 @@ std::unique_ptr env(base::Environment::Create()); path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir); -@@ -219,7 +219,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -267,7 +267,7 @@ base::FilePath GetEndpointVerificationDir() { if (!got_path) return path; diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc new file mode 100644 index 00000000000..d16ed579902 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc @@ -0,0 +1,11 @@ +--- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc +@@ -6,7 +6,7 @@ + + #include "build/build_config.h" + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + #include + #include diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h new file mode 100644 index 00000000000..25d560bc078 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h @@ -0,0 +1,11 @@ +--- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h +@@ -7,7 +7,7 @@ + + #include "build/build_config.h" + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + #include + diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc index 9e8b0249e65..519a666554c 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc @@ -1,6 +1,24 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc -@@ -155,7 +155,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: +@@ -31,7 +31,7 @@ + #include "components/reporting/util/statusor.h" + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/strings/string_util.h" + #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" + #include "chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h" +@@ -155,7 +155,7 @@ api::enterprise_reporting_private::ContextInfo ToConte + return info; + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + device_signals::SignalsAggregationRequest CreateAggregationRequest( + const std::string& user_id, +@@ -215,7 +215,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: // getPersistentSecret @@ -9,3 +27,12 @@ EnterpriseReportingPrivateGetPersistentSecretFunction:: EnterpriseReportingPrivateGetPersistentSecretFunction() = default; +@@ -655,7 +655,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: + } + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + // getFileSystemInfo + diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h index a0b9e6578db..459dd155385 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h +++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h @@ -1,6 +1,15 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h -@@ -45,7 +45,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction : +@@ -19,7 +19,7 @@ + #include "components/reporting/proto/synced/record.pb.h" + #include "components/reporting/proto/synced/record_constants.pb.h" + #include "components/reporting/util/statusor.h" +-#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "components/device_signals/core/browser/signals_types.h" + #endif // BUILDFLAG(IS_CHROMEOS) + +@@ -54,7 +54,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction : ~EnterpriseReportingPrivateGetDeviceIdFunction() override; }; @@ -9,3 +18,12 @@ class EnterpriseReportingPrivateGetPersistentSecretFunction : public ExtensionFunction { +@@ -264,7 +264,7 @@ class EnterpriseReportingPrivateEnqueueRecordFunction + + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + class EnterpriseReportingPrivateGetFileSystemInfoFunction + : public ExtensionFunction { diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc b/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc index 64813d2cf34..5a02959f36c 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc -@@ -22,6 +22,7 @@ static base::LazyInstancePostTask( FROM_HERE, -@@ -35,6 +36,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis +@@ -34,6 +35,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}, base::BindOnce(&RemovableStorageProvider::PopulateDeviceList), std::move(callback)); diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 28742ea1988..1875d794c31 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -182,7 +182,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -187,7 +187,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -201,7 +201,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist settings_api::PrefType::PREF_TYPE_NUMBER; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc index c2d7a575d82..d75962f3a55 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc -@@ -30,7 +30,7 @@ +@@ -29,7 +29,7 @@ #include "extensions/browser/process_manager.h" #include "extensions/common/error_utils.h" @@ -9,7 +9,7 @@ #include "extensions/common/permissions/permissions_data.h" #endif -@@ -39,7 +39,7 @@ namespace { +@@ -38,7 +38,7 @@ namespace { bool CanEnableAudioDebugRecordingsFromExtension( const extensions::Extension* extension) { bool enabled_by_permissions = false; diff --git a/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc index c98fc0f0510..4ff312c9f9a 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc -@@ -52,7 +52,7 @@ +@@ -53,7 +53,7 @@ #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" #include "ppapi/buildflags/buildflags.h" @@ -9,10 +9,10 @@ #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h" #endif -@@ -124,7 +124,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -122,7 +122,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() extensions::SettingsPrivateEventRouterFactory::GetInstance(); extensions::SettingsOverridesAPI::GetFactoryInstance(); - extensions::SignedInDevicesManager::GetFactoryInstance(); + extensions::SidePanelService::GetFactoryInstance(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) extensions::SystemIndicatorManagerFactory::GetInstance(); diff --git a/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc index 3e8b30e0e33..1e2ff2cddb9 100644 --- a/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc +++ b/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -217,7 +217,7 @@ const struct { +@@ -254,7 +254,7 @@ const struct { {base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"), kDontBlockChildren}, #endif diff --git a/www/iridium/files/patch-chrome_browser_first__run_first__run__internal.h b/www/iridium/files/patch-chrome_browser_first__run_first__run__internal.h index de61b89cd96..3eb6923fa7a 100644 --- a/www/iridium/files/patch-chrome_browser_first__run_first__run__internal.h +++ b/www/iridium/files/patch-chrome_browser_first__run_first__run__internal.h @@ -1,11 +1,11 @@ ---- chrome/browser/first_run/first_run_internal.h.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/first_run/first_run_internal.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/first_run/first_run_internal.h -@@ -58,7 +58,7 @@ FirstRunState DetermineFirstRunState(bool has_sentinel +@@ -56,7 +56,7 @@ FirstRunState DetermineFirstRunState(bool has_sentinel + bool force_first_run, + bool no_first_run); - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // For testing, forces the first run dialog to either be shown or not. If not // called, the decision to show the dialog or not will be made by Chrome based // on a number of factors (such as install type, whether it's a Chrome-branded diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc index 1c3cfa8f187..974da531f97 100644 --- a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,24 +1,24 @@ ---- chrome/browser/flag_descriptions.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/flag_descriptions.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/flag_descriptions.cc -@@ -5508,7 +5508,7 @@ const char kDownloadShelfWebUIDescription[] = +@@ -6226,7 +6226,7 @@ const char kSideSearchDSESupportDescription[] = // Random platform combinations ----------------------------------------------- - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - - const char kWebuiFeedbackName[] = "WebUI Feedback"; - const char kWebuiFeedbackDescription[] = -@@ -5519,7 +5519,7 @@ const char kWebuiFeedbackDescription[] = - // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + const char kQuickCommandsName[] = "Quick Commands"; + const char kQuickCommandsDescription[] = + "Enable a text interface to browser features. Invoke with Ctrl-Space."; +@@ -6235,7 +6235,7 @@ const char kQuickCommandsDescription[] = + // BUILDFLAG(IS_FUCHSIA) - const char kCommanderName[] = "Commander"; - const char kCommanderDescription[] = -@@ -5545,7 +5545,7 @@ const char kWebShareDescription[] = + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; + const char kFollowingFeedSidepanelDescription[] = + "Enables the following feed in the sidepanel."; +@@ -6249,7 +6249,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -27,16 +27,16 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -5557,7 +5557,7 @@ const char kOzonePlatformHintDescription[] = - "\"X11\". \"Auto\" selects Wayland if possible, X11 otherwise. "; - #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +@@ -6269,7 +6269,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti + "Bluetooth"; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const char kCleanUndecryptablePasswordsLinuxName[] = "Cleanup local undecryptable passwords during initial sync flow"; const char kCleanUndecryptablePasswordsLinuxDescription[] = -@@ -5570,7 +5570,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail +@@ -6282,7 +6282,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail "storage and requests initial sync."; #endif // BUILDFLAG(IS_LINUX) @@ -45,7 +45,16 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -5687,7 +5687,7 @@ const char kElasticOverscrollDescription[] = +@@ -6291,7 +6291,7 @@ const char kSkipUndecryptablePasswordsDescription[] = + "there are undecryptable ones."; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char kAsyncDnsName[] = "Async DNS resolver"; + const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +@@ -6396,7 +6396,7 @@ const char kElasticOverscrollDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.h b/www/iridium/files/patch-chrome_browser_flag__descriptions.h index 852395a2e12..66ef087962b 100644 --- a/www/iridium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.h @@ -1,33 +1,24 @@ ---- chrome/browser/flag_descriptions.h.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/flag_descriptions.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/flag_descriptions.h -@@ -3178,7 +3178,7 @@ extern const char kDownloadShelfWebUIDescription[]; +@@ -3574,7 +3574,7 @@ extern const char kSideSearchDSESupportDescription[]; // Random platform combinations ----------------------------------------------- - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - - extern const char kWebuiFeedbackName[]; - extern const char kWebuiFeedbackDescription[]; -@@ -3187,7 +3187,7 @@ extern const char kWebuiFeedbackDescription[]; - // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + extern const char kQuickCommandsName[]; + extern const char kQuickCommandsDescription[]; - extern const char kCommanderName[]; - extern const char kCommanderDescription[]; -@@ -3206,7 +3206,7 @@ extern const char kWebShareName[]; - extern const char kWebShareDescription[]; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +@@ -3591,7 +3591,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa + extern const char kWebBluetoothConfirmPairingSupportDescription[]; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -3222,7 +3222,7 @@ extern const char kForcePasswordInitialSyncWhenDecrypt +@@ -3607,18 +3607,18 @@ extern const char kForcePasswordInitialSyncWhenDecrypt extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; #endif // BUILDFLAG(IS_LINUX) @@ -36,7 +27,20 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -3304,7 +3304,7 @@ extern const char kElasticOverscrollDescription[]; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + extern const char kAsyncDnsName[]; + extern const char kAsyncDnsDescription[]; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + extern const char kFollowingFeedSidepanelName[]; + extern const char kFollowingFeedSidepanelDescription[]; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +@@ -3695,7 +3695,7 @@ extern const char kElasticOverscrollDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -44,4 +48,4 @@ + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; - #endif + diff --git a/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc b/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc index 8c14cf58400..dbd5900ac03 100644 --- a/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc +++ b/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/audio_service_util.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/media/audio_service_util.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/media/audio_service_util.cc @@ -21,7 +21,7 @@ @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) bool GetPolicyOrFeature(const char* policy_name, const base::Feature& feature) { const policy::PolicyMap& policies = -@@ -41,7 +41,7 @@ bool GetPolicyOrFeature(const char* policy_name, const +@@ -40,7 +40,7 @@ bool GetPolicyOrFeature(const char* policy_name, const bool IsAudioServiceSandboxEnabled() { // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. diff --git a/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn b/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn index c90a233b8f7..6413e1c86e8 100644 --- a/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn +++ b/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/media/router/discovery/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/media/router/discovery/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/media/router/discovery/BUILD.gn -@@ -94,7 +94,7 @@ static_library("discovery") { +@@ -79,7 +79,7 @@ static_library("discovery") { "media_sink_discovery_metrics.h", ] diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc index 4f31027db3b..6d6c37b1bd9 100644 --- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -363,6 +363,10 @@ void WebRtcLogUploader::SetupMultipart( +@@ -362,6 +362,10 @@ void WebRtcLogUploader::SetupMultipart( const char product[] = "Chrome_ChromeOS"; #elif BUILDFLAG(IS_FUCHSIA) const char product[] = "Chrome_Fuchsia"; diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc index 87ebb9c6931..88e0199ad9f 100644 --- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc -@@ -25,10 +25,10 @@ +@@ -24,10 +24,10 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/render_process_host.h" @@ -13,7 +13,7 @@ using webrtc_event_logging::WebRtcEventLogManager; -@@ -282,7 +282,7 @@ void WebRtcLoggingController::StartEventLogging( +@@ -281,7 +281,7 @@ void WebRtcLoggingController::StartEventLogging( web_app_id, callback); } @@ -22,7 +22,7 @@ void WebRtcLoggingController::GetLogsDirectory( LogsDirectoryCallback callback, LogsDirectoryErrorCallback error_callback) { -@@ -328,7 +328,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess +@@ -327,7 +327,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess FROM_HERE, base::BindOnce(std::move(callback), file_system.id(), registered_name)); } diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index c83720399e8..dd9c42c7d27 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -57,8 +57,10 @@ +@@ -58,8 +58,10 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -12,7 +12,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" -@@ -223,7 +225,7 @@ void RecordStartupMetrics() { +@@ -516,7 +518,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index dc9485b16cb..86455309a17 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,6 +1,24 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -773,7 +773,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -174,7 +174,7 @@ + #include "chrome/notification_helper/notification_helper_constants.h" + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "components/metrics/motherboard_metrics_provider.h" + #endif + +@@ -721,7 +721,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic + metrics_service_->RegisterMetricsProvider( + std::make_unique()); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + metrics_service_->RegisterMetricsProvider( + std::make_unique()); + #endif +@@ -798,7 +798,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +27,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics_service_->RegisterMetricsProvider( std::make_unique()); -@@ -869,7 +869,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -890,7 +890,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique()); #endif @@ -18,7 +36,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1045,7 +1045,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1073,7 +1073,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc b/www/iridium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc new file mode 100644 index 00000000000..a2b475fb749 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc @@ -0,0 +1,11 @@ +--- chrome/browser/metrics/power/process_metrics_recorder_util.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/metrics/power/process_metrics_recorder_util.cc +@@ -59,7 +59,7 @@ void RecordProcessHistograms(const char* histogram_suf + const ProcessMonitor::Metrics& metrics) { + RecordAverageCPUUsage(histogram_suffix, metrics.cpu_usage); + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) + base::UmaHistogramCounts10000( + base::StrCat({"PerformanceMonitor.IdleWakeups2.", histogram_suffix}), + metrics.idle_wakeups); diff --git a/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.cc b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.cc new file mode 100644 index 00000000000..ed6557e1448 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.cc @@ -0,0 +1,29 @@ +--- chrome/browser/metrics/power/process_monitor.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/metrics/power/process_monitor.cc +@@ -64,7 +64,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet + #endif + + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) + metrics.idle_wakeups = process_metrics.GetIdleWakeupsPerSecond(); + #endif + #if BUILDFLAG(IS_MAC) +@@ -81,7 +81,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do + metrics->cpu_usage *= factor; + + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) + metrics->idle_wakeups *= factor; + #endif + +@@ -130,7 +130,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me + lhs.cpu_usage += rhs.cpu_usage; + + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) + lhs.idle_wakeups += rhs.idle_wakeups; + #endif + diff --git a/www/iridium/files/patch-chrome_browser_performance__monitor_process__monitor.h b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.h similarity index 61% rename from www/iridium/files/patch-chrome_browser_performance__monitor_process__monitor.h rename to www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.h index 90a31ee2631..fef39301f47 100644 --- a/www/iridium/files/patch-chrome_browser_performance__monitor_process__monitor.h +++ b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.h @@ -1,6 +1,6 @@ ---- chrome/browser/performance_monitor/process_monitor.h.orig 2022-04-01 07:48:30 UTC -+++ chrome/browser/performance_monitor/process_monitor.h -@@ -52,7 +52,7 @@ class ProcessMonitor { +--- chrome/browser/metrics/power/process_monitor.h.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/metrics/power/process_monitor.h +@@ -70,7 +70,7 @@ class ProcessMonitor : public content::BrowserChildPro double cpu_usage = 0.0; #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc index 89a5cd56d72..0d99aec179e 100644 --- a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -84,7 +84,7 @@ +@@ -91,7 +91,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ #include "chrome/common/chrome_paths_internal.h" #include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -144,7 +144,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -173,7 +173,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -18,7 +18,7 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -377,7 +377,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -484,7 +484,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -27,10 +27,10 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -437,7 +437,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe - registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string()); - registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist, - std::string()); +@@ -556,7 +556,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe + registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); + #endif // BUILDFLAG(IS_CHROMEOS_LACROS) + -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, diff --git a/www/iridium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc b/www/iridium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc new file mode 100644 index 00000000000..a89356fbdc9 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc @@ -0,0 +1,11 @@ +--- chrome/browser/new_tab_page/new_tab_page_util.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/new_tab_page/new_tab_page_util.cc +@@ -11,7 +11,7 @@ + + namespace { + bool IsOsSupportedForRecipe() { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return true; + #else + return false; diff --git a/www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc b/www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc index 0874da625e5..db2fa7fcfd2 100644 --- a/www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc +++ b/www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/notifications/notification_display_service_impl.cc @@ -32,7 +32,7 @@ #endif @@ -15,10 +15,10 @@ user_prefs::PrefRegistrySyncable* registry) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - registry->RegisterBooleanPref(prefs::kAllowNativeNotifications, true); registry->RegisterBooleanPref(prefs::kAllowSystemNotifications, true); #endif -@@ -82,7 +82,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer + } +@@ -81,7 +81,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer std::make_unique()); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -27,7 +27,7 @@ AddNotificationHandler( NotificationHandler::Type::SEND_TAB_TO_SELF, std::make_unique( -@@ -90,7 +90,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer +@@ -89,7 +89,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc b/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc index 1c0a6176e49..0d1c471f4e1 100644 --- a/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc +++ b/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/password_manager/password_reuse_manager_factory.cc -@@ -94,7 +94,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic +@@ -92,7 +92,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc b/www/iridium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc deleted file mode 100644 index f963880d0ac..00000000000 --- a/www/iridium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/performance_manager/policies/high_pmf_discard_policy.cc.orig 2022-03-28 18:11:04 UTC -+++ chrome/browser/performance_manager/policies/high_pmf_discard_policy.cc -@@ -17,7 +17,7 @@ - #include "content/public/browser/browser_task_traits.h" - #include "content/public/browser/browser_thread.h" - --#if !BUILDFLAG(IS_LINUX) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - #include "base/memory/memory_pressure_monitor.h" - #endif - -@@ -122,7 +122,7 @@ void HighPMFDiscardPolicy::OnProcessMemoryMetricsAvail - - if (should_discard) { - discard_attempt_in_progress_ = true; --#if !BUILDFLAG(IS_LINUX) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - // Record the memory pressure level before discarding a tab. - content::GetUIThreadTaskRunner({})->PostTask( - FROM_HERE, base::BindOnce([]() { diff --git a/www/iridium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc b/www/iridium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc deleted file mode 100644 index c9bb97b3ea6..00000000000 --- a/www/iridium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/performance_monitor/process_metrics_recorder_util.cc.orig 2022-04-01 07:48:30 UTC -+++ chrome/browser/performance_monitor/process_metrics_recorder_util.cc -@@ -39,7 +39,7 @@ void RecordProcessHistograms(const char* histogram_suf - metrics.cpu_usage * kCPUUsageFactor, kCPUUsageHistogramMin, - kCPUUsageHistogramMax, kCPUUsageHistogramBucketCount); - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_AIX) -+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) - base::UmaHistogramCounts10000( - base::JoinString({"PerformanceMonitor.IdleWakeups.", histogram_suffix}, - ""), diff --git a/www/iridium/files/patch-chrome_browser_performance__monitor_process__monitor.cc b/www/iridium/files/patch-chrome_browser_performance__monitor_process__monitor.cc deleted file mode 100644 index 6d5d461621f..00000000000 --- a/www/iridium/files/patch-chrome_browser_performance__monitor_process__monitor.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/performance_monitor/process_monitor.cc.orig 2022-03-28 18:11:04 UTC -+++ chrome/browser/performance_monitor/process_monitor.cc -@@ -82,7 +82,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me - lhs.cpu_usage += rhs.cpu_usage; - - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_AIX) -+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) - lhs.idle_wakeups += rhs.idle_wakeups; - #endif - diff --git a/www/iridium/files/patch-chrome_browser_platform__util__linux.cc b/www/iridium/files/patch-chrome_browser_platform__util__linux.cc index bb36e6f7611..8a2d6bccdc8 100644 --- a/www/iridium/files/patch-chrome_browser_platform__util__linux.cc +++ b/www/iridium/files/patch-chrome_browser_platform__util__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/platform_util_linux.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/platform_util_linux.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/platform_util_linux.cc -@@ -298,7 +298,9 @@ void RunCommand(const std::string& command, +@@ -295,7 +295,9 @@ void RunCommand(const std::string& command, base::LaunchOptions options; options.current_directory = working_directory; diff --git a/www/iridium/files/patch-chrome_browser_plugins_plugins__resource__service.cc b/www/iridium/files/patch-chrome_browser_plugins_plugins__resource__service.cc deleted file mode 100644 index 871a3d42b99..00000000000 --- a/www/iridium/files/patch-chrome_browser_plugins_plugins__resource__service.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/plugins/plugins_resource_service.cc.orig 2022-03-28 18:11:04 UTC -+++ chrome/browser/plugins/plugins_resource_service.cc -@@ -62,7 +62,7 @@ GURL GetPluginsServerURL() { - filename = "plugins_win.json"; - #elif BUILDFLAG(IS_CHROMEOS_ASH) - filename = "plugins_chromeos.json"; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - filename = "plugins_linux.json"; - #elif BUILDFLAG(IS_MAC) - filename = "plugins_mac.json"; diff --git a/www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc b/www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc index 966f352f40a..4548084bdef 100644 --- a/www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc +++ b/www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc @@ -1,7 +1,7 @@ ---- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/policy/browser_signin_policy_handler.cc -@@ -43,7 +43,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c - const base::Value* value = policies.GetValue(policy_name()); +@@ -44,7 +44,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c + policies.GetValue(policy_name(), base::Value::Type::INTEGER); switch (static_cast(value->GetInt())) { case BrowserSigninMode::kForced: -#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/www/iridium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc index f3bba5c3ea6..e6884780372 100644 --- a/www/iridium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc +++ b/www/iridium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc -@@ -46,7 +46,7 @@ +@@ -47,7 +47,7 @@ #include "chrome/browser/policy/browser_dm_token_storage_mac.h" #endif // BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ #include "chrome/browser/policy/browser_dm_token_storage_linux.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -55,7 +55,7 @@ +@@ -56,7 +56,7 @@ #include "chrome/install_static/install_util.h" #endif // BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/device_trust_features.h" #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h" #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher.h" -@@ -88,7 +88,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: +@@ -89,7 +89,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: #if BUILDFLAG(IS_MAC) storage_delegate = std::make_unique(); @@ -27,7 +27,7 @@ storage_delegate = std::make_unique(); #elif BUILDFLAG(IS_WIN) storage_delegate = std::make_unique(); -@@ -243,7 +243,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC +@@ -244,7 +244,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC std::unique_ptr ChromeBrowserCloudManagementControllerDesktop::CreateDeviceTrustKeyManager() { diff --git a/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index a674a17985d..00174075da4 100644 --- a/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,47 +1,129 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -1456,7 +1456,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -189,12 +189,12 @@ + #include "components/spellcheck/browser/pref_names.h" + #endif // BUILDFLAG(ENABLE_SPELLCHECK) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "components/device_signals/core/browser/pref_names.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #include "chrome/browser/web_applications/policy/web_app_settings_policy_handler.h" + #endif + +@@ -725,7 +725,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + prefs::kManagedDefaultGeolocationSetting, + base::Value::Type::INTEGER }, + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ +- || BUILDFLAG(IS_FUCHSIA) ++ || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + { key::kRequireOnlineRevocationChecksForLocalAnchors, + prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, - #endif // !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_CHROMEOS) +@@ -1330,7 +1330,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::BOOLEAN }, + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + { key::kGSSAPILibraryName, + prefs::kGSSAPILibraryName, + base::Value::Type::STRING }, +@@ -1400,18 +1400,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + prefs::kTotalMemoryLimitMb, + base::Value::Type::INTEGER }, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + { key::kBackgroundModeEnabled, + prefs::kBackgroundModeEnabled, + base::Value::Type::BOOLEAN }, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + { key::kUnmanagedDeviceSignalsConsentFlowEnabled, + device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, + base::Value::Type::BOOLEAN }, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ +- || BUILDFLAG(IS_FUCHSIA) ++ || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + { key::kDefaultBrowserSettingEnabled, + prefs::kDefaultBrowserSettingEnabled, + base::Value::Type::BOOLEAN }, +@@ -1424,7 +1424,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + // || BUILDFLAG(IS_FUCHSIA) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ +- || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + { key::kAutoplayAllowed, + prefs::kAutoplayAllowed, + base::Value::Type::BOOLEAN }, +@@ -1609,7 +1609,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::BOOLEAN }, + #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1565,7 +1565,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::BOOLEAN }, +@@ -1668,7 +1668,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)) -+#if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + #if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) \ +- || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)) ++ || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)) || BUILDFLAG(IS_BSD) { key::kChromeAppsEnabled, extensions::pref_names::kChromeAppsEnabled, base::Value::Type::BOOLEAN }, -@@ -1885,7 +1885,7 @@ std::unique_ptr BuildH - #endif // BUILDFLAG(IS_ANDROID) +@@ -2007,7 +2007,7 @@ std::unique_ptr BuildH + key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, + chrome_schema)); - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - handlers->AddHandler( - std::make_unique< - enterprise_connectors::EnterpriseConnectorsPolicyHandler>( -@@ -2256,7 +2256,7 @@ std::unique_ptr BuildH - SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + handlers->AddHandler(std::make_unique()); + handlers->AddHandler(std::make_unique()); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +@@ -2036,7 +2036,7 @@ std::unique_ptr BuildH + std::vector> + signin_legacy_policies; + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + signin_legacy_policies.push_back(std::make_unique( + key::kForceBrowserSignin, prefs::kForceBrowserSignin, + base::Value::Type::BOOLEAN)); +@@ -2369,7 +2369,7 @@ std::unique_ptr BuildH + chrome_schema)); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - handlers->AddHandler(std::make_unique( - key::kWebAppSettings, prefs::kWebAppSettings, chrome_schema, - SCHEMA_ALLOW_UNKNOWN, -@@ -2287,7 +2287,7 @@ std::unique_ptr BuildH - policy::key::kSpellcheckLanguageBlocklist)); + handlers->AddHandler( + std::make_unique(chrome_schema)); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +@@ -2382,7 +2382,7 @@ std::unique_ptr BuildH + #endif + + #if BUILDFLAG(ENABLE_SPELLCHECK) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + handlers->AddHandler(std::make_unique()); + handlers->AddHandler( + std::make_unique( +@@ -2390,7 +2390,7 @@ std::unique_ptr BuildH + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - handlers->AddHandler(std::make_unique( - std::make_unique(key::kAllowNativeNotifications, - prefs::kAllowNativeNotifications, + handlers->AddHandler(std::make_unique( + key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, + base::Value::Type::BOOLEAN)); diff --git a/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc index 71d0e148e2e..1d9062af219 100644 --- a/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,13 +1,13 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -418,14 +418,14 @@ +@@ -439,14 +439,14 @@ #include "components/os_crypt/os_crypt.h" #endif --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/web_applications/url_handler_prefs.h" + #include "components/device_signals/core/browser/pref_names.h" #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch @@ -17,25 +17,23 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -1139,7 +1139,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) - // TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the - // migration is complete. - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - enterprise_connectors::RegisterLocalPrefs(registry); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) - -@@ -1171,7 +1171,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1214,7 +1214,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_WIN) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) web_app::url_handler_prefs::RegisterLocalStatePrefs(registry); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + +@@ -1531,13 +1531,13 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync + safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); #endif -@@ -1469,7 +1469,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + device_signals::RegisterProfilePrefs(registry); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index 39fffee9b1e..61db7e1db22 100644 --- a/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc +++ b/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -139,7 +139,7 @@ const char* const kPersistentPrefNames[] = { +@@ -138,7 +138,7 @@ const char* const kPersistentPrefNames[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc b/www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc new file mode 100644 index 00000000000..e70f88886f8 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc @@ -0,0 +1,29 @@ +--- chrome/browser/printing/print_backend_service_manager.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/printing/print_backend_service_manager.cc +@@ -481,7 +481,7 @@ absl::optional PrintBackendServiceManager::R + query_clients_.insert(client_id); + break; + case ClientType::kQueryWithUi: +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + if (!query_with_ui_clients_.empty()) + return absl::nullopt; + #endif +@@ -706,7 +706,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate + break; + + case ClientType::kQueryWithUi: +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // No need to update if there were other query with UI clients. + if (query_with_ui_clients_.size() > 1) + return absl::nullopt; +@@ -763,7 +763,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate + return kNoClientsRegisteredResetOnIdleTimeout; + + case ClientType::kQueryWithUi: +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // No need to update if there were other query with UI clients. + if (!query_with_ui_clients_.empty()) + return absl::nullopt; diff --git a/www/iridium/files/patch-chrome_browser_printing_print__job__worker.cc b/www/iridium/files/patch-chrome_browser_printing_print__job__worker.cc index 9b23520a203..d7c98e82f66 100644 --- a/www/iridium/files/patch-chrome_browser_printing_print__job__worker.cc +++ b/www/iridium/files/patch-chrome_browser_printing_print__job__worker.cc @@ -1,6 +1,6 @@ ---- chrome/browser/printing/print_job_worker.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/printing/print_job_worker.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/printing/print_job_worker.cc -@@ -225,7 +225,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n +@@ -195,7 +195,7 @@ void PrintJobWorker::SetSettings(base::Value::Dict new crash_key = std::make_unique( print_backend->GetPrinterDriverInfo(printer_name)); diff --git a/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc b/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc index 741ea318daa..e91ae056c8f 100644 --- a/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/process_singleton_posix.cc -@@ -98,12 +98,12 @@ +@@ -97,7 +97,7 @@ #include "net/base/network_interfaces.h" #include "ui/base/l10n/l10n_util.h" @@ -9,13 +9,7 @@ #include "chrome/browser/ui/process_singleton_dialog_linux.h" #endif - #if defined(TOOLKIT_VIEWS) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - #include "ui/views/linux_ui/linux_ui.h" - #endif - -@@ -357,7 +357,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo +@@ -351,7 +351,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo if (g_disable_prompt) return g_user_opted_unlock_in_use_profile; @@ -24,12 +18,3 @@ std::u16string relaunch_button_text = l10n_util::GetStringUTF16(IDS_PROFILE_IN_USE_LINUX_RELAUNCH); return ShowProcessSingletonDialog(error, relaunch_button_text); -@@ -926,7 +926,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif - return PROCESS_NONE; - } else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) { - #if defined(TOOLKIT_VIEWS) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - // Likely NULL in unit tests. - views::LinuxUI* linux_ui = views::LinuxUI::instance(); - if (linux_ui) diff --git a/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index 6ef95157394..b2fb081d187 100644 --- a/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,6 +1,15 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -393,7 +393,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -255,7 +255,7 @@ + #include "chrome/browser/ui/cocoa/screentime/screentime_features.h" + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/idle/idle_service_factory.h" + #endif + +@@ -435,11 +435,11 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,3 +18,8 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + enterprise_idle::IdleServiceFactory::GetInstance(); + #endif + ModelTypeStoreServiceFactory::GetInstance(); diff --git a/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc index ef57e867a8e..d9914b5b7e9 100644 --- a/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc +++ b/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -263,6 +263,10 @@ +@@ -261,6 +261,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -848,7 +852,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -851,7 +855,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/iridium/files/patch-chrome_browser_profiles_profiles__state.cc b/www/iridium/files/patch-chrome_browser_profiles_profiles__state.cc index 9bfb5778baf..fc540d87a49 100644 --- a/www/iridium/files/patch-chrome_browser_profiles_profiles__state.cc +++ b/www/iridium/files/patch-chrome_browser_profiles_profiles__state.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profiles_state.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/profiles/profiles_state.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/profiles/profiles_state.cc -@@ -176,7 +176,7 @@ bool IsGuestModeRequested(const base::CommandLine& com +@@ -181,7 +181,7 @@ bool IsGuestModeRequested(const base::CommandLine& com PrefService* local_state, bool show_warning) { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ diff --git a/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc index a4e5f01fb39..e7fa42eb503 100644 --- a/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,21 +1,21 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/renderer_preferences_util.cc @@ -37,7 +37,7 @@ #include "ui/views/controls/textfield/textfield.h" #endif --#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) +-#if defined(USE_AURA) && BUILDFLAG(IS_LINUX) ++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" - #include "ui/views/linux_ui/linux_ui.h" + #include "ui/linux/linux_ui.h" @@ -159,7 +159,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval(); #endif --#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - views::LinuxUI* linux_ui = views::LinuxUI::instance(); +-#if defined(USE_AURA) && BUILDFLAG(IS_LINUX) ++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + ui::LinuxUi* linux_ui = ui::LinuxUi::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { @@ -179,7 +179,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc diff --git a/www/iridium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts b/www/iridium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts new file mode 100644 index 00000000000..fdca0e8e76b --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts @@ -0,0 +1,29 @@ +--- chrome/browser/resources/sandbox_internals/sandbox_internals.ts.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/resources/sandbox_internals/sandbox_internals.ts +@@ -2,7 +2,7 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + +-// ++// + import './strings.m.js'; + + import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; +@@ -121,7 +121,7 @@ function androidHandler() { + } + // + +-// ++// + + /** + * Adds a status row that reports either Yes or No. +@@ -182,7 +182,7 @@ document.addEventListener('DOMContentLoaded', () => { + // + androidHandler(); + // +- // ++ // + linuxHandler(); + // + }); diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts index 87c58b4470e..606bb92511a 100644 --- a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts +++ b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts @@ -1,11 +1,11 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts @@ -16,7 +16,7 @@ export interface AppearanceBrowserProxy { useDefaultTheme(): void; -- // -+ // +- // ++ // useSystemTheme(): void; // @@ -13,8 +13,8 @@ chrome.send('useDefaultTheme'); } -- // -+ // +- // ++ // useSystemTheme() { chrome.send('useSystemTheme'); } diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html index dfceea09ee4..c1e1690188b 100644 --- a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html +++ b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html @@ -1,11 +1,11 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.html @@ -27,7 +27,7 @@ -- -+ +- ++ -- -+ +- ++ + + +- ++