Le Thu, Feb 29, 2024 at 09:35:39PM +0100, Rafael Sadowski a écrit :
> On Thu Feb 29, 2024 at 09:12:49AM +0100, Landry Breuil wrote:
> > Le Thu, Feb 29, 2024 at 09:03:17AM +0100, Rafael Sadowski a écrit :
> > > OK to import qca-qt6-2.3.8? It's the same as security/qca-qt5, but with
> > > Qt6 enabled and Qt5 disabled. No conflicts with qt5 and qt6.
> >
> > in that case, wouldnt it be better/simpler to multipackage qca into -qt5
> > and -qt6 and only build it once ? no real opinion, rather thinking out
> > loud..
> >
>
> Thanks for your feedback. I have already evaluate these options and have
> come to the following 2 1/2 points:
>
> - I don't like to have a Qt6 port in a directory that contains qt5.
> - I don't like the multipackage pattern a lot. For me qca-qt6 is much
> simpler with the same goal.
fair point, your call. not a big deal since it builds quite fast..
Thursday, February 29, 2024
EuroBSDCon 2024 Call for Talk and Presentation proposals for EuroBSDCon 2024 is now open.
EuroBSDCon 2024, Dublin, September 2024
The Call for Talk and Presentation proposals for EuroBSDCon 2024 is now open.
EuroBSDCon is the European technical conference for users and developers of BSD-based systems. The conference is scheduled to take place September 19-22 2024 in Dublin, Ireland or as an all-online event if COVID-19 developments dictate. The tutorials will be held on Thursday and Friday to registered participants and the talks are presented to conference attendees on Saturday and Sunday.
The Call for Talk and Presentation proposals period will close on May 15th, 2024. Prospective speakers will be notified of acceptance or otherwise by May 22nd, 2024.
This document is available at https://2024.eurobsdcon.org/cfp/.
Call for Talk and Presentation Proposals (CfP)
The EuroBSDCon program committee is inviting BSD developers and users to submit innovative and original talk proposals not previously presented at other European conferences. Topics of interest to the conference include, but are not limited to applications, architecture, implementation, performance and security of BSD-based operating systems, as well as topics concerning the economic or organizational aspects of BSD use. Presentations are expected to be 45 minutes and are to be delivered in English.
Call for Tutorial Proposals
The EuroBSDCon program committee is also inviting qualified practitioners in their field to submit proposals for half or full day tutorials on topics relevant to development, implementation and use of BSD-based systems.
Half-day tutorials are expected to be 2.5 to 3 hours and full-day tutorials 5 to 6 hours. The tutorials and talks are to be held in English.
Submissions
Proposals should be sent through the registration system at https://events.eurobsdcon.org.
Proposals should contain a short and concise text description in about 100 words as well as a short speaker bio.
Accepted papers and presentations will be published on the conference web site as soon as feasible during or after the conference. We encourage the submitter to consider writing up a formal paper for this purpose in addition to making a presentation.
While we urge prospective speakers to seek funding from employers or other benevolent sources, the conference does have a budget for covering reasonable travel and accommodation expenses for speakers, with accommodation to the extent possible provided at the primary speaker hotel (see the Travel page on the conference website). Speakers who will be applying for travel funding should also submit an estimate of expected travel expenses. Please see the Speaker Reimbursement Policy for details.
Please also note that due to visa issues in the past, we would like to know as early as possible of any visa requirements for speakers. Please check the Ireland visa application requirements site at https://www.dfa.ie/travel/visas/visas-for-ireland/ for guidance.
NOTE: If conditions dictate that the conference move to an all-online format, further instructions on how to access the conference for both speakers and attendees will be forwarded by email and posted on the conference website. As such we are especially interested in proposals that would work well in a virtual format, such as panel discussions. Please also include your timezone and expected available times with your proposals. Due to known and unknown unknowns, the format of the conference has not yet been decided at this writing. If the format of the conference, on-site versus online has consequences for your ability to present, please let us know in the notes on your submission.
Contact
If you have any questions, please feel free to contact us by sending an email to pc@eurobscon.org
The Call for Talk and Presentation proposals for EuroBSDCon 2024 is now open.
EuroBSDCon is the European technical conference for users and developers of BSD-based systems. The conference is scheduled to take place September 19-22 2024 in Dublin, Ireland or as an all-online event if COVID-19 developments dictate. The tutorials will be held on Thursday and Friday to registered participants and the talks are presented to conference attendees on Saturday and Sunday.
The Call for Talk and Presentation proposals period will close on May 15th, 2024. Prospective speakers will be notified of acceptance or otherwise by May 22nd, 2024.
This document is available at https://2024.eurobsdcon.org/cfp/.
Call for Talk and Presentation Proposals (CfP)
The EuroBSDCon program committee is inviting BSD developers and users to submit innovative and original talk proposals not previously presented at other European conferences. Topics of interest to the conference include, but are not limited to applications, architecture, implementation, performance and security of BSD-based operating systems, as well as topics concerning the economic or organizational aspects of BSD use. Presentations are expected to be 45 minutes and are to be delivered in English.
Call for Tutorial Proposals
The EuroBSDCon program committee is also inviting qualified practitioners in their field to submit proposals for half or full day tutorials on topics relevant to development, implementation and use of BSD-based systems.
Half-day tutorials are expected to be 2.5 to 3 hours and full-day tutorials 5 to 6 hours. The tutorials and talks are to be held in English.
Submissions
Proposals should be sent through the registration system at https://events.eurobsdcon.org.
Proposals should contain a short and concise text description in about 100 words as well as a short speaker bio.
Accepted papers and presentations will be published on the conference web site as soon as feasible during or after the conference. We encourage the submitter to consider writing up a formal paper for this purpose in addition to making a presentation.
While we urge prospective speakers to seek funding from employers or other benevolent sources, the conference does have a budget for covering reasonable travel and accommodation expenses for speakers, with accommodation to the extent possible provided at the primary speaker hotel (see the Travel page on the conference website). Speakers who will be applying for travel funding should also submit an estimate of expected travel expenses. Please see the Speaker Reimbursement Policy for details.
Please also note that due to visa issues in the past, we would like to know as early as possible of any visa requirements for speakers. Please check the Ireland visa application requirements site at https://www.dfa.ie/travel/visas/visas-for-ireland/ for guidance.
NOTE: If conditions dictate that the conference move to an all-online format, further instructions on how to access the conference for both speakers and attendees will be forwarded by email and posted on the conference website. As such we are especially interested in proposals that would work well in a virtual format, such as panel discussions. Please also include your timezone and expected available times with your proposals. Due to known and unknown unknowns, the format of the conference has not yet been decided at this writing. If the format of the conference, on-site versus online has consequences for your ability to present, please let us know in the notes on your submission.
Contact
If you have any questions, please feel free to contact us by sending an email to pc@eurobscon.org
UPDATE: cad/prusaslicer-2.7.2
diff -NPru -x CVS /usr/ports/cad/prusaslicer/Makefile ./Makefile
--- /usr/ports/cad/prusaslicer/Makefile Wed Feb 28 16:57:39 2024
+++ ./Makefile Thu Feb 29 19:57:20 2024
@@ -2,9 +2,8 @@
ONLY_FOR_ARCHS = ${LP64_ARCHS}
DPB_PROPERTIES = parallel
-V = 2.7.1
+V = 2.7.2
PKGNAME = prusaslicer-${V}
-REVISION = 1
GH_ACCOUNT = prusa3d
GH_PROJECT = PrusaSlicer
diff -NPru -x CVS /usr/ports/cad/prusaslicer/distinfo ./distinfo
--- /usr/ports/cad/prusaslicer/distinfo Wed Feb 7 14:17:08 2024
+++ ./distinfo Thu Feb 29 19:53:44 2024
@@ -1,2 +1,2 @@
-SHA256 (PrusaSlicer-version_2.7.1.tar.gz) = XaqOi801Vtbv+nNpYYkjB5petxCtbL/WK5uHRYbJpKM=
-SIZE (PrusaSlicer-version_2.7.1.tar.gz) = 64975776
+SHA256 (PrusaSlicer-version_2.7.2.tar.gz) = Cvirg60zzevB0T032O07ISXYRTLrS8p2GMQiv3ZI6+4=
+SIZE (PrusaSlicer-version_2.7.2.tar.gz) = 64915607
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-CMakeLists_txt ./patches/patch-CMakeLists_txt
--- /usr/ports/cad/prusaslicer/patches/patch-CMakeLists_txt Wed Feb 7 14:17:08 2024
+++ ./patches/patch-CMakeLists_txt Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -224,7 +224,7 @@ if (APPLE)
+@@ -218,7 +218,7 @@ if (APPLE)
endif ()
endif ()
@@ -10,7 +10,7 @@
find_package(PkgConfig REQUIRED)
if (CMAKE_VERSION VERSION_LESS "3.1")
-@@ -654,7 +654,6 @@ elseif (SLIC3R_FHS)
+@@ -641,7 +641,6 @@ elseif (SLIC3R_FHS)
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME PrusaSlicer-gcodeviewer.png
)
endforeach()
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_PrusaSlicer_cpp ./patches/patch-src_PrusaSlicer_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_PrusaSlicer_cpp Wed Feb 7 14:17:08 2024
+++ ./patches/patch-src_PrusaSlicer_cpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/PrusaSlicer.cpp
--- src/PrusaSlicer.cpp.orig
+++ src/PrusaSlicer.cpp
-@@ -754,8 +754,8 @@ bool CLI::setup(int argc, char **argv)
+@@ -770,8 +770,8 @@ bool CLI::setup(int argc, char **argv)
#endif
// See Invoking prusa-slicer from $PATH environment variable crashes #5542
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_libslic3r_CMakeLists_txt ./patches/patch-src_libslic3r_CMakeLists_txt
--- /usr/ports/cad/prusaslicer/patches/patch-src_libslic3r_CMakeLists_txt Wed Feb 7 14:17:08 2024
+++ ./patches/patch-src_libslic3r_CMakeLists_txt Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/libslic3r/CMakeLists.txt
--- src/libslic3r/CMakeLists.txt.orig
+++ src/libslic3r/CMakeLists.txt
-@@ -572,13 +572,12 @@ find_package(JPEG REQUIRED)
+@@ -575,13 +575,12 @@ find_package(JPEG REQUIRED)
target_link_libraries(libslic3r
libnest2d
admesh
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_libslic3r_Config_hpp ./patches/patch-src_libslic3r_Config_hpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_libslic3r_Config_hpp Wed Dec 31 16:00:00 1969
+++ ./patches/patch-src_libslic3r_Config_hpp Thu Feb 29 19:57:17 2024
@@ -0,0 +1,12 @@
+Index: src/libslic3r/Config.hpp
+--- src/libslic3r/Config.hpp.orig
++++ src/libslic3r/Config.hpp
+@@ -339,7 +339,7 @@ template<class T>
+ struct NilValueTempl<T, std::enable_if_t<std::is_enum_v<T>, void>>
+ {
+ using NilType = T;
+- static constexpr auto value = static_cast<T>(std::numeric_limits<std::underlying_type_t<T>>::max());
++ static constexpr auto value = static_cast<std::underlying_type_t<T>>(std::numeric_limits<std::underlying_type_t<T>>::max());
+ };
+
+ template<class T> struct NilValueTempl<T, std::enable_if_t<std::is_floating_point_v<T>, void>> {
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_libslic3r_GCode_cpp ./patches/patch-src_libslic3r_GCode_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_libslic3r_GCode_cpp Wed Feb 7 10:31:05 2024
+++ ./patches/patch-src_libslic3r_GCode_cpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/libslic3r/GCode.cpp
--- src/libslic3r/GCode.cpp.orig
+++ src/libslic3r/GCode.cpp
-@@ -1532,13 +1532,13 @@ void GCodeGenerator::process_layers(
+@@ -1524,13 +1524,13 @@ void GCodeGenerator::process_layers(
[&output_stream](std::string s) { output_stream.write(s); }
);
@@ -17,7 +17,7 @@
if (m_find_replace)
pipeline_to_string = pipeline_to_string & find_replace;
-@@ -1624,13 +1624,13 @@ void GCodeGenerator::process_layers(
+@@ -1616,13 +1616,13 @@ void GCodeGenerator::process_layers(
[&output_stream](std::string s) { output_stream.write(s); }
);
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_ConfigWizard_cpp ./patches/patch-src_slic3r_GUI_ConfigWizard_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_ConfigWizard_cpp Wed Feb 7 14:17:08 2024
+++ ./patches/patch-src_slic3r_GUI_ConfigWizard_cpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/slic3r/GUI/ConfigWizard.cpp
--- src/slic3r/GUI/ConfigWizard.cpp.orig
+++ src/slic3r/GUI/ConfigWizard.cpp
-@@ -3058,7 +3058,7 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_c
+@@ -3063,7 +3063,7 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_c
if ((check_unsaved_preset_changes = install_bundles.size() > 0))
header = _L_PLURAL("A new vendor was installed and one of its printers will be activated", "New vendors were installed and one of theirs printers will be activated", install_bundles.size());
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_GUI_Factories_cpp ./patches/patch-src_slic3r_GUI_GUI_Factories_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_GUI_Factories_cpp Wed Feb 7 14:17:08 2024
+++ ./patches/patch-src_slic3r_GUI_GUI_Factories_cpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/slic3r/GUI/GUI_Factories.cpp
--- src/slic3r/GUI/GUI_Factories.cpp.orig
+++ src/slic3r/GUI/GUI_Factories.cpp
-@@ -1442,7 +1442,7 @@ void MenuFactory::sys_color_changed(wxMenuBar* menubar
+@@ -1466,7 +1466,7 @@ void MenuFactory::sys_color_changed(wxMenuBar* menubar
for (size_t id = 0; id < menubar->GetMenuCount(); id++) {
wxMenu* menu = menubar->GetMenu(id);
sys_color_changed_menu(menu);
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_GUI_Init_cpp ./patches/patch-src_slic3r_GUI_GUI_Init_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_GUI_Init_cpp Sat Jan 27 19:21:25 2024
+++ ./patches/patch-src_slic3r_GUI_GUI_Init_cpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/slic3r/GUI/GUI_Init.cpp
--- src/slic3r/GUI/GUI_Init.cpp.orig
+++ src/slic3r/GUI/GUI_Init.cpp
-@@ -49,6 +49,10 @@ int GUI_Run(GUI_InitParams ¶ms)
+@@ -45,6 +45,10 @@ int GUI_Run(GUI_InitParams ¶ms)
signal(SIGCHLD, SIG_DFL);
#endif // __APPLE__
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_GUI_cpp ./patches/patch-src_slic3r_GUI_GUI_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_GUI_cpp Sat Jan 27 19:21:25 2024
+++ ./patches/patch-src_slic3r_GUI_GUI_cpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/slic3r/GUI/GUI.cpp
--- src/slic3r/GUI/GUI.cpp.orig
+++ src/slic3r/GUI/GUI.cpp
-@@ -498,7 +498,8 @@ void desktop_open_folder(const boost::filesystem::path
+@@ -501,7 +501,8 @@ void desktop_open_folder(const boost::filesystem::path
#endif
}
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_GUI_hpp ./patches/patch-src_slic3r_GUI_GUI_hpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_GUI_hpp Sat Jan 27 19:21:25 2024
+++ ./patches/patch-src_slic3r_GUI_GUI_hpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/slic3r/GUI/GUI.hpp
--- src/slic3r/GUI/GUI.hpp.orig
+++ src/slic3r/GUI/GUI.hpp
-@@ -89,7 +89,7 @@ extern void desktop_open_datadir_folder();
+@@ -88,7 +88,7 @@ extern void desktop_open_datadir_folder();
// Ask the destop to open the directory specified by path using the default file explorer.
void desktop_open_folder(const boost::filesystem::path& path);
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_OpenGLManager_cpp ./patches/patch-src_slic3r_GUI_OpenGLManager_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_OpenGLManager_cpp Sat Jan 27 19:21:25 2024
+++ ./patches/patch-src_slic3r_GUI_OpenGLManager_cpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/slic3r/GUI/OpenGLManager.cpp
--- src/slic3r/GUI/OpenGLManager.cpp.orig
+++ src/slic3r/GUI/OpenGLManager.cpp
-@@ -340,7 +340,7 @@ bool OpenGLManager::init_gl()
+@@ -344,7 +344,7 @@ bool OpenGLManager::init_gl()
glewExperimental = true;
#endif // ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
GLenum err = glewInit();
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_Plater_cpp ./patches/patch-src_slic3r_GUI_Plater_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_Plater_cpp Wed Feb 7 14:17:08 2024
+++ ./patches/patch-src_slic3r_GUI_Plater_cpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/slic3r/GUI/Plater.cpp
--- src/slic3r/GUI/Plater.cpp.orig
+++ src/slic3r/GUI/Plater.cpp
-@@ -5395,7 +5395,7 @@ void Plater::load_project(const wxString& filename)
+@@ -5425,7 +5425,7 @@ void Plater::load_project(const wxString& filename)
p->reset();
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_Utils_WifiScanner_cpp ./patches/patch-src_slic3r_Utils_WifiScanner_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_Utils_WifiScanner_cpp Wed Feb 7 10:31:05 2024
+++ ./patches/patch-src_slic3r_Utils_WifiScanner_cpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/slic3r/Utils/WifiScanner.cpp
--- src/slic3r/Utils/WifiScanner.cpp.orig
+++ src/slic3r/Utils/WifiScanner.cpp
-@@ -19,7 +19,7 @@
+@@ -17,7 +17,7 @@
#include "WifiScannerMac.h"
#endif
@@ -10,10 +10,10 @@
#include <dbus/dbus.h> /* Pull in all of D-Bus headers. */
#endif //__linux__
-@@ -457,4 +457,4 @@ std::string WifiScanner::get_psk(const std::string& ss
- }
- return {};
+@@ -489,4 +489,4 @@ void WifiScanner::fill_wifi_map(Slic3r::WifiSsidPskMap
+ wlanFreeMemoryFunc(interface_list);
}
+ #endif // _WIN32
-} // Slic3r
\ No newline at end of file
+} // Slic3r
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_gcode_cpp ./patches/patch-tests_fff_print_test_gcode_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_gcode_cpp Wed Dec 31 16:00:00 1969
+++ ./patches/patch-tests_fff_print_test_gcode_cpp Thu Feb 29 19:57:17 2024
@@ -0,0 +1,12 @@
+Index: tests/fff_print/test_gcode.cpp
+--- tests/fff_print/test_gcode.cpp.orig
++++ tests/fff_print/test_gcode.cpp
+@@ -66,7 +66,7 @@ TEST_CASE("Wiping speeds", "[GCode]") {
+ INFO("Wipe moves don\'t retract faster than configured speed");
+ CHECK(retract_speed < expected_retract_speed);
+ }
+- INFO("No wiping after layer change")
++ INFO("No wiping after layer change");
+ CHECK(!wiping_on_new_layer);
+ }
+
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_layers_cpp ./patches/patch-tests_fff_print_test_layers_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_layers_cpp Wed Dec 31 16:00:00 1969
+++ ./patches/patch-tests_fff_print_test_layers_cpp Thu Feb 29 19:57:17 2024
@@ -0,0 +1,16 @@
+Index: tests/fff_print/test_layers.cpp
+--- tests/fff_print/test_layers.cpp.orig
++++ tests/fff_print/test_layers.cpp
+@@ -27,10 +27,10 @@ void check_layers(const DynamicPrintConfig& config) {
+ const double layer_height = config.opt_float("layer_height");
+ INFO("Correct first layer height.");
+ CHECK(z.at(0) == Approx(first_layer_height + z_offset));
+- INFO("Correct second layer height")
++ INFO("Correct second layer height");
+ CHECK(z.at(1) == Approx(first_layer_height + layer_height + z_offset));
+
+- INFO("Correct layer height")
++ INFO("Correct layer height");
+ for (const double increment : tcb::span{increments}.subspan(1)) {
+ CHECK(increment == Approx(layer_height));
+ }
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_retraction_cpp ./patches/patch-tests_fff_print_test_retraction_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_retraction_cpp Wed Dec 31 16:00:00 1969
+++ ./patches/patch-tests_fff_print_test_retraction_cpp Thu Feb 29 19:57:17 2024
@@ -0,0 +1,12 @@
+Index: tests/fff_print/test_retraction.cpp
+--- tests/fff_print/test_retraction.cpp.orig
++++ tests/fff_print/test_retraction.cpp
+@@ -77,7 +77,7 @@ void check_gcode(std::initializer_list<TestMesh> meshe
+ lift_dist = line.dist_Z(self);
+ }
+ if (line.dist_Z(self) < 0) {
+- INFO("Must be lifted before going down.")
++ INFO("Must be lifted before going down.");
+ CHECK(lifted);
+ INFO("Going down by the same amount of the lift or by the amount needed to get to next layer");
+ CHECK((
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_line_cpp ./patches/patch-tests_libslic3r_test_line_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_line_cpp Wed Dec 31 16:00:00 1969
+++ ./patches/patch-tests_libslic3r_test_line_cpp Thu Feb 29 19:57:17 2024
@@ -0,0 +1,12 @@
+Index: tests/libslic3r/test_line.cpp
+--- tests/libslic3r/test_line.cpp.orig
++++ tests/libslic3r/test_line.cpp
+@@ -37,7 +37,7 @@ TEST_CASE("Parallel lines under angles", "[Line]") {
+ CHECK(line.parallel_to(line.direction()));
+ INFO("Line is parallel to its direction + PI");
+ line.parallel_to(line.direction() + M_PI);
+- INFO("line is parallel to its direction - PI")
++ INFO("line is parallel to its direction - PI");
+ line.parallel_to(line.direction() - M_PI);
+
+ SECTION("Line is parallel within epsilon") {
diff -NPru -x CVS /usr/ports/cad/prusaslicer/pkg/PLIST ./pkg/PLIST
--- /usr/ports/cad/prusaslicer/pkg/PLIST Wed Feb 7 14:17:09 2024
+++ ./pkg/PLIST Thu Feb 29 20:41:26 2024
@@ -421,6 +421,11 @@
share/PrusaSlicer/profiles/Anker/M5-bed.stl
share/PrusaSlicer/profiles/Anker/M5-texture.svg
share/PrusaSlicer/profiles/Anker/M5-texture_v2.svg
+share/PrusaSlicer/profiles/Anker/M5C-bed.stl
+share/PrusaSlicer/profiles/Anker/M5C-texture.svg
+share/PrusaSlicer/profiles/Anker/M5C-texture_v2.svg
+share/PrusaSlicer/profiles/Anker/M5C_thumbnail.png
+share/PrusaSlicer/profiles/Anker/M5C_thumbnail_v2.png
share/PrusaSlicer/profiles/Anker/M5_thumbnail.png
share/PrusaSlicer/profiles/Anker/M5_thumbnail_v2.png
share/PrusaSlicer/profiles/Anycubic/
@@ -453,12 +458,22 @@
share/PrusaSlicer/profiles/Artillery/Genius_thumbnail.png
share/PrusaSlicer/profiles/Artillery/Hornet_thumbnail.png
share/PrusaSlicer/profiles/Artillery/X1_thumbnail.png
+share/PrusaSlicer/profiles/Artillery/X3 Plus_thumbnail.png
+share/PrusaSlicer/profiles/Artillery/X3 Pro_thumbnail.png
+share/PrusaSlicer/profiles/Artillery/X4 Max_thumbnail.png
+share/PrusaSlicer/profiles/Artillery/X4 Plus_thumbnail.png
+share/PrusaSlicer/profiles/Artillery/X4 Pro_thumbnail.png
share/PrusaSlicer/profiles/Artillery/bed-genius.png
share/PrusaSlicer/profiles/Artillery/bed-genius.stl
share/PrusaSlicer/profiles/Artillery/bed-hornet.png
share/PrusaSlicer/profiles/Artillery/bed-hornet.stl
share/PrusaSlicer/profiles/Artillery/bed-x1.png
share/PrusaSlicer/profiles/Artillery/bed-x1.stl
+share/PrusaSlicer/profiles/Artillery/bed-x3-plus.stl
+share/PrusaSlicer/profiles/Artillery/bed-x3-pro.stl
+share/PrusaSlicer/profiles/Artillery/bed-x4-max.stl
+share/PrusaSlicer/profiles/Artillery/bed-x4-plus.stl
+share/PrusaSlicer/profiles/Artillery/bed-x4-pro.stl
share/PrusaSlicer/profiles/BIBO/
share/PrusaSlicer/profiles/BIBO.idx
share/PrusaSlicer/profiles/BIBO.ini
@@ -714,6 +729,7 @@
share/PrusaSlicer/profiles/PrusaResearch/MK2.5_thumbnail.png
share/PrusaSlicer/profiles/PrusaResearch/MK2SMM_thumbnail.png
share/PrusaSlicer/profiles/PrusaResearch/MK2S_thumbnail.png
+share/PrusaSlicer/profiles/PrusaResearch/MK35_thumbnail.png
share/PrusaSlicer/profiles/PrusaResearch/MK39IS_thumbnail.png
share/PrusaSlicer/profiles/PrusaResearch/MK39_thumbnail.png
share/PrusaSlicer/profiles/PrusaResearch/MK3MMU2_thumbnail.png
@@ -745,6 +761,7 @@
share/PrusaSlicer/profiles/PrusaResearch/mk2.svg
share/PrusaSlicer/profiles/PrusaResearch/mk2_bed.stl
share/PrusaSlicer/profiles/PrusaResearch/mk3.svg
+share/PrusaSlicer/profiles/PrusaResearch/mk35.svg
share/PrusaSlicer/profiles/PrusaResearch/mk39.svg
share/PrusaSlicer/profiles/PrusaResearch/mk3_bed.stl
share/PrusaSlicer/profiles/PrusaResearch/mk4.svg
@@ -790,12 +807,23 @@
share/PrusaSlicer/profiles/Snapmaker/
share/PrusaSlicer/profiles/Snapmaker.idx
share/PrusaSlicer/profiles/Snapmaker.ini
-share/PrusaSlicer/profiles/Snapmaker/A250_bed.stl
-share/PrusaSlicer/profiles/Snapmaker/A250_texture.svg
-share/PrusaSlicer/profiles/Snapmaker/A250_thumbnail.png
-share/PrusaSlicer/profiles/Snapmaker/A350_bed.stl
-share/PrusaSlicer/profiles/Snapmaker/A350_texture.svg
-share/PrusaSlicer/profiles/Snapmaker/A350_thumbnail.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A250 Dual QSKit_cover.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A250 Dual_cover.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A250 QSKit_cover.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A250 QSKit_texture.svg
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A250_bed.stl
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A250_cover.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A250_texture.svg
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A350 Dual QSKit_cover.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A350 Dual_cover.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A350 QSKit_cover.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A350 QSKit_texture.svg
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A350_bed.stl
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A350_cover.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A350_texture.svg
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker J1_bed.stl
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker J1_cover.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker J1_texture.svg
share/PrusaSlicer/profiles/Sovol/
share/PrusaSlicer/profiles/Sovol.idx
share/PrusaSlicer/profiles/Sovol.ini
Here is a diff updating cad/prusaslicer to 2.7.2:
--- /usr/ports/cad/prusaslicer/Makefile Wed Feb 28 16:57:39 2024
+++ ./Makefile Thu Feb 29 19:57:20 2024
@@ -2,9 +2,8 @@
ONLY_FOR_ARCHS = ${LP64_ARCHS}
DPB_PROPERTIES = parallel
-V = 2.7.1
+V = 2.7.2
PKGNAME = prusaslicer-${V}
-REVISION = 1
GH_ACCOUNT = prusa3d
GH_PROJECT = PrusaSlicer
diff -NPru -x CVS /usr/ports/cad/prusaslicer/distinfo ./distinfo
--- /usr/ports/cad/prusaslicer/distinfo Wed Feb 7 14:17:08 2024
+++ ./distinfo Thu Feb 29 19:53:44 2024
@@ -1,2 +1,2 @@
-SHA256 (PrusaSlicer-version_2.7.1.tar.gz) = XaqOi801Vtbv+nNpYYkjB5petxCtbL/WK5uHRYbJpKM=
-SIZE (PrusaSlicer-version_2.7.1.tar.gz) = 64975776
+SHA256 (PrusaSlicer-version_2.7.2.tar.gz) = Cvirg60zzevB0T032O07ISXYRTLrS8p2GMQiv3ZI6+4=
+SIZE (PrusaSlicer-version_2.7.2.tar.gz) = 64915607
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-CMakeLists_txt ./patches/patch-CMakeLists_txt
--- /usr/ports/cad/prusaslicer/patches/patch-CMakeLists_txt Wed Feb 7 14:17:08 2024
+++ ./patches/patch-CMakeLists_txt Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -224,7 +224,7 @@ if (APPLE)
+@@ -218,7 +218,7 @@ if (APPLE)
endif ()
endif ()
@@ -10,7 +10,7 @@
find_package(PkgConfig REQUIRED)
if (CMAKE_VERSION VERSION_LESS "3.1")
-@@ -654,7 +654,6 @@ elseif (SLIC3R_FHS)
+@@ -641,7 +641,6 @@ elseif (SLIC3R_FHS)
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME PrusaSlicer-gcodeviewer.png
)
endforeach()
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_PrusaSlicer_cpp ./patches/patch-src_PrusaSlicer_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_PrusaSlicer_cpp Wed Feb 7 14:17:08 2024
+++ ./patches/patch-src_PrusaSlicer_cpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/PrusaSlicer.cpp
--- src/PrusaSlicer.cpp.orig
+++ src/PrusaSlicer.cpp
-@@ -754,8 +754,8 @@ bool CLI::setup(int argc, char **argv)
+@@ -770,8 +770,8 @@ bool CLI::setup(int argc, char **argv)
#endif
// See Invoking prusa-slicer from $PATH environment variable crashes #5542
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_libslic3r_CMakeLists_txt ./patches/patch-src_libslic3r_CMakeLists_txt
--- /usr/ports/cad/prusaslicer/patches/patch-src_libslic3r_CMakeLists_txt Wed Feb 7 14:17:08 2024
+++ ./patches/patch-src_libslic3r_CMakeLists_txt Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/libslic3r/CMakeLists.txt
--- src/libslic3r/CMakeLists.txt.orig
+++ src/libslic3r/CMakeLists.txt
-@@ -572,13 +572,12 @@ find_package(JPEG REQUIRED)
+@@ -575,13 +575,12 @@ find_package(JPEG REQUIRED)
target_link_libraries(libslic3r
libnest2d
admesh
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_libslic3r_Config_hpp ./patches/patch-src_libslic3r_Config_hpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_libslic3r_Config_hpp Wed Dec 31 16:00:00 1969
+++ ./patches/patch-src_libslic3r_Config_hpp Thu Feb 29 19:57:17 2024
@@ -0,0 +1,12 @@
+Index: src/libslic3r/Config.hpp
+--- src/libslic3r/Config.hpp.orig
++++ src/libslic3r/Config.hpp
+@@ -339,7 +339,7 @@ template<class T>
+ struct NilValueTempl<T, std::enable_if_t<std::is_enum_v<T>, void>>
+ {
+ using NilType = T;
+- static constexpr auto value = static_cast<T>(std::numeric_limits<std::underlying_type_t<T>>::max());
++ static constexpr auto value = static_cast<std::underlying_type_t<T>>(std::numeric_limits<std::underlying_type_t<T>>::max());
+ };
+
+ template<class T> struct NilValueTempl<T, std::enable_if_t<std::is_floating_point_v<T>, void>> {
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_libslic3r_GCode_cpp ./patches/patch-src_libslic3r_GCode_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_libslic3r_GCode_cpp Wed Feb 7 10:31:05 2024
+++ ./patches/patch-src_libslic3r_GCode_cpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/libslic3r/GCode.cpp
--- src/libslic3r/GCode.cpp.orig
+++ src/libslic3r/GCode.cpp
-@@ -1532,13 +1532,13 @@ void GCodeGenerator::process_layers(
+@@ -1524,13 +1524,13 @@ void GCodeGenerator::process_layers(
[&output_stream](std::string s) { output_stream.write(s); }
);
@@ -17,7 +17,7 @@
if (m_find_replace)
pipeline_to_string = pipeline_to_string & find_replace;
-@@ -1624,13 +1624,13 @@ void GCodeGenerator::process_layers(
+@@ -1616,13 +1616,13 @@ void GCodeGenerator::process_layers(
[&output_stream](std::string s) { output_stream.write(s); }
);
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_ConfigWizard_cpp ./patches/patch-src_slic3r_GUI_ConfigWizard_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_ConfigWizard_cpp Wed Feb 7 14:17:08 2024
+++ ./patches/patch-src_slic3r_GUI_ConfigWizard_cpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/slic3r/GUI/ConfigWizard.cpp
--- src/slic3r/GUI/ConfigWizard.cpp.orig
+++ src/slic3r/GUI/ConfigWizard.cpp
-@@ -3058,7 +3058,7 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_c
+@@ -3063,7 +3063,7 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_c
if ((check_unsaved_preset_changes = install_bundles.size() > 0))
header = _L_PLURAL("A new vendor was installed and one of its printers will be activated", "New vendors were installed and one of theirs printers will be activated", install_bundles.size());
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_GUI_Factories_cpp ./patches/patch-src_slic3r_GUI_GUI_Factories_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_GUI_Factories_cpp Wed Feb 7 14:17:08 2024
+++ ./patches/patch-src_slic3r_GUI_GUI_Factories_cpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/slic3r/GUI/GUI_Factories.cpp
--- src/slic3r/GUI/GUI_Factories.cpp.orig
+++ src/slic3r/GUI/GUI_Factories.cpp
-@@ -1442,7 +1442,7 @@ void MenuFactory::sys_color_changed(wxMenuBar* menubar
+@@ -1466,7 +1466,7 @@ void MenuFactory::sys_color_changed(wxMenuBar* menubar
for (size_t id = 0; id < menubar->GetMenuCount(); id++) {
wxMenu* menu = menubar->GetMenu(id);
sys_color_changed_menu(menu);
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_GUI_Init_cpp ./patches/patch-src_slic3r_GUI_GUI_Init_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_GUI_Init_cpp Sat Jan 27 19:21:25 2024
+++ ./patches/patch-src_slic3r_GUI_GUI_Init_cpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/slic3r/GUI/GUI_Init.cpp
--- src/slic3r/GUI/GUI_Init.cpp.orig
+++ src/slic3r/GUI/GUI_Init.cpp
-@@ -49,6 +49,10 @@ int GUI_Run(GUI_InitParams ¶ms)
+@@ -45,6 +45,10 @@ int GUI_Run(GUI_InitParams ¶ms)
signal(SIGCHLD, SIG_DFL);
#endif // __APPLE__
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_GUI_cpp ./patches/patch-src_slic3r_GUI_GUI_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_GUI_cpp Sat Jan 27 19:21:25 2024
+++ ./patches/patch-src_slic3r_GUI_GUI_cpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/slic3r/GUI/GUI.cpp
--- src/slic3r/GUI/GUI.cpp.orig
+++ src/slic3r/GUI/GUI.cpp
-@@ -498,7 +498,8 @@ void desktop_open_folder(const boost::filesystem::path
+@@ -501,7 +501,8 @@ void desktop_open_folder(const boost::filesystem::path
#endif
}
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_GUI_hpp ./patches/patch-src_slic3r_GUI_GUI_hpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_GUI_hpp Sat Jan 27 19:21:25 2024
+++ ./patches/patch-src_slic3r_GUI_GUI_hpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/slic3r/GUI/GUI.hpp
--- src/slic3r/GUI/GUI.hpp.orig
+++ src/slic3r/GUI/GUI.hpp
-@@ -89,7 +89,7 @@ extern void desktop_open_datadir_folder();
+@@ -88,7 +88,7 @@ extern void desktop_open_datadir_folder();
// Ask the destop to open the directory specified by path using the default file explorer.
void desktop_open_folder(const boost::filesystem::path& path);
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_OpenGLManager_cpp ./patches/patch-src_slic3r_GUI_OpenGLManager_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_OpenGLManager_cpp Sat Jan 27 19:21:25 2024
+++ ./patches/patch-src_slic3r_GUI_OpenGLManager_cpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/slic3r/GUI/OpenGLManager.cpp
--- src/slic3r/GUI/OpenGLManager.cpp.orig
+++ src/slic3r/GUI/OpenGLManager.cpp
-@@ -340,7 +340,7 @@ bool OpenGLManager::init_gl()
+@@ -344,7 +344,7 @@ bool OpenGLManager::init_gl()
glewExperimental = true;
#endif // ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
GLenum err = glewInit();
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_Plater_cpp ./patches/patch-src_slic3r_GUI_Plater_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_GUI_Plater_cpp Wed Feb 7 14:17:08 2024
+++ ./patches/patch-src_slic3r_GUI_Plater_cpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/slic3r/GUI/Plater.cpp
--- src/slic3r/GUI/Plater.cpp.orig
+++ src/slic3r/GUI/Plater.cpp
-@@ -5395,7 +5395,7 @@ void Plater::load_project(const wxString& filename)
+@@ -5425,7 +5425,7 @@ void Plater::load_project(const wxString& filename)
p->reset();
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_Utils_WifiScanner_cpp ./patches/patch-src_slic3r_Utils_WifiScanner_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-src_slic3r_Utils_WifiScanner_cpp Wed Feb 7 10:31:05 2024
+++ ./patches/patch-src_slic3r_Utils_WifiScanner_cpp Thu Feb 29 19:57:17 2024
@@ -1,7 +1,7 @@
Index: src/slic3r/Utils/WifiScanner.cpp
--- src/slic3r/Utils/WifiScanner.cpp.orig
+++ src/slic3r/Utils/WifiScanner.cpp
-@@ -19,7 +19,7 @@
+@@ -17,7 +17,7 @@
#include "WifiScannerMac.h"
#endif
@@ -10,10 +10,10 @@
#include <dbus/dbus.h> /* Pull in all of D-Bus headers. */
#endif //__linux__
-@@ -457,4 +457,4 @@ std::string WifiScanner::get_psk(const std::string& ss
- }
- return {};
+@@ -489,4 +489,4 @@ void WifiScanner::fill_wifi_map(Slic3r::WifiSsidPskMap
+ wlanFreeMemoryFunc(interface_list);
}
+ #endif // _WIN32
-} // Slic3r
\ No newline at end of file
+} // Slic3r
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_gcode_cpp ./patches/patch-tests_fff_print_test_gcode_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_gcode_cpp Wed Dec 31 16:00:00 1969
+++ ./patches/patch-tests_fff_print_test_gcode_cpp Thu Feb 29 19:57:17 2024
@@ -0,0 +1,12 @@
+Index: tests/fff_print/test_gcode.cpp
+--- tests/fff_print/test_gcode.cpp.orig
++++ tests/fff_print/test_gcode.cpp
+@@ -66,7 +66,7 @@ TEST_CASE("Wiping speeds", "[GCode]") {
+ INFO("Wipe moves don\'t retract faster than configured speed");
+ CHECK(retract_speed < expected_retract_speed);
+ }
+- INFO("No wiping after layer change")
++ INFO("No wiping after layer change");
+ CHECK(!wiping_on_new_layer);
+ }
+
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_layers_cpp ./patches/patch-tests_fff_print_test_layers_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_layers_cpp Wed Dec 31 16:00:00 1969
+++ ./patches/patch-tests_fff_print_test_layers_cpp Thu Feb 29 19:57:17 2024
@@ -0,0 +1,16 @@
+Index: tests/fff_print/test_layers.cpp
+--- tests/fff_print/test_layers.cpp.orig
++++ tests/fff_print/test_layers.cpp
+@@ -27,10 +27,10 @@ void check_layers(const DynamicPrintConfig& config) {
+ const double layer_height = config.opt_float("layer_height");
+ INFO("Correct first layer height.");
+ CHECK(z.at(0) == Approx(first_layer_height + z_offset));
+- INFO("Correct second layer height")
++ INFO("Correct second layer height");
+ CHECK(z.at(1) == Approx(first_layer_height + layer_height + z_offset));
+
+- INFO("Correct layer height")
++ INFO("Correct layer height");
+ for (const double increment : tcb::span{increments}.subspan(1)) {
+ CHECK(increment == Approx(layer_height));
+ }
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_retraction_cpp ./patches/patch-tests_fff_print_test_retraction_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_retraction_cpp Wed Dec 31 16:00:00 1969
+++ ./patches/patch-tests_fff_print_test_retraction_cpp Thu Feb 29 19:57:17 2024
@@ -0,0 +1,12 @@
+Index: tests/fff_print/test_retraction.cpp
+--- tests/fff_print/test_retraction.cpp.orig
++++ tests/fff_print/test_retraction.cpp
+@@ -77,7 +77,7 @@ void check_gcode(std::initializer_list<TestMesh> meshe
+ lift_dist = line.dist_Z(self);
+ }
+ if (line.dist_Z(self) < 0) {
+- INFO("Must be lifted before going down.")
++ INFO("Must be lifted before going down.");
+ CHECK(lifted);
+ INFO("Going down by the same amount of the lift or by the amount needed to get to next layer");
+ CHECK((
diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_line_cpp ./patches/patch-tests_libslic3r_test_line_cpp
--- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_line_cpp Wed Dec 31 16:00:00 1969
+++ ./patches/patch-tests_libslic3r_test_line_cpp Thu Feb 29 19:57:17 2024
@@ -0,0 +1,12 @@
+Index: tests/libslic3r/test_line.cpp
+--- tests/libslic3r/test_line.cpp.orig
++++ tests/libslic3r/test_line.cpp
+@@ -37,7 +37,7 @@ TEST_CASE("Parallel lines under angles", "[Line]") {
+ CHECK(line.parallel_to(line.direction()));
+ INFO("Line is parallel to its direction + PI");
+ line.parallel_to(line.direction() + M_PI);
+- INFO("line is parallel to its direction - PI")
++ INFO("line is parallel to its direction - PI");
+ line.parallel_to(line.direction() - M_PI);
+
+ SECTION("Line is parallel within epsilon") {
diff -NPru -x CVS /usr/ports/cad/prusaslicer/pkg/PLIST ./pkg/PLIST
--- /usr/ports/cad/prusaslicer/pkg/PLIST Wed Feb 7 14:17:09 2024
+++ ./pkg/PLIST Thu Feb 29 20:41:26 2024
@@ -421,6 +421,11 @@
share/PrusaSlicer/profiles/Anker/M5-bed.stl
share/PrusaSlicer/profiles/Anker/M5-texture.svg
share/PrusaSlicer/profiles/Anker/M5-texture_v2.svg
+share/PrusaSlicer/profiles/Anker/M5C-bed.stl
+share/PrusaSlicer/profiles/Anker/M5C-texture.svg
+share/PrusaSlicer/profiles/Anker/M5C-texture_v2.svg
+share/PrusaSlicer/profiles/Anker/M5C_thumbnail.png
+share/PrusaSlicer/profiles/Anker/M5C_thumbnail_v2.png
share/PrusaSlicer/profiles/Anker/M5_thumbnail.png
share/PrusaSlicer/profiles/Anker/M5_thumbnail_v2.png
share/PrusaSlicer/profiles/Anycubic/
@@ -453,12 +458,22 @@
share/PrusaSlicer/profiles/Artillery/Genius_thumbnail.png
share/PrusaSlicer/profiles/Artillery/Hornet_thumbnail.png
share/PrusaSlicer/profiles/Artillery/X1_thumbnail.png
+share/PrusaSlicer/profiles/Artillery/X3 Plus_thumbnail.png
+share/PrusaSlicer/profiles/Artillery/X3 Pro_thumbnail.png
+share/PrusaSlicer/profiles/Artillery/X4 Max_thumbnail.png
+share/PrusaSlicer/profiles/Artillery/X4 Plus_thumbnail.png
+share/PrusaSlicer/profiles/Artillery/X4 Pro_thumbnail.png
share/PrusaSlicer/profiles/Artillery/bed-genius.png
share/PrusaSlicer/profiles/Artillery/bed-genius.stl
share/PrusaSlicer/profiles/Artillery/bed-hornet.png
share/PrusaSlicer/profiles/Artillery/bed-hornet.stl
share/PrusaSlicer/profiles/Artillery/bed-x1.png
share/PrusaSlicer/profiles/Artillery/bed-x1.stl
+share/PrusaSlicer/profiles/Artillery/bed-x3-plus.stl
+share/PrusaSlicer/profiles/Artillery/bed-x3-pro.stl
+share/PrusaSlicer/profiles/Artillery/bed-x4-max.stl
+share/PrusaSlicer/profiles/Artillery/bed-x4-plus.stl
+share/PrusaSlicer/profiles/Artillery/bed-x4-pro.stl
share/PrusaSlicer/profiles/BIBO/
share/PrusaSlicer/profiles/BIBO.idx
share/PrusaSlicer/profiles/BIBO.ini
@@ -714,6 +729,7 @@
share/PrusaSlicer/profiles/PrusaResearch/MK2.5_thumbnail.png
share/PrusaSlicer/profiles/PrusaResearch/MK2SMM_thumbnail.png
share/PrusaSlicer/profiles/PrusaResearch/MK2S_thumbnail.png
+share/PrusaSlicer/profiles/PrusaResearch/MK35_thumbnail.png
share/PrusaSlicer/profiles/PrusaResearch/MK39IS_thumbnail.png
share/PrusaSlicer/profiles/PrusaResearch/MK39_thumbnail.png
share/PrusaSlicer/profiles/PrusaResearch/MK3MMU2_thumbnail.png
@@ -745,6 +761,7 @@
share/PrusaSlicer/profiles/PrusaResearch/mk2.svg
share/PrusaSlicer/profiles/PrusaResearch/mk2_bed.stl
share/PrusaSlicer/profiles/PrusaResearch/mk3.svg
+share/PrusaSlicer/profiles/PrusaResearch/mk35.svg
share/PrusaSlicer/profiles/PrusaResearch/mk39.svg
share/PrusaSlicer/profiles/PrusaResearch/mk3_bed.stl
share/PrusaSlicer/profiles/PrusaResearch/mk4.svg
@@ -790,12 +807,23 @@
share/PrusaSlicer/profiles/Snapmaker/
share/PrusaSlicer/profiles/Snapmaker.idx
share/PrusaSlicer/profiles/Snapmaker.ini
-share/PrusaSlicer/profiles/Snapmaker/A250_bed.stl
-share/PrusaSlicer/profiles/Snapmaker/A250_texture.svg
-share/PrusaSlicer/profiles/Snapmaker/A250_thumbnail.png
-share/PrusaSlicer/profiles/Snapmaker/A350_bed.stl
-share/PrusaSlicer/profiles/Snapmaker/A350_texture.svg
-share/PrusaSlicer/profiles/Snapmaker/A350_thumbnail.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A250 Dual QSKit_cover.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A250 Dual_cover.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A250 QSKit_cover.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A250 QSKit_texture.svg
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A250_bed.stl
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A250_cover.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A250_texture.svg
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A350 Dual QSKit_cover.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A350 Dual_cover.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A350 QSKit_cover.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A350 QSKit_texture.svg
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A350_bed.stl
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A350_cover.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker A350_texture.svg
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker J1_bed.stl
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker J1_cover.png
+share/PrusaSlicer/profiles/Snapmaker/Snapmaker J1_texture.svg
share/PrusaSlicer/profiles/Sovol/
share/PrusaSlicer/profiles/Sovol.idx
share/PrusaSlicer/profiles/Sovol.ini
Here is a diff updating cad/prusaslicer to 2.7.2:
UPDATE: devel/libbgcode-20240122
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/libbgcode/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 5 Feb 2024 05:18:10 -0000 1.1.1.1
+++ Makefile 1 Mar 2024 04:51:46 -0000
@@ -1,8 +1,8 @@
COMMENT = Prusa Block & Binary G-code reader / writer / converter
-COMMIT = bc390aab4427589a6402b4c7f65cf4d0a8f987ec
+COMMIT = 6f43cb004ef3d3bda37dde49f6235e24d2717629
DISTNAME = libbgcode-${COMMIT}
-PKGNAME = libbgcode-20231116
+PKGNAME = libbgcode-20240122
DIST_TUPLE = github prusa3d libbgcode ${COMMIT} .
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/libbgcode/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 5 Feb 2024 05:18:10 -0000 1.1.1.1
+++ distinfo 1 Mar 2024 04:51:46 -0000
@@ -1,2 +1,2 @@
-SHA256 (prusa3d-libbgcode-bc390aab4427589a6402b4c7f65cf4d0a8f987ec.tar.gz) = C08RiRL9I1iDlgAJkk9NXVs3t4f7awPn+iJtLhuhRIY=
-SIZE (prusa3d-libbgcode-bc390aab4427589a6402b4c7f65cf4d0a8f987ec.tar.gz) = 455134
+SHA256 (prusa3d-libbgcode-6f43cb004ef3d3bda37dde49f6235e24d2717629.tar.gz) = MVNJ1V/O4ur0HKe6akuODkQsdLBPYHTW4QjBafo26Qg=
+SIZE (prusa3d-libbgcode-6f43cb004ef3d3bda37dde49f6235e24d2717629.tar.gz) = 455740
Updating libbgcode to commit 6f43cb004ef3d3bda37dde49f6235e24d2717629 to
match version bundled in prusaslicer 2.7.2.
===================================================================
RCS file: /cvs/ports/devel/libbgcode/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 5 Feb 2024 05:18:10 -0000 1.1.1.1
+++ Makefile 1 Mar 2024 04:51:46 -0000
@@ -1,8 +1,8 @@
COMMENT = Prusa Block & Binary G-code reader / writer / converter
-COMMIT = bc390aab4427589a6402b4c7f65cf4d0a8f987ec
+COMMIT = 6f43cb004ef3d3bda37dde49f6235e24d2717629
DISTNAME = libbgcode-${COMMIT}
-PKGNAME = libbgcode-20231116
+PKGNAME = libbgcode-20240122
DIST_TUPLE = github prusa3d libbgcode ${COMMIT} .
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/libbgcode/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 5 Feb 2024 05:18:10 -0000 1.1.1.1
+++ distinfo 1 Mar 2024 04:51:46 -0000
@@ -1,2 +1,2 @@
-SHA256 (prusa3d-libbgcode-bc390aab4427589a6402b4c7f65cf4d0a8f987ec.tar.gz) = C08RiRL9I1iDlgAJkk9NXVs3t4f7awPn+iJtLhuhRIY=
-SIZE (prusa3d-libbgcode-bc390aab4427589a6402b4c7f65cf4d0a8f987ec.tar.gz) = 455134
+SHA256 (prusa3d-libbgcode-6f43cb004ef3d3bda37dde49f6235e24d2717629.tar.gz) = MVNJ1V/O4ur0HKe6akuODkQsdLBPYHTW4QjBafo26Qg=
+SIZE (prusa3d-libbgcode-6f43cb004ef3d3bda37dde49f6235e24d2717629.tar.gz) = 455740
Updating libbgcode to commit 6f43cb004ef3d3bda37dde49f6235e24d2717629 to
match version bundled in prusaslicer 2.7.2.
UPDATE: blender 3.3.16
Here is an update to Blender 3.3.16.
Blender 3.3.16 LTS - February 2024
Fix: memory leak during Property Search. [e10b2fc1a3cee6f0a802cd853a0be3dc788204f9]
Assign Shortcut Missing when Right Clicking Undo History. [#97431]
Regression: Guiding in manta is broken. [#106425]
External Particle Cache Playback Is Broken (2.8). [#68436]
Blender Crash When Changing Color Palette in Edit Mode. [#117526]
Unable to enter node group by clicking on the icon after exiting it using the shortcut ctrl+tab. [#117530]
bpy.ops.paint.image_paint with a texture requires initialization with manual paint stroke otherwise color not quite right. [#54554]
Fix buffer overflow passing a vertical segment to convexhull_2d. [6fba82404d9]
Regression: Crash on deleting shape key from Blender File view. [#108407]
Regression: Crash on deleting shape key from Blender File view. [#108407]
object.override_library.resync(…) â€" crashes when view_layer is not specified. [#118055]
Blender 3.3.15 LTS - January 2024
Crash: Opening a 3.3 project crashes 3.6/4.0. [#114582]
Cycles: add ROCm 6 compatibility for HIP. [9673fa2720b99d935e69f3c3d9ef0a0d61c2e3cf]
Make the preference option “remap relative†apply for all save operations. [80e39f14e45]
foreach_get/set doesn’t work for enum. [#92621]
Extrude to Cursor tool: it don’t allow to correct position of new vertex after LMB pressed. [#114282]
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/blender/Makefile,v
retrieving revision 1.120
diff -u -p -u -p -r1.120 Makefile
--- Makefile 7 Feb 2024 18:09:05 -0000 1.120
+++ Makefile 1 Mar 2024 04:17:21 -0000
@@ -7,8 +7,7 @@ DPB_PROPERTIES = parallel
COMMENT = 3D creation software
-DISTNAME = blender-3.3.14
-REVISION = 0
+DISTNAME = blender-3.3.16
CATEGORIES = graphics
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/blender/distinfo,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 distinfo
--- distinfo 25 Dec 2023 18:33:55 -0000 1.35
+++ distinfo 1 Mar 2024 04:17:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (blender-3.3.14.tar.xz) = qdbNt1aqvtZJ+DstHz94HtCN18WBaEMc3UWAlHBqk7o=
-SIZE (blender-3.3.14.tar.xz) = 41949696
+SHA256 (blender-3.3.16.tar.xz) = pSJ3SvSJ5Gf8q6r4DvI3mTw4ZjHtClZW6baYhCsEKRc=
+SIZE (blender-3.3.16.tar.xz) = 41924328
Blender 3.3.16 LTS - February 2024
Fix: memory leak during Property Search. [e10b2fc1a3cee6f0a802cd853a0be3dc788204f9]
Assign Shortcut Missing when Right Clicking Undo History. [#97431]
Regression: Guiding in manta is broken. [#106425]
External Particle Cache Playback Is Broken (2.8). [#68436]
Blender Crash When Changing Color Palette in Edit Mode. [#117526]
Unable to enter node group by clicking on the icon after exiting it using the shortcut ctrl+tab. [#117530]
bpy.ops.paint.image_paint with a texture requires initialization with manual paint stroke otherwise color not quite right. [#54554]
Fix buffer overflow passing a vertical segment to convexhull_2d. [6fba82404d9]
Regression: Crash on deleting shape key from Blender File view. [#108407]
Regression: Crash on deleting shape key from Blender File view. [#108407]
object.override_library.resync(…) â€" crashes when view_layer is not specified. [#118055]
Blender 3.3.15 LTS - January 2024
Crash: Opening a 3.3 project crashes 3.6/4.0. [#114582]
Cycles: add ROCm 6 compatibility for HIP. [9673fa2720b99d935e69f3c3d9ef0a0d61c2e3cf]
Make the preference option “remap relative†apply for all save operations. [80e39f14e45]
foreach_get/set doesn’t work for enum. [#92621]
Extrude to Cursor tool: it don’t allow to correct position of new vertex after LMB pressed. [#114282]
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/blender/Makefile,v
retrieving revision 1.120
diff -u -p -u -p -r1.120 Makefile
--- Makefile 7 Feb 2024 18:09:05 -0000 1.120
+++ Makefile 1 Mar 2024 04:17:21 -0000
@@ -7,8 +7,7 @@ DPB_PROPERTIES = parallel
COMMENT = 3D creation software
-DISTNAME = blender-3.3.14
-REVISION = 0
+DISTNAME = blender-3.3.16
CATEGORIES = graphics
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/blender/distinfo,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 distinfo
--- distinfo 25 Dec 2023 18:33:55 -0000 1.35
+++ distinfo 1 Mar 2024 04:17:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (blender-3.3.14.tar.xz) = qdbNt1aqvtZJ+DstHz94HtCN18WBaEMc3UWAlHBqk7o=
-SIZE (blender-3.3.14.tar.xz) = 41949696
+SHA256 (blender-3.3.16.tar.xz) = pSJ3SvSJ5Gf8q6r4DvI3mTw4ZjHtClZW6baYhCsEKRc=
+SIZE (blender-3.3.16.tar.xz) = 41924328
Re: UPDATE: net/tailscale-1.60.1
On Thu, 29 Feb 2024 20:12:18 -0400, Adriano Barbosa
<barbosa.aob@gmail.com> wrote:
> Hi.
> Update for net/tailscale v1.60.1
>
> Changelog:
> https://github.com/tailscale/tailscale/releases/tag/v1.60.1
> - Fixed: Exposing port 8080 to other devices on your tailnet works as
> expected
Committed, thanks!
<barbosa.aob@gmail.com> wrote:
> Hi.
> Update for net/tailscale v1.60.1
>
> Changelog:
> https://github.com/tailscale/tailscale/releases/tag/v1.60.1
> - Fixed: Exposing port 8080 to other devices on your tailnet works as
> expected
Committed, thanks!
UPDATE: net/tailscale-1.60.1
Hi.
Update for net/tailscale v1.60.1
Changelog:
https://github.com/tailscale/tailscale/releases/tag/v1.60.1
- Fixed: Exposing port 8080 to other devices on your tailnet works as
expected
Obrigado!
--
Adriano
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/tailscale/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile 17 Feb 2024 16:17:32 -0000 1.28
+++ Makefile 1 Mar 2024 00:01:40 -0000
@@ -2,7 +2,7 @@ BROKEN-i386 = unix.EPROTO not defined
COMMENT = modern overlay-like VPN built on top of WireGuard
-V = 1.60.0
+V = 1.60.1
MODGO_MODNAME = tailscale.com
MODGO_VERSION = v${V}
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/tailscale/distinfo,v
retrieving revision 1.26
diff -u -p -r1.26 distinfo
--- distinfo 17 Feb 2024 16:17:32 -0000 1.26
+++ distinfo 1 Mar 2024 00:01:42 -0000
@@ -2189,7 +2189,7 @@ SHA256 (go_modules/software.sslmate.com/
SHA256 (go_modules/software.sslmate.com/src/go-pkcs12/@v/v0.4.0.zip) = VQGaOR5TAqUbpi6YkJ4AYiS4EgeGbakL6vWC7A3uA28=
SHA256 (go_modules/src.elv.sh/@v/v0.16.0-rc1.0.20220116211855-fda62502ad7f.mod) = ImJNCVe1tA5jNq8JoM2bIJGqRqDtuksdWKAwpOaNWiI=
SHA256 (go_modules/src.elv.sh/@v/v0.16.0-rc1.0.20220116211855-fda62502ad7f.zip) = edEgOGTOmXKXLEt1tIEy1odFM3S8Y8hyYUcl8moi1Ts=
-SHA256 (tailscale.com-v1.60.0.zip) = eWjBnbvzWU8UyVW6wq663FZ2gBM7RsaAfRDOnXSfGYQ=
+SHA256 (tailscale.com-v1.60.1.zip) = ZJGUG+9xE3sV072OEe6ptjPgznNSsSgYomrrm9JJxiM=
SIZE (go_modules/4d63.com/gocheckcompilerdirectives/@v/v1.2.1.mod) = 173
SIZE (go_modules/4d63.com/gocheckcompilerdirectives/@v/v1.2.1.zip) = 7059
SIZE (go_modules/4d63.com/gochecknoglobals/@v/v0.2.1.mod) = 77
@@ -4381,4 +4381,4 @@ SIZE (go_modules/software.sslmate.com/sr
SIZE (go_modules/software.sslmate.com/src/go-pkcs12/@v/v0.4.0.zip) = 45988
SIZE (go_modules/src.elv.sh/@v/v0.16.0-rc1.0.20220116211855-fda62502ad7f.mod) = 185
SIZE (go_modules/src.elv.sh/@v/v0.16.0-rc1.0.20220116211855-fda62502ad7f.zip) = 705404
-SIZE (tailscale.com-v1.60.0.zip) = 3106995
+SIZE (tailscale.com-v1.60.1.zip) = 3107334
Update for net/tailscale v1.60.1
Changelog:
https://github.com/tailscale/tailscale/releases/tag/v1.60.1
- Fixed: Exposing port 8080 to other devices on your tailnet works as
expected
Obrigado!
--
Adriano
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/tailscale/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile 17 Feb 2024 16:17:32 -0000 1.28
+++ Makefile 1 Mar 2024 00:01:40 -0000
@@ -2,7 +2,7 @@ BROKEN-i386 = unix.EPROTO not defined
COMMENT = modern overlay-like VPN built on top of WireGuard
-V = 1.60.0
+V = 1.60.1
MODGO_MODNAME = tailscale.com
MODGO_VERSION = v${V}
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/tailscale/distinfo,v
retrieving revision 1.26
diff -u -p -r1.26 distinfo
--- distinfo 17 Feb 2024 16:17:32 -0000 1.26
+++ distinfo 1 Mar 2024 00:01:42 -0000
@@ -2189,7 +2189,7 @@ SHA256 (go_modules/software.sslmate.com/
SHA256 (go_modules/software.sslmate.com/src/go-pkcs12/@v/v0.4.0.zip) = VQGaOR5TAqUbpi6YkJ4AYiS4EgeGbakL6vWC7A3uA28=
SHA256 (go_modules/src.elv.sh/@v/v0.16.0-rc1.0.20220116211855-fda62502ad7f.mod) = ImJNCVe1tA5jNq8JoM2bIJGqRqDtuksdWKAwpOaNWiI=
SHA256 (go_modules/src.elv.sh/@v/v0.16.0-rc1.0.20220116211855-fda62502ad7f.zip) = edEgOGTOmXKXLEt1tIEy1odFM3S8Y8hyYUcl8moi1Ts=
-SHA256 (tailscale.com-v1.60.0.zip) = eWjBnbvzWU8UyVW6wq663FZ2gBM7RsaAfRDOnXSfGYQ=
+SHA256 (tailscale.com-v1.60.1.zip) = ZJGUG+9xE3sV072OEe6ptjPgznNSsSgYomrrm9JJxiM=
SIZE (go_modules/4d63.com/gocheckcompilerdirectives/@v/v1.2.1.mod) = 173
SIZE (go_modules/4d63.com/gocheckcompilerdirectives/@v/v1.2.1.zip) = 7059
SIZE (go_modules/4d63.com/gochecknoglobals/@v/v0.2.1.mod) = 77
@@ -4381,4 +4381,4 @@ SIZE (go_modules/software.sslmate.com/sr
SIZE (go_modules/software.sslmate.com/src/go-pkcs12/@v/v0.4.0.zip) = 45988
SIZE (go_modules/src.elv.sh/@v/v0.16.0-rc1.0.20220116211855-fda62502ad7f.mod) = 185
SIZE (go_modules/src.elv.sh/@v/v0.16.0-rc1.0.20220116211855-fda62502ad7f.zip) = 705404
-SIZE (tailscale.com-v1.60.0.zip) = 3106995
+SIZE (tailscale.com-v1.60.1.zip) = 3107334
[update] www/badwolf to 1.3.0
Badwolf changed its build system to use ninja between 1.2.2 and this
release.
This is not my port, I updated it to the latest version hoping it would
resolve some bugs I was having while using the browser (certain webpages
crashing, video playback stopping after a second). Unfortunately it
didn't, and testing other gtkwebkit browsers like Epiphany, the problems
persist (maybe they're bugs in gtkwebkit or gstreamer).
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/badwolf/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 27 Sep 2023 19:13:00 -0000 1.8
+++ Makefile 29 Feb 2024 22:16:49 -0000
@@ -1,6 +1,5 @@
COMMENT = minimalist and privacy-oriented WebKitGTK+ browser
-DISTNAME = badwolf-1.2.2
-REVISION = 2
+DISTNAME = badwolf-1.3.0
CATEGORIES = www
HOMEPAGE = https://hacktivis.me/projects/badwolf
@@ -15,14 +14,18 @@ SITES = https://hacktivis.me/releases/
COMPILER = base-clang ports-gcc
COMPILER_LANGS = c
-WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gobject-2.0 gtk-3 harfbuzz intl javascriptcoregtk-4.0 pango-1.0
-WANTLIB += pangocairo-1.0 soup-2.4 webkit2gtk-4.0 xml2 gmodule-2.0 pthread
-
-BUILD_DEPENDS = devel/gettext,-tools \
+WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gtk-3 harfbuzz
+WANTLIB += intl javascriptcoregtk-4.1 pango-1.0 pangocairo-1.0
+WANTLIB += pthread soup-3.0 webkit2gtk-4.1 xml2
+
+BUILD_DEPENDS = devel/flawfinder \
+ devel/gettext,-tools \
+ devel/ninja \
+ devel/shellcheck \
textproc/libxml
-LIB_DEPENDS = devel/libsoup \
- www/webkitgtk4
+LIB_DEPENDS = devel/glib2 \
+ www/webkitgtk4,webkitgtk41
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+4,-guic
@@ -31,11 +34,14 @@ RUN_DEPENDS = devel/desktop-file-utils \
# shellcheck.
NO_TEST = Yes
-USE_GMAKE = Yes
-
CONFIGURE_STYLE = simple
-
-MAKE_FLAGS = DOCDIR=${PREFIX}/share/doc/badwolf \
+CONFIGURE_ARGS = WITH_WEBKITGTK=4.1 \
+ WITH_URI_PARSER=guri \
MANDIR=${PREFIX}/man
+
+do-build:
+ cd ${WRKBUILD} && ninja
+do-install:
+ cd ${WRKBUILD} && ninja install
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/badwolf/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 8 Dec 2021 08:47:41 -0000 1.2
+++ distinfo 29 Feb 2024 22:16:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (badwolf-1.2.2.tar.gz) = /N8bDXERBx21P3hc087PtMe6hSQDpWlwN7KB5/4mKks=
-SIZE (badwolf-1.2.2.tar.gz) = 80102
+SHA256 (badwolf-1.3.0.tar.gz) = J238y6it38IFzrEEd2aOSytqSFPzRMhtXB41sccDRZ8=
+SIZE (badwolf-1.3.0.tar.gz) = 114477
Index: patches/patch-version_sh
===================================================================
RCS file: /cvs/ports/www/badwolf/patches/patch-version_sh,v
retrieving revision 1.2
diff -u -p -r1.2 patch-version_sh
--- patches/patch-version_sh 11 Mar 2022 20:09:39 -0000 1.2
+++ patches/patch-version_sh 29 Feb 2024 22:16:49 -0000
@@ -1,8 +1,10 @@
Index: version.sh
--- version.sh.orig
+++ version.sh
-@@ -1,4 +1,7 @@
- #!/bin/sh
+@@ -3,6 +3,9 @@
+ # SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf>
+ # SPDX-License-Identifier: BSD-3-Clause
+
+
+[ -d .git ] || exit
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/badwolf/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 11 Mar 2022 20:09:39 -0000 1.2
+++ pkg/PLIST 29 Feb 2024 22:16:49 -0000
@@ -1,5 +1,17 @@
@bin bin/badwolf
+man/de/
+man/de/man1/
+@man man/de/man1/badwolf.1
+man/fr/
+man/fr/man1/
+@man man/fr/man1/badwolf.1
@man man/man1/badwolf.1
+man/tr/
+man/tr/man1/
+@man man/tr/man1/badwolf.1
+man/vi/
+man/vi/man1/
+@man man/vi/man1/badwolf.1
share/applications/badwolf.desktop
share/badwolf/
share/badwolf/interface.css
@@ -19,11 +31,11 @@ share/badwolf/locale/tr/LC_MESSAGES/Badw
share/badwolf/locale/vi/
share/badwolf/locale/vi/LC_MESSAGES/
share/badwolf/locale/vi/LC_MESSAGES/Badwolf.mo
-share/doc/badwolf/
-share/doc/badwolf/KnowledgeBase.md
-share/doc/badwolf/README.md
-share/doc/badwolf/interface.txt
-@comment share/doc/badwolf/usr.bin.badwolf
+share/doc/badwolf-1.3.0/
+share/doc/badwolf-1.3.0/KnowledgeBase.md
+share/doc/badwolf-1.3.0/README.md
+share/doc/badwolf-1.3.0/interface.md
+@comment share/doc/badwolf-1.3.0/usr.bin.badwolf
share/icons/hicolor/128x128/apps/badwolf.png
share/icons/hicolor/24x24/apps/badwolf.png
share/icons/hicolor/256x256/apps/badwolf.png
release.
This is not my port, I updated it to the latest version hoping it would
resolve some bugs I was having while using the browser (certain webpages
crashing, video playback stopping after a second). Unfortunately it
didn't, and testing other gtkwebkit browsers like Epiphany, the problems
persist (maybe they're bugs in gtkwebkit or gstreamer).
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/badwolf/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 27 Sep 2023 19:13:00 -0000 1.8
+++ Makefile 29 Feb 2024 22:16:49 -0000
@@ -1,6 +1,5 @@
COMMENT = minimalist and privacy-oriented WebKitGTK+ browser
-DISTNAME = badwolf-1.2.2
-REVISION = 2
+DISTNAME = badwolf-1.3.0
CATEGORIES = www
HOMEPAGE = https://hacktivis.me/projects/badwolf
@@ -15,14 +14,18 @@ SITES = https://hacktivis.me/releases/
COMPILER = base-clang ports-gcc
COMPILER_LANGS = c
-WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gobject-2.0 gtk-3 harfbuzz intl javascriptcoregtk-4.0 pango-1.0
-WANTLIB += pangocairo-1.0 soup-2.4 webkit2gtk-4.0 xml2 gmodule-2.0 pthread
-
-BUILD_DEPENDS = devel/gettext,-tools \
+WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gtk-3 harfbuzz
+WANTLIB += intl javascriptcoregtk-4.1 pango-1.0 pangocairo-1.0
+WANTLIB += pthread soup-3.0 webkit2gtk-4.1 xml2
+
+BUILD_DEPENDS = devel/flawfinder \
+ devel/gettext,-tools \
+ devel/ninja \
+ devel/shellcheck \
textproc/libxml
-LIB_DEPENDS = devel/libsoup \
- www/webkitgtk4
+LIB_DEPENDS = devel/glib2 \
+ www/webkitgtk4,webkitgtk41
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+4,-guic
@@ -31,11 +34,14 @@ RUN_DEPENDS = devel/desktop-file-utils \
# shellcheck.
NO_TEST = Yes
-USE_GMAKE = Yes
-
CONFIGURE_STYLE = simple
-
-MAKE_FLAGS = DOCDIR=${PREFIX}/share/doc/badwolf \
+CONFIGURE_ARGS = WITH_WEBKITGTK=4.1 \
+ WITH_URI_PARSER=guri \
MANDIR=${PREFIX}/man
+
+do-build:
+ cd ${WRKBUILD} && ninja
+do-install:
+ cd ${WRKBUILD} && ninja install
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/badwolf/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 8 Dec 2021 08:47:41 -0000 1.2
+++ distinfo 29 Feb 2024 22:16:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (badwolf-1.2.2.tar.gz) = /N8bDXERBx21P3hc087PtMe6hSQDpWlwN7KB5/4mKks=
-SIZE (badwolf-1.2.2.tar.gz) = 80102
+SHA256 (badwolf-1.3.0.tar.gz) = J238y6it38IFzrEEd2aOSytqSFPzRMhtXB41sccDRZ8=
+SIZE (badwolf-1.3.0.tar.gz) = 114477
Index: patches/patch-version_sh
===================================================================
RCS file: /cvs/ports/www/badwolf/patches/patch-version_sh,v
retrieving revision 1.2
diff -u -p -r1.2 patch-version_sh
--- patches/patch-version_sh 11 Mar 2022 20:09:39 -0000 1.2
+++ patches/patch-version_sh 29 Feb 2024 22:16:49 -0000
@@ -1,8 +1,10 @@
Index: version.sh
--- version.sh.orig
+++ version.sh
-@@ -1,4 +1,7 @@
- #!/bin/sh
+@@ -3,6 +3,9 @@
+ # SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf>
+ # SPDX-License-Identifier: BSD-3-Clause
+
+
+[ -d .git ] || exit
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/badwolf/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 11 Mar 2022 20:09:39 -0000 1.2
+++ pkg/PLIST 29 Feb 2024 22:16:49 -0000
@@ -1,5 +1,17 @@
@bin bin/badwolf
+man/de/
+man/de/man1/
+@man man/de/man1/badwolf.1
+man/fr/
+man/fr/man1/
+@man man/fr/man1/badwolf.1
@man man/man1/badwolf.1
+man/tr/
+man/tr/man1/
+@man man/tr/man1/badwolf.1
+man/vi/
+man/vi/man1/
+@man man/vi/man1/badwolf.1
share/applications/badwolf.desktop
share/badwolf/
share/badwolf/interface.css
@@ -19,11 +31,11 @@ share/badwolf/locale/tr/LC_MESSAGES/Badw
share/badwolf/locale/vi/
share/badwolf/locale/vi/LC_MESSAGES/
share/badwolf/locale/vi/LC_MESSAGES/Badwolf.mo
-share/doc/badwolf/
-share/doc/badwolf/KnowledgeBase.md
-share/doc/badwolf/README.md
-share/doc/badwolf/interface.txt
-@comment share/doc/badwolf/usr.bin.badwolf
+share/doc/badwolf-1.3.0/
+share/doc/badwolf-1.3.0/KnowledgeBase.md
+share/doc/badwolf-1.3.0/README.md
+share/doc/badwolf-1.3.0/interface.md
+@comment share/doc/badwolf-1.3.0/usr.bin.badwolf
share/icons/hicolor/128x128/apps/badwolf.png
share/icons/hicolor/24x24/apps/badwolf.png
share/icons/hicolor/256x256/apps/badwolf.png
Re: NEW: security/qca-qt6
On Thu Feb 29, 2024 at 09:12:49AM +0100, Landry Breuil wrote:
> Le Thu, Feb 29, 2024 at 09:03:17AM +0100, Rafael Sadowski a écrit :
> > OK to import qca-qt6-2.3.8? It's the same as security/qca-qt5, but with
> > Qt6 enabled and Qt5 disabled. No conflicts with qt5 and qt6.
>
> in that case, wouldnt it be better/simpler to multipackage qca into -qt5
> and -qt6 and only build it once ? no real opinion, rather thinking out
> loud..
>
Thanks for your feedback. I have already evaluate these options and have
come to the following 2 1/2 points:
- I don't like to have a Qt6 port in a directory that contains qt5.
- I don't like the multipackage pattern a lot. For me qca-qt6 is much
simpler with the same goal.
- lazy rsadowski
Rafael
> Le Thu, Feb 29, 2024 at 09:03:17AM +0100, Rafael Sadowski a écrit :
> > OK to import qca-qt6-2.3.8? It's the same as security/qca-qt5, but with
> > Qt6 enabled and Qt5 disabled. No conflicts with qt5 and qt6.
>
> in that case, wouldnt it be better/simpler to multipackage qca into -qt5
> and -qt6 and only build it once ? no real opinion, rather thinking out
> loud..
>
Thanks for your feedback. I have already evaluate these options and have
come to the following 2 1/2 points:
- I don't like to have a Qt6 port in a directory that contains qt5.
- I don't like the multipackage pattern a lot. For me qca-qt6 is much
simpler with the same goal.
- lazy rsadowski
Rafael
Re: missing endbr64
On Thu, Feb 29, 2024 at 11:01:49AM +0100, Sebastian Reitenbach wrote:
> On Wednesday, February 28, 2024 22:49 CET, Theo Buehler <tb@theobuehler.org> wrote:
>
> > On Wed, Feb 28, 2024 at 10:44:27PM +0100, Sebastian Reitenbach wrote:
> > > Hi,
> > > On Wednesday, February 28, 2024 21:13 CET, Theo Buehler <tb@theobuehler.org> wrote:
> > >
> > > > On Sun, Feb 25, 2024 at 10:13:44PM +0100, Sebastian Reitenbach wrote:
> > > > > On Sunday, February 25, 2024 16:44 CET, Mark Kettenis <mark.kettenis@xs4all.nl> wrote:
> > > > >
>
> Tested your patch, the warnings are gone. A couple of apps tested, seems to work.
> I don't have a machine where it would cause aborts.
>
> Additionally, the typo fix (which I found in upstream already fixed) also prevents the
> Git checkout at configure stage. The revision bump might not be needed, as no packages
> could have been built, but someone might have manually built it?
Yes, this definitely needs a bump.
> OK?
ok tb, but please give kettenis a chance to take a look.
>
> Sebastian
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/gnustep/libobjc2/Makefile,v
> diff -u -r1.34 Makefile
> --- Makefile 28 Feb 2024 19:52:15 -0000 1.34
> +++ Makefile 29 Feb 2024 09:54:53 -0000
> @@ -4,7 +4,7 @@
>
> # note: this port does not use the gnustep module
> VERSION = 2.2
> -REVISION = 0
> +REVISION = 1
> GH_ACCOUNT = gnustep
> GH_PROJECT = libobjc2
> GH_TAGNAME = v${VERSION}
> Index: patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: patches/patch-CMakeLists_txt
> diff -N patches/patch-CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-CMakeLists_txt 29 Feb 2024 09:54:53 -0000
> @@ -0,0 +1,12 @@
> +Index: CMakeLists.txt
> +--- CMakeLists.txt.orig
> ++++ CMakeLists.txt
> +@@ -126,7 +126,7 @@ endif ()
> +
> + find_package(tsl-robin-map)
> +
> +-if (NOT tls-robin-map_FOUND)
> ++if (NOT tsl-robin-map_FOUND)
> + FetchContent_Declare(
> + robinmap
> + GIT_REPOSITORY https://github.com/Tessil/robin-map/
> Index: patches/patch-block_trampolines_S
> ===================================================================
> RCS file: patches/patch-block_trampolines_S
> diff -N patches/patch-block_trampolines_S
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-block_trampolines_S 29 Feb 2024 09:54:53 -0000
> @@ -0,0 +1,19 @@
> +Index: block_trampolines.S
> +--- block_trampolines.S.orig
> ++++ block_trampolines.S
> +@@ -22,6 +22,7 @@
> + // x86-64 trampoline
> + ////////////////////////////////////////////////////////////////////////////////
> + .macro trampoline arg0, arg1
> ++ endbr64
> + mov -0x1007(%rip), \arg1 # Load the block pointer into the second argument
> + xchg \arg1, \arg0 # Swap the first and second arguments
> + jmp *-0x1008(%rip) # Call the block function
> +@@ -121,6 +122,7 @@
> + // AArch64 (ARM64) trampoline
> + ////////////////////////////////////////////////////////////////////////////////
> + .macro trampoline arg0, arg1
> ++ bti c
> + adr x17, #-4096
> + mov \arg1, \arg0
> + ldp \arg0, x17, [x17]
> Index: patches/patch-objc_msgSend_aarch64_S
> ===================================================================
> RCS file: patches/patch-objc_msgSend_aarch64_S
> diff -N patches/patch-objc_msgSend_aarch64_S
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-objc_msgSend_aarch64_S 29 Feb 2024 09:54:53 -0000
> @@ -0,0 +1,12 @@
> +Index: objc_msgSend.aarch64.S
> +--- objc_msgSend.aarch64.S.orig
> ++++ objc_msgSend.aarch64.S
> +@@ -47,7 +47,7 @@
> + # define EH_NOP .seh_nop
> + #else
> + // Marks the real start and end of the function
> +-# define EH_START .cfi_startproc
> ++# define EH_START .cfi_startproc; bti c
> + # define EH_END .cfi_endproc
> +
> + // The following directives are either not
> Index: patches/patch-objc_msgSend_x86-64_S
> ===================================================================
> RCS file: patches/patch-objc_msgSend_x86-64_S
> diff -N patches/patch-objc_msgSend_x86-64_S
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-objc_msgSend_x86-64_S 29 Feb 2024 09:54:53 -0000
> @@ -0,0 +1,12 @@
> +Index: objc_msgSend.x86-64.S
> +--- objc_msgSend.x86-64.S.orig
> ++++ objc_msgSend.x86-64.S
> +@@ -8,7 +8,7 @@
> + # define SECOND_ARGUMENT %rdx
> + # define THIRD_ARGUMENT %r8
> + #else
> +-# define START_PROC(x) .cfi_startproc
> ++# define START_PROC(x) .cfi_startproc; endbr64
> + # define END_PROC(x) .cfi_endproc
> + # define FRAME_OFFSET(x) .cfi_adjust_cfa_offset x
> + # define FIRST_ARGUMENT_STR "%rdi"
>
> On Wednesday, February 28, 2024 22:49 CET, Theo Buehler <tb@theobuehler.org> wrote:
>
> > On Wed, Feb 28, 2024 at 10:44:27PM +0100, Sebastian Reitenbach wrote:
> > > Hi,
> > > On Wednesday, February 28, 2024 21:13 CET, Theo Buehler <tb@theobuehler.org> wrote:
> > >
> > > > On Sun, Feb 25, 2024 at 10:13:44PM +0100, Sebastian Reitenbach wrote:
> > > > > On Sunday, February 25, 2024 16:44 CET, Mark Kettenis <mark.kettenis@xs4all.nl> wrote:
> > > > >
>
> Tested your patch, the warnings are gone. A couple of apps tested, seems to work.
> I don't have a machine where it would cause aborts.
>
> Additionally, the typo fix (which I found in upstream already fixed) also prevents the
> Git checkout at configure stage. The revision bump might not be needed, as no packages
> could have been built, but someone might have manually built it?
Yes, this definitely needs a bump.
> OK?
ok tb, but please give kettenis a chance to take a look.
>
> Sebastian
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/gnustep/libobjc2/Makefile,v
> diff -u -r1.34 Makefile
> --- Makefile 28 Feb 2024 19:52:15 -0000 1.34
> +++ Makefile 29 Feb 2024 09:54:53 -0000
> @@ -4,7 +4,7 @@
>
> # note: this port does not use the gnustep module
> VERSION = 2.2
> -REVISION = 0
> +REVISION = 1
> GH_ACCOUNT = gnustep
> GH_PROJECT = libobjc2
> GH_TAGNAME = v${VERSION}
> Index: patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: patches/patch-CMakeLists_txt
> diff -N patches/patch-CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-CMakeLists_txt 29 Feb 2024 09:54:53 -0000
> @@ -0,0 +1,12 @@
> +Index: CMakeLists.txt
> +--- CMakeLists.txt.orig
> ++++ CMakeLists.txt
> +@@ -126,7 +126,7 @@ endif ()
> +
> + find_package(tsl-robin-map)
> +
> +-if (NOT tls-robin-map_FOUND)
> ++if (NOT tsl-robin-map_FOUND)
> + FetchContent_Declare(
> + robinmap
> + GIT_REPOSITORY https://github.com/Tessil/robin-map/
> Index: patches/patch-block_trampolines_S
> ===================================================================
> RCS file: patches/patch-block_trampolines_S
> diff -N patches/patch-block_trampolines_S
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-block_trampolines_S 29 Feb 2024 09:54:53 -0000
> @@ -0,0 +1,19 @@
> +Index: block_trampolines.S
> +--- block_trampolines.S.orig
> ++++ block_trampolines.S
> +@@ -22,6 +22,7 @@
> + // x86-64 trampoline
> + ////////////////////////////////////////////////////////////////////////////////
> + .macro trampoline arg0, arg1
> ++ endbr64
> + mov -0x1007(%rip), \arg1 # Load the block pointer into the second argument
> + xchg \arg1, \arg0 # Swap the first and second arguments
> + jmp *-0x1008(%rip) # Call the block function
> +@@ -121,6 +122,7 @@
> + // AArch64 (ARM64) trampoline
> + ////////////////////////////////////////////////////////////////////////////////
> + .macro trampoline arg0, arg1
> ++ bti c
> + adr x17, #-4096
> + mov \arg1, \arg0
> + ldp \arg0, x17, [x17]
> Index: patches/patch-objc_msgSend_aarch64_S
> ===================================================================
> RCS file: patches/patch-objc_msgSend_aarch64_S
> diff -N patches/patch-objc_msgSend_aarch64_S
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-objc_msgSend_aarch64_S 29 Feb 2024 09:54:53 -0000
> @@ -0,0 +1,12 @@
> +Index: objc_msgSend.aarch64.S
> +--- objc_msgSend.aarch64.S.orig
> ++++ objc_msgSend.aarch64.S
> +@@ -47,7 +47,7 @@
> + # define EH_NOP .seh_nop
> + #else
> + // Marks the real start and end of the function
> +-# define EH_START .cfi_startproc
> ++# define EH_START .cfi_startproc; bti c
> + # define EH_END .cfi_endproc
> +
> + // The following directives are either not
> Index: patches/patch-objc_msgSend_x86-64_S
> ===================================================================
> RCS file: patches/patch-objc_msgSend_x86-64_S
> diff -N patches/patch-objc_msgSend_x86-64_S
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-objc_msgSend_x86-64_S 29 Feb 2024 09:54:53 -0000
> @@ -0,0 +1,12 @@
> +Index: objc_msgSend.x86-64.S
> +--- objc_msgSend.x86-64.S.orig
> ++++ objc_msgSend.x86-64.S
> +@@ -8,7 +8,7 @@
> + # define SECOND_ARGUMENT %rdx
> + # define THIRD_ARGUMENT %r8
> + #else
> +-# define START_PROC(x) .cfi_startproc
> ++# define START_PROC(x) .cfi_startproc; endbr64
> + # define END_PROC(x) .cfi_endproc
> + # define FRAME_OFFSET(x) .cfi_adjust_cfa_offset x
> + # define FIRST_ARGUMENT_STR "%rdi"
>
Re: missing endbr64
On Wednesday, February 28, 2024 22:49 CET, Theo Buehler <tb@theobuehler.org> wrote:
> On Wed, Feb 28, 2024 at 10:44:27PM +0100, Sebastian Reitenbach wrote:
> > Hi,
> > On Wednesday, February 28, 2024 21:13 CET, Theo Buehler <tb@theobuehler.org> wrote:
> >
> > > On Sun, Feb 25, 2024 at 10:13:44PM +0100, Sebastian Reitenbach wrote:
> > > > On Sunday, February 25, 2024 16:44 CET, Mark Kettenis <mark.kettenis@xs4all.nl> wrote:
> > > >
Tested your patch, the warnings are gone. A couple of apps tested, seems to work.
I don't have a machine where it would cause aborts.
Additionally, the typo fix (which I found in upstream already fixed) also prevents the
Git checkout at configure stage. The revision bump might not be needed, as no packages
could have been built, but someone might have manually built it?
OK?
Sebastian
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/gnustep/libobjc2/Makefile,v
diff -u -r1.34 Makefile
--- Makefile 28 Feb 2024 19:52:15 -0000 1.34
+++ Makefile 29 Feb 2024 09:54:53 -0000
@@ -4,7 +4,7 @@
# note: this port does not use the gnustep module
VERSION = 2.2
-REVISION = 0
+REVISION = 1
GH_ACCOUNT = gnustep
GH_PROJECT = libobjc2
GH_TAGNAME = v${VERSION}
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt 29 Feb 2024 09:54:53 -0000
@@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -126,7 +126,7 @@ endif ()
+
+ find_package(tsl-robin-map)
+
+-if (NOT tls-robin-map_FOUND)
++if (NOT tsl-robin-map_FOUND)
+ FetchContent_Declare(
+ robinmap
+ GIT_REPOSITORY https://github.com/Tessil/robin-map/
Index: patches/patch-block_trampolines_S
===================================================================
RCS file: patches/patch-block_trampolines_S
diff -N patches/patch-block_trampolines_S
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-block_trampolines_S 29 Feb 2024 09:54:53 -0000
@@ -0,0 +1,19 @@
+Index: block_trampolines.S
+--- block_trampolines.S.orig
++++ block_trampolines.S
+@@ -22,6 +22,7 @@
+ // x86-64 trampoline
+ ////////////////////////////////////////////////////////////////////////////////
+ .macro trampoline arg0, arg1
++ endbr64
+ mov -0x1007(%rip), \arg1 # Load the block pointer into the second argument
+ xchg \arg1, \arg0 # Swap the first and second arguments
+ jmp *-0x1008(%rip) # Call the block function
+@@ -121,6 +122,7 @@
+ // AArch64 (ARM64) trampoline
+ ////////////////////////////////////////////////////////////////////////////////
+ .macro trampoline arg0, arg1
++ bti c
+ adr x17, #-4096
+ mov \arg1, \arg0
+ ldp \arg0, x17, [x17]
Index: patches/patch-objc_msgSend_aarch64_S
===================================================================
RCS file: patches/patch-objc_msgSend_aarch64_S
diff -N patches/patch-objc_msgSend_aarch64_S
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-objc_msgSend_aarch64_S 29 Feb 2024 09:54:53 -0000
@@ -0,0 +1,12 @@
+Index: objc_msgSend.aarch64.S
+--- objc_msgSend.aarch64.S.orig
++++ objc_msgSend.aarch64.S
+@@ -47,7 +47,7 @@
+ # define EH_NOP .seh_nop
+ #else
+ // Marks the real start and end of the function
+-# define EH_START .cfi_startproc
++# define EH_START .cfi_startproc; bti c
+ # define EH_END .cfi_endproc
+
+ // The following directives are either not
Index: patches/patch-objc_msgSend_x86-64_S
===================================================================
RCS file: patches/patch-objc_msgSend_x86-64_S
diff -N patches/patch-objc_msgSend_x86-64_S
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-objc_msgSend_x86-64_S 29 Feb 2024 09:54:53 -0000
@@ -0,0 +1,12 @@
+Index: objc_msgSend.x86-64.S
+--- objc_msgSend.x86-64.S.orig
++++ objc_msgSend.x86-64.S
+@@ -8,7 +8,7 @@
+ # define SECOND_ARGUMENT %rdx
+ # define THIRD_ARGUMENT %r8
+ #else
+-# define START_PROC(x) .cfi_startproc
++# define START_PROC(x) .cfi_startproc; endbr64
+ # define END_PROC(x) .cfi_endproc
+ # define FRAME_OFFSET(x) .cfi_adjust_cfa_offset x
+ # define FIRST_ARGUMENT_STR "%rdi"
> On Wed, Feb 28, 2024 at 10:44:27PM +0100, Sebastian Reitenbach wrote:
> > Hi,
> > On Wednesday, February 28, 2024 21:13 CET, Theo Buehler <tb@theobuehler.org> wrote:
> >
> > > On Sun, Feb 25, 2024 at 10:13:44PM +0100, Sebastian Reitenbach wrote:
> > > > On Sunday, February 25, 2024 16:44 CET, Mark Kettenis <mark.kettenis@xs4all.nl> wrote:
> > > >
Tested your patch, the warnings are gone. A couple of apps tested, seems to work.
I don't have a machine where it would cause aborts.
Additionally, the typo fix (which I found in upstream already fixed) also prevents the
Git checkout at configure stage. The revision bump might not be needed, as no packages
could have been built, but someone might have manually built it?
OK?
Sebastian
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/gnustep/libobjc2/Makefile,v
diff -u -r1.34 Makefile
--- Makefile 28 Feb 2024 19:52:15 -0000 1.34
+++ Makefile 29 Feb 2024 09:54:53 -0000
@@ -4,7 +4,7 @@
# note: this port does not use the gnustep module
VERSION = 2.2
-REVISION = 0
+REVISION = 1
GH_ACCOUNT = gnustep
GH_PROJECT = libobjc2
GH_TAGNAME = v${VERSION}
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt 29 Feb 2024 09:54:53 -0000
@@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -126,7 +126,7 @@ endif ()
+
+ find_package(tsl-robin-map)
+
+-if (NOT tls-robin-map_FOUND)
++if (NOT tsl-robin-map_FOUND)
+ FetchContent_Declare(
+ robinmap
+ GIT_REPOSITORY https://github.com/Tessil/robin-map/
Index: patches/patch-block_trampolines_S
===================================================================
RCS file: patches/patch-block_trampolines_S
diff -N patches/patch-block_trampolines_S
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-block_trampolines_S 29 Feb 2024 09:54:53 -0000
@@ -0,0 +1,19 @@
+Index: block_trampolines.S
+--- block_trampolines.S.orig
++++ block_trampolines.S
+@@ -22,6 +22,7 @@
+ // x86-64 trampoline
+ ////////////////////////////////////////////////////////////////////////////////
+ .macro trampoline arg0, arg1
++ endbr64
+ mov -0x1007(%rip), \arg1 # Load the block pointer into the second argument
+ xchg \arg1, \arg0 # Swap the first and second arguments
+ jmp *-0x1008(%rip) # Call the block function
+@@ -121,6 +122,7 @@
+ // AArch64 (ARM64) trampoline
+ ////////////////////////////////////////////////////////////////////////////////
+ .macro trampoline arg0, arg1
++ bti c
+ adr x17, #-4096
+ mov \arg1, \arg0
+ ldp \arg0, x17, [x17]
Index: patches/patch-objc_msgSend_aarch64_S
===================================================================
RCS file: patches/patch-objc_msgSend_aarch64_S
diff -N patches/patch-objc_msgSend_aarch64_S
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-objc_msgSend_aarch64_S 29 Feb 2024 09:54:53 -0000
@@ -0,0 +1,12 @@
+Index: objc_msgSend.aarch64.S
+--- objc_msgSend.aarch64.S.orig
++++ objc_msgSend.aarch64.S
+@@ -47,7 +47,7 @@
+ # define EH_NOP .seh_nop
+ #else
+ // Marks the real start and end of the function
+-# define EH_START .cfi_startproc
++# define EH_START .cfi_startproc; bti c
+ # define EH_END .cfi_endproc
+
+ // The following directives are either not
Index: patches/patch-objc_msgSend_x86-64_S
===================================================================
RCS file: patches/patch-objc_msgSend_x86-64_S
diff -N patches/patch-objc_msgSend_x86-64_S
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-objc_msgSend_x86-64_S 29 Feb 2024 09:54:53 -0000
@@ -0,0 +1,12 @@
+Index: objc_msgSend.x86-64.S
+--- objc_msgSend.x86-64.S.orig
++++ objc_msgSend.x86-64.S
+@@ -8,7 +8,7 @@
+ # define SECOND_ARGUMENT %rdx
+ # define THIRD_ARGUMENT %r8
+ #else
+-# define START_PROC(x) .cfi_startproc
++# define START_PROC(x) .cfi_startproc; endbr64
+ # define END_PROC(x) .cfi_endproc
+ # define FRAME_OFFSET(x) .cfi_adjust_cfa_offset x
+ # define FIRST_ARGUMENT_STR "%rdi"
Re: Enable Qt6 in multimedia/phonon
Le Thu, Feb 29, 2024 at 09:09:57AM +0100, Rafael Sadowski a écrit :
> Here is a diff that enable both qt5 and qt6 in one build and package.
> I don't see any real problems for multimedia/phonon. It only adds
> headers/libs for Qt6. multimedia/phonon-backend/vlc goes hand in hand
> with phonon. Here, too, only one new plugin is added.
>
> -@so lib/qt5/plugins/phonon4qt5_backend/phonon_vlc_qt5.so
> +@so lib/plugins/phonon4qt5_backend/phonon_vlc_qt5.so
are those path changes safe for runtime consumers ?
> -share/kf5/mkspecs/qt_phonon4qt5.pri
> +mkspecs/modules/qt_phonon4qt5.pri
same thing, are those files used during build by ports depending on it ?
> Here is a diff that enable both qt5 and qt6 in one build and package.
> I don't see any real problems for multimedia/phonon. It only adds
> headers/libs for Qt6. multimedia/phonon-backend/vlc goes hand in hand
> with phonon. Here, too, only one new plugin is added.
>
> -@so lib/qt5/plugins/phonon4qt5_backend/phonon_vlc_qt5.so
> +@so lib/plugins/phonon4qt5_backend/phonon_vlc_qt5.so
are those path changes safe for runtime consumers ?
> -share/kf5/mkspecs/qt_phonon4qt5.pri
> +mkspecs/modules/qt_phonon4qt5.pri
same thing, are those files used during build by ports depending on it ?
Re: NEW: security/qca-qt6
Le Thu, Feb 29, 2024 at 09:03:17AM +0100, Rafael Sadowski a écrit :
> OK to import qca-qt6-2.3.8? It's the same as security/qca-qt5, but with
> Qt6 enabled and Qt5 disabled. No conflicts with qt5 and qt6.
in that case, wouldnt it be better/simpler to multipackage qca into -qt5
and -qt6 and only build it once ? no real opinion, rather thinking out
loud..
> OK to import qca-qt6-2.3.8? It's the same as security/qca-qt5, but with
> Qt6 enabled and Qt5 disabled. No conflicts with qt5 and qt6.
in that case, wouldnt it be better/simpler to multipackage qca into -qt5
and -qt6 and only build it once ? no real opinion, rather thinking out
loud..
Enable Qt6 in multimedia/phonon
Here is a diff that enable both qt5 and qt6 in one build and package.
I don't see any real problems for multimedia/phonon. It only adds
headers/libs for Qt6. multimedia/phonon-backend/vlc goes hand in hand
with phonon. Here, too, only one new plugin is added.
OK?
diff --git a/multimedia/phonon-backend/vlc/Makefile b/multimedia/phonon-backend/vlc/Makefile
index f60915aa37e..60a3a33677e 100644
--- a/multimedia/phonon-backend/vlc/Makefile
+++ b/multimedia/phonon-backend/vlc/Makefile
@@ -1,21 +1,22 @@
COMMENT = VLC-based Phonon backend
VERSION = 0.12.0
DISTNAME = phonon-backend-vlc-${VERSION}
+REVISION = 0
SITES = ${SITE_KDE:=stable/phonon/phonon-backend-vlc/${VERSION}/}
EXTRACT_SUFX = .tar.xz
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets m phonon4qt5
-WANTLIB += phonon4qt5experimental vlc vlccore
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Widgets Qt6Core
+WANTLIB += Qt6Gui Qt6Widgets m phonon4qt5 phonon4qt5experimental
+WANTLIB += phonon4qt6 phonon4qt6experimental vlc vlccore
-MODULES = devel/kf5
+MODULES = x11/qt5 x11/qt6 devel/cmake
BUILD_DEPENDS = devel/gettext,-tools
-LIB_DEPENDS = x11/vlc
+LIB_DEPENDS = x11/vlc \
+ multimedia/phonon>=4.12.0p0
NO_TEST = Yes
-CONFIGURE_ARGS = -DPHONON_BUILD_QT6=OFF
-
.include <bsd.port.mk>
diff --git a/multimedia/phonon-backend/vlc/pkg/PLIST b/multimedia/phonon-backend/vlc/pkg/PLIST
index da59ef5fccd..4ac1ce9269f 100644
--- a/multimedia/phonon-backend/vlc/pkg/PLIST
+++ b/multimedia/phonon-backend/vlc/pkg/PLIST
@@ -1,59 +1,171 @@
@conflict phonon-vlc-<=0.10.3
@conflict phonon-qt5-vlc-<0.11
@pkgpath multimedia/phonon-backend/vlc,qt5
-lib/qt5/plugins/phonon4qt5_backend/
-@so lib/qt5/plugins/phonon4qt5_backend/phonon_vlc_qt5.so
+lib/plugins/
+lib/plugins/phonon4qt5_backend/
+@so lib/plugins/phonon4qt5_backend/phonon_vlc_qt5.so
+lib/plugins/phonon4qt6_backend/
+@so lib/plugins/phonon4qt6_backend/phonon_vlc_qt6.so
+share/locale/
+share/locale/az/
+share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/bg/
+share/locale/bg/LC_MESSAGES/
share/locale/bg/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/bs/
+share/locale/bs/LC_MESSAGES/
share/locale/bs/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ca/
+share/locale/ca/LC_MESSAGES/
share/locale/ca/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ca@valencia/
+share/locale/ca@valencia/LC_MESSAGES/
share/locale/ca@valencia/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/cs/
+share/locale/cs/LC_MESSAGES/
share/locale/cs/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/da/
+share/locale/da/LC_MESSAGES/
share/locale/da/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/de/
+share/locale/de/LC_MESSAGES/
share/locale/de/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/el/
+share/locale/el/LC_MESSAGES/
share/locale/el/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/en_GB/
+share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/eo/
+share/locale/eo/LC_MESSAGES/
share/locale/eo/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/es/
+share/locale/es/LC_MESSAGES/
share/locale/es/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/et/
+share/locale/et/LC_MESSAGES/
share/locale/et/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/eu/
+share/locale/eu/LC_MESSAGES/
share/locale/eu/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/fi/
+share/locale/fi/LC_MESSAGES/
share/locale/fi/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/fr/
+share/locale/fr/LC_MESSAGES/
share/locale/fr/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ga/
+share/locale/ga/LC_MESSAGES/
share/locale/ga/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/gl/
+share/locale/gl/LC_MESSAGES/
share/locale/gl/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/hi/
+share/locale/hi/LC_MESSAGES/
share/locale/hi/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/hu/
+share/locale/hu/LC_MESSAGES/
share/locale/hu/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ia/
+share/locale/ia/LC_MESSAGES/
share/locale/ia/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/id/
+share/locale/id/LC_MESSAGES/
share/locale/id/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/is/
+share/locale/is/LC_MESSAGES/
share/locale/is/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/it/
+share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ja/
+share/locale/ja/LC_MESSAGES/
share/locale/ja/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ka/
+share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/kk/
+share/locale/kk/LC_MESSAGES/
share/locale/kk/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ko/
+share/locale/ko/LC_MESSAGES/
share/locale/ko/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/lt/
+share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/mr/
+share/locale/mr/LC_MESSAGES/
share/locale/mr/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/nb/
+share/locale/nb/LC_MESSAGES/
share/locale/nb/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/nds/
+share/locale/nds/LC_MESSAGES/
share/locale/nds/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/nl/
+share/locale/nl/LC_MESSAGES/
share/locale/nl/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/nn/
+share/locale/nn/LC_MESSAGES/
share/locale/nn/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/pa/
+share/locale/pa/LC_MESSAGES/
share/locale/pa/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/pl/
+share/locale/pl/LC_MESSAGES/
share/locale/pl/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/pt/
+share/locale/pt/LC_MESSAGES/
share/locale/pt/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/pt_BR/
+share/locale/pt_BR/LC_MESSAGES/
share/locale/pt_BR/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ro/
+share/locale/ro/LC_MESSAGES/
share/locale/ro/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ru/
+share/locale/ru/LC_MESSAGES/
share/locale/ru/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sk/
+share/locale/sk/LC_MESSAGES/
share/locale/sk/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sl/
+share/locale/sl/LC_MESSAGES/
share/locale/sl/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sr/
+share/locale/sr/LC_MESSAGES/
share/locale/sr/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sr@ijekavian/
+share/locale/sr@ijekavian/LC_MESSAGES/
share/locale/sr@ijekavian/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sr@ijekavianlatin/
+share/locale/sr@ijekavianlatin/LC_MESSAGES/
share/locale/sr@ijekavianlatin/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sr@latin/
+share/locale/sr@latin/LC_MESSAGES/
share/locale/sr@latin/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sv/
+share/locale/sv/LC_MESSAGES/
share/locale/sv/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/tg/
+share/locale/tg/LC_MESSAGES/
share/locale/tg/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/tr/
+share/locale/tr/LC_MESSAGES/
share/locale/tr/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ug/
+share/locale/ug/LC_MESSAGES/
share/locale/ug/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/uk/
+share/locale/uk/LC_MESSAGES/
share/locale/uk/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/vi/
+share/locale/vi/LC_MESSAGES/
share/locale/vi/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/zh_CN/
+share/locale/zh_CN/LC_MESSAGES/
share/locale/zh_CN/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/zh_TW/
+share/locale/zh_TW/LC_MESSAGES/
share/locale/zh_TW/LC_MESSAGES/phonon_vlc_qt.qm
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 24d1057f778..023f9b1c8c3 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -4,11 +4,18 @@ CATEGORIES = multimedia devel
VERSION = 4.12.0
DISTNAME = phonon-${VERSION}
+REVISION = 0
# XXX major should be tweaked on any update, to unbreak
# IMPORTED_LINK_INTERFACE_LIBRARIES CMake feature.
-SHARED_LIBS += phonon4qt5 4.0
-SHARED_LIBS += phonon4qt5experimental 4.0
+SHARED_LIBS += phonon4qt5 4.0
+SHARED_LIBS += phonon4qt5experimental 4.0
+
+SHARED_LIBS += phonon4qt6 0.0 # 0.0
+SHARED_LIBS += phonon4qt6experimental 0.0 # 0.0
+
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Widgets Qt6Core
+WANTLIB += Qt6Core5Compat Qt6Gui Qt6Widgets c m pulse pulse-mainloop-glib
HOMEPAGE = https://community.kde.org/Phonon
@@ -17,25 +24,21 @@ MAINTAINER = Rafael Sadowski <rsadowski@openbsd.org>
# LGPL v2.1
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets c m pulse
-WANTLIB += pulse-mainloop-glib
CXXFLAGS_base-clang = -Wno-error=enum-constexpr-conversion
SITES = ${SITE_KDE:=stable/phonon/${VERSION}/}
+EXTRACT_SUFX = .tar.xz
-MODULES = devel/kf5
-
-LIB_DEPENDS = audio/pulseaudio
-
-BUILD_DEPENDS = x11/qt5/qtdeclarative
+MODULES = x11/qt5 x11/qt6 devel/cmake
-RUN_DEPENDS = x11/qt5/qtdeclarative
+LIB_DEPENDS = audio/pulseaudio \
+ x11/qt6/qt5compat
# Clashes with the one provided by Qt itself.
CONFIGURE_ARGS += -DPHONON_BUILD_DESIGNER_PLUGIN=OFF
+BUILD_DEPENDS = x11/qt5/qtdeclarative \
+ x11/qt6/qtdeclarative
-# Qt5 only port
-CONFIGURE_ARGS += -DPHONON_BUILD_QT6=OFF
.include <bsd.port.mk>
diff --git a/multimedia/phonon/pkg/PLIST b/multimedia/phonon/pkg/PLIST
index cc2ea3f18e9..b4da250c943 100644
--- a/multimedia/phonon/pkg/PLIST
+++ b/multimedia/phonon/pkg/PLIST
@@ -167,6 +167,124 @@ include/phonon4qt5/phonon/videowidgetinterface.h
include/phonon4qt5/phonon/volumefadereffect.h
include/phonon4qt5/phonon/volumefaderinterface.h
include/phonon4qt5/phonon/volumeslider.h
+include/phonon4qt6/
+include/phonon4qt6/phonon/
+include/phonon4qt6/phonon/AbstractAudioOutput
+include/phonon4qt6/phonon/AbstractMediaStream
+include/phonon4qt6/phonon/AbstractVideoOutput
+include/phonon4qt6/phonon/AddonInterface
+include/phonon4qt6/phonon/AudioCaptureDevice
+include/phonon4qt6/phonon/AudioCaptureDeviceModel
+include/phonon4qt6/phonon/AudioChannelDescription
+include/phonon4qt6/phonon/AudioChannelDescriptionModel
+include/phonon4qt6/phonon/AudioDataOutput
+include/phonon4qt6/phonon/AudioOutput
+include/phonon4qt6/phonon/AudioOutputDevice
+include/phonon4qt6/phonon/AudioOutputDeviceModel
+include/phonon4qt6/phonon/AudioOutputInterface
+include/phonon4qt6/phonon/AudioOutputInterface40
+include/phonon4qt6/phonon/AudioOutputInterface42
+include/phonon4qt6/phonon/AvCapture
+include/phonon4qt6/phonon/BackendCapabilities
+include/phonon4qt6/phonon/BackendInterface
+include/phonon4qt6/phonon/Effect
+include/phonon4qt6/phonon/EffectDescription
+include/phonon4qt6/phonon/EffectDescriptionModel
+include/phonon4qt6/phonon/EffectInterface
+include/phonon4qt6/phonon/EffectParameter
+include/phonon4qt6/phonon/EffectWidget
+include/phonon4qt6/phonon/Global
+include/phonon4qt6/phonon/GlobalDescriptionContainer
+include/phonon4qt6/phonon/MediaController
+include/phonon4qt6/phonon/MediaNode
+include/phonon4qt6/phonon/MediaObject
+include/phonon4qt6/phonon/MediaObjectInterface
+include/phonon4qt6/phonon/MediaSource
+include/phonon4qt6/phonon/Mrl
+include/phonon4qt6/phonon/ObjectDescription
+include/phonon4qt6/phonon/ObjectDescriptionData
+include/phonon4qt6/phonon/ObjectDescriptionModel
+include/phonon4qt6/phonon/ObjectDescriptionModelData
+include/phonon4qt6/phonon/Path
+include/phonon4qt6/phonon/PlatformPlugin
+include/phonon4qt6/phonon/SeekSlider
+include/phonon4qt6/phonon/StreamInterface
+include/phonon4qt6/phonon/SubtitleDescription
+include/phonon4qt6/phonon/SubtitleDescriptionModel
+include/phonon4qt6/phonon/VideoCaptureDevice
+include/phonon4qt6/phonon/VideoCaptureDeviceModel
+include/phonon4qt6/phonon/VideoPlayer
+include/phonon4qt6/phonon/VideoWidget
+include/phonon4qt6/phonon/VideoWidgetInterface
+include/phonon4qt6/phonon/VideoWidgetInterface44
+include/phonon4qt6/phonon/VideoWidgetInterfaceLatest
+include/phonon4qt6/phonon/VolumeFaderEffect
+include/phonon4qt6/phonon/VolumeFaderInterface
+include/phonon4qt6/phonon/VolumeSlider
+include/phonon4qt6/phonon/abstractaudiooutput.h
+include/phonon4qt6/phonon/abstractmediastream.h
+include/phonon4qt6/phonon/abstractvideooutput.h
+include/phonon4qt6/phonon/addoninterface.h
+include/phonon4qt6/phonon/audiodataoutput.h
+include/phonon4qt6/phonon/audiodataoutputinterface.h
+include/phonon4qt6/phonon/audiooutput.h
+include/phonon4qt6/phonon/audiooutputinterface.h
+include/phonon4qt6/phonon/backendcapabilities.h
+include/phonon4qt6/phonon/backendinterface.h
+include/phonon4qt6/phonon/effect.h
+include/phonon4qt6/phonon/effectinterface.h
+include/phonon4qt6/phonon/effectparameter.h
+include/phonon4qt6/phonon/effectwidget.h
+include/phonon4qt6/phonon/experimental/
+include/phonon4qt6/phonon/experimental/abstractaudiodataoutput.h
+include/phonon4qt6/phonon/experimental/abstractvideodataoutput.h
+include/phonon4qt6/phonon/experimental/audiodataoutput.h
+include/phonon4qt6/phonon/experimental/audiodataoutputinterface.h
+include/phonon4qt6/phonon/experimental/audioformat.h
+include/phonon4qt6/phonon/experimental/avcapture.h
+include/phonon4qt6/phonon/experimental/avcaptureinterface.h
+include/phonon4qt6/phonon/experimental/backendcapabilities.h
+include/phonon4qt6/phonon/experimental/backendinterface.h
+include/phonon4qt6/phonon/experimental/export.h
+include/phonon4qt6/phonon/experimental/globalconfig.h
+include/phonon4qt6/phonon/experimental/mediasource.h
+include/phonon4qt6/phonon/experimental/objectdescription.h
+include/phonon4qt6/phonon/experimental/packet.h
+include/phonon4qt6/phonon/experimental/packetpool.h
+include/phonon4qt6/phonon/experimental/phononnamespace.h
+include/phonon4qt6/phonon/experimental/snapshotinterface.h
+include/phonon4qt6/phonon/experimental/videodataoutput.h
+include/phonon4qt6/phonon/experimental/videodataoutput2.h
+include/phonon4qt6/phonon/experimental/videodataoutputinterface.h
+include/phonon4qt6/phonon/experimental/videoframe.h
+include/phonon4qt6/phonon/experimental/videoframe2.h
+include/phonon4qt6/phonon/experimental/videowidget.h
+include/phonon4qt6/phonon/experimental/visualization.h
+include/phonon4qt6/phonon/globalconfig.h
+include/phonon4qt6/phonon/globaldescriptioncontainer.h
+include/phonon4qt6/phonon/mediacontroller.h
+include/phonon4qt6/phonon/medianode.h
+include/phonon4qt6/phonon/mediaobject.h
+include/phonon4qt6/phonon/mediaobjectinterface.h
+include/phonon4qt6/phonon/mediasource.h
+include/phonon4qt6/phonon/mrl.h
+include/phonon4qt6/phonon/objectdescription.h
+include/phonon4qt6/phonon/objectdescriptionmodel.h
+include/phonon4qt6/phonon/path.h
+include/phonon4qt6/phonon/phonon_export.h
+include/phonon4qt6/phonon/phonon_version.h
+include/phonon4qt6/phonon/phonondefs.h
+include/phonon4qt6/phonon/phononnamespace.h
+include/phonon4qt6/phonon/platformplugin.h
+include/phonon4qt6/phonon/pulsesupport.h
+include/phonon4qt6/phonon/seekslider.h
+include/phonon4qt6/phonon/streaminterface.h
+include/phonon4qt6/phonon/videoplayer.h
+include/phonon4qt6/phonon/videowidget.h
+include/phonon4qt6/phonon/videowidgetinterface.h
+include/phonon4qt6/phonon/volumefadereffect.h
+include/phonon4qt6/phonon/volumefaderinterface.h
+include/phonon4qt6/phonon/volumeslider.h
lib/cmake/phonon4qt5/
lib/cmake/phonon4qt5/Phonon4Qt5Config.cmake
lib/cmake/phonon4qt5/Phonon4Qt5ConfigVersion.cmake
@@ -176,12 +294,24 @@ lib/cmake/phonon4qt5/PhononExperimentalTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/phonon4qt5/PhononExperimentalTargets.cmake
lib/cmake/phonon4qt5/PhononTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/phonon4qt5/PhononTargets.cmake
+lib/cmake/phonon4qt6/
+lib/cmake/phonon4qt6/Phonon4Qt6Config.cmake
+lib/cmake/phonon4qt6/Phonon4Qt6ConfigVersion.cmake
+lib/cmake/phonon4qt6/Phonon4Qt6ExperimentalConfig.cmake
+lib/cmake/phonon4qt6/Phonon4Qt6ExperimentalConfigVersion.cmake
+lib/cmake/phonon4qt6/PhononExperimentalTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/phonon4qt6/PhononExperimentalTargets.cmake
+lib/cmake/phonon4qt6/PhononTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/phonon4qt6/PhononTargets.cmake
@lib lib/libphonon4qt5.so.${LIBphonon4qt5_VERSION}
@lib lib/libphonon4qt5experimental.so.${LIBphonon4qt5experimental_VERSION}
+@lib lib/libphonon4qt6.so.${LIBphonon4qt6_VERSION}
+@lib lib/libphonon4qt6experimental.so.${LIBphonon4qt6experimental_VERSION}
lib/pkgconfig/phonon4qt5.pc
-share/kf5/
-share/kf5/mkspecs/
-share/kf5/mkspecs/qt_phonon4qt5.pri
+lib/pkgconfig/phonon4qt6.pc
+mkspecs/
+mkspecs/modules/
+mkspecs/modules/qt_phonon4qt5.pri
share/locale/ar/LC_MESSAGES/libphonon_qt.qm
share/locale/ar/LC_MESSAGES/phononsettings_qt.qm
share/locale/az/LC_MESSAGES/libphonon_qt.qm
@@ -225,6 +355,8 @@ share/locale/fi/LC_MESSAGES/libphonon_qt.qm
share/locale/fi/LC_MESSAGES/phononsettings_qt.qm
share/locale/fr/LC_MESSAGES/libphonon_qt.qm
share/locale/fr/LC_MESSAGES/phononsettings_qt.qm
+share/locale/fy/
+share/locale/fy/LC_MESSAGES/
share/locale/fy/LC_MESSAGES/phononsettings_qt.qm
share/locale/ga/LC_MESSAGES/libphonon_qt.qm
share/locale/ga/LC_MESSAGES/phononsettings_qt.qm
I don't see any real problems for multimedia/phonon. It only adds
headers/libs for Qt6. multimedia/phonon-backend/vlc goes hand in hand
with phonon. Here, too, only one new plugin is added.
OK?
diff --git a/multimedia/phonon-backend/vlc/Makefile b/multimedia/phonon-backend/vlc/Makefile
index f60915aa37e..60a3a33677e 100644
--- a/multimedia/phonon-backend/vlc/Makefile
+++ b/multimedia/phonon-backend/vlc/Makefile
@@ -1,21 +1,22 @@
COMMENT = VLC-based Phonon backend
VERSION = 0.12.0
DISTNAME = phonon-backend-vlc-${VERSION}
+REVISION = 0
SITES = ${SITE_KDE:=stable/phonon/phonon-backend-vlc/${VERSION}/}
EXTRACT_SUFX = .tar.xz
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets m phonon4qt5
-WANTLIB += phonon4qt5experimental vlc vlccore
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Widgets Qt6Core
+WANTLIB += Qt6Gui Qt6Widgets m phonon4qt5 phonon4qt5experimental
+WANTLIB += phonon4qt6 phonon4qt6experimental vlc vlccore
-MODULES = devel/kf5
+MODULES = x11/qt5 x11/qt6 devel/cmake
BUILD_DEPENDS = devel/gettext,-tools
-LIB_DEPENDS = x11/vlc
+LIB_DEPENDS = x11/vlc \
+ multimedia/phonon>=4.12.0p0
NO_TEST = Yes
-CONFIGURE_ARGS = -DPHONON_BUILD_QT6=OFF
-
.include <bsd.port.mk>
diff --git a/multimedia/phonon-backend/vlc/pkg/PLIST b/multimedia/phonon-backend/vlc/pkg/PLIST
index da59ef5fccd..4ac1ce9269f 100644
--- a/multimedia/phonon-backend/vlc/pkg/PLIST
+++ b/multimedia/phonon-backend/vlc/pkg/PLIST
@@ -1,59 +1,171 @@
@conflict phonon-vlc-<=0.10.3
@conflict phonon-qt5-vlc-<0.11
@pkgpath multimedia/phonon-backend/vlc,qt5
-lib/qt5/plugins/phonon4qt5_backend/
-@so lib/qt5/plugins/phonon4qt5_backend/phonon_vlc_qt5.so
+lib/plugins/
+lib/plugins/phonon4qt5_backend/
+@so lib/plugins/phonon4qt5_backend/phonon_vlc_qt5.so
+lib/plugins/phonon4qt6_backend/
+@so lib/plugins/phonon4qt6_backend/phonon_vlc_qt6.so
+share/locale/
+share/locale/az/
+share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/bg/
+share/locale/bg/LC_MESSAGES/
share/locale/bg/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/bs/
+share/locale/bs/LC_MESSAGES/
share/locale/bs/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ca/
+share/locale/ca/LC_MESSAGES/
share/locale/ca/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ca@valencia/
+share/locale/ca@valencia/LC_MESSAGES/
share/locale/ca@valencia/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/cs/
+share/locale/cs/LC_MESSAGES/
share/locale/cs/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/da/
+share/locale/da/LC_MESSAGES/
share/locale/da/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/de/
+share/locale/de/LC_MESSAGES/
share/locale/de/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/el/
+share/locale/el/LC_MESSAGES/
share/locale/el/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/en_GB/
+share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/eo/
+share/locale/eo/LC_MESSAGES/
share/locale/eo/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/es/
+share/locale/es/LC_MESSAGES/
share/locale/es/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/et/
+share/locale/et/LC_MESSAGES/
share/locale/et/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/eu/
+share/locale/eu/LC_MESSAGES/
share/locale/eu/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/fi/
+share/locale/fi/LC_MESSAGES/
share/locale/fi/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/fr/
+share/locale/fr/LC_MESSAGES/
share/locale/fr/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ga/
+share/locale/ga/LC_MESSAGES/
share/locale/ga/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/gl/
+share/locale/gl/LC_MESSAGES/
share/locale/gl/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/hi/
+share/locale/hi/LC_MESSAGES/
share/locale/hi/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/hu/
+share/locale/hu/LC_MESSAGES/
share/locale/hu/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ia/
+share/locale/ia/LC_MESSAGES/
share/locale/ia/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/id/
+share/locale/id/LC_MESSAGES/
share/locale/id/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/is/
+share/locale/is/LC_MESSAGES/
share/locale/is/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/it/
+share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ja/
+share/locale/ja/LC_MESSAGES/
share/locale/ja/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ka/
+share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/kk/
+share/locale/kk/LC_MESSAGES/
share/locale/kk/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ko/
+share/locale/ko/LC_MESSAGES/
share/locale/ko/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/lt/
+share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/mr/
+share/locale/mr/LC_MESSAGES/
share/locale/mr/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/nb/
+share/locale/nb/LC_MESSAGES/
share/locale/nb/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/nds/
+share/locale/nds/LC_MESSAGES/
share/locale/nds/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/nl/
+share/locale/nl/LC_MESSAGES/
share/locale/nl/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/nn/
+share/locale/nn/LC_MESSAGES/
share/locale/nn/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/pa/
+share/locale/pa/LC_MESSAGES/
share/locale/pa/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/pl/
+share/locale/pl/LC_MESSAGES/
share/locale/pl/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/pt/
+share/locale/pt/LC_MESSAGES/
share/locale/pt/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/pt_BR/
+share/locale/pt_BR/LC_MESSAGES/
share/locale/pt_BR/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ro/
+share/locale/ro/LC_MESSAGES/
share/locale/ro/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ru/
+share/locale/ru/LC_MESSAGES/
share/locale/ru/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sk/
+share/locale/sk/LC_MESSAGES/
share/locale/sk/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sl/
+share/locale/sl/LC_MESSAGES/
share/locale/sl/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sr/
+share/locale/sr/LC_MESSAGES/
share/locale/sr/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sr@ijekavian/
+share/locale/sr@ijekavian/LC_MESSAGES/
share/locale/sr@ijekavian/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sr@ijekavianlatin/
+share/locale/sr@ijekavianlatin/LC_MESSAGES/
share/locale/sr@ijekavianlatin/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sr@latin/
+share/locale/sr@latin/LC_MESSAGES/
share/locale/sr@latin/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sv/
+share/locale/sv/LC_MESSAGES/
share/locale/sv/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/tg/
+share/locale/tg/LC_MESSAGES/
share/locale/tg/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/tr/
+share/locale/tr/LC_MESSAGES/
share/locale/tr/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ug/
+share/locale/ug/LC_MESSAGES/
share/locale/ug/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/uk/
+share/locale/uk/LC_MESSAGES/
share/locale/uk/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/vi/
+share/locale/vi/LC_MESSAGES/
share/locale/vi/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/zh_CN/
+share/locale/zh_CN/LC_MESSAGES/
share/locale/zh_CN/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/zh_TW/
+share/locale/zh_TW/LC_MESSAGES/
share/locale/zh_TW/LC_MESSAGES/phonon_vlc_qt.qm
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 24d1057f778..023f9b1c8c3 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -4,11 +4,18 @@ CATEGORIES = multimedia devel
VERSION = 4.12.0
DISTNAME = phonon-${VERSION}
+REVISION = 0
# XXX major should be tweaked on any update, to unbreak
# IMPORTED_LINK_INTERFACE_LIBRARIES CMake feature.
-SHARED_LIBS += phonon4qt5 4.0
-SHARED_LIBS += phonon4qt5experimental 4.0
+SHARED_LIBS += phonon4qt5 4.0
+SHARED_LIBS += phonon4qt5experimental 4.0
+
+SHARED_LIBS += phonon4qt6 0.0 # 0.0
+SHARED_LIBS += phonon4qt6experimental 0.0 # 0.0
+
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Widgets Qt6Core
+WANTLIB += Qt6Core5Compat Qt6Gui Qt6Widgets c m pulse pulse-mainloop-glib
HOMEPAGE = https://community.kde.org/Phonon
@@ -17,25 +24,21 @@ MAINTAINER = Rafael Sadowski <rsadowski@openbsd.org>
# LGPL v2.1
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets c m pulse
-WANTLIB += pulse-mainloop-glib
CXXFLAGS_base-clang = -Wno-error=enum-constexpr-conversion
SITES = ${SITE_KDE:=stable/phonon/${VERSION}/}
+EXTRACT_SUFX = .tar.xz
-MODULES = devel/kf5
-
-LIB_DEPENDS = audio/pulseaudio
-
-BUILD_DEPENDS = x11/qt5/qtdeclarative
+MODULES = x11/qt5 x11/qt6 devel/cmake
-RUN_DEPENDS = x11/qt5/qtdeclarative
+LIB_DEPENDS = audio/pulseaudio \
+ x11/qt6/qt5compat
# Clashes with the one provided by Qt itself.
CONFIGURE_ARGS += -DPHONON_BUILD_DESIGNER_PLUGIN=OFF
+BUILD_DEPENDS = x11/qt5/qtdeclarative \
+ x11/qt6/qtdeclarative
-# Qt5 only port
-CONFIGURE_ARGS += -DPHONON_BUILD_QT6=OFF
.include <bsd.port.mk>
diff --git a/multimedia/phonon/pkg/PLIST b/multimedia/phonon/pkg/PLIST
index cc2ea3f18e9..b4da250c943 100644
--- a/multimedia/phonon/pkg/PLIST
+++ b/multimedia/phonon/pkg/PLIST
@@ -167,6 +167,124 @@ include/phonon4qt5/phonon/videowidgetinterface.h
include/phonon4qt5/phonon/volumefadereffect.h
include/phonon4qt5/phonon/volumefaderinterface.h
include/phonon4qt5/phonon/volumeslider.h
+include/phonon4qt6/
+include/phonon4qt6/phonon/
+include/phonon4qt6/phonon/AbstractAudioOutput
+include/phonon4qt6/phonon/AbstractMediaStream
+include/phonon4qt6/phonon/AbstractVideoOutput
+include/phonon4qt6/phonon/AddonInterface
+include/phonon4qt6/phonon/AudioCaptureDevice
+include/phonon4qt6/phonon/AudioCaptureDeviceModel
+include/phonon4qt6/phonon/AudioChannelDescription
+include/phonon4qt6/phonon/AudioChannelDescriptionModel
+include/phonon4qt6/phonon/AudioDataOutput
+include/phonon4qt6/phonon/AudioOutput
+include/phonon4qt6/phonon/AudioOutputDevice
+include/phonon4qt6/phonon/AudioOutputDeviceModel
+include/phonon4qt6/phonon/AudioOutputInterface
+include/phonon4qt6/phonon/AudioOutputInterface40
+include/phonon4qt6/phonon/AudioOutputInterface42
+include/phonon4qt6/phonon/AvCapture
+include/phonon4qt6/phonon/BackendCapabilities
+include/phonon4qt6/phonon/BackendInterface
+include/phonon4qt6/phonon/Effect
+include/phonon4qt6/phonon/EffectDescription
+include/phonon4qt6/phonon/EffectDescriptionModel
+include/phonon4qt6/phonon/EffectInterface
+include/phonon4qt6/phonon/EffectParameter
+include/phonon4qt6/phonon/EffectWidget
+include/phonon4qt6/phonon/Global
+include/phonon4qt6/phonon/GlobalDescriptionContainer
+include/phonon4qt6/phonon/MediaController
+include/phonon4qt6/phonon/MediaNode
+include/phonon4qt6/phonon/MediaObject
+include/phonon4qt6/phonon/MediaObjectInterface
+include/phonon4qt6/phonon/MediaSource
+include/phonon4qt6/phonon/Mrl
+include/phonon4qt6/phonon/ObjectDescription
+include/phonon4qt6/phonon/ObjectDescriptionData
+include/phonon4qt6/phonon/ObjectDescriptionModel
+include/phonon4qt6/phonon/ObjectDescriptionModelData
+include/phonon4qt6/phonon/Path
+include/phonon4qt6/phonon/PlatformPlugin
+include/phonon4qt6/phonon/SeekSlider
+include/phonon4qt6/phonon/StreamInterface
+include/phonon4qt6/phonon/SubtitleDescription
+include/phonon4qt6/phonon/SubtitleDescriptionModel
+include/phonon4qt6/phonon/VideoCaptureDevice
+include/phonon4qt6/phonon/VideoCaptureDeviceModel
+include/phonon4qt6/phonon/VideoPlayer
+include/phonon4qt6/phonon/VideoWidget
+include/phonon4qt6/phonon/VideoWidgetInterface
+include/phonon4qt6/phonon/VideoWidgetInterface44
+include/phonon4qt6/phonon/VideoWidgetInterfaceLatest
+include/phonon4qt6/phonon/VolumeFaderEffect
+include/phonon4qt6/phonon/VolumeFaderInterface
+include/phonon4qt6/phonon/VolumeSlider
+include/phonon4qt6/phonon/abstractaudiooutput.h
+include/phonon4qt6/phonon/abstractmediastream.h
+include/phonon4qt6/phonon/abstractvideooutput.h
+include/phonon4qt6/phonon/addoninterface.h
+include/phonon4qt6/phonon/audiodataoutput.h
+include/phonon4qt6/phonon/audiodataoutputinterface.h
+include/phonon4qt6/phonon/audiooutput.h
+include/phonon4qt6/phonon/audiooutputinterface.h
+include/phonon4qt6/phonon/backendcapabilities.h
+include/phonon4qt6/phonon/backendinterface.h
+include/phonon4qt6/phonon/effect.h
+include/phonon4qt6/phonon/effectinterface.h
+include/phonon4qt6/phonon/effectparameter.h
+include/phonon4qt6/phonon/effectwidget.h
+include/phonon4qt6/phonon/experimental/
+include/phonon4qt6/phonon/experimental/abstractaudiodataoutput.h
+include/phonon4qt6/phonon/experimental/abstractvideodataoutput.h
+include/phonon4qt6/phonon/experimental/audiodataoutput.h
+include/phonon4qt6/phonon/experimental/audiodataoutputinterface.h
+include/phonon4qt6/phonon/experimental/audioformat.h
+include/phonon4qt6/phonon/experimental/avcapture.h
+include/phonon4qt6/phonon/experimental/avcaptureinterface.h
+include/phonon4qt6/phonon/experimental/backendcapabilities.h
+include/phonon4qt6/phonon/experimental/backendinterface.h
+include/phonon4qt6/phonon/experimental/export.h
+include/phonon4qt6/phonon/experimental/globalconfig.h
+include/phonon4qt6/phonon/experimental/mediasource.h
+include/phonon4qt6/phonon/experimental/objectdescription.h
+include/phonon4qt6/phonon/experimental/packet.h
+include/phonon4qt6/phonon/experimental/packetpool.h
+include/phonon4qt6/phonon/experimental/phononnamespace.h
+include/phonon4qt6/phonon/experimental/snapshotinterface.h
+include/phonon4qt6/phonon/experimental/videodataoutput.h
+include/phonon4qt6/phonon/experimental/videodataoutput2.h
+include/phonon4qt6/phonon/experimental/videodataoutputinterface.h
+include/phonon4qt6/phonon/experimental/videoframe.h
+include/phonon4qt6/phonon/experimental/videoframe2.h
+include/phonon4qt6/phonon/experimental/videowidget.h
+include/phonon4qt6/phonon/experimental/visualization.h
+include/phonon4qt6/phonon/globalconfig.h
+include/phonon4qt6/phonon/globaldescriptioncontainer.h
+include/phonon4qt6/phonon/mediacontroller.h
+include/phonon4qt6/phonon/medianode.h
+include/phonon4qt6/phonon/mediaobject.h
+include/phonon4qt6/phonon/mediaobjectinterface.h
+include/phonon4qt6/phonon/mediasource.h
+include/phonon4qt6/phonon/mrl.h
+include/phonon4qt6/phonon/objectdescription.h
+include/phonon4qt6/phonon/objectdescriptionmodel.h
+include/phonon4qt6/phonon/path.h
+include/phonon4qt6/phonon/phonon_export.h
+include/phonon4qt6/phonon/phonon_version.h
+include/phonon4qt6/phonon/phonondefs.h
+include/phonon4qt6/phonon/phononnamespace.h
+include/phonon4qt6/phonon/platformplugin.h
+include/phonon4qt6/phonon/pulsesupport.h
+include/phonon4qt6/phonon/seekslider.h
+include/phonon4qt6/phonon/streaminterface.h
+include/phonon4qt6/phonon/videoplayer.h
+include/phonon4qt6/phonon/videowidget.h
+include/phonon4qt6/phonon/videowidgetinterface.h
+include/phonon4qt6/phonon/volumefadereffect.h
+include/phonon4qt6/phonon/volumefaderinterface.h
+include/phonon4qt6/phonon/volumeslider.h
lib/cmake/phonon4qt5/
lib/cmake/phonon4qt5/Phonon4Qt5Config.cmake
lib/cmake/phonon4qt5/Phonon4Qt5ConfigVersion.cmake
@@ -176,12 +294,24 @@ lib/cmake/phonon4qt5/PhononExperimentalTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/phonon4qt5/PhononExperimentalTargets.cmake
lib/cmake/phonon4qt5/PhononTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/phonon4qt5/PhononTargets.cmake
+lib/cmake/phonon4qt6/
+lib/cmake/phonon4qt6/Phonon4Qt6Config.cmake
+lib/cmake/phonon4qt6/Phonon4Qt6ConfigVersion.cmake
+lib/cmake/phonon4qt6/Phonon4Qt6ExperimentalConfig.cmake
+lib/cmake/phonon4qt6/Phonon4Qt6ExperimentalConfigVersion.cmake
+lib/cmake/phonon4qt6/PhononExperimentalTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/phonon4qt6/PhononExperimentalTargets.cmake
+lib/cmake/phonon4qt6/PhononTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/phonon4qt6/PhononTargets.cmake
@lib lib/libphonon4qt5.so.${LIBphonon4qt5_VERSION}
@lib lib/libphonon4qt5experimental.so.${LIBphonon4qt5experimental_VERSION}
+@lib lib/libphonon4qt6.so.${LIBphonon4qt6_VERSION}
+@lib lib/libphonon4qt6experimental.so.${LIBphonon4qt6experimental_VERSION}
lib/pkgconfig/phonon4qt5.pc
-share/kf5/
-share/kf5/mkspecs/
-share/kf5/mkspecs/qt_phonon4qt5.pri
+lib/pkgconfig/phonon4qt6.pc
+mkspecs/
+mkspecs/modules/
+mkspecs/modules/qt_phonon4qt5.pri
share/locale/ar/LC_MESSAGES/libphonon_qt.qm
share/locale/ar/LC_MESSAGES/phononsettings_qt.qm
share/locale/az/LC_MESSAGES/libphonon_qt.qm
@@ -225,6 +355,8 @@ share/locale/fi/LC_MESSAGES/libphonon_qt.qm
share/locale/fi/LC_MESSAGES/phononsettings_qt.qm
share/locale/fr/LC_MESSAGES/libphonon_qt.qm
share/locale/fr/LC_MESSAGES/phononsettings_qt.qm
+share/locale/fy/
+share/locale/fy/LC_MESSAGES/
share/locale/fy/LC_MESSAGES/phononsettings_qt.qm
share/locale/ga/LC_MESSAGES/libphonon_qt.qm
share/locale/ga/LC_MESSAGES/phononsettings_qt.qm
NEW: security/qca-qt6
OK to import qca-qt6-2.3.8? It's the same as security/qca-qt5, but with
Qt6 enabled and Qt5 disabled. No conflicts with qt5 and qt6.
Comment:
Qt Cryptographic Architecture
Description:
QCA aims to provide a straightforward and cross-platform crypto API, using Qt
datatypes and conventions. QCA separates the API from the implementation,
using plugins known as Providers.
Maintainer: Rafael Sadowski <rsadowski@openbsd.org>
WWW: https://userbase.kde.org/QCA
Qt6 enabled and Qt5 disabled. No conflicts with qt5 and qt6.
Comment:
Qt Cryptographic Architecture
Description:
QCA aims to provide a straightforward and cross-platform crypto API, using Qt
datatypes and conventions. QCA separates the API from the implementation,
using plugins known as Providers.
Maintainer: Rafael Sadowski <rsadowski@openbsd.org>
WWW: https://userbase.kde.org/QCA
Wednesday, February 28, 2024
NEW: x11/qt6/qtlocation
OK to import qt6-qtlocation-6.6.1?
Comment:
Geo positioning APIs
Required by:
debug-qt6-qtlocation-6.6.1
Description:
QtPositioning provides positioning information via QML and C++ interfaces.
QtLocation Provides C++ interfaces to retrieve location and navigational
information.
The C++ API provides access to geocoding and navigation information, and also
place search. Use the Maps and Navigation QML API to render this information on
an interactive map that supports touch gestures, overlays, and so on.
Maintainer: Rafael Sadowski <rsadowski@openbsd.org>
WWW: https://www.qt.io/
Comment:
Geo positioning APIs
Required by:
debug-qt6-qtlocation-6.6.1
Description:
QtPositioning provides positioning information via QML and C++ interfaces.
QtLocation Provides C++ interfaces to retrieve location and navigational
information.
The C++ API provides access to geocoding and navigation information, and also
place search. Use the Maps and Navigation QML API to render this information on
an interactive map that supports touch gestures, overlays, and so on.
Maintainer: Rafael Sadowski <rsadowski@openbsd.org>
WWW: https://www.qt.io/
UPDATE: jasper 4.2.1
Here is an update to jasper 4.2.1.
4.2.1 (2024-02-18)
==================
* Fix a build problem for the DJGPP/MS-DOS environment (#372).
4.2.0 (2024-02-05)
==================
* Add the JAS_PACKAGING option to the CMake build in an attempt to allow
easier control over rpath settings by packagers of JasPer.
* Remove a number of obsolete scripts.
* Make some cosmetic changes to the code for the JPC codec in order
to improve readability (#371).
* Fix a portability bug related to threads/atomics.
* Replace some lingering uses of strtok in the JPC coder with jas_strtok,
since the use of strtok is problematic in multithreading contexts.
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/jasper/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- Makefile 19 Jan 2024 07:55:00 -0000 1.34
+++ Makefile 29 Feb 2024 06:03:39 -0000
@@ -1,6 +1,6 @@
COMMENT = reference implementation of JPEG-2000
-V = 4.1.2
+V = 4.2.1
DISTNAME = jasper-$V
SHARED_LIBS = jasper 6.1
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/jasper/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo 19 Jan 2024 07:55:00 -0000 1.13
+++ distinfo 29 Feb 2024 06:03:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (jasper-4.1.2.tar.gz) = IjkuQ5uHx5qvhonseaKGpxR+gRxL7jTt89CyOXmNZys=
-SIZE (jasper-4.1.2.tar.gz) = 2104141
+SHA256 (jasper-4.2.1.tar.gz) = LR4h8bNGcJvBdhVhc8bXej5VQzRnZAhdvecyIVEgt5Y=
+SIZE (jasper-4.2.1.tar.gz) = 2123323
4.2.1 (2024-02-18)
==================
* Fix a build problem for the DJGPP/MS-DOS environment (#372).
4.2.0 (2024-02-05)
==================
* Add the JAS_PACKAGING option to the CMake build in an attempt to allow
easier control over rpath settings by packagers of JasPer.
* Remove a number of obsolete scripts.
* Make some cosmetic changes to the code for the JPC codec in order
to improve readability (#371).
* Fix a portability bug related to threads/atomics.
* Replace some lingering uses of strtok in the JPC coder with jas_strtok,
since the use of strtok is problematic in multithreading contexts.
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/jasper/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- Makefile 19 Jan 2024 07:55:00 -0000 1.34
+++ Makefile 29 Feb 2024 06:03:39 -0000
@@ -1,6 +1,6 @@
COMMENT = reference implementation of JPEG-2000
-V = 4.1.2
+V = 4.2.1
DISTNAME = jasper-$V
SHARED_LIBS = jasper 6.1
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/jasper/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo 19 Jan 2024 07:55:00 -0000 1.13
+++ distinfo 29 Feb 2024 06:03:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (jasper-4.1.2.tar.gz) = IjkuQ5uHx5qvhonseaKGpxR+gRxL7jTt89CyOXmNZys=
-SIZE (jasper-4.1.2.tar.gz) = 2104141
+SHA256 (jasper-4.2.1.tar.gz) = LR4h8bNGcJvBdhVhc8bXej5VQzRnZAhdvecyIVEgt5Y=
+SIZE (jasper-4.2.1.tar.gz) = 2123323
ipython 8.19.0 -> 8.22.1
See below for an update to latest ipython.
The BDEP on py-mako doens't make much sense to me. If removing it causes
failures again, I'll be happy to investigate any stack trace log that's
provided to me.
ok's welcome, otherwise I'll plan to commit this update in a few days.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/ipython/Makefile,v
diff -u -p -u -r1.82 Makefile
--- Makefile 27 Dec 2023 07:22:52 -0000 1.82
+++ Makefile 29 Feb 2024 05:42:07 -0000
@@ -1,6 +1,6 @@
COMMENT = enhanced interactive Python shell
-MODPY_EGG_VERSION = 8.19.0
+MODPY_EGG_VERSION = 8.22.1
DISTNAME = ipython-${MODPY_EGG_VERSION}
PKGNAME = ipython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
@@ -14,13 +14,12 @@ MAINTAINER = Daniel Dickman <daniel@ope
PERMIT_PACKAGE = Yes
MODULES = lang/python
-MODPY_PYBUILD = setuptools
-MODPY_PI = Yes
-#MODPY_PYTEST_ARGS = IPython
-# Optional dependency which gets picked up if it happens to be installed, thus
-# causing race conditions under dpb. Pull it in to avoid this possibility.
-BUILD_DEPENDS = www/py-mako${MODPY_FLAVOR}
+FLAVORS = python3
+FLAVOR = python3
+
+MODPY_PI = Yes
+MODPY_PYBUILD = setuptools
# XXX: pickleshare is optional as of 8.17, but keep as RDEP for now.
# If pickleshare is ever removed as an RDEP, it needs to become a TDEP
@@ -32,20 +31,20 @@ RUN_DEPENDS = databases/py-pickleshare$
devel/py-pexpect${MODPY_FLAVOR}>=4.3 \
devel/py-prompt_toolkit${MODPY_FLAVOR}>=3.0.41v1,<3.1.0v1 \
devel/py-stack_data${MODPY_FLAVOR} \
- devel/py-traitlets${MODPY_FLAVOR}>=5 \
+ devel/py-traitlets${MODPY_FLAVOR}>=5.13.0 \
graphics/py-matplotlib-inline${MODPY_FLAVOR} \
textproc/py-pygments${MODPY_FLAVOR}>=2.4.0
# Note that if you have pdb++ installed, tests will fail.
TEST_DEPENDS = devel/py-ipykernel${MODPY_FLAVOR} \
+ devel/py-curio${MODPY_FLAVOR} \
devel/py-nbformat${MODPY_FLAVOR} \
devel/py-testpath${MODPY_FLAVOR} \
+ devel/py-test-asyncio${MODPY_FLAVOR}<0.22 \
+ devel/py-trio${MODPY_FLAVOR} \
+ graphics/py-matplotlib${MODPY_FLAVOR} \
math/py-numpy${MODPY_FLAVOR}>=1.23 \
- textproc/py-pygments${MODPY_FLAVOR} \
- www/py-requests${MODPY_FLAVOR}
-
-FLAVORS = python3
-FLAVOR = python3
+ math/py-pandas${MODPY_FLAVOR}
PORTHOME = ${WRKDIR}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/ipython/distinfo,v
diff -u -p -u -r1.41 distinfo
--- distinfo 27 Dec 2023 07:22:52 -0000 1.41
+++ distinfo 29 Feb 2024 05:42:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (ipython-8.19.0.tar.gz) = rE2k7PAEL7TgzlfGBDDC2zxxn6i9+S+GMda9ileF0fA=
-SIZE (ipython-8.19.0.tar.gz) = 5487746
+SHA256 (ipython-8.22.1.tar.gz) = Ocb578B5+xm/sPF+7pA5eP6aKQsbgtaBlsZBzst26iI=
+SIZE (ipython-8.22.1.tar.gz) = 5490428
Index: patches/patch-IPython_core_tests_test_interactiveshell_py
===================================================================
RCS file: /cvs/ports/devel/ipython/patches/patch-IPython_core_tests_test_interactiveshell_py,v
diff -u -p -u -r1.11 patch-IPython_core_tests_test_interactiveshell_py
--- patches/patch-IPython_core_tests_test_interactiveshell_py 14 Sep 2023 02:20:56 -0000 1.11
+++ patches/patch-IPython_core_tests_test_interactiveshell_py 29 Feb 2024 05:42:07 -0000
@@ -1,7 +1,7 @@
Index: IPython/core/tests/test_interactiveshell.py
--- IPython/core/tests/test_interactiveshell.py.orig
+++ IPython/core/tests/test_interactiveshell.py
-@@ -646,7 +646,7 @@ class TestSystemRaw(ExitCodeChecks):
+@@ -650,7 +650,7 @@ class TestSystemRaw(ExitCodeChecks):
def test_1(self):
"""Test system_raw with non-ascii cmd
"""
Index: patches/patch-setupbase_py
===================================================================
RCS file: /cvs/ports/devel/ipython/patches/patch-setupbase_py,v
diff -u -p -u -r1.10 patch-setupbase_py
--- patches/patch-setupbase_py 16 Aug 2022 19:30:17 -0000 1.10
+++ patches/patch-setupbase_py 29 Feb 2024 05:42:07 -0000
@@ -3,7 +3,7 @@ Put man pages where they belong.
Index: setupbase.py
--- setupbase.py.orig
+++ setupbase.py
-@@ -145,7 +145,7 @@ def find_data_files():
+@@ -106,7 +106,7 @@ def find_data_files():
Just man pages at this point.
"""
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/ipython/pkg/PLIST,v
diff -u -p -u -r1.32 PLIST
--- pkg/PLIST 25 Nov 2023 19:03:43 -0000 1.32
+++ pkg/PLIST 29 Feb 2024 05:42:07 -0000
@@ -683,6 +683,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_cli.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_emscripten.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_emscripten.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_posix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_posix.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_win32.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -773,6 +775,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}wildcard.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_cli.py
lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_common.py
+lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_emscripten.py
lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_posix.py
lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_win32.py
lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_win32_controller.py
The BDEP on py-mako doens't make much sense to me. If removing it causes
failures again, I'll be happy to investigate any stack trace log that's
provided to me.
ok's welcome, otherwise I'll plan to commit this update in a few days.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/ipython/Makefile,v
diff -u -p -u -r1.82 Makefile
--- Makefile 27 Dec 2023 07:22:52 -0000 1.82
+++ Makefile 29 Feb 2024 05:42:07 -0000
@@ -1,6 +1,6 @@
COMMENT = enhanced interactive Python shell
-MODPY_EGG_VERSION = 8.19.0
+MODPY_EGG_VERSION = 8.22.1
DISTNAME = ipython-${MODPY_EGG_VERSION}
PKGNAME = ipython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
@@ -14,13 +14,12 @@ MAINTAINER = Daniel Dickman <daniel@ope
PERMIT_PACKAGE = Yes
MODULES = lang/python
-MODPY_PYBUILD = setuptools
-MODPY_PI = Yes
-#MODPY_PYTEST_ARGS = IPython
-# Optional dependency which gets picked up if it happens to be installed, thus
-# causing race conditions under dpb. Pull it in to avoid this possibility.
-BUILD_DEPENDS = www/py-mako${MODPY_FLAVOR}
+FLAVORS = python3
+FLAVOR = python3
+
+MODPY_PI = Yes
+MODPY_PYBUILD = setuptools
# XXX: pickleshare is optional as of 8.17, but keep as RDEP for now.
# If pickleshare is ever removed as an RDEP, it needs to become a TDEP
@@ -32,20 +31,20 @@ RUN_DEPENDS = databases/py-pickleshare$
devel/py-pexpect${MODPY_FLAVOR}>=4.3 \
devel/py-prompt_toolkit${MODPY_FLAVOR}>=3.0.41v1,<3.1.0v1 \
devel/py-stack_data${MODPY_FLAVOR} \
- devel/py-traitlets${MODPY_FLAVOR}>=5 \
+ devel/py-traitlets${MODPY_FLAVOR}>=5.13.0 \
graphics/py-matplotlib-inline${MODPY_FLAVOR} \
textproc/py-pygments${MODPY_FLAVOR}>=2.4.0
# Note that if you have pdb++ installed, tests will fail.
TEST_DEPENDS = devel/py-ipykernel${MODPY_FLAVOR} \
+ devel/py-curio${MODPY_FLAVOR} \
devel/py-nbformat${MODPY_FLAVOR} \
devel/py-testpath${MODPY_FLAVOR} \
+ devel/py-test-asyncio${MODPY_FLAVOR}<0.22 \
+ devel/py-trio${MODPY_FLAVOR} \
+ graphics/py-matplotlib${MODPY_FLAVOR} \
math/py-numpy${MODPY_FLAVOR}>=1.23 \
- textproc/py-pygments${MODPY_FLAVOR} \
- www/py-requests${MODPY_FLAVOR}
-
-FLAVORS = python3
-FLAVOR = python3
+ math/py-pandas${MODPY_FLAVOR}
PORTHOME = ${WRKDIR}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/ipython/distinfo,v
diff -u -p -u -r1.41 distinfo
--- distinfo 27 Dec 2023 07:22:52 -0000 1.41
+++ distinfo 29 Feb 2024 05:42:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (ipython-8.19.0.tar.gz) = rE2k7PAEL7TgzlfGBDDC2zxxn6i9+S+GMda9ileF0fA=
-SIZE (ipython-8.19.0.tar.gz) = 5487746
+SHA256 (ipython-8.22.1.tar.gz) = Ocb578B5+xm/sPF+7pA5eP6aKQsbgtaBlsZBzst26iI=
+SIZE (ipython-8.22.1.tar.gz) = 5490428
Index: patches/patch-IPython_core_tests_test_interactiveshell_py
===================================================================
RCS file: /cvs/ports/devel/ipython/patches/patch-IPython_core_tests_test_interactiveshell_py,v
diff -u -p -u -r1.11 patch-IPython_core_tests_test_interactiveshell_py
--- patches/patch-IPython_core_tests_test_interactiveshell_py 14 Sep 2023 02:20:56 -0000 1.11
+++ patches/patch-IPython_core_tests_test_interactiveshell_py 29 Feb 2024 05:42:07 -0000
@@ -1,7 +1,7 @@
Index: IPython/core/tests/test_interactiveshell.py
--- IPython/core/tests/test_interactiveshell.py.orig
+++ IPython/core/tests/test_interactiveshell.py
-@@ -646,7 +646,7 @@ class TestSystemRaw(ExitCodeChecks):
+@@ -650,7 +650,7 @@ class TestSystemRaw(ExitCodeChecks):
def test_1(self):
"""Test system_raw with non-ascii cmd
"""
Index: patches/patch-setupbase_py
===================================================================
RCS file: /cvs/ports/devel/ipython/patches/patch-setupbase_py,v
diff -u -p -u -r1.10 patch-setupbase_py
--- patches/patch-setupbase_py 16 Aug 2022 19:30:17 -0000 1.10
+++ patches/patch-setupbase_py 29 Feb 2024 05:42:07 -0000
@@ -3,7 +3,7 @@ Put man pages where they belong.
Index: setupbase.py
--- setupbase.py.orig
+++ setupbase.py
-@@ -145,7 +145,7 @@ def find_data_files():
+@@ -106,7 +106,7 @@ def find_data_files():
Just man pages at this point.
"""
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/ipython/pkg/PLIST,v
diff -u -p -u -r1.32 PLIST
--- pkg/PLIST 25 Nov 2023 19:03:43 -0000 1.32
+++ pkg/PLIST 29 Feb 2024 05:42:07 -0000
@@ -683,6 +683,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_cli.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_emscripten.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_emscripten.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_posix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_posix.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_win32.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -773,6 +775,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}wildcard.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_cli.py
lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_common.py
+lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_emscripten.py
lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_posix.py
lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_win32.py
lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_win32_controller.py
UPDATE: SVT-AV1 1.8.0
Here is an update to SVT-AV1 1.8.0.
## [1.8.0] - 2023-12-11
Encoder
- Improve the tradeoffs for the random access mode across presets:
- Speedup CRF presets M6 to M0 by 17-53% while maintaining similar quality levels
- Re-adjust CRF presets M7 to M13 for better quality with BD-rate gains ranging from 1-4%
- Improve the quality and speed of the 1-pass VBR mode
- More details on the per preset improvements can be found in MR !2143
- Add API allowing to update bitrate / CRF and Key_frame placement during the encoding session for CBR lowdelay mode and CRF Random Access mode
- ARM Neon SIMD optimizations for most critical kernels allowing for a 4.5-8x fps speedup vs the c implementation
Cleanup and bug fixes and documentation
- Various cleanups and functional bug fixes
- Update the documentation for preset options and individual features
## [1.7.0] - 2023-08-23
Encoder
- Improve the tradeoffs for the random access mode across presets MR-M13:
- Quality improvements across all presets and metrics ranging from 0.3% to 4.5% in BD-rate (!2129)
- Spacing between presets [M1-M6] has been adjusted to account for the tradeoff improvements achieved
- As a user guidance when comparing v1.7 vs v1.6 in a convexhull encoding setup:
- v1.7.0 M2 is now at similar quality levels as v1.6.0 M1 while being ~50% faster
- v1.7.0 M3 is now at similar quality levels as v1.6.0 M2 while being ~50% faster
- v1.7.0 M4 is now at similar quality levels as v1.6.0 M3 while being ~40% faster
- v1.7.0 M5 is now at similar quality levels as v1.6.0 M4 while being ~30% faster
- v1.7.0 M6 is now at similar quality levels as v1.6.0 M5 while being ~25% faster
- Added an experimental tune SSIM mode yielding ~3-4% additional SSIM BD-rate gains (!2109)
Build, cleanup and bug fixes
- Various cleanups and functional bug fixes
- Fix build conflict with libaom
## [1.6.0] - 2023-06-18
Encoder
- Improve the tradeoffs for the random access mode across presets M1-M13:
- Speeding up the higher quality presets by 30-40%
- Improving the BD-rate by 1-2% for the faster presets
- Improve the tradeoffs for the low delay mode for both scrren content and non-screen content encoding modes
- Add a toggle to remove the legacy one-frame buffer at the input of the pipeline alowing the low delay mode to operate at sub-frame processing latencies
- Add a new API allowing the user to specify quantization offsets for a region of interest per frame
Build, cleanup and bug fixes
- Various cleanups and functional bug fixes
- Fix the startup minigop size BD-rate loss
- Add ability to run the ci-testing offline
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/svt-av1/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile 27 Sep 2023 10:10:22 -0000 1.15
+++ Makefile 29 Feb 2024 04:05:06 -0000
@@ -2,7 +2,7 @@ ONLY_FOR_ARCHS= ${LP64_ARCHS} i386
COMMENT= scalable AV1 encoder/decoder
-VER= 1.5.0
+VER= 1.8.0
DISTNAME= SVT-AV1-v${VER}
PKGNAME= svt-av1-${VER}
CATEGORIES= multimedia
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/svt-av1/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo 30 Apr 2023 11:54:30 -0000 1.12
+++ distinfo 29 Feb 2024 04:05:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (SVT-AV1-v1.5.0.tar.bz2) = pkmwcZBvuEDfGfsOLsl8BP3oLI7WTfuGYvYly4vGJF4=
-SIZE (SVT-AV1-v1.5.0.tar.bz2) = 9490521
+SHA256 (SVT-AV1-v1.8.0.tar.bz2) = QccYO+maLHJlaxX7pABeRsmYzTRkGFA+0pbFq+ZILkc=
+SIZE (SVT-AV1-v1.8.0.tar.bz2) = 9585789
## [1.8.0] - 2023-12-11
Encoder
- Improve the tradeoffs for the random access mode across presets:
- Speedup CRF presets M6 to M0 by 17-53% while maintaining similar quality levels
- Re-adjust CRF presets M7 to M13 for better quality with BD-rate gains ranging from 1-4%
- Improve the quality and speed of the 1-pass VBR mode
- More details on the per preset improvements can be found in MR !2143
- Add API allowing to update bitrate / CRF and Key_frame placement during the encoding session for CBR lowdelay mode and CRF Random Access mode
- ARM Neon SIMD optimizations for most critical kernels allowing for a 4.5-8x fps speedup vs the c implementation
Cleanup and bug fixes and documentation
- Various cleanups and functional bug fixes
- Update the documentation for preset options and individual features
## [1.7.0] - 2023-08-23
Encoder
- Improve the tradeoffs for the random access mode across presets MR-M13:
- Quality improvements across all presets and metrics ranging from 0.3% to 4.5% in BD-rate (!2129)
- Spacing between presets [M1-M6] has been adjusted to account for the tradeoff improvements achieved
- As a user guidance when comparing v1.7 vs v1.6 in a convexhull encoding setup:
- v1.7.0 M2 is now at similar quality levels as v1.6.0 M1 while being ~50% faster
- v1.7.0 M3 is now at similar quality levels as v1.6.0 M2 while being ~50% faster
- v1.7.0 M4 is now at similar quality levels as v1.6.0 M3 while being ~40% faster
- v1.7.0 M5 is now at similar quality levels as v1.6.0 M4 while being ~30% faster
- v1.7.0 M6 is now at similar quality levels as v1.6.0 M5 while being ~25% faster
- Added an experimental tune SSIM mode yielding ~3-4% additional SSIM BD-rate gains (!2109)
Build, cleanup and bug fixes
- Various cleanups and functional bug fixes
- Fix build conflict with libaom
## [1.6.0] - 2023-06-18
Encoder
- Improve the tradeoffs for the random access mode across presets M1-M13:
- Speeding up the higher quality presets by 30-40%
- Improving the BD-rate by 1-2% for the faster presets
- Improve the tradeoffs for the low delay mode for both scrren content and non-screen content encoding modes
- Add a toggle to remove the legacy one-frame buffer at the input of the pipeline alowing the low delay mode to operate at sub-frame processing latencies
- Add a new API allowing the user to specify quantization offsets for a region of interest per frame
Build, cleanup and bug fixes
- Various cleanups and functional bug fixes
- Fix the startup minigop size BD-rate loss
- Add ability to run the ci-testing offline
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/svt-av1/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile 27 Sep 2023 10:10:22 -0000 1.15
+++ Makefile 29 Feb 2024 04:05:06 -0000
@@ -2,7 +2,7 @@ ONLY_FOR_ARCHS= ${LP64_ARCHS} i386
COMMENT= scalable AV1 encoder/decoder
-VER= 1.5.0
+VER= 1.8.0
DISTNAME= SVT-AV1-v${VER}
PKGNAME= svt-av1-${VER}
CATEGORIES= multimedia
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/svt-av1/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo 30 Apr 2023 11:54:30 -0000 1.12
+++ distinfo 29 Feb 2024 04:05:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (SVT-AV1-v1.5.0.tar.bz2) = pkmwcZBvuEDfGfsOLsl8BP3oLI7WTfuGYvYly4vGJF4=
-SIZE (SVT-AV1-v1.5.0.tar.bz2) = 9490521
+SHA256 (SVT-AV1-v1.8.0.tar.bz2) = QccYO+maLHJlaxX7pABeRsmYzTRkGFA+0pbFq+ZILkc=
+SIZE (SVT-AV1-v1.8.0.tar.bz2) = 9585789
UPDATE: giflib 5.2.2
Here is an update to giflib 5.2.2.
CVE-2022-28506, CVE-2023-48161
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/giflib/Makefile,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 Makefile
--- Makefile 7 Nov 2023 14:19:33 -0000 1.33
+++ Makefile 29 Feb 2024 03:29:19 -0000
@@ -1,9 +1,8 @@
COMMENT= tools and library routines for working with GIF images
-DISTNAME= giflib-5.2.1
-SHARED_LIBS += gif 9.0 # 7.1
+DISTNAME= giflib-5.2.2
+SHARED_LIBS += gif 9.1 # 7.1
CATEGORIES= graphics
-REVISION= 0
SITES= ${SITE_SOURCEFORGE:=giflib/}
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/giflib/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo 2 Jul 2022 14:13:43 -0000 1.7
+++ distinfo 29 Feb 2024 03:29:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (giflib-5.2.1.tar.gz) = MdpVYvRMXxXWM0Cgmk/WK0jEViDNMC93ptms8Ad4eb0=
-SIZE (giflib-5.2.1.tar.gz) = 444187
+SHA256 (giflib-5.2.2.tar.gz) = vn/70FfK3r4qoURUL9kMaDjGoIO16KkEi47jtmsp1fs=
+SIZE (giflib-5.2.2.tar.gz) = 447175
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/graphics/giflib/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Makefile
--- patches/patch-Makefile 2 Jul 2022 14:13:43 -0000 1.3
+++ patches/patch-Makefile 29 Feb 2024 03:29:19 -0000
@@ -1,3 +1,6 @@
+- Correct document page install.
+ 61f375082c80ee479eb8ff03189aea691a6a06aa
+
hunk 1, disable -Wno-format-truncation, not available on some compilers?
hunk 2, move quantize.c back to exported library, it was in the public
@@ -5,7 +8,7 @@ API prior to 5.2 and is used by various
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=935088
https://src.fedoraproject.org/rpms/giflib/c/109bf038d703a471b857aba44af673be103d7079?branch=master
-hunk 3-4, library naming
+hunk 5-6, library handling
Index: Makefile
--- Makefile.orig
@@ -33,31 +36,61 @@ Index: Makefile
UHEADERS = getarg.h
UOBJECTS = $(USOURCES:.c=.o)
-@@ -61,13 +61,13 @@ UTILS = $(INSTALLABLE) \
+@@ -63,17 +63,21 @@ UTILS = $(INSTALLABLE) \
LDLIBS=libgif.a -lm
--all: libgif.so libgif.a libutil.so libutil.a $(UTILS)
-+all: libgif.so.${LIBVER} libgif.a libutil.so libutil.a $(UTILS)
- $(MAKE) -C doc
-
- $(UTILS):: libgif.a libutil.a
-
--libgif.so: $(OBJECTS) $(HEADERS)
-- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
-+libgif.so.$(LIBVER): $(OBJECTS) $(HEADERS)
-+ $(CC) $(CFLAGS) -shared $(OFLAGS) -o libgif.so.$(LIBVER) $(OBJECTS)
+-MANUAL_PAGES = \
++MANUAL_PAGES_1 = \
+ doc/gif2rgb.xml \
+ doc/gifbuild.xml \
+ doc/gifclrmp.xml \
+ doc/giffix.xml \
+- doc/giflib.xml \
+ doc/giftext.xml \
+ doc/giftool.xml
+
++MANUAL_PAGES_7 = \
++ doc/giflib.xml
++
++MANUAL_PAGES = $(MANUAL_PAGES_1) $(MANUAL_PAGES_7)
++
+ SOEXTENSION = so
+-LIBGIFSO = libgif.$(SOEXTENSION)
++LIBGIFSO = libgif.$(SOEXTENSION).$(LIBVER)
+ LIBGIFSOMAJOR = libgif.$(SOEXTENSION).$(LIBMAJOR)
+ LIBGIFSOVER = libgif.$(SOEXTENSION).$(LIBVER)
+ LIBUTILSO = libutil.$(SOEXTENSION)
+@@ -99,7 +103,7 @@ $(LIBGIFSO): $(OBJECTS) $(HEADERS)
+ ifeq ($(UNAME), Darwin)
+ $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o $(LIBGIFSO)
+ else
+- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBGIFSOMAJOR) -o $(LIBGIFSO) $(OBJECTS)
++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -o $(LIBGIFSO) $(OBJECTS)
+ endif
libgif.a: $(OBJECTS) $(HEADERS)
- $(AR) rcs libgif.a $(OBJECTS)
-@@ -99,9 +99,7 @@ install-include:
- install-lib:
+@@ -109,7 +113,7 @@ $(LIBUTILSO): $(UOBJECTS) $(UHEADERS)
+ ifeq ($(UNAME), Darwin)
+ $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o $(LIBUTILSO)
+ else
+- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILMAJOR) -o $(LIBUTILSO) $(UOBJECTS)
++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -o $(LIBUTILSO) $(UOBJECTS)
+ endif
+
+ libutil.a: $(UOBJECTS) $(UHEADERS)
+@@ -145,11 +149,10 @@ install-lib:
$(INSTALL) -d "$(DESTDIR)$(LIBDIR)"
$(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a"
-- $(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)"
-- ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)"
-- ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so"
-+ $(INSTALL) -m 755 libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)"
+ $(INSTALL) -m 755 $(LIBGIFSO) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOVER)"
+- ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)"
+- ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)"
install-man:
- $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"
- $(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)/man1"
+- $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"
+- $(INSTALL) -m 644 $(MANUAL_PAGES) "$(DESTDIR)$(MANDIR)/man1"
++ $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(MANDIR)/man7"
++ $(INSTALL) -m 644 $(MANUAL_PAGES_1:xml=1) "$(DESTDIR)$(MANDIR)/man1"
++ $(INSTALL) -m 644 $(MANUAL_PAGES_7:xml=7) "$(DESTDIR)$(MANDIR)/man7"
+ uninstall: uninstall-man uninstall-include uninstall-lib uninstall-bin
+ uninstall-bin:
+ cd "$(DESTDIR)$(BINDIR)" && rm -f $(INSTALLABLE)
Index: patches/patch-doc_Makefile
===================================================================
RCS file: patches/patch-doc_Makefile
diff -N patches/patch-doc_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_Makefile 29 Feb 2024 03:29:19 -0000
@@ -0,0 +1,14 @@
+Disable calling a target which wants ImageMagick.
+
+Index: doc/Makefile
+--- doc/Makefile.orig
++++ doc/Makefile
+@@ -46,7 +46,7 @@ giflib-logo.gif: ../pic/gifgrid.gif
+ convert $^ -resize 50x50 $@
+
+ # Philosophical choice: the website gets the internal manual pages
+-allhtml: $(XMLALL:.xml=.html) giflib-logo.gif
++allhtml: $(XMLALL:.xml=.html)
+
+ manpages: $(XMLMAN1:.xml=.1) $(XMLMAN7:.xml=.7) $(XMLINTERNAL:.xml=.1)
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/giflib/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 PLIST
--- pkg/PLIST 2 Jul 2022 14:13:43 -0000 1.12
+++ pkg/PLIST 29 Feb 2024 03:29:19 -0000
@@ -10,15 +10,9 @@ include/gif_lib.h
@static-lib lib/libgif.a
@lib lib/libgif.so.${LIBgif_VERSION}
@man man/man1/gif2rgb.1
-@man man/man1/gifbg.1
@man man/man1/gifbuild.1
@man man/man1/gifclrmp.1
-@man man/man1/gifcolor.1
-@man man/man1/gifecho.1
@man man/man1/giffix.1
-@man man/man1/gifhisto.1
-@man man/man1/gifinto.1
-@man man/man1/giflib.1
@man man/man1/giftext.1
@man man/man1/giftool.1
-@man man/man1/gifwedge.1
+@man man/man7/giflib.7
CVE-2022-28506, CVE-2023-48161
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/giflib/Makefile,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 Makefile
--- Makefile 7 Nov 2023 14:19:33 -0000 1.33
+++ Makefile 29 Feb 2024 03:29:19 -0000
@@ -1,9 +1,8 @@
COMMENT= tools and library routines for working with GIF images
-DISTNAME= giflib-5.2.1
-SHARED_LIBS += gif 9.0 # 7.1
+DISTNAME= giflib-5.2.2
+SHARED_LIBS += gif 9.1 # 7.1
CATEGORIES= graphics
-REVISION= 0
SITES= ${SITE_SOURCEFORGE:=giflib/}
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/giflib/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo 2 Jul 2022 14:13:43 -0000 1.7
+++ distinfo 29 Feb 2024 03:29:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (giflib-5.2.1.tar.gz) = MdpVYvRMXxXWM0Cgmk/WK0jEViDNMC93ptms8Ad4eb0=
-SIZE (giflib-5.2.1.tar.gz) = 444187
+SHA256 (giflib-5.2.2.tar.gz) = vn/70FfK3r4qoURUL9kMaDjGoIO16KkEi47jtmsp1fs=
+SIZE (giflib-5.2.2.tar.gz) = 447175
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/graphics/giflib/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Makefile
--- patches/patch-Makefile 2 Jul 2022 14:13:43 -0000 1.3
+++ patches/patch-Makefile 29 Feb 2024 03:29:19 -0000
@@ -1,3 +1,6 @@
+- Correct document page install.
+ 61f375082c80ee479eb8ff03189aea691a6a06aa
+
hunk 1, disable -Wno-format-truncation, not available on some compilers?
hunk 2, move quantize.c back to exported library, it was in the public
@@ -5,7 +8,7 @@ API prior to 5.2 and is used by various
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=935088
https://src.fedoraproject.org/rpms/giflib/c/109bf038d703a471b857aba44af673be103d7079?branch=master
-hunk 3-4, library naming
+hunk 5-6, library handling
Index: Makefile
--- Makefile.orig
@@ -33,31 +36,61 @@ Index: Makefile
UHEADERS = getarg.h
UOBJECTS = $(USOURCES:.c=.o)
-@@ -61,13 +61,13 @@ UTILS = $(INSTALLABLE) \
+@@ -63,17 +63,21 @@ UTILS = $(INSTALLABLE) \
LDLIBS=libgif.a -lm
--all: libgif.so libgif.a libutil.so libutil.a $(UTILS)
-+all: libgif.so.${LIBVER} libgif.a libutil.so libutil.a $(UTILS)
- $(MAKE) -C doc
-
- $(UTILS):: libgif.a libutil.a
-
--libgif.so: $(OBJECTS) $(HEADERS)
-- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
-+libgif.so.$(LIBVER): $(OBJECTS) $(HEADERS)
-+ $(CC) $(CFLAGS) -shared $(OFLAGS) -o libgif.so.$(LIBVER) $(OBJECTS)
+-MANUAL_PAGES = \
++MANUAL_PAGES_1 = \
+ doc/gif2rgb.xml \
+ doc/gifbuild.xml \
+ doc/gifclrmp.xml \
+ doc/giffix.xml \
+- doc/giflib.xml \
+ doc/giftext.xml \
+ doc/giftool.xml
+
++MANUAL_PAGES_7 = \
++ doc/giflib.xml
++
++MANUAL_PAGES = $(MANUAL_PAGES_1) $(MANUAL_PAGES_7)
++
+ SOEXTENSION = so
+-LIBGIFSO = libgif.$(SOEXTENSION)
++LIBGIFSO = libgif.$(SOEXTENSION).$(LIBVER)
+ LIBGIFSOMAJOR = libgif.$(SOEXTENSION).$(LIBMAJOR)
+ LIBGIFSOVER = libgif.$(SOEXTENSION).$(LIBVER)
+ LIBUTILSO = libutil.$(SOEXTENSION)
+@@ -99,7 +103,7 @@ $(LIBGIFSO): $(OBJECTS) $(HEADERS)
+ ifeq ($(UNAME), Darwin)
+ $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o $(LIBGIFSO)
+ else
+- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBGIFSOMAJOR) -o $(LIBGIFSO) $(OBJECTS)
++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -o $(LIBGIFSO) $(OBJECTS)
+ endif
libgif.a: $(OBJECTS) $(HEADERS)
- $(AR) rcs libgif.a $(OBJECTS)
-@@ -99,9 +99,7 @@ install-include:
- install-lib:
+@@ -109,7 +113,7 @@ $(LIBUTILSO): $(UOBJECTS) $(UHEADERS)
+ ifeq ($(UNAME), Darwin)
+ $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o $(LIBUTILSO)
+ else
+- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILMAJOR) -o $(LIBUTILSO) $(UOBJECTS)
++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -o $(LIBUTILSO) $(UOBJECTS)
+ endif
+
+ libutil.a: $(UOBJECTS) $(UHEADERS)
+@@ -145,11 +149,10 @@ install-lib:
$(INSTALL) -d "$(DESTDIR)$(LIBDIR)"
$(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a"
-- $(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)"
-- ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)"
-- ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so"
-+ $(INSTALL) -m 755 libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)"
+ $(INSTALL) -m 755 $(LIBGIFSO) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOVER)"
+- ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)"
+- ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)"
install-man:
- $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"
- $(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)/man1"
+- $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"
+- $(INSTALL) -m 644 $(MANUAL_PAGES) "$(DESTDIR)$(MANDIR)/man1"
++ $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(MANDIR)/man7"
++ $(INSTALL) -m 644 $(MANUAL_PAGES_1:xml=1) "$(DESTDIR)$(MANDIR)/man1"
++ $(INSTALL) -m 644 $(MANUAL_PAGES_7:xml=7) "$(DESTDIR)$(MANDIR)/man7"
+ uninstall: uninstall-man uninstall-include uninstall-lib uninstall-bin
+ uninstall-bin:
+ cd "$(DESTDIR)$(BINDIR)" && rm -f $(INSTALLABLE)
Index: patches/patch-doc_Makefile
===================================================================
RCS file: patches/patch-doc_Makefile
diff -N patches/patch-doc_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_Makefile 29 Feb 2024 03:29:19 -0000
@@ -0,0 +1,14 @@
+Disable calling a target which wants ImageMagick.
+
+Index: doc/Makefile
+--- doc/Makefile.orig
++++ doc/Makefile
+@@ -46,7 +46,7 @@ giflib-logo.gif: ../pic/gifgrid.gif
+ convert $^ -resize 50x50 $@
+
+ # Philosophical choice: the website gets the internal manual pages
+-allhtml: $(XMLALL:.xml=.html) giflib-logo.gif
++allhtml: $(XMLALL:.xml=.html)
+
+ manpages: $(XMLMAN1:.xml=.1) $(XMLMAN7:.xml=.7) $(XMLINTERNAL:.xml=.1)
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/giflib/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 PLIST
--- pkg/PLIST 2 Jul 2022 14:13:43 -0000 1.12
+++ pkg/PLIST 29 Feb 2024 03:29:19 -0000
@@ -10,15 +10,9 @@ include/gif_lib.h
@static-lib lib/libgif.a
@lib lib/libgif.so.${LIBgif_VERSION}
@man man/man1/gif2rgb.1
-@man man/man1/gifbg.1
@man man/man1/gifbuild.1
@man man/man1/gifclrmp.1
-@man man/man1/gifcolor.1
-@man man/man1/gifecho.1
@man man/man1/giffix.1
-@man man/man1/gifhisto.1
-@man man/man1/gifinto.1
-@man man/man1/giflib.1
@man man/man1/giftext.1
@man man/man1/giftool.1
-@man man/man1/gifwedge.1
+@man man/man7/giflib.7
flycast: disable vulkan for now to restore build
flycast build broke with vulkan updates. I suggest we disable vulkan
for now until we can give this a closer look or find an update that
fixes this...
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/flycast/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 8 Feb 2024 00:57:55 -0000 1.6
+++ Makefile 28 Feb 2024 03:41:47 -0000
@@ -8,7 +8,7 @@ COMMENT = emulator for Sega Dreamcast an
V = 2.1pl20230303
DISTNAME = flycast-${V}
COMMIT = 27b6bafd0f003c8f8bcd1fb3bfd48a3523b298f5
-REVISION = 2
+REVISION = 3
CATEGORIES = emulators games
@@ -25,8 +25,8 @@ MAINTAINER = Nam Nguyen <namn@openbsd.or
PERMIT_PACKAGE = Yes
# if running with vulkan backend, dlopen's vulkan in vulkan.hpp
-WANTLIB += ${COMPILER_LIBCXX} GL SDL2 SPIRV ao c curl chdr glslang
-WANTLIB += lua${MODLUA_VERSION} m miniupnpc pulse vulkan xxhash z zip
+WANTLIB += ${COMPILER_LIBCXX} GL SDL2 ao c curl chdr
+WANTLIB += lua${MODLUA_VERSION} m miniupnpc pulse xxhash z zip
SITES = https://messagemode2.com/source/
@@ -53,12 +53,11 @@ LIB_DEPENDS = archivers/libzip \
audio/pulseaudio \
devel/sdl2 \
emulators/libchdr \
- graphics/glslang \
- graphics/vulkan-loader \
net/curl \
net/miniupnp/miniupnpc \
sysutils/xxhash
+CONFIGURE_ARGS += -DUSE_VULKAN=OFF
do-gen:
${SUBST_CMD} ${WRKSRC}/CMakeLists.txt
for now until we can give this a closer look or find an update that
fixes this...
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/flycast/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 8 Feb 2024 00:57:55 -0000 1.6
+++ Makefile 28 Feb 2024 03:41:47 -0000
@@ -8,7 +8,7 @@ COMMENT = emulator for Sega Dreamcast an
V = 2.1pl20230303
DISTNAME = flycast-${V}
COMMIT = 27b6bafd0f003c8f8bcd1fb3bfd48a3523b298f5
-REVISION = 2
+REVISION = 3
CATEGORIES = emulators games
@@ -25,8 +25,8 @@ MAINTAINER = Nam Nguyen <namn@openbsd.or
PERMIT_PACKAGE = Yes
# if running with vulkan backend, dlopen's vulkan in vulkan.hpp
-WANTLIB += ${COMPILER_LIBCXX} GL SDL2 SPIRV ao c curl chdr glslang
-WANTLIB += lua${MODLUA_VERSION} m miniupnpc pulse vulkan xxhash z zip
+WANTLIB += ${COMPILER_LIBCXX} GL SDL2 ao c curl chdr
+WANTLIB += lua${MODLUA_VERSION} m miniupnpc pulse xxhash z zip
SITES = https://messagemode2.com/source/
@@ -53,12 +53,11 @@ LIB_DEPENDS = archivers/libzip \
audio/pulseaudio \
devel/sdl2 \
emulators/libchdr \
- graphics/glslang \
- graphics/vulkan-loader \
net/curl \
net/miniupnp/miniupnpc \
sysutils/xxhash
+CONFIGURE_ARGS += -DUSE_VULKAN=OFF
do-gen:
${SUBST_CMD} ${WRKSRC}/CMakeLists.txt
UPDATE: openimageio 2.4.17.0
Here is an update to OpenImageIO 2.4.17.0.
https://raw.githubusercontent.com/AcademySoftwareFoundation/OpenImageIO/dev-2.4/CHANGES.md
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/openimageio/Makefile,v
retrieving revision 1.68
diff -u -p -u -p -r1.68 Makefile
--- Makefile 1 Sep 2023 15:20:14 -0000 1.68
+++ Makefile 29 Feb 2024 02:06:22 -0000
@@ -3,21 +3,22 @@
COMMENT = library for reading and writing images
+V = 2.4.17.0
+DISTNAME = openimageio-${V}
GH_ACCOUNT = OpenImageIO
GH_PROJECT = oiio
GH_TAGNAME = v$V
-V = 2.4.11.0
-DISTNAME = openimageio-${V}
-REVISION = 0
-SHARED_LIBS += OpenImageIO 13.0 # 2.4.10
-SHARED_LIBS += OpenImageIO_Util 8.0 # 2.4.10
+WRKDIST = ${WRKDIR}/${GH_ACCOUNT}-${GH_TAGNAME:C/^[vV]([0-9])/\1/}
+
+SHARED_LIBS += OpenImageIO 14.0 # 2.4.10
+SHARED_LIBS += OpenImageIO_Util 9.0 # 2.4.10
CATEGORIES = graphics devel
HOMEPAGE = https://sites.google.com/site/openimageio/home
-# BSD
+# Apache 2.0 / BSD
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} GL GLU Iex-3_2 IlmThread-3_2 Imath-3_1
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/openimageio/distinfo,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 distinfo
--- distinfo 14 May 2023 12:40:05 -0000 1.18
+++ distinfo 29 Feb 2024 02:06:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (openimageio-2.4.11.0.tar.gz) = UTkLPnIiiS6H65KdInu7W5vp9787RyKakdKxBuv/s/s=
-SIZE (openimageio-2.4.11.0.tar.gz) = 32158503
+SHA256 (openimageio-2.4.17.0.tar.gz) = f+gdjlvOMMxKIS8CCsPMQ0Tmt8HAhCR146BIUVCZxlw=
+SIZE (openimageio-2.4.17.0.tar.gz) = 47900800
https://raw.githubusercontent.com/AcademySoftwareFoundation/OpenImageIO/dev-2.4/CHANGES.md
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/openimageio/Makefile,v
retrieving revision 1.68
diff -u -p -u -p -r1.68 Makefile
--- Makefile 1 Sep 2023 15:20:14 -0000 1.68
+++ Makefile 29 Feb 2024 02:06:22 -0000
@@ -3,21 +3,22 @@
COMMENT = library for reading and writing images
+V = 2.4.17.0
+DISTNAME = openimageio-${V}
GH_ACCOUNT = OpenImageIO
GH_PROJECT = oiio
GH_TAGNAME = v$V
-V = 2.4.11.0
-DISTNAME = openimageio-${V}
-REVISION = 0
-SHARED_LIBS += OpenImageIO 13.0 # 2.4.10
-SHARED_LIBS += OpenImageIO_Util 8.0 # 2.4.10
+WRKDIST = ${WRKDIR}/${GH_ACCOUNT}-${GH_TAGNAME:C/^[vV]([0-9])/\1/}
+
+SHARED_LIBS += OpenImageIO 14.0 # 2.4.10
+SHARED_LIBS += OpenImageIO_Util 9.0 # 2.4.10
CATEGORIES = graphics devel
HOMEPAGE = https://sites.google.com/site/openimageio/home
-# BSD
+# Apache 2.0 / BSD
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} GL GLU Iex-3_2 IlmThread-3_2 Imath-3_1
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/openimageio/distinfo,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 distinfo
--- distinfo 14 May 2023 12:40:05 -0000 1.18
+++ distinfo 29 Feb 2024 02:06:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (openimageio-2.4.11.0.tar.gz) = UTkLPnIiiS6H65KdInu7W5vp9787RyKakdKxBuv/s/s=
-SIZE (openimageio-2.4.11.0.tar.gz) = 32158503
+SHA256 (openimageio-2.4.17.0.tar.gz) = f+gdjlvOMMxKIS8CCsPMQ0Tmt8HAhCR146BIUVCZxlw=
+SIZE (openimageio-2.4.17.0.tar.gz) = 47900800
[update] security/osv-scanner to 1.6.2
diff refs/heads/master refs/heads/osv-scanner
commit - 7613a8cf0b66c00314807995741459338c5bd5d4
commit + 79224448a1d8ffe9f9a5e56791730c8f54ff2836
blob - 7f2a1cac0a859bce9ed72b508f08a8f316386202
blob + 950e8b5dd2048bfb31c626aa2f3abe23466e12d8
--- security/osv-scanner/Makefile
+++ security/osv-scanner/Makefile
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS = aarch64 amd64 mips64 riscv64
COMMENT = scan your project's dependencies for vulnerabilities
-V = 1.6.1
+V = 1.6.2
MODGO_MODNAME = github.com/google/osv-scanner
MODGO_VERSION = v${V}
blob - 93ceb7953126b28476ffd3331f3c8e1387b057ab
blob + b0f572931570f2d0c025cd3b5172433c011344b7
--- security/osv-scanner/distinfo
+++ security/osv-scanner/distinfo
@@ -4,8 +4,13 @@ SHA256 (go_modules/cloud.google.com/go/compute/metadat
SHA256 (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.3.zip) = KShk29Cx3jepaOKF6UmIXlczhIN9gc02lb5c4uI5GIc=
SHA256 (go_modules/dario.cat/mergo/@v/v1.0.0.mod) = 4jxLgDpsbm5FdHlG6H0kcEzXd1bMSEvf0XtXIjvzINY=
SHA256 (go_modules/dario.cat/mergo/@v/v1.0.0.zip) = Gn7zlnCcWDUha7R7qSGN1ECsUwdYPGnReYzp5FfxMR0=
+SHA256 (go_modules/deps.dev/api/v3alpha/@v/v0.0.0-20231114023923-e40c4d5c34e5.mod) = h/veE8xDl3AO43RbynyN7nbNERVbVmMCHMmQ07wfiOc=
SHA256 (go_modules/deps.dev/api/v3alpha/@v/v0.0.0-20240109042716-00b51ef52ece.mod) = h/veE8xDl3AO43RbynyN7nbNERVbVmMCHMmQ07wfiOc=
SHA256 (go_modules/deps.dev/api/v3alpha/@v/v0.0.0-20240109042716-00b51ef52ece.zip) = 6enK6Ws3A9qUndelYdFX5ck9+OLN4POMROhxCHr08sk=
+SHA256 (go_modules/deps.dev/util/resolve/@v/v0.0.0-20240109042716-00b51ef52ece.mod) = WnpKVdUYRv0AEsYuGl21fqLdd562akWx8o/C+Okbk5Y=
+SHA256 (go_modules/deps.dev/util/resolve/@v/v0.0.0-20240109042716-00b51ef52ece.zip) = mxvUXKycVMBCaRmgLvHPEmC8WaM6e86FLtPH3LpQFg4=
+SHA256 (go_modules/deps.dev/util/semver/@v/v0.0.0-20240109040450-1e316b822bc4.mod) = PBARmS9BLys0bWQHHH40BDoAiidH3bPqo/In6id0XXw=
+SHA256 (go_modules/deps.dev/util/semver/@v/v0.0.0-20240109040450-1e316b822bc4.zip) = 9v1Va2QyQ05p9PTdcRwa0sd3llF6wXshSTv0cXdbjaA=
SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.3.2.mod) = JnfIL+dPIDdyiJpagBr7Mp2VF1UId92ssXIZFpurPt0=
SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.3.2.zip) = XeJGoMtMJW8/1dDbigihFPWK8MLhk7vwrZASEErbtrI=
SHA256 (go_modules/github.com/!cyclone!d!x/cyclonedx-go/@v/v0.8.0.mod) = X1TYnaBD7V3Tmb6nIG+3k3AcVSRgAH6nq+sCUVmMX9s=
@@ -42,6 +47,8 @@ SHA256 (go_modules/github.com/cncf/xds/go/@v/v0.0.0-20
SHA256 (go_modules/github.com/cncf/xds/go/@v/v0.0.0-20230607035331-e9ce68804cb4.zip) = oMbmbq3jV67aTtqp0JYSCFhg3EwLRO34ImV0k5vfYJE=
SHA256 (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.mod) = FMOvou9iNVXBtINNH4ixTfd1Sa/uheV1DBkQJGW3iro=
SHA256 (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.zip) = cKfmCYCc8qksVTUQTbXrgtdcVL/P7S0iTofdL9lyn2I=
+SHA256 (go_modules/github.com/creack/pty/@v/v1.1.9.mod) = 6rBwW8ShjdMVwnpOPbqPIKnhIwZfogYzlmMytczPdzE=
+SHA256 (go_modules/github.com/creack/pty/@v/v1.1.9.zip) = IO38wnr9eZF4C8kcpSPSaZnqAl5B9gvF7XG7rADhdeI=
SHA256 (go_modules/github.com/cyphar/filepath-securejoin/@v/v0.2.4.mod) = 3H2HZHOPLSMbofLvWkVzpI/kD2Rby4spHkIGljRXJTc=
SHA256 (go_modules/github.com/cyphar/filepath-securejoin/@v/v0.2.4.zip) = CvlOtZEz/aaf0ETa/6fWK6Do0nFtT7HEJPPirWNtPjQ=
SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.0.mod) = vLKTkyUSN7eaF7bBm/KRNPQ+j0OMMZiYj81GGhzfBcw=
@@ -57,6 +64,12 @@ SHA256 (go_modules/github.com/envoyproxy/protoc-gen-va
SHA256 (go_modules/github.com/envoyproxy/protoc-gen-validate/@v/v1.0.2.zip) = p50Z+wZVVLIUSSx2GddguUQFQp58pp7eki6WiSmmb/s=
SHA256 (go_modules/github.com/felixge/fgprof/@v/v0.9.3.mod) = G4FCpyTwr69dOnTq+HyFVk1QzegJwKNNz6AmZH+ucx4=
SHA256 (go_modules/github.com/felixge/fgprof/@v/v0.9.3.zip) = LIMmgIes+Ldnvmnbw3wJn6hYVnY8Loj7mWN9Rutqwjw=
+SHA256 (go_modules/github.com/gkampitakis/ciinfo/@v/v0.3.0.mod) = cxFqOWZ0gqB4QqNn1Ze7DFk05gNRPicBwCRh2PdqSe8=
+SHA256 (go_modules/github.com/gkampitakis/ciinfo/@v/v0.3.0.zip) = bz2w1Z/F4ggHP2wgCkhz/J1FFU2/fZKtqPxp5bvGYV4=
+SHA256 (go_modules/github.com/gkampitakis/go-diff/@v/v1.3.2.mod) = qTKf7D6TiBiejVKKZSqPGMG528Fd1zjkXuHPZKJgMKI=
+SHA256 (go_modules/github.com/gkampitakis/go-diff/@v/v1.3.2.zip) = R0q2xm5qvE+ll5s/tIvCUf2yN+UtnwoodGy0ws1cAoY=
+SHA256 (go_modules/github.com/gkampitakis/go-snaps/@v/v0.4.12.mod) = bkEHDHL8uKlTFntlUY8ObX02kEtalqLjYlSnpmYz044=
+SHA256 (go_modules/github.com/gkampitakis/go-snaps/@v/v0.4.12.zip) = OQAkNiUsiKLxWcuTK3cyvakxnaGMhX/nVS0IVM/Z4Qk=
SHA256 (go_modules/github.com/gliderlabs/ssh/@v/v0.3.5.mod) = e58vOhQap3SYfxqH3pDCYmF1qKUCULu557Sbxvv9Kf8=
SHA256 (go_modules/github.com/gliderlabs/ssh/@v/v0.3.5.zip) = fJ36VBTamJYPw9nSBdJ3SNzGPTFIJqTUdF9IhrWpfx8=
SHA256 (go_modules/github.com/go-git/gcfg/@v/v1.5.1-0.20230307220236-3a3c6141e376.mod) = L01TDeXjVrwb8VEBENnKBAbTI7bLlBl44d1zEdQYuo8=
@@ -90,10 +103,8 @@ SHA256 (go_modules/github.com/google/renameio/@v/v0.1.
SHA256 (go_modules/github.com/google/renameio/@v/v0.1.0.zip) = uFELs0B4aRoguOSQLTca/g6xcbLa+VP2fLOWDRkmzPM=
SHA256 (go_modules/github.com/google/uuid/@v/v1.3.1.mod) = c9pHtjOLAKCC/UUao1oyc9OtwJuOm7qY2rAQkeQCr24=
SHA256 (go_modules/github.com/google/uuid/@v/v1.3.1.zip) = nZ1s+yjObb5LUYxCxrzNZ7tTGhBoWYCPNugqXD+4xk0=
-SHA256 (go_modules/github.com/hexops/gotextdiff/@v/v1.0.3.mod) = qUfdi3h5PdOY6iCt7h99M8zydn2/juazzXe3Hxnm+5s=
-SHA256 (go_modules/github.com/hexops/gotextdiff/@v/v1.0.3.zip) = oQw5QvCbxRMiaNItS7nQwYSRItUz/ozfZepp2gXOu68=
-SHA256 (go_modules/github.com/ianlancetaylor/demangle/@v/v0.0.0-20231023195312-e2daf7ba7156.mod) = EF1NDHjIIF+F1TvIayvdxYQwzg+d03tyWCu6f/jeOLw=
-SHA256 (go_modules/github.com/ianlancetaylor/demangle/@v/v0.0.0-20231023195312-e2daf7ba7156.zip) = aaRXXHjLCWywU1ZUDt/6cm2iBsql/heJ1iZx0wj0pUg=
+SHA256 (go_modules/github.com/ianlancetaylor/demangle/@v/v0.0.0-20240117034632-964b1d53ca6c.mod) = EF1NDHjIIF+F1TvIayvdxYQwzg+d03tyWCu6f/jeOLw=
+SHA256 (go_modules/github.com/ianlancetaylor/demangle/@v/v0.0.0-20240117034632-964b1d53ca6c.zip) = QAc8gXYGfCcYpTeTl2Zq3vsT77ZEFn3wrj97GIVCKzY=
SHA256 (go_modules/github.com/jbenet/go-context/@v/v0.0.0-20150711004518-d14ea06fba99.mod) = 4+87N7MKDkMiuzbTB2k2Og1Dv0YszdpGT6Y4YtFpT5c=
SHA256 (go_modules/github.com/jbenet/go-context/@v/v0.0.0-20150711004518-d14ea06fba99.zip) = TNCVWr7qQ9xLWgi4dp5pYQngN28qETqbjv8TzJDKwcc=
SHA256 (go_modules/github.com/jedib0t/go-pretty/v6/@v/v6.5.3.mod) = CcS/hHDsFeQrjDq1SPl3bKNC6tZw+75rph4grx4U8MM=
@@ -108,6 +119,8 @@ SHA256 (go_modules/github.com/kr/pty/@v/v1.1.1.zip) =
SHA256 (go_modules/github.com/kr/text/@v/v0.1.0.mod) = L7qVKeXBPd5i83Hvc4O68E1xMlAdrGqgjpEPnsC/hcU=
SHA256 (go_modules/github.com/kr/text/@v/v0.2.0.mod) = 9jh5sgT2zolc6lNZS4FPWsCvCEhrM7HKecZXOE77xyY=
SHA256 (go_modules/github.com/kr/text/@v/v0.2.0.zip) = No6zGPkaW2e+kFxHAyq1wxodSal4SLEBGg0KISKzC6Q=
+SHA256 (go_modules/github.com/maruel/natural/@v/v1.1.0.mod) = yoZQDbGGI1+Id1DCr4bGyMnJx+553MwrNOZy/Ja6O7o=
+SHA256 (go_modules/github.com/maruel/natural/@v/v1.1.0.zip) = SGRrh/1r6ypIc3s7ddS6NXvQ1sDuM37gcmLCSnyn/yc=
SHA256 (go_modules/github.com/mattn/go-runewidth/@v/v0.0.15.mod) = IWyT0ZMQYSyB1cdBAkmJ+DiX0jM8Op+We1ixMXWH9Rk=
SHA256 (go_modules/github.com/mattn/go-runewidth/@v/v0.0.15.zip) = 2XxPBmehSVdWnJMqjiSI8cQ3V7TczjE4l6oAHwfRSbA=
SHA256 (go_modules/github.com/mmcloughlin/avo/@v/v0.5.0.mod) = ub0wCk3oARuPZ7dUz1udGPukajNNjUlaQBMZXtg3QXQ=
@@ -124,6 +137,8 @@ SHA256 (go_modules/github.com/pandatix/go-cvss/@v/v0.6
SHA256 (go_modules/github.com/pandatix/go-cvss/@v/v0.6.2.zip) = qdwiUINJPYS29uBDsVcF4w126chpOiHAAWTchtaILfw=
SHA256 (go_modules/github.com/pjbgf/sha1cd/@v/v0.3.0.mod) = 8Qo2tGIntPuz5pD2zHJtlGR18xZp7rxSxK1bLombToA=
SHA256 (go_modules/github.com/pjbgf/sha1cd/@v/v0.3.0.zip) = rP7pbdL+jmrgiumGRQSDCknSNddMKrk996XfopqQpGE=
+SHA256 (go_modules/github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.mod) = XVuUVOLQIK8MdgNWjoaQS5m+/E1dZ8OoUF9hIVib0R8=
+SHA256 (go_modules/github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.zip) = 81sj/dK5Ui3dRsxcAWG08HZcUUR11dTKKoasoxOIyL0=
SHA256 (go_modules/github.com/pkg/errors/@v/v0.9.1.mod) = 3yjGqCPxgddheWlxd8DFlDxv+zjzwQstxTvjYO59RYk=
SHA256 (go_modules/github.com/pkg/errors/@v/v0.9.1.zip) = 1MNri80GFikKORMhXg9TuTG9bgBnBZbylg3xtEryvQc=
SHA256 (go_modules/github.com/pkg/profile/@v/v1.7.0.mod) = SnkqIyRN7sE3zqtMGrCjdQcat/FyI0w6M+JL0BlpR7U=
@@ -135,6 +150,7 @@ SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.4.4.mo
SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.4.4.zip) = dAzVgDEE763yd6DzUZ8OrZfjIdvZCc7uvXyLaza0R1Q=
SHA256 (go_modules/github.com/rogpeppe/go-internal/@v/v1.11.0.mod) = zRKUMvaTrNtOkSxjkyyxIG1UWcjboC3sG0GPgH3LeOs=
SHA256 (go_modules/github.com/rogpeppe/go-internal/@v/v1.11.0.zip) = NinUsuRX/bpenVGjduK+rZsoogaW+pBbcBx5JQGIxOM=
+SHA256 (go_modules/github.com/rogpeppe/go-internal/@v/v1.9.0.mod) = kFmpfaKZDIGaCXZ6XpvYeEtFpXt6JeKQVbvRsKqhRP8=
SHA256 (go_modules/github.com/russross/blackfriday/v2/@v/v2.1.0.mod) = w5VHzOboZujPo5XSk3vOMIAc0H8LkBwhMySPH7oS9Y0=
SHA256 (go_modules/github.com/russross/blackfriday/v2/@v/v2.1.0.zip) = eFJ1DVigU844sB8sIDIIgXVk9VLr83GytjAIHXAExq4=
SHA256 (go_modules/github.com/sergi/go-diff/@v/v1.1.0.mod) = IObs3/d7hGk4Nbl4uKFvbCK3hVlisjQQPV63SBi+RB8=
@@ -163,6 +179,16 @@ SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8
SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.4.zip) = 4gbart4L0D3gYL3765hKwsSbgwWHU//8k/4MIg6odTI=
SHA256 (go_modules/github.com/terminalstatic/go-xsd-validate/@v/v0.1.5.mod) = rgAGWi389/UqxU+L2CZMy/xhWdcRqzEv3hTpLph2Prs=
SHA256 (go_modules/github.com/terminalstatic/go-xsd-validate/@v/v0.1.5.zip) = 8m+czoXKLRfpnM64pu+R5OVXZWLBHbKGDgv3aU2ExNQ=
+SHA256 (go_modules/github.com/tidwall/gjson/@v/v1.14.2.mod) = 2U7s2AUM/8lXuZvtijCO/qpmmsE4VCkNCBot7VR4r5M=
+SHA256 (go_modules/github.com/tidwall/gjson/@v/v1.17.0.mod) = 2U7s2AUM/8lXuZvtijCO/qpmmsE4VCkNCBot7VR4r5M=
+SHA256 (go_modules/github.com/tidwall/gjson/@v/v1.17.0.zip) = i3HzD31yfJeYYdZOVJoZEeTNNtRwSBtR2imYuZSzxMY=
+SHA256 (go_modules/github.com/tidwall/match/@v/v1.1.1.mod) = AjZOUVMn2ZiNH2vTevnFhPi5jTtPQ/nh8Y4m12rsD0Q=
+SHA256 (go_modules/github.com/tidwall/match/@v/v1.1.1.zip) = K6QffyczDUng5DLL+Wv5ByCjPkqXvlj+U/Y6fmbwTTc=
+SHA256 (go_modules/github.com/tidwall/pretty/@v/v1.2.0.mod) = blxfpJPY8Y6JdLOO1j6McYY8zlnmWdmNDvhBe/gePs8=
+SHA256 (go_modules/github.com/tidwall/pretty/@v/v1.2.1.mod) = blxfpJPY8Y6JdLOO1j6McYY8zlnmWdmNDvhBe/gePs8=
+SHA256 (go_modules/github.com/tidwall/pretty/@v/v1.2.1.zip) = kydXm/nmEN51Put8NcjPHj9W5uViPL9l5HvIB2Aj0as=
+SHA256 (go_modules/github.com/tidwall/sjson/@v/v1.2.5.mod) = OLCTI6uO+PgDs9hrriyUdl04FaLVt1H9TwcDn0VRzG8=
+SHA256 (go_modules/github.com/tidwall/sjson/@v/v1.2.5.zip) = /ED9qHx95VNi9jhuBp1nR3LyXJ12QR7oI6y5rHiyBWU=
SHA256 (go_modules/github.com/urfave/cli/v2/@v/v2.27.1.mod) = XD3aJw3iuXT/2n/bvxItJJk7suwFeFtP+RROdhfqxBU=
SHA256 (go_modules/github.com/urfave/cli/v2/@v/v2.27.1.zip) = UtYNuIDHWL39a1+2enBjtT3AjzpjgC6hxOKQrkCPEbM=
SHA256 (go_modules/github.com/vmihailenco/msgpack/v4/@v/v4.3.12.mod) = LIDah2TON8JwC2yT3I7lPROceagqQKB1mAD3k4O8/cY=
@@ -193,14 +219,15 @@ SHA256 (go_modules/golang.org/x/crypto/@v/v0.18.0.mod)
SHA256 (go_modules/golang.org/x/crypto/@v/v0.18.0.zip) = VBNHlyC79RgxRGUoBSA6PfdIANLygfYR6C06fsFfQyU=
SHA256 (go_modules/golang.org/x/crypto/@v/v0.3.1-0.20221117191849-2c476679df9a.mod) = t5UQb4uN637XdSOoHeAatGAfDwOBNTkYRX0teK2ePOk=
SHA256 (go_modules/golang.org/x/crypto/@v/v0.7.0.mod) = yJ/iLnPawmoAplasEf9MbhprbNKrzFftzazew/va2C0=
-SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20240112132812-db7319d0e0e3.mod) = mR9g3gigToBWNSaTXIm9u5J07hRUdeXqAfjvGjxVdTs=
-SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20240112132812-db7319d0e0e3.zip) = Inr7dQ66eqtnQw276p46OIbIaKrkH+p43URYZaIDsjI=
+SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20240119083558-1b970713d09a.mod) = mR9g3gigToBWNSaTXIm9u5J07hRUdeXqAfjvGjxVdTs=
+SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20240119083558-1b970713d09a.zip) = cGuv2OfT19QRKmIwt06TBAFafY8zrxg+Arq8z7hyF+U=
SHA256 (go_modules/golang.org/x/mod/@v/v0.12.0.mod) = YkVnRZxumUesSr3gtwNO5h3Ltqk3P1lwCUwLs+gSGWQ=
SHA256 (go_modules/golang.org/x/mod/@v/v0.14.0.mod) = XErAMQolMwdXA5zPOpjnX+/by31ETd0EkjAAOkSUW94=
SHA256 (go_modules/golang.org/x/mod/@v/v0.14.0.zip) = mKEiySrVXe72dPZUa0wpXtk9EGF43STsQESa4ztBA3o=
SHA256 (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20220419223038-86c51ed26bb4.mod) = QtGQI/+PLq5wC8VJXzcezZmKItGbqYXQr19pkAslQIM=
SHA256 (go_modules/golang.org/x/mod/@v/v0.6.0.mod) = mfQKUOjWDCWZrEXGzix21VSoQorNE8LGikk/ymGbT6g=
SHA256 (go_modules/golang.org/x/mod/@v/v0.8.0.mod) = YkVnRZxumUesSr3gtwNO5h3Ltqk3P1lwCUwLs+gSGWQ=
+SHA256 (go_modules/golang.org/x/mod/@v/v0.9.0.mod) = YkVnRZxumUesSr3gtwNO5h3Ltqk3P1lwCUwLs+gSGWQ=
SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod) = br6z+vsJYS0+8f8EE9+qwFu6+PIpq94K4OASKY3+ZwI=
SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod) = 5u/a94opUD8IDPbSYV4onPsdnjq31XD1NmjsorSrQdo=
SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod) = 5u/a94opUD8IDPbSYV4onPsdnjq31XD1NmjsorSrQdo=
@@ -315,15 +342,20 @@ SHA256 (go_modules/mvdan.cc/unparam/@v/v0.0.0-20230312
SHA256 (go_modules/mvdan.cc/unparam/@v/v0.0.0-20230312165513-e84e2d14e3b8.zip) = m1xb4Hh4qr/7KDXx3UhPUC/y64MhLl7fxmYXlz55hio=
SHA256 (go_modules/sigs.k8s.io/yaml/@v/v1.3.0.mod) = L8eybun2ctl7QvpvJfWxWlWYK7usaZYdduux0DbRUAE=
SHA256 (go_modules/sigs.k8s.io/yaml/@v/v1.3.0.zip) = qsiNpVHCpRK2Qss1ZYvz3IYllaNWa9hA6/GOSALx/Mk=
-SHA256 (osv-scanner-v1.6.1.zip) = q3cALnmazcW9q/6/C0F37kWZO5H+z4ns1csC2dgjT3s=
+SHA256 (osv-scanner-v1.6.2.zip) = rucJfd2lZUbH+HPR6M43qAQfAks1OFe1Izpmn2+3wr0=
SIZE (go_modules/cloud.google.com/go/compute/@v/v1.23.0.mod) = 1093
SIZE (go_modules/cloud.google.com/go/compute/@v/v1.23.0.zip) = 1756502
SIZE (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.3.mod) = 98
SIZE (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.3.zip) = 20855
SIZE (go_modules/dario.cat/mergo/@v/v1.0.0.mod) = 65
SIZE (go_modules/dario.cat/mergo/@v/v1.0.0.zip) = 49320
+SIZE (go_modules/deps.dev/api/v3alpha/@v/v0.0.0-20231114023923-e40c4d5c34e5.mod) = 356
SIZE (go_modules/deps.dev/api/v3alpha/@v/v0.0.0-20240109042716-00b51ef52ece.mod) = 356
SIZE (go_modules/deps.dev/api/v3alpha/@v/v0.0.0-20240109042716-00b51ef52ece.zip) = 39831
+SIZE (go_modules/deps.dev/util/resolve/@v/v0.0.0-20240109042716-00b51ef52ece.mod) = 585
+SIZE (go_modules/deps.dev/util/resolve/@v/v0.0.0-20240109042716-00b51ef52ece.zip) = 83541
+SIZE (go_modules/deps.dev/util/semver/@v/v0.0.0-20240109040450-1e316b822bc4.mod) = 39
+SIZE (go_modules/deps.dev/util/semver/@v/v0.0.0-20240109040450-1e316b822bc4.zip) = 91136
SIZE (go_modules/github.com/!burnt!sushi/toml/@v/v1.3.2.mod) = 43
SIZE (go_modules/github.com/!burnt!sushi/toml/@v/v1.3.2.zip) = 303020
SIZE (go_modules/github.com/!cyclone!d!x/cyclonedx-go/@v/v0.8.0.mod) = 543
@@ -360,6 +392,8 @@ SIZE (go_modules/github.com/cncf/xds/go/@v/v0.0.0-2023
SIZE (go_modules/github.com/cncf/xds/go/@v/v0.0.0-20230607035331-e9ce68804cb4.zip) = 140361
SIZE (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.mod) = 100
SIZE (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.zip) = 12539
+SIZE (go_modules/github.com/creack/pty/@v/v1.1.9.mod) = 39
+SIZE (go_modules/github.com/creack/pty/@v/v1.1.9.zip) = 19440
SIZE (go_modules/github.com/cyphar/filepath-securejoin/@v/v0.2.4.mod) = 54
SIZE (go_modules/github.com/cyphar/filepath-securejoin/@v/v0.2.4.zip) = 9553
SIZE (go_modules/github.com/davecgh/go-spew/@v/v1.1.0.mod) = 34
@@ -375,6 +409,12 @@ SIZE (go_modules/github.com/envoyproxy/protoc-gen-vali
SIZE (go_modules/github.com/envoyproxy/protoc-gen-validate/@v/v1.0.2.zip) = 227165
SIZE (go_modules/github.com/felixge/fgprof/@v/v0.9.3.mod) = 151
SIZE (go_modules/github.com/felixge/fgprof/@v/v0.9.3.zip) = 343885
+SIZE (go_modules/github.com/gkampitakis/ciinfo/@v/v0.3.0.mod) = 46
+SIZE (go_modules/github.com/gkampitakis/ciinfo/@v/v0.3.0.zip) = 15099
+SIZE (go_modules/github.com/gkampitakis/go-diff/@v/v1.3.2.mod) = 47
+SIZE (go_modules/github.com/gkampitakis/go-diff/@v/v1.3.2.zip) = 1349669
+SIZE (go_modules/github.com/gkampitakis/go-snaps/@v/v0.4.12.mod) = 454
+SIZE (go_modules/github.com/gkampitakis/go-snaps/@v/v0.4.12.zip) = 155263
SIZE (go_modules/github.com/gliderlabs/ssh/@v/v0.3.5.mod) = 371
SIZE (go_modules/github.com/gliderlabs/ssh/@v/v0.3.5.zip) = 35754
SIZE (go_modules/github.com/go-git/gcfg/@v/v1.5.1-0.20230307220236-3a3c6141e376.mod) = 111
@@ -408,10 +448,8 @@ SIZE (go_modules/github.com/google/renameio/@v/v0.1.0.
SIZE (go_modules/github.com/google/renameio/@v/v0.1.0.zip) = 14941
SIZE (go_modules/github.com/google/uuid/@v/v1.3.1.mod) = 30
SIZE (go_modules/github.com/google/uuid/@v/v1.3.1.zip) = 26946
-SIZE (go_modules/github.com/hexops/gotextdiff/@v/v1.0.3.mod) = 45
-SIZE (go_modules/github.com/hexops/gotextdiff/@v/v1.0.3.zip) = 33608
-SIZE (go_modules/github.com/ianlancetaylor/demangle/@v/v0.0.0-20231023195312-e2daf7ba7156.mod) = 51
-SIZE (go_modules/github.com/ianlancetaylor/demangle/@v/v0.0.0-20231023195312-e2daf7ba7156.zip) = 696032
+SIZE (go_modules/github.com/ianlancetaylor/demangle/@v/v0.0.0-20240117034632-964b1d53ca6c.mod) = 51
+SIZE (go_modules/github.com/ianlancetaylor/demangle/@v/v0.0.0-20240117034632-964b1d53ca6c.zip) = 696101
SIZE (go_modules/github.com/jbenet/go-context/@v/v0.0.0-20150711004518-d14ea06fba99.mod) = 36
SIZE (go_modules/github.com/jbenet/go-context/@v/v0.0.0-20150711004518-d14ea06fba99.zip) = 8654
SIZE (go_modules/github.com/jedib0t/go-pretty/v6/@v/v6.5.3.mod) = 528
@@ -426,6 +464,8 @@ SIZE (go_modules/github.com/kr/pty/@v/v1.1.1.zip) = 14
SIZE (go_modules/github.com/kr/text/@v/v0.1.0.mod) = 64
SIZE (go_modules/github.com/kr/text/@v/v0.2.0.mod) = 68
SIZE (go_modules/github.com/kr/text/@v/v0.2.0.zip) = 12607
+SIZE (go_modules/github.com/maruel/natural/@v/v1.1.0.mod) = 42
+SIZE (go_modules/github.com/maruel/natural/@v/v1.1.0.zip) = 10462
SIZE (go_modules/github.com/mattn/go-runewidth/@v/v0.0.15.mod) = 84
SIZE (go_modules/github.com/mattn/go-runewidth/@v/v0.0.15.zip) = 21768
SIZE (go_modules/github.com/mmcloughlin/avo/@v/v0.5.0.mod) = 134
@@ -442,6 +482,8 @@ SIZE (go_modules/github.com/pandatix/go-cvss/@v/v0.6.2
SIZE (go_modules/github.com/pandatix/go-cvss/@v/v0.6.2.zip) = 281859
SIZE (go_modules/github.com/pjbgf/sha1cd/@v/v0.3.0.mod) = 213
SIZE (go_modules/github.com/pjbgf/sha1cd/@v/v0.3.0.zip) = 3528787
+SIZE (go_modules/github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.mod) = 36
+SIZE (go_modules/github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.zip) = 219375
SIZE (go_modules/github.com/pkg/errors/@v/v0.9.1.mod) = 29
SIZE (go_modules/github.com/pkg/errors/@v/v0.9.1.zip) = 17866
SIZE (go_modules/github.com/pkg/profile/@v/v1.7.0.mod) = 81
@@ -453,6 +495,7 @@ SIZE (go_modules/github.com/rivo/uniseg/@v/v0.4.4.mod)
SIZE (go_modules/github.com/rivo/uniseg/@v/v0.4.4.zip) = 476937
SIZE (go_modules/github.com/rogpeppe/go-internal/@v/v1.11.0.mod) = 167
SIZE (go_modules/github.com/rogpeppe/go-internal/@v/v1.11.0.zip) = 183284
+SIZE (go_modules/github.com/rogpeppe/go-internal/@v/v1.9.0.mod) = 112
SIZE (go_modules/github.com/russross/blackfriday/v2/@v/v2.1.0.mod) = 42
SIZE (go_modules/github.com/russross/blackfriday/v2/@v/v2.1.0.zip) = 122358
SIZE (go_modules/github.com/sergi/go-diff/@v/v1.1.0.mod) = 281
@@ -481,6 +524,16 @@ SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.4
SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.4.zip) = 120537
SIZE (go_modules/github.com/terminalstatic/go-xsd-validate/@v/v0.1.5.mod) = 58
SIZE (go_modules/github.com/terminalstatic/go-xsd-validate/@v/v0.1.5.zip) = 23362
+SIZE (go_modules/github.com/tidwall/gjson/@v/v1.14.2.mod) = 121
+SIZE (go_modules/github.com/tidwall/gjson/@v/v1.17.0.mod) = 121
+SIZE (go_modules/github.com/tidwall/gjson/@v/v1.17.0.zip) = 61942
+SIZE (go_modules/github.com/tidwall/match/@v/v1.1.1.mod) = 41
+SIZE (go_modules/github.com/tidwall/match/@v/v1.1.1.zip) = 6893
+SIZE (go_modules/github.com/tidwall/pretty/@v/v1.2.0.mod) = 42
+SIZE (go_modules/github.com/tidwall/pretty/@v/v1.2.1.mod) = 42
+SIZE (go_modules/github.com/tidwall/pretty/@v/v1.2.1.zip) = 12501
+SIZE (go_modules/github.com/tidwall/sjson/@v/v1.2.5.mod) = 122
+SIZE (go_modules/github.com/tidwall/sjson/@v/v1.2.5.zip) = 28719
SIZE (go_modules/github.com/urfave/cli/v2/@v/v2.27.1.mod) = 280
SIZE (go_modules/github.com/urfave/cli/v2/@v/v2.27.1.zip) = 3552284
SIZE (go_modules/github.com/vmihailenco/msgpack/v4/@v/v4.3.12.mod) = 382
@@ -511,14 +564,15 @@ SIZE (go_modules/golang.org/x/crypto/@v/v0.18.0.mod) =
SIZE (go_modules/golang.org/x/crypto/@v/v0.18.0.zip) = 1797935
SIZE (go_modules/golang.org/x/crypto/@v/v0.3.1-0.20221117191849-2c476679df9a.mod) = 171
SIZE (go_modules/golang.org/x/crypto/@v/v0.7.0.mod) = 171
-SIZE (go_modules/golang.org/x/exp/@v/v0.0.0-20240112132812-db7319d0e0e3.mod) = 133
-SIZE (go_modules/golang.org/x/exp/@v/v0.0.0-20240112132812-db7319d0e0e3.zip) = 589707
+SIZE (go_modules/golang.org/x/exp/@v/v0.0.0-20240119083558-1b970713d09a.mod) = 133
+SIZE (go_modules/golang.org/x/exp/@v/v0.0.0-20240119083558-1b970713d09a.zip) = 590537
SIZE (go_modules/golang.org/x/mod/@v/v0.12.0.mod) = 84
SIZE (go_modules/golang.org/x/mod/@v/v0.14.0.mod) = 84
SIZE (go_modules/golang.org/x/mod/@v/v0.14.0.zip) = 165104
SIZE (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20220419223038-86c51ed26bb4.mod) = 157
SIZE (go_modules/golang.org/x/mod/@v/v0.6.0.mod) = 117
SIZE (go_modules/golang.org/x/mod/@v/v0.8.0.mod) = 84
+SIZE (go_modules/golang.org/x/mod/@v/v0.9.0.mod) = 84
SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod) = 172
SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod) = 181
SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod) = 181
@@ -633,4 +687,4 @@ SIZE (go_modules/mvdan.cc/unparam/@v/v0.0.0-2023031216
SIZE (go_modules/mvdan.cc/unparam/@v/v0.0.0-20230312165513-e84e2d14e3b8.zip) = 28985
SIZE (go_modules/sigs.k8s.io/yaml/@v/v1.3.0.mod) = 106
SIZE (go_modules/sigs.k8s.io/yaml/@v/v1.3.0.zip) = 21567
-SIZE (osv-scanner-v1.6.1.zip) = 2166878
+SIZE (osv-scanner-v1.6.2.zip) = 3034859
blob - 7fe8089387d22745e421fe3e182603b347180fdf
blob + a3b57b7d07e8c21e946abeea00fe96cf37efe4f1
--- security/osv-scanner/modules.inc
+++ security/osv-scanner/modules.inc
@@ -3,6 +3,8 @@ MODGO_MODULES = \
cloud.google.com/go/compute/metadata v0.2.3 \
dario.cat/mergo v1.0.0 \
deps.dev/api/v3alpha v0.0.0-20240109042716-00b51ef52ece \
+ deps.dev/util/resolve v0.0.0-20240109042716-00b51ef52ece \
+ deps.dev/util/semver v0.0.0-20240109040450-1e316b822bc4 \
github.com/!burnt!sushi/toml v1.3.2 \
github.com/!cyclone!d!x/cyclonedx-go v0.8.0 \
github.com/!microsoft/go-winio v0.6.1 \
@@ -19,6 +21,7 @@ MODGO_MODULES = \
github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe \
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 \
github.com/cpuguy83/go-md2man/v2 v2.0.2 \
+ github.com/creack/pty v1.1.9 \
github.com/cyphar/filepath-securejoin v0.2.4 \
github.com/davecgh/go-spew v1.1.1 \
github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a \
@@ -26,6 +29,9 @@ MODGO_MODULES = \
github.com/envoyproxy/go-control-plane v0.11.1 \
github.com/envoyproxy/protoc-gen-validate v1.0.2 \
github.com/felixge/fgprof v0.9.3 \
+ github.com/gkampitakis/ciinfo v0.3.0 \
+ github.com/gkampitakis/go-diff v1.3.2 \
+ github.com/gkampitakis/go-snaps v0.4.12 \
github.com/gliderlabs/ssh v0.3.5 \
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 \
github.com/go-git/go-billy/v5 v5.5.0 \
@@ -39,14 +45,14 @@ MODGO_MODULES = \
github.com/google/pprof v0.0.0-20211214055906-6f57359322fd \
github.com/google/renameio v0.1.0 \
github.com/google/uuid v1.3.1 \
- github.com/hexops/gotextdiff v1.0.3 \
- github.com/ianlancetaylor/demangle v0.0.0-20231023195312-e2daf7ba7156 \
+ github.com/ianlancetaylor/demangle v0.0.0-20240117034632-964b1d53ca6c \
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 \
github.com/jedib0t/go-pretty/v6 v6.5.3 \
github.com/kevinburke/ssh_config v1.2.0 \
github.com/kr/pretty v0.3.1 \
github.com/kr/pty v1.1.1 \
github.com/kr/text v0.2.0 \
+ github.com/maruel/natural v1.1.0 \
github.com/mattn/go-runewidth v0.0.15 \
github.com/mmcloughlin/avo v0.5.0 \
github.com/onsi/gomega v1.27.10 \
@@ -55,6 +61,7 @@ MODGO_MODULES = \
github.com/package-url/packageurl-go v0.1.2 \
github.com/pandatix/go-cvss v0.6.2 \
github.com/pjbgf/sha1cd v0.3.0 \
+ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e \
github.com/pkg/errors v0.9.1 \
github.com/pkg/profile v1.7.0 \
github.com/pmezard/go-difflib v1.0.0 \
@@ -69,6 +76,10 @@ MODGO_MODULES = \
github.com/stretchr/objx v0.5.0 \
github.com/stretchr/testify v1.8.4 \
github.com/terminalstatic/go-xsd-validate v0.1.5 \
+ github.com/tidwall/gjson v1.17.0 \
+ github.com/tidwall/match v1.1.1 \
+ github.com/tidwall/pretty v1.2.1 \
+ github.com/tidwall/sjson v1.2.5 \
github.com/urfave/cli/v2 v2.27.1 \
github.com/vmihailenco/msgpack/v4 v4.3.12 \
github.com/vmihailenco/tagparser v0.1.1 \
@@ -80,7 +91,7 @@ MODGO_MODULES = \
github.com/yuin/goldmark v1.4.13 \
github.com/zclconf/go-cty v1.10.0 \
golang.org/x/crypto v0.18.0 \
- golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 \
+ golang.org/x/exp v0.0.0-20240119083558-1b970713d09a \
golang.org/x/mod v0.14.0 \
golang.org/x/net v0.20.0 \
golang.org/x/oauth2 v0.13.0 \
@@ -105,6 +116,7 @@ MODGO_MODULES = \
sigs.k8s.io/yaml v1.3.0
MODGO_MODFILES = \
+ deps.dev/api/v3alpha v0.0.0-20231114023923-e40c4d5c34e5 \
github.com/!microsoft/go-winio v0.5.2 \
github.com/!proton!mail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 \
github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092 \
@@ -120,6 +132,7 @@ MODGO_MODFILES = \
github.com/kr/pretty v0.1.0 \
github.com/kr/text v0.1.0 \
github.com/rivo/uniseg v0.2.0 \
+ github.com/rogpeppe/go-internal v1.9.0 \
github.com/sergi/go-diff v1.1.0 \
github.com/sirupsen/logrus v1.7.0 \
github.com/spdx/gordf v0.0.0-20201111095634-7098f93598fb \
@@ -130,6 +143,8 @@ MODGO_MODFILES = \
github.com/stretchr/testify v1.7.0 \
github.com/stretchr/testify v1.7.1 \
github.com/stretchr/testify v1.8.0 \
+ github.com/tidwall/gjson v1.14.2 \
+ github.com/tidwall/pretty v1.2.0 \
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 \
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 \
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d \
@@ -142,6 +157,7 @@ MODGO_MODFILES = \
golang.org/x/mod v0.6.0 \
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 \
golang.org/x/mod v0.8.0 \
+ golang.org/x/mod v0.9.0 \
golang.org/x/net v0.0.0-20190603091049-60506f45cf65 \
golang.org/x/net v0.0.0-20190620200207-3b0461eec859 \
golang.org/x/net v0.0.0-20200301022130-244492dfa37a \
Hello,
Here's an update for osv-scanner which has been running fine on amd64.
Other tests?
changelog:
https://github.com/google/osv-scanner/releases/tag/v1.6.2
Thanks,
Lucas
commit - 7613a8cf0b66c00314807995741459338c5bd5d4
commit + 79224448a1d8ffe9f9a5e56791730c8f54ff2836
blob - 7f2a1cac0a859bce9ed72b508f08a8f316386202
blob + 950e8b5dd2048bfb31c626aa2f3abe23466e12d8
--- security/osv-scanner/Makefile
+++ security/osv-scanner/Makefile
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS = aarch64 amd64 mips64 riscv64
COMMENT = scan your project's dependencies for vulnerabilities
-V = 1.6.1
+V = 1.6.2
MODGO_MODNAME = github.com/google/osv-scanner
MODGO_VERSION = v${V}
blob - 93ceb7953126b28476ffd3331f3c8e1387b057ab
blob + b0f572931570f2d0c025cd3b5172433c011344b7
--- security/osv-scanner/distinfo
+++ security/osv-scanner/distinfo
@@ -4,8 +4,13 @@ SHA256 (go_modules/cloud.google.com/go/compute/metadat
SHA256 (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.3.zip) = KShk29Cx3jepaOKF6UmIXlczhIN9gc02lb5c4uI5GIc=
SHA256 (go_modules/dario.cat/mergo/@v/v1.0.0.mod) = 4jxLgDpsbm5FdHlG6H0kcEzXd1bMSEvf0XtXIjvzINY=
SHA256 (go_modules/dario.cat/mergo/@v/v1.0.0.zip) = Gn7zlnCcWDUha7R7qSGN1ECsUwdYPGnReYzp5FfxMR0=
+SHA256 (go_modules/deps.dev/api/v3alpha/@v/v0.0.0-20231114023923-e40c4d5c34e5.mod) = h/veE8xDl3AO43RbynyN7nbNERVbVmMCHMmQ07wfiOc=
SHA256 (go_modules/deps.dev/api/v3alpha/@v/v0.0.0-20240109042716-00b51ef52ece.mod) = h/veE8xDl3AO43RbynyN7nbNERVbVmMCHMmQ07wfiOc=
SHA256 (go_modules/deps.dev/api/v3alpha/@v/v0.0.0-20240109042716-00b51ef52ece.zip) = 6enK6Ws3A9qUndelYdFX5ck9+OLN4POMROhxCHr08sk=
+SHA256 (go_modules/deps.dev/util/resolve/@v/v0.0.0-20240109042716-00b51ef52ece.mod) = WnpKVdUYRv0AEsYuGl21fqLdd562akWx8o/C+Okbk5Y=
+SHA256 (go_modules/deps.dev/util/resolve/@v/v0.0.0-20240109042716-00b51ef52ece.zip) = mxvUXKycVMBCaRmgLvHPEmC8WaM6e86FLtPH3LpQFg4=
+SHA256 (go_modules/deps.dev/util/semver/@v/v0.0.0-20240109040450-1e316b822bc4.mod) = PBARmS9BLys0bWQHHH40BDoAiidH3bPqo/In6id0XXw=
+SHA256 (go_modules/deps.dev/util/semver/@v/v0.0.0-20240109040450-1e316b822bc4.zip) = 9v1Va2QyQ05p9PTdcRwa0sd3llF6wXshSTv0cXdbjaA=
SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.3.2.mod) = JnfIL+dPIDdyiJpagBr7Mp2VF1UId92ssXIZFpurPt0=
SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.3.2.zip) = XeJGoMtMJW8/1dDbigihFPWK8MLhk7vwrZASEErbtrI=
SHA256 (go_modules/github.com/!cyclone!d!x/cyclonedx-go/@v/v0.8.0.mod) = X1TYnaBD7V3Tmb6nIG+3k3AcVSRgAH6nq+sCUVmMX9s=
@@ -42,6 +47,8 @@ SHA256 (go_modules/github.com/cncf/xds/go/@v/v0.0.0-20
SHA256 (go_modules/github.com/cncf/xds/go/@v/v0.0.0-20230607035331-e9ce68804cb4.zip) = oMbmbq3jV67aTtqp0JYSCFhg3EwLRO34ImV0k5vfYJE=
SHA256 (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.mod) = FMOvou9iNVXBtINNH4ixTfd1Sa/uheV1DBkQJGW3iro=
SHA256 (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.zip) = cKfmCYCc8qksVTUQTbXrgtdcVL/P7S0iTofdL9lyn2I=
+SHA256 (go_modules/github.com/creack/pty/@v/v1.1.9.mod) = 6rBwW8ShjdMVwnpOPbqPIKnhIwZfogYzlmMytczPdzE=
+SHA256 (go_modules/github.com/creack/pty/@v/v1.1.9.zip) = IO38wnr9eZF4C8kcpSPSaZnqAl5B9gvF7XG7rADhdeI=
SHA256 (go_modules/github.com/cyphar/filepath-securejoin/@v/v0.2.4.mod) = 3H2HZHOPLSMbofLvWkVzpI/kD2Rby4spHkIGljRXJTc=
SHA256 (go_modules/github.com/cyphar/filepath-securejoin/@v/v0.2.4.zip) = CvlOtZEz/aaf0ETa/6fWK6Do0nFtT7HEJPPirWNtPjQ=
SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.0.mod) = vLKTkyUSN7eaF7bBm/KRNPQ+j0OMMZiYj81GGhzfBcw=
@@ -57,6 +64,12 @@ SHA256 (go_modules/github.com/envoyproxy/protoc-gen-va
SHA256 (go_modules/github.com/envoyproxy/protoc-gen-validate/@v/v1.0.2.zip) = p50Z+wZVVLIUSSx2GddguUQFQp58pp7eki6WiSmmb/s=
SHA256 (go_modules/github.com/felixge/fgprof/@v/v0.9.3.mod) = G4FCpyTwr69dOnTq+HyFVk1QzegJwKNNz6AmZH+ucx4=
SHA256 (go_modules/github.com/felixge/fgprof/@v/v0.9.3.zip) = LIMmgIes+Ldnvmnbw3wJn6hYVnY8Loj7mWN9Rutqwjw=
+SHA256 (go_modules/github.com/gkampitakis/ciinfo/@v/v0.3.0.mod) = cxFqOWZ0gqB4QqNn1Ze7DFk05gNRPicBwCRh2PdqSe8=
+SHA256 (go_modules/github.com/gkampitakis/ciinfo/@v/v0.3.0.zip) = bz2w1Z/F4ggHP2wgCkhz/J1FFU2/fZKtqPxp5bvGYV4=
+SHA256 (go_modules/github.com/gkampitakis/go-diff/@v/v1.3.2.mod) = qTKf7D6TiBiejVKKZSqPGMG528Fd1zjkXuHPZKJgMKI=
+SHA256 (go_modules/github.com/gkampitakis/go-diff/@v/v1.3.2.zip) = R0q2xm5qvE+ll5s/tIvCUf2yN+UtnwoodGy0ws1cAoY=
+SHA256 (go_modules/github.com/gkampitakis/go-snaps/@v/v0.4.12.mod) = bkEHDHL8uKlTFntlUY8ObX02kEtalqLjYlSnpmYz044=
+SHA256 (go_modules/github.com/gkampitakis/go-snaps/@v/v0.4.12.zip) = OQAkNiUsiKLxWcuTK3cyvakxnaGMhX/nVS0IVM/Z4Qk=
SHA256 (go_modules/github.com/gliderlabs/ssh/@v/v0.3.5.mod) = e58vOhQap3SYfxqH3pDCYmF1qKUCULu557Sbxvv9Kf8=
SHA256 (go_modules/github.com/gliderlabs/ssh/@v/v0.3.5.zip) = fJ36VBTamJYPw9nSBdJ3SNzGPTFIJqTUdF9IhrWpfx8=
SHA256 (go_modules/github.com/go-git/gcfg/@v/v1.5.1-0.20230307220236-3a3c6141e376.mod) = L01TDeXjVrwb8VEBENnKBAbTI7bLlBl44d1zEdQYuo8=
@@ -90,10 +103,8 @@ SHA256 (go_modules/github.com/google/renameio/@v/v0.1.
SHA256 (go_modules/github.com/google/renameio/@v/v0.1.0.zip) = uFELs0B4aRoguOSQLTca/g6xcbLa+VP2fLOWDRkmzPM=
SHA256 (go_modules/github.com/google/uuid/@v/v1.3.1.mod) = c9pHtjOLAKCC/UUao1oyc9OtwJuOm7qY2rAQkeQCr24=
SHA256 (go_modules/github.com/google/uuid/@v/v1.3.1.zip) = nZ1s+yjObb5LUYxCxrzNZ7tTGhBoWYCPNugqXD+4xk0=
-SHA256 (go_modules/github.com/hexops/gotextdiff/@v/v1.0.3.mod) = qUfdi3h5PdOY6iCt7h99M8zydn2/juazzXe3Hxnm+5s=
-SHA256 (go_modules/github.com/hexops/gotextdiff/@v/v1.0.3.zip) = oQw5QvCbxRMiaNItS7nQwYSRItUz/ozfZepp2gXOu68=
-SHA256 (go_modules/github.com/ianlancetaylor/demangle/@v/v0.0.0-20231023195312-e2daf7ba7156.mod) = EF1NDHjIIF+F1TvIayvdxYQwzg+d03tyWCu6f/jeOLw=
-SHA256 (go_modules/github.com/ianlancetaylor/demangle/@v/v0.0.0-20231023195312-e2daf7ba7156.zip) = aaRXXHjLCWywU1ZUDt/6cm2iBsql/heJ1iZx0wj0pUg=
+SHA256 (go_modules/github.com/ianlancetaylor/demangle/@v/v0.0.0-20240117034632-964b1d53ca6c.mod) = EF1NDHjIIF+F1TvIayvdxYQwzg+d03tyWCu6f/jeOLw=
+SHA256 (go_modules/github.com/ianlancetaylor/demangle/@v/v0.0.0-20240117034632-964b1d53ca6c.zip) = QAc8gXYGfCcYpTeTl2Zq3vsT77ZEFn3wrj97GIVCKzY=
SHA256 (go_modules/github.com/jbenet/go-context/@v/v0.0.0-20150711004518-d14ea06fba99.mod) = 4+87N7MKDkMiuzbTB2k2Og1Dv0YszdpGT6Y4YtFpT5c=
SHA256 (go_modules/github.com/jbenet/go-context/@v/v0.0.0-20150711004518-d14ea06fba99.zip) = TNCVWr7qQ9xLWgi4dp5pYQngN28qETqbjv8TzJDKwcc=
SHA256 (go_modules/github.com/jedib0t/go-pretty/v6/@v/v6.5.3.mod) = CcS/hHDsFeQrjDq1SPl3bKNC6tZw+75rph4grx4U8MM=
@@ -108,6 +119,8 @@ SHA256 (go_modules/github.com/kr/pty/@v/v1.1.1.zip) =
SHA256 (go_modules/github.com/kr/text/@v/v0.1.0.mod) = L7qVKeXBPd5i83Hvc4O68E1xMlAdrGqgjpEPnsC/hcU=
SHA256 (go_modules/github.com/kr/text/@v/v0.2.0.mod) = 9jh5sgT2zolc6lNZS4FPWsCvCEhrM7HKecZXOE77xyY=
SHA256 (go_modules/github.com/kr/text/@v/v0.2.0.zip) = No6zGPkaW2e+kFxHAyq1wxodSal4SLEBGg0KISKzC6Q=
+SHA256 (go_modules/github.com/maruel/natural/@v/v1.1.0.mod) = yoZQDbGGI1+Id1DCr4bGyMnJx+553MwrNOZy/Ja6O7o=
+SHA256 (go_modules/github.com/maruel/natural/@v/v1.1.0.zip) = SGRrh/1r6ypIc3s7ddS6NXvQ1sDuM37gcmLCSnyn/yc=
SHA256 (go_modules/github.com/mattn/go-runewidth/@v/v0.0.15.mod) = IWyT0ZMQYSyB1cdBAkmJ+DiX0jM8Op+We1ixMXWH9Rk=
SHA256 (go_modules/github.com/mattn/go-runewidth/@v/v0.0.15.zip) = 2XxPBmehSVdWnJMqjiSI8cQ3V7TczjE4l6oAHwfRSbA=
SHA256 (go_modules/github.com/mmcloughlin/avo/@v/v0.5.0.mod) = ub0wCk3oARuPZ7dUz1udGPukajNNjUlaQBMZXtg3QXQ=
@@ -124,6 +137,8 @@ SHA256 (go_modules/github.com/pandatix/go-cvss/@v/v0.6
SHA256 (go_modules/github.com/pandatix/go-cvss/@v/v0.6.2.zip) = qdwiUINJPYS29uBDsVcF4w126chpOiHAAWTchtaILfw=
SHA256 (go_modules/github.com/pjbgf/sha1cd/@v/v0.3.0.mod) = 8Qo2tGIntPuz5pD2zHJtlGR18xZp7rxSxK1bLombToA=
SHA256 (go_modules/github.com/pjbgf/sha1cd/@v/v0.3.0.zip) = rP7pbdL+jmrgiumGRQSDCknSNddMKrk996XfopqQpGE=
+SHA256 (go_modules/github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.mod) = XVuUVOLQIK8MdgNWjoaQS5m+/E1dZ8OoUF9hIVib0R8=
+SHA256 (go_modules/github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.zip) = 81sj/dK5Ui3dRsxcAWG08HZcUUR11dTKKoasoxOIyL0=
SHA256 (go_modules/github.com/pkg/errors/@v/v0.9.1.mod) = 3yjGqCPxgddheWlxd8DFlDxv+zjzwQstxTvjYO59RYk=
SHA256 (go_modules/github.com/pkg/errors/@v/v0.9.1.zip) = 1MNri80GFikKORMhXg9TuTG9bgBnBZbylg3xtEryvQc=
SHA256 (go_modules/github.com/pkg/profile/@v/v1.7.0.mod) = SnkqIyRN7sE3zqtMGrCjdQcat/FyI0w6M+JL0BlpR7U=
@@ -135,6 +150,7 @@ SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.4.4.mo
SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.4.4.zip) = dAzVgDEE763yd6DzUZ8OrZfjIdvZCc7uvXyLaza0R1Q=
SHA256 (go_modules/github.com/rogpeppe/go-internal/@v/v1.11.0.mod) = zRKUMvaTrNtOkSxjkyyxIG1UWcjboC3sG0GPgH3LeOs=
SHA256 (go_modules/github.com/rogpeppe/go-internal/@v/v1.11.0.zip) = NinUsuRX/bpenVGjduK+rZsoogaW+pBbcBx5JQGIxOM=
+SHA256 (go_modules/github.com/rogpeppe/go-internal/@v/v1.9.0.mod) = kFmpfaKZDIGaCXZ6XpvYeEtFpXt6JeKQVbvRsKqhRP8=
SHA256 (go_modules/github.com/russross/blackfriday/v2/@v/v2.1.0.mod) = w5VHzOboZujPo5XSk3vOMIAc0H8LkBwhMySPH7oS9Y0=
SHA256 (go_modules/github.com/russross/blackfriday/v2/@v/v2.1.0.zip) = eFJ1DVigU844sB8sIDIIgXVk9VLr83GytjAIHXAExq4=
SHA256 (go_modules/github.com/sergi/go-diff/@v/v1.1.0.mod) = IObs3/d7hGk4Nbl4uKFvbCK3hVlisjQQPV63SBi+RB8=
@@ -163,6 +179,16 @@ SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8
SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.4.zip) = 4gbart4L0D3gYL3765hKwsSbgwWHU//8k/4MIg6odTI=
SHA256 (go_modules/github.com/terminalstatic/go-xsd-validate/@v/v0.1.5.mod) = rgAGWi389/UqxU+L2CZMy/xhWdcRqzEv3hTpLph2Prs=
SHA256 (go_modules/github.com/terminalstatic/go-xsd-validate/@v/v0.1.5.zip) = 8m+czoXKLRfpnM64pu+R5OVXZWLBHbKGDgv3aU2ExNQ=
+SHA256 (go_modules/github.com/tidwall/gjson/@v/v1.14.2.mod) = 2U7s2AUM/8lXuZvtijCO/qpmmsE4VCkNCBot7VR4r5M=
+SHA256 (go_modules/github.com/tidwall/gjson/@v/v1.17.0.mod) = 2U7s2AUM/8lXuZvtijCO/qpmmsE4VCkNCBot7VR4r5M=
+SHA256 (go_modules/github.com/tidwall/gjson/@v/v1.17.0.zip) = i3HzD31yfJeYYdZOVJoZEeTNNtRwSBtR2imYuZSzxMY=
+SHA256 (go_modules/github.com/tidwall/match/@v/v1.1.1.mod) = AjZOUVMn2ZiNH2vTevnFhPi5jTtPQ/nh8Y4m12rsD0Q=
+SHA256 (go_modules/github.com/tidwall/match/@v/v1.1.1.zip) = K6QffyczDUng5DLL+Wv5ByCjPkqXvlj+U/Y6fmbwTTc=
+SHA256 (go_modules/github.com/tidwall/pretty/@v/v1.2.0.mod) = blxfpJPY8Y6JdLOO1j6McYY8zlnmWdmNDvhBe/gePs8=
+SHA256 (go_modules/github.com/tidwall/pretty/@v/v1.2.1.mod) = blxfpJPY8Y6JdLOO1j6McYY8zlnmWdmNDvhBe/gePs8=
+SHA256 (go_modules/github.com/tidwall/pretty/@v/v1.2.1.zip) = kydXm/nmEN51Put8NcjPHj9W5uViPL9l5HvIB2Aj0as=
+SHA256 (go_modules/github.com/tidwall/sjson/@v/v1.2.5.mod) = OLCTI6uO+PgDs9hrriyUdl04FaLVt1H9TwcDn0VRzG8=
+SHA256 (go_modules/github.com/tidwall/sjson/@v/v1.2.5.zip) = /ED9qHx95VNi9jhuBp1nR3LyXJ12QR7oI6y5rHiyBWU=
SHA256 (go_modules/github.com/urfave/cli/v2/@v/v2.27.1.mod) = XD3aJw3iuXT/2n/bvxItJJk7suwFeFtP+RROdhfqxBU=
SHA256 (go_modules/github.com/urfave/cli/v2/@v/v2.27.1.zip) = UtYNuIDHWL39a1+2enBjtT3AjzpjgC6hxOKQrkCPEbM=
SHA256 (go_modules/github.com/vmihailenco/msgpack/v4/@v/v4.3.12.mod) = LIDah2TON8JwC2yT3I7lPROceagqQKB1mAD3k4O8/cY=
@@ -193,14 +219,15 @@ SHA256 (go_modules/golang.org/x/crypto/@v/v0.18.0.mod)
SHA256 (go_modules/golang.org/x/crypto/@v/v0.18.0.zip) = VBNHlyC79RgxRGUoBSA6PfdIANLygfYR6C06fsFfQyU=
SHA256 (go_modules/golang.org/x/crypto/@v/v0.3.1-0.20221117191849-2c476679df9a.mod) = t5UQb4uN637XdSOoHeAatGAfDwOBNTkYRX0teK2ePOk=
SHA256 (go_modules/golang.org/x/crypto/@v/v0.7.0.mod) = yJ/iLnPawmoAplasEf9MbhprbNKrzFftzazew/va2C0=
-SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20240112132812-db7319d0e0e3.mod) = mR9g3gigToBWNSaTXIm9u5J07hRUdeXqAfjvGjxVdTs=
-SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20240112132812-db7319d0e0e3.zip) = Inr7dQ66eqtnQw276p46OIbIaKrkH+p43URYZaIDsjI=
+SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20240119083558-1b970713d09a.mod) = mR9g3gigToBWNSaTXIm9u5J07hRUdeXqAfjvGjxVdTs=
+SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20240119083558-1b970713d09a.zip) = cGuv2OfT19QRKmIwt06TBAFafY8zrxg+Arq8z7hyF+U=
SHA256 (go_modules/golang.org/x/mod/@v/v0.12.0.mod) = YkVnRZxumUesSr3gtwNO5h3Ltqk3P1lwCUwLs+gSGWQ=
SHA256 (go_modules/golang.org/x/mod/@v/v0.14.0.mod) = XErAMQolMwdXA5zPOpjnX+/by31ETd0EkjAAOkSUW94=
SHA256 (go_modules/golang.org/x/mod/@v/v0.14.0.zip) = mKEiySrVXe72dPZUa0wpXtk9EGF43STsQESa4ztBA3o=
SHA256 (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20220419223038-86c51ed26bb4.mod) = QtGQI/+PLq5wC8VJXzcezZmKItGbqYXQr19pkAslQIM=
SHA256 (go_modules/golang.org/x/mod/@v/v0.6.0.mod) = mfQKUOjWDCWZrEXGzix21VSoQorNE8LGikk/ymGbT6g=
SHA256 (go_modules/golang.org/x/mod/@v/v0.8.0.mod) = YkVnRZxumUesSr3gtwNO5h3Ltqk3P1lwCUwLs+gSGWQ=
+SHA256 (go_modules/golang.org/x/mod/@v/v0.9.0.mod) = YkVnRZxumUesSr3gtwNO5h3Ltqk3P1lwCUwLs+gSGWQ=
SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod) = br6z+vsJYS0+8f8EE9+qwFu6+PIpq94K4OASKY3+ZwI=
SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod) = 5u/a94opUD8IDPbSYV4onPsdnjq31XD1NmjsorSrQdo=
SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod) = 5u/a94opUD8IDPbSYV4onPsdnjq31XD1NmjsorSrQdo=
@@ -315,15 +342,20 @@ SHA256 (go_modules/mvdan.cc/unparam/@v/v0.0.0-20230312
SHA256 (go_modules/mvdan.cc/unparam/@v/v0.0.0-20230312165513-e84e2d14e3b8.zip) = m1xb4Hh4qr/7KDXx3UhPUC/y64MhLl7fxmYXlz55hio=
SHA256 (go_modules/sigs.k8s.io/yaml/@v/v1.3.0.mod) = L8eybun2ctl7QvpvJfWxWlWYK7usaZYdduux0DbRUAE=
SHA256 (go_modules/sigs.k8s.io/yaml/@v/v1.3.0.zip) = qsiNpVHCpRK2Qss1ZYvz3IYllaNWa9hA6/GOSALx/Mk=
-SHA256 (osv-scanner-v1.6.1.zip) = q3cALnmazcW9q/6/C0F37kWZO5H+z4ns1csC2dgjT3s=
+SHA256 (osv-scanner-v1.6.2.zip) = rucJfd2lZUbH+HPR6M43qAQfAks1OFe1Izpmn2+3wr0=
SIZE (go_modules/cloud.google.com/go/compute/@v/v1.23.0.mod) = 1093
SIZE (go_modules/cloud.google.com/go/compute/@v/v1.23.0.zip) = 1756502
SIZE (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.3.mod) = 98
SIZE (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.3.zip) = 20855
SIZE (go_modules/dario.cat/mergo/@v/v1.0.0.mod) = 65
SIZE (go_modules/dario.cat/mergo/@v/v1.0.0.zip) = 49320
+SIZE (go_modules/deps.dev/api/v3alpha/@v/v0.0.0-20231114023923-e40c4d5c34e5.mod) = 356
SIZE (go_modules/deps.dev/api/v3alpha/@v/v0.0.0-20240109042716-00b51ef52ece.mod) = 356
SIZE (go_modules/deps.dev/api/v3alpha/@v/v0.0.0-20240109042716-00b51ef52ece.zip) = 39831
+SIZE (go_modules/deps.dev/util/resolve/@v/v0.0.0-20240109042716-00b51ef52ece.mod) = 585
+SIZE (go_modules/deps.dev/util/resolve/@v/v0.0.0-20240109042716-00b51ef52ece.zip) = 83541
+SIZE (go_modules/deps.dev/util/semver/@v/v0.0.0-20240109040450-1e316b822bc4.mod) = 39
+SIZE (go_modules/deps.dev/util/semver/@v/v0.0.0-20240109040450-1e316b822bc4.zip) = 91136
SIZE (go_modules/github.com/!burnt!sushi/toml/@v/v1.3.2.mod) = 43
SIZE (go_modules/github.com/!burnt!sushi/toml/@v/v1.3.2.zip) = 303020
SIZE (go_modules/github.com/!cyclone!d!x/cyclonedx-go/@v/v0.8.0.mod) = 543
@@ -360,6 +392,8 @@ SIZE (go_modules/github.com/cncf/xds/go/@v/v0.0.0-2023
SIZE (go_modules/github.com/cncf/xds/go/@v/v0.0.0-20230607035331-e9ce68804cb4.zip) = 140361
SIZE (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.mod) = 100
SIZE (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.zip) = 12539
+SIZE (go_modules/github.com/creack/pty/@v/v1.1.9.mod) = 39
+SIZE (go_modules/github.com/creack/pty/@v/v1.1.9.zip) = 19440
SIZE (go_modules/github.com/cyphar/filepath-securejoin/@v/v0.2.4.mod) = 54
SIZE (go_modules/github.com/cyphar/filepath-securejoin/@v/v0.2.4.zip) = 9553
SIZE (go_modules/github.com/davecgh/go-spew/@v/v1.1.0.mod) = 34
@@ -375,6 +409,12 @@ SIZE (go_modules/github.com/envoyproxy/protoc-gen-vali
SIZE (go_modules/github.com/envoyproxy/protoc-gen-validate/@v/v1.0.2.zip) = 227165
SIZE (go_modules/github.com/felixge/fgprof/@v/v0.9.3.mod) = 151
SIZE (go_modules/github.com/felixge/fgprof/@v/v0.9.3.zip) = 343885
+SIZE (go_modules/github.com/gkampitakis/ciinfo/@v/v0.3.0.mod) = 46
+SIZE (go_modules/github.com/gkampitakis/ciinfo/@v/v0.3.0.zip) = 15099
+SIZE (go_modules/github.com/gkampitakis/go-diff/@v/v1.3.2.mod) = 47
+SIZE (go_modules/github.com/gkampitakis/go-diff/@v/v1.3.2.zip) = 1349669
+SIZE (go_modules/github.com/gkampitakis/go-snaps/@v/v0.4.12.mod) = 454
+SIZE (go_modules/github.com/gkampitakis/go-snaps/@v/v0.4.12.zip) = 155263
SIZE (go_modules/github.com/gliderlabs/ssh/@v/v0.3.5.mod) = 371
SIZE (go_modules/github.com/gliderlabs/ssh/@v/v0.3.5.zip) = 35754
SIZE (go_modules/github.com/go-git/gcfg/@v/v1.5.1-0.20230307220236-3a3c6141e376.mod) = 111
@@ -408,10 +448,8 @@ SIZE (go_modules/github.com/google/renameio/@v/v0.1.0.
SIZE (go_modules/github.com/google/renameio/@v/v0.1.0.zip) = 14941
SIZE (go_modules/github.com/google/uuid/@v/v1.3.1.mod) = 30
SIZE (go_modules/github.com/google/uuid/@v/v1.3.1.zip) = 26946
-SIZE (go_modules/github.com/hexops/gotextdiff/@v/v1.0.3.mod) = 45
-SIZE (go_modules/github.com/hexops/gotextdiff/@v/v1.0.3.zip) = 33608
-SIZE (go_modules/github.com/ianlancetaylor/demangle/@v/v0.0.0-20231023195312-e2daf7ba7156.mod) = 51
-SIZE (go_modules/github.com/ianlancetaylor/demangle/@v/v0.0.0-20231023195312-e2daf7ba7156.zip) = 696032
+SIZE (go_modules/github.com/ianlancetaylor/demangle/@v/v0.0.0-20240117034632-964b1d53ca6c.mod) = 51
+SIZE (go_modules/github.com/ianlancetaylor/demangle/@v/v0.0.0-20240117034632-964b1d53ca6c.zip) = 696101
SIZE (go_modules/github.com/jbenet/go-context/@v/v0.0.0-20150711004518-d14ea06fba99.mod) = 36
SIZE (go_modules/github.com/jbenet/go-context/@v/v0.0.0-20150711004518-d14ea06fba99.zip) = 8654
SIZE (go_modules/github.com/jedib0t/go-pretty/v6/@v/v6.5.3.mod) = 528
@@ -426,6 +464,8 @@ SIZE (go_modules/github.com/kr/pty/@v/v1.1.1.zip) = 14
SIZE (go_modules/github.com/kr/text/@v/v0.1.0.mod) = 64
SIZE (go_modules/github.com/kr/text/@v/v0.2.0.mod) = 68
SIZE (go_modules/github.com/kr/text/@v/v0.2.0.zip) = 12607
+SIZE (go_modules/github.com/maruel/natural/@v/v1.1.0.mod) = 42
+SIZE (go_modules/github.com/maruel/natural/@v/v1.1.0.zip) = 10462
SIZE (go_modules/github.com/mattn/go-runewidth/@v/v0.0.15.mod) = 84
SIZE (go_modules/github.com/mattn/go-runewidth/@v/v0.0.15.zip) = 21768
SIZE (go_modules/github.com/mmcloughlin/avo/@v/v0.5.0.mod) = 134
@@ -442,6 +482,8 @@ SIZE (go_modules/github.com/pandatix/go-cvss/@v/v0.6.2
SIZE (go_modules/github.com/pandatix/go-cvss/@v/v0.6.2.zip) = 281859
SIZE (go_modules/github.com/pjbgf/sha1cd/@v/v0.3.0.mod) = 213
SIZE (go_modules/github.com/pjbgf/sha1cd/@v/v0.3.0.zip) = 3528787
+SIZE (go_modules/github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.mod) = 36
+SIZE (go_modules/github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.zip) = 219375
SIZE (go_modules/github.com/pkg/errors/@v/v0.9.1.mod) = 29
SIZE (go_modules/github.com/pkg/errors/@v/v0.9.1.zip) = 17866
SIZE (go_modules/github.com/pkg/profile/@v/v1.7.0.mod) = 81
@@ -453,6 +495,7 @@ SIZE (go_modules/github.com/rivo/uniseg/@v/v0.4.4.mod)
SIZE (go_modules/github.com/rivo/uniseg/@v/v0.4.4.zip) = 476937
SIZE (go_modules/github.com/rogpeppe/go-internal/@v/v1.11.0.mod) = 167
SIZE (go_modules/github.com/rogpeppe/go-internal/@v/v1.11.0.zip) = 183284
+SIZE (go_modules/github.com/rogpeppe/go-internal/@v/v1.9.0.mod) = 112
SIZE (go_modules/github.com/russross/blackfriday/v2/@v/v2.1.0.mod) = 42
SIZE (go_modules/github.com/russross/blackfriday/v2/@v/v2.1.0.zip) = 122358
SIZE (go_modules/github.com/sergi/go-diff/@v/v1.1.0.mod) = 281
@@ -481,6 +524,16 @@ SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.4
SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.4.zip) = 120537
SIZE (go_modules/github.com/terminalstatic/go-xsd-validate/@v/v0.1.5.mod) = 58
SIZE (go_modules/github.com/terminalstatic/go-xsd-validate/@v/v0.1.5.zip) = 23362
+SIZE (go_modules/github.com/tidwall/gjson/@v/v1.14.2.mod) = 121
+SIZE (go_modules/github.com/tidwall/gjson/@v/v1.17.0.mod) = 121
+SIZE (go_modules/github.com/tidwall/gjson/@v/v1.17.0.zip) = 61942
+SIZE (go_modules/github.com/tidwall/match/@v/v1.1.1.mod) = 41
+SIZE (go_modules/github.com/tidwall/match/@v/v1.1.1.zip) = 6893
+SIZE (go_modules/github.com/tidwall/pretty/@v/v1.2.0.mod) = 42
+SIZE (go_modules/github.com/tidwall/pretty/@v/v1.2.1.mod) = 42
+SIZE (go_modules/github.com/tidwall/pretty/@v/v1.2.1.zip) = 12501
+SIZE (go_modules/github.com/tidwall/sjson/@v/v1.2.5.mod) = 122
+SIZE (go_modules/github.com/tidwall/sjson/@v/v1.2.5.zip) = 28719
SIZE (go_modules/github.com/urfave/cli/v2/@v/v2.27.1.mod) = 280
SIZE (go_modules/github.com/urfave/cli/v2/@v/v2.27.1.zip) = 3552284
SIZE (go_modules/github.com/vmihailenco/msgpack/v4/@v/v4.3.12.mod) = 382
@@ -511,14 +564,15 @@ SIZE (go_modules/golang.org/x/crypto/@v/v0.18.0.mod) =
SIZE (go_modules/golang.org/x/crypto/@v/v0.18.0.zip) = 1797935
SIZE (go_modules/golang.org/x/crypto/@v/v0.3.1-0.20221117191849-2c476679df9a.mod) = 171
SIZE (go_modules/golang.org/x/crypto/@v/v0.7.0.mod) = 171
-SIZE (go_modules/golang.org/x/exp/@v/v0.0.0-20240112132812-db7319d0e0e3.mod) = 133
-SIZE (go_modules/golang.org/x/exp/@v/v0.0.0-20240112132812-db7319d0e0e3.zip) = 589707
+SIZE (go_modules/golang.org/x/exp/@v/v0.0.0-20240119083558-1b970713d09a.mod) = 133
+SIZE (go_modules/golang.org/x/exp/@v/v0.0.0-20240119083558-1b970713d09a.zip) = 590537
SIZE (go_modules/golang.org/x/mod/@v/v0.12.0.mod) = 84
SIZE (go_modules/golang.org/x/mod/@v/v0.14.0.mod) = 84
SIZE (go_modules/golang.org/x/mod/@v/v0.14.0.zip) = 165104
SIZE (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20220419223038-86c51ed26bb4.mod) = 157
SIZE (go_modules/golang.org/x/mod/@v/v0.6.0.mod) = 117
SIZE (go_modules/golang.org/x/mod/@v/v0.8.0.mod) = 84
+SIZE (go_modules/golang.org/x/mod/@v/v0.9.0.mod) = 84
SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod) = 172
SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod) = 181
SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod) = 181
@@ -633,4 +687,4 @@ SIZE (go_modules/mvdan.cc/unparam/@v/v0.0.0-2023031216
SIZE (go_modules/mvdan.cc/unparam/@v/v0.0.0-20230312165513-e84e2d14e3b8.zip) = 28985
SIZE (go_modules/sigs.k8s.io/yaml/@v/v1.3.0.mod) = 106
SIZE (go_modules/sigs.k8s.io/yaml/@v/v1.3.0.zip) = 21567
-SIZE (osv-scanner-v1.6.1.zip) = 2166878
+SIZE (osv-scanner-v1.6.2.zip) = 3034859
blob - 7fe8089387d22745e421fe3e182603b347180fdf
blob + a3b57b7d07e8c21e946abeea00fe96cf37efe4f1
--- security/osv-scanner/modules.inc
+++ security/osv-scanner/modules.inc
@@ -3,6 +3,8 @@ MODGO_MODULES = \
cloud.google.com/go/compute/metadata v0.2.3 \
dario.cat/mergo v1.0.0 \
deps.dev/api/v3alpha v0.0.0-20240109042716-00b51ef52ece \
+ deps.dev/util/resolve v0.0.0-20240109042716-00b51ef52ece \
+ deps.dev/util/semver v0.0.0-20240109040450-1e316b822bc4 \
github.com/!burnt!sushi/toml v1.3.2 \
github.com/!cyclone!d!x/cyclonedx-go v0.8.0 \
github.com/!microsoft/go-winio v0.6.1 \
@@ -19,6 +21,7 @@ MODGO_MODULES = \
github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe \
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 \
github.com/cpuguy83/go-md2man/v2 v2.0.2 \
+ github.com/creack/pty v1.1.9 \
github.com/cyphar/filepath-securejoin v0.2.4 \
github.com/davecgh/go-spew v1.1.1 \
github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a \
@@ -26,6 +29,9 @@ MODGO_MODULES = \
github.com/envoyproxy/go-control-plane v0.11.1 \
github.com/envoyproxy/protoc-gen-validate v1.0.2 \
github.com/felixge/fgprof v0.9.3 \
+ github.com/gkampitakis/ciinfo v0.3.0 \
+ github.com/gkampitakis/go-diff v1.3.2 \
+ github.com/gkampitakis/go-snaps v0.4.12 \
github.com/gliderlabs/ssh v0.3.5 \
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 \
github.com/go-git/go-billy/v5 v5.5.0 \
@@ -39,14 +45,14 @@ MODGO_MODULES = \
github.com/google/pprof v0.0.0-20211214055906-6f57359322fd \
github.com/google/renameio v0.1.0 \
github.com/google/uuid v1.3.1 \
- github.com/hexops/gotextdiff v1.0.3 \
- github.com/ianlancetaylor/demangle v0.0.0-20231023195312-e2daf7ba7156 \
+ github.com/ianlancetaylor/demangle v0.0.0-20240117034632-964b1d53ca6c \
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 \
github.com/jedib0t/go-pretty/v6 v6.5.3 \
github.com/kevinburke/ssh_config v1.2.0 \
github.com/kr/pretty v0.3.1 \
github.com/kr/pty v1.1.1 \
github.com/kr/text v0.2.0 \
+ github.com/maruel/natural v1.1.0 \
github.com/mattn/go-runewidth v0.0.15 \
github.com/mmcloughlin/avo v0.5.0 \
github.com/onsi/gomega v1.27.10 \
@@ -55,6 +61,7 @@ MODGO_MODULES = \
github.com/package-url/packageurl-go v0.1.2 \
github.com/pandatix/go-cvss v0.6.2 \
github.com/pjbgf/sha1cd v0.3.0 \
+ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e \
github.com/pkg/errors v0.9.1 \
github.com/pkg/profile v1.7.0 \
github.com/pmezard/go-difflib v1.0.0 \
@@ -69,6 +76,10 @@ MODGO_MODULES = \
github.com/stretchr/objx v0.5.0 \
github.com/stretchr/testify v1.8.4 \
github.com/terminalstatic/go-xsd-validate v0.1.5 \
+ github.com/tidwall/gjson v1.17.0 \
+ github.com/tidwall/match v1.1.1 \
+ github.com/tidwall/pretty v1.2.1 \
+ github.com/tidwall/sjson v1.2.5 \
github.com/urfave/cli/v2 v2.27.1 \
github.com/vmihailenco/msgpack/v4 v4.3.12 \
github.com/vmihailenco/tagparser v0.1.1 \
@@ -80,7 +91,7 @@ MODGO_MODULES = \
github.com/yuin/goldmark v1.4.13 \
github.com/zclconf/go-cty v1.10.0 \
golang.org/x/crypto v0.18.0 \
- golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 \
+ golang.org/x/exp v0.0.0-20240119083558-1b970713d09a \
golang.org/x/mod v0.14.0 \
golang.org/x/net v0.20.0 \
golang.org/x/oauth2 v0.13.0 \
@@ -105,6 +116,7 @@ MODGO_MODULES = \
sigs.k8s.io/yaml v1.3.0
MODGO_MODFILES = \
+ deps.dev/api/v3alpha v0.0.0-20231114023923-e40c4d5c34e5 \
github.com/!microsoft/go-winio v0.5.2 \
github.com/!proton!mail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 \
github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092 \
@@ -120,6 +132,7 @@ MODGO_MODFILES = \
github.com/kr/pretty v0.1.0 \
github.com/kr/text v0.1.0 \
github.com/rivo/uniseg v0.2.0 \
+ github.com/rogpeppe/go-internal v1.9.0 \
github.com/sergi/go-diff v1.1.0 \
github.com/sirupsen/logrus v1.7.0 \
github.com/spdx/gordf v0.0.0-20201111095634-7098f93598fb \
@@ -130,6 +143,8 @@ MODGO_MODFILES = \
github.com/stretchr/testify v1.7.0 \
github.com/stretchr/testify v1.7.1 \
github.com/stretchr/testify v1.8.0 \
+ github.com/tidwall/gjson v1.14.2 \
+ github.com/tidwall/pretty v1.2.0 \
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 \
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 \
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d \
@@ -142,6 +157,7 @@ MODGO_MODFILES = \
golang.org/x/mod v0.6.0 \
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 \
golang.org/x/mod v0.8.0 \
+ golang.org/x/mod v0.9.0 \
golang.org/x/net v0.0.0-20190603091049-60506f45cf65 \
golang.org/x/net v0.0.0-20190620200207-3b0461eec859 \
golang.org/x/net v0.0.0-20200301022130-244492dfa37a \
Hello,
Here's an update for osv-scanner which has been running fine on amd64.
Other tests?
changelog:
https://github.com/google/osv-scanner/releases/tag/v1.6.2
Thanks,
Lucas
Subscribe to:
Posts (Atom)