Skip to content

Conversation

afarber
Copy link
Contributor

@afarber afarber commented Sep 13, 2025

Fix the #7239 by:

  • Upgrade protozero dependency from v1.7.1 to v1.8.1 using git subtree pull to preserve the upstream git log
  • Resolve merge conflicts by accepting upstream changes (--theirs)
  • Maintain the policy of excluding protozero test files, same as in Bump version of protozero to 1.7.1 #6999
  • Update obsolete link in scripts/update_dependencies.sh comment
  • Ignore .gradle folder

Tasklist

Requirements / Relations

Link any requirements here. Other pull requests this PR is based on?

89a55ad29 Merge pull request Project-OSRM#134 from joto/release-181
68aadc2ae Release 1.8.1
67e3247e0 Merge pull request Project-OSRM#133 from mapbox/kk/bool-overrun
72802a4ff Fix buffer overrun for truncated bools
c8d60c2f0 Fix test that checks that protozero also works with std::string_view
b5243ef0c Revert "Remove unused PROTOZERO_DATA_VIEW setting in CMake config"
6cae9e9ef Github action: Remove deprecated windows-2019 build, add windows-2025
e19043c54 Remove unused PROTOZERO_DATA_VIEW setting in CMake config
310b92079 Release 1.8.0
07889f69b Some cleanups
99e6f6754 Merge pull request Project-OSRM#127 from joto/clang-tidy-fixes
a1ecc6f62 Add some more includes to master test include
b634e2601 We are handling the exception we catch here by returning false
807621640 Use static_cast instead of C style cast
4c8b8e00e Iterators are small so it is okay to copy them by value
bb0070881 clang-tidy likes parentheses
93094298b Remove redundant inline specifiers
7fecbaad1 Merge pull request Project-OSRM#124 from joto/cicheck
bf3b7e704 Merge pull request Project-OSRM#125 from joto/modernize-clang-tidy
3b30856b9 Merge pull request Project-OSRM#126 from joto/changelog
cc72d7337 Update change log
3497cb5cf Add annotations for IWYU/clang-tidy
bbfcbac70 Update clang-tidy config and add Github actions workflow
185561ee9 Github action: Remove buster build, build variants on bookworm
b045c4531 Merge pull request Project-OSRM#123 from joto/more-cleanups
a216428b0 Merge pull request Project-OSRM#119 from joto/clang-tidy-fixes
c8f89940e Disable a clang-tidy warning we are getting for a debug macro
4f8d58be7 basic_pbf_builder constructor can not be noexcept
32015c666 Add "const" in place where we can (found by clang-tidy)
349ed9b95 Use anonymous namespace for internal linkage
64eb4c5cf Use new form of type traits available in C++14
a7dab958d Merge pull request Project-OSRM#120 from joto/avoid-shadowing
d14dcae73 Merge pull request Project-OSRM#121 from joto/only-tests-need-protobuf
ead6d6ce5 Merge pull request Project-OSRM#122 from joto/explicit-cast
c9e9e860d Add explicit cast
8a0aed112 Only tests need Protobuf library
091295e7c Avoid variable name "data" because it shadows the data() member func
34d145521 Merge pull request Project-OSRM#112 from georgthegreat/patch-1
93bcee28f Merge pull request Project-OSRM#118 from joto/ci-updates
b7f2ac035 Some CI updates
5cc0ee585 Merge pull request Project-OSRM#117 from joto/update-some-stuff
16e41ee0b Disable a warning in newer clang versions
6b02a99fc Github action: Remove unused clang-13 install
4a2c8b69e Update included catch.hpp
9538e6da0 Upgrade Doxygen config and fix wrong documentation
5c210b91c C++14 now required, modernize CMake config and Github CI check
2a739b160 Merge pull request Project-OSRM#113 from brawer/license
e91587f4b Change license formatting to get recognized by license scanning tools
c8fa0c190 Fix
721fa4ee5 Improve compatibility with various STL flavors
542fcf7dd Merge pull request Project-OSRM#111 from elfprince13/patch-1
4904953de Fix missing dependency error when BUILD_TESTING=OFF
f379578a3 Release 1.7.1
040947ba2 CMake: Add language C to project()
c60e87879 Update include catch.hpp to 2.13.8
6599d4828 Update change log
ebd2e4f40 Allow setting C++ version to compile with in CMake config
bbb2a95d0 Github actions: Only install x64 version of vcpkgs in windows build
546edf929 Avoid narrowing conversion by being explicit
91adaecd6 Fix various issues reported by clang-tidy and disable some checks
68f30a1f7 Add Github actions CI build for Linux/macOS/Windows
c13886b78 Update some links
bd429c52f Include tools subdirectory *after* testing is enabled
3133dc52f Use std::memcpy instead of just memcpy
7ee29422a Merge pull request Project-OSRM#106 from daniel-j-h/fix-byteswap-ub
aba0800aa CMake config: clang-tidy target needs writer_tests which need protobuf
74516e8df Modernize CMake config a little bit
b4486ca7a Disable some clang-tidy warnings
19f4b75f6 Fix appveyor build
58b1a19a4 Modernize Doxygen config file
046c07d0e Update included catch2 framework to current version v2.13.7
49acea746 fix some doxygen warnings by removing obsolete config entries
0c5426df3 fix cmake dep warning: 'Compatibility with CMake < 2.8.12 will be removed from a future version of CMake'
dadf7bd51 Fixes float and double byteswap undefined behavior
85db94025 Merge pull request Project-OSRM#105 from ffontaine/master
d3a35791d Merge pull request Project-OSRM#104 from joto/master
03daae49c CMakeLists.txt: respect BUILD_TESTING
67133e362 Add missing includes
9f85f3a5e Update README.md
010ffcf69 Release 1.7.0
6ad492994 Fixed docs
adde4dedf Travis: Add non-Intel architectures
37c3d0e1d Add typedefs and functions to make buffer adaptor work as container
83563acdb Remove delegating constructor because clang-tidy doesn't like it
b4afc06db Use #include "" for library-internal includes
d1929788e Add missing includes
fae5247f0 Update change log
2abb1b5cd Travis: Test with std::string_view, not std::experimental::string_view
697bd812d Use forwarding constructor in fixed_size_buffer_adaptor
c8fd2e819 Move fixed_size_buffer_adaptor into buffer_fixed.hpp
abb856ecc Remove semicolon where it doesn't belong
6243855bc Change the way the customization for special buffer classes work
d6a8ed098 Remove useless post-increment
184046cb0 Remove need for push_back() on custom buffer types
0a974e067 Remove templated buffer adaptor wrappers
ed6ba5097 Add buffer implementation based on std::vector<char>
cec309c3c Use more descriptive names for buffer test types
a7b99da6f Use TEMPLATE_TEST_CASE to test different buffer implementations
a0abc493c Use explicit for constructor
72850abc9 Remove broken doxygen link
1e347c620 Add more convenient fixed_size_buffer_adaptor constructor
fb575e0ea Make members private
50e953b71 Make older compilers happy
c850ef150 Extend tests of static buffer use
f6d8394c0 Rename fixed_size_buffer to fixed_size_buffer_adaptor
3b18162e3 Make the buffer backend used by the pbf writer configurable.
6fd19c58d "Modernize" travis config
981aba084 Use explicit cast to avoid undefined behaviour
550974d5d Travis: Do not test GCC 4.7 any more
866e024fc Revert "Workaround in catch code so it compiles with older compilers"
65dfad056 Disable a clang-tidy test triggered by Catch.
02bf73df5 Workaround in catch code so it compiles with older compilers
f98792a15 Travis: Do not update homebrew for faster builds
2d87da7ec Switch tests to Catch2
5dc45ac3b Avoid signed/unsigned comparison
3a93f19ba Add missing includes
b49c077ac Disable clang-tidy for files where we don't have a compile command
34396fc7d Travis: Fix gcc8 build
c3060101c Handle clang-tidy warnings
64ef96ff0 Revert "Initialize test messages"
a0828d538 Travis: Also build with GCC 8
171c5c446 Update travis xcode versions
f5a223aa7 Use "auto*" instead of just "auto" for pointer types
e4fa23616 Initialize test messages
e3a59454a Simpler code and avoid shadowing of external function
830f049b4 Use STL algorithms insted of raw loops
faa7e6e8a Disable config settings not used in newer Doxygen versions
3b2e11438 Remove unnecessary enum name
7487f8109 Release 1.6.8
6dcaf8fde Travis config: Use "official" way to pull homebrew package.
c61eb29c3 Revert "Disable warnings from clang-tidy about a missing file."
28d05a0a8 Disable warnings from clang-tidy about a missing file.
329920a3c Pesky aliases of clang-tidy warnings strike again.
79fd87922 User plain assert() instead of our own so compare() can be noexcept.
473e6ec13 Update change log.
393e279b7 Make pbf_writer destructor noexcept.
48a38b3f2 Disable clang-tidy misc-non-private-member-variables-in-classes.
e9c148c8a Use no-argument version of main().
29ba04123 Disable clang tidy checks for C arrays.
2fcfb56e2 More places to use std::array instead of a C style array.
7321761a3 Disable a clang-tidy warning.
4d9d8fff4 Make data_view::compare() noexcept.
3325364cf User uppercase integer literal suffix.
df0a23c5e Use std::array instead of C arrays in some places.
8247ed76b Make clang-tidy include order check happy.
f1b504e16 Update travis config to user newer compilers and operating systems.
ccf692d47 Disable some clang-tidy warnings.
095abd259 CMake config: Also look for newer clang-tidy versions.
2c1f6f9c8 Use uppercase integer literal suffixes.
fadd024d4 Release 1.6.7
8c6acbff7 Fix signed-unsigned comparison.
b36774ccb Release 1.6.6
5a92b744f Remove useless asserts, simplify condition.
06bafb56c Fix several possible UBs.
b7b290b1a Release 1.6.5
51753d514 Merge pull request Project-OSRM#95 from tomhughes/subscript
b90faaf03 Avoid out of bounds array subscript
7d418492e Merge pull request Project-OSRM#94 from nigels-com/proto2
015f9cc5e Specify proto2 syntax to appease protoc
23d48fd2a Use universal initialization syntax in constructors.
0f610fad5 Update travis config: Use xenial for most builds.
d71da0b04 Update appveyor config: Simpler builds, current MSVC, 32bit build
3ef46ba78 Release 1.6.4
3a1ef0138 Tighten some tests.
18eebb8c3 Remove unused code from tests.
29ef3e4e7 More casts to remove undefined behaviour.
6108e6480 No more bitwise operations on signed integers in zigzag encoder/decoder.
6e0d34985 Remove bitwise operations on signed integers in varint decoder.
4af65f262 Update change log.
2f82182fe Add some tips to test/create_pbf_test_data.sh.
c55f4ed55 Fix some doxygen warnings.
afa362a03 Add static_asserts to check movability of some classes.
efeb45e0c Disable readability-implicit-bool-conversion clang-tidy warning.
78febda5b Explicit conversion and tests for new pbf_reader::data() function.
0d5492c9c Revert "Explicit conversion and tests for new pbf_reader::data() function."
43cf8fa5a Fix travis config.
bd2ae4682 Explicit conversion and tests for new pbf_reader::data() function.
28cd406bd Update travis with newer compiler versions.
0555e6a1f Add function to get the not yet read data from a pbf_reader.
bf4284bee Disable docker builds on travis. They are being phased out by travis.
5ffe45b71 New add_packed_fixed template function.
e54cd858d Add helper function that computes the length a varint would have.
72d7e143a More consistent implementation of operators.
3a41880c2 Do not download protobuf library, it isn't found by cmake anyway.
3c662ce3c Remove comment that doesn't apply (any more).
45da6dd4d Update zigzag tests.
4ad573dbf Extra cast so we do the xor with unsigned ints.
509aec5ab Update appveyor build to current Visual Studio compiler.
67b24e1a3 Remove unnecessary workaround in Appveyor config.
c559af682 Remove xcode6.4 build soon to be removed from travis.
0662dcecc Release 1.6.3
da5bfc019 Move byteswap_inplace functions from detail into protozero namespace.
a44efc34e Travis: Ignore install problems on OSX.
5775b2b23 Travis update to newer OSX image.
032aa037c Special case the distance between default initialized iterators.
0ca02161e Make dereferencing operator of fixed_iterator noexcept.
a0095f603 Test code must call functions that it wants to test.
6791b0bc3 Add unit tests.
191eb4004 Add some paranoia asserts.
99ca512f5 Use TEST_CASEs instead of SECTIOs in some tests.
040e2bc14 Add some asserts and tests.

git-subtree-dir: third_party/protozero
git-subtree-split: 89a55ad2962cca3adbe8383a4b6d9a8411352ef2
@afarber
Copy link
Contributor Author

afarber commented Sep 14, 2025

Hi @DennisOSRM and @SiarheiFedartsou please review my PR.

Naturally it modifies many files.

You can verify, that I have not introduced any "trojan horses" by running:

git clone --depth 1 --branch v1.8.1 https://github.com/mapbox/protozero.git /tmp/protozero-official

for dir in include tools doc CMakeLists.txt; do
  echo "=== Comparing $dir ==="
  diff -r "third_party/protozero/$dir" "/tmp/protozero-official/$dir" \
    --exclude='*.o' --exclude='*.so' --exclude='CMakeFiles' \
    --exclude='*.cmake' --exclude='Makefile' 2>/dev/null || echo "No differences"
done

@afarber
Copy link
Contributor Author

afarber commented Sep 23, 2025

Hi @DennisOSRM and @SiarheiFedartsou please consider merging the PR

@DennisOSRM
Copy link
Collaborator

Seems there are conflicts that prevent a clean merge

@afarber
Copy link
Contributor Author

afarber commented Sep 23, 2025

@DennisOSRM please try to merge again, I have resolved the conflicting lines in the CHANGELOG.md

@DennisOSRM DennisOSRM merged commit e83f361 into Project-OSRM:master Sep 23, 2025
21 checks passed
@afarber afarber deleted the 7239-upgrade-protozero branch September 23, 2025 20:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants