Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker: reformat version output #12

Merged
merged 1 commit into from Nov 2, 2020
Merged

docker: reformat version output #12

merged 1 commit into from Nov 2, 2020

Conversation

ghost
Copy link

@ghost ghost commented Oct 23, 2020

No description provided.

@paralin
Copy link
Collaborator

paralin commented Oct 27, 2020

Thanks I'll try to merge this soon.

@paralin paralin merged commit 329c5ba into skiffos:skiff-next Nov 2, 2020
paralin pushed a commit that referenced this pull request Nov 4, 2020
paralin pushed a commit that referenced this pull request Nov 9, 2020
paralin pushed a commit that referenced this pull request Nov 13, 2020
paralin pushed a commit that referenced this pull request Nov 13, 2020
paralin pushed a commit that referenced this pull request Nov 13, 2020
paralin pushed a commit that referenced this pull request Nov 13, 2020
paralin pushed a commit that referenced this pull request Nov 13, 2020
paralin pushed a commit that referenced this pull request Nov 13, 2020
paralin pushed a commit that referenced this pull request Nov 14, 2020
paralin pushed a commit that referenced this pull request Nov 14, 2020
paralin pushed a commit that referenced this pull request Nov 14, 2020
paralin pushed a commit that referenced this pull request Nov 15, 2020
paralin pushed a commit that referenced this pull request Nov 18, 2020
paralin pushed a commit that referenced this pull request Jul 19, 2024
Commit 8f88a64 ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.

Due to this change, grpc fails to build with output:

    Applying 0003-host-grpc-only-cpp-plugin.patch using patch:
    patching file CMakeLists.txt
    Hunk #2 succeeded at 567 (offset 8 lines).
    Hunk #3 succeeded at 580 (offset 7 lines).
    Hunk #4 succeeded at 1315 (offset 79 lines).
    Hunk #5 succeeded at 1368 (offset 79 lines).
    Hunk #6 FAILED at 1462.
    Hunk #7 succeeded at 2515 (offset 131 lines).
    Hunk #8 succeeded at 2631 (offset 107 lines).
    Hunk #9 succeeded at 3117 (offset 186 lines).
    Hunk #10 succeeded at 3202 (offset 198 lines).
    Hunk #11 succeeded at 3654 (offset 172 lines).
    Hunk #12 succeeded at 3909 (offset 184 lines).
    Hunk #13 succeeded at 4203 (offset 158 lines).
    Hunk #14 succeeded at 4263 (offset 158 lines).
    Hunk #15 succeeded at 4347 (offset 158 lines).
    Hunk #16 FAILED at 4281.
    Hunk #17 succeeded at 11110 (offset -143 lines).
    Hunk #18 succeeded at 11140 (offset -143 lines).
    Hunk #19 succeeded at 23153 (offset 3325 lines).
    Hunk #20 succeeded at 23250 (offset 3325 lines).
    2 out of 20 hunks FAILED -- saving rejects to file CMakeLists.txt.rej

This commit refreshes the package patch on the current package version.

Signed-off-by: Dario Binacchi <[email protected]>
Signed-off-by: Arnout Vandecappelle <[email protected]>
paralin pushed a commit that referenced this pull request Jul 19, 2024
Commit 8f88a64 ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.

Due to this change, libssh2 fails to build with output:

    Applying 0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch using patch:
    patching file src/kex.c
    Hunk #1 succeeded at 3037 (offset 5 lines).
    Hunk #2 succeeded at 3062 (offset 5 lines).
    Hunk #3 succeeded at 3315 (offset 5 lines).
    Hunk #4 succeeded at 3406 (offset 5 lines).
    Hunk #5 succeeded at 3440 (offset 5 lines).
    Hunk #6 succeeded at 3476 (offset 5 lines).
    Hunk #7 succeeded at 3489 (offset 5 lines).
    Hunk #8 succeeded at 3523 (offset 5 lines).
    Hunk #9 succeeded at 3569 (offset 5 lines).
    Hunk #10 succeeded at 3591 (offset 5 lines).
    Hunk #11 succeeded at 3633 (offset 5 lines).
    Hunk #12 succeeded at 3654 (offset 5 lines).
    Hunk #13 succeeded at 3687 (offset 5 lines).
    Hunk #14 succeeded at 3709 (offset 5 lines).
    Hunk #15 succeeded at 3892 (offset 5 lines).
    Hunk #16 succeeded at 3918 (offset 5 lines).
    Hunk #17 succeeded at 3967 (offset 5 lines).
    patching file src/libssh2_priv.h
    Hunk #1 succeeded at 699 (offset -37 lines).
    Hunk #2 succeeded at 873 (offset -38 lines).
    Hunk #3 succeeded at 914 (offset -38 lines).
    Hunk #4 succeeded at 1149 (offset -38 lines).
    patching file src/packet.c
    Hunk #1 succeeded at 605 (offset -19 lines).
    Hunk #2 succeeded at 656 (offset -19 lines).
    Hunk #3 succeeded at 1404 (offset -23 lines).
    Hunk #4 succeeded at 1474 (offset -23 lines).
    patching file src/packet.h
    Hunk #1 FAILED at 72.
    1 out of 1 hunk FAILED -- saving rejects to file src/packet.h.rej

This commit refreshes the package patches on the current package version.

Signed-off-by: Dario Binacchi <[email protected]>
Signed-off-by: Romain Naour <[email protected]>
paralin pushed a commit that referenced this pull request Jul 19, 2024
Commit 8f88a64 ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.

Due to this change, lxc fails to build with output:

    Applying 0001-src-lxc-syscall_numbers.h-drop-define-1.patch using patch:
    patching file src/lxc/syscall_numbers.h
    Hunk #1 FAILED at 53.
    Hunk #2 FAILED at 92.
    Hunk #3 FAILED at 129.
    Hunk #4 FAILED at 166.
    Hunk #5 FAILED at 203.
    Hunk #6 FAILED at 272.
    Hunk #7 FAILED at 309.
    Hunk #8 FAILED at 346.
    Hunk #9 FAILED at 383.
    Hunk #10 FAILED at 440.
    Hunk #11 FAILED at 477.
    Hunk #12 FAILED at 518.
    Hunk #13 FAILED at 759.
    13 out of 13 hunks FAILED -- saving rejects to file src/lxc/syscall_numbers.h.rej

This commit refreshes the package patch on the current package version.

As you can see from [1], the patch was created for version v6.0.0 but
has been backported in Buildroot without being rebased on lxc v5.0.0,
where loongarch64 support was not yet merged. This is further evidence
of the importance of applying patches with fuzz 0.

[1] lxc/lxc@82fe018
Signed-off-by: Dario Binacchi <[email protected]>
Signed-off-by: Romain Naour <[email protected]>
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.

1 participant