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

Update libssh2 patches #50959

Merged
merged 1 commit into from
Aug 18, 2023
Merged

Update libssh2 patches #50959

merged 1 commit into from
Aug 18, 2023

Conversation

ararslan
Copy link
Member

We're now using libssh2 v1.11.0 which includes the two patches we were carrying. The patches need to be dropped in order to build with USE_BINARYBUILDER=0. (This was my bad, I should have made this change as part of #50826, which updated libssh2 to v1.11.0.)

@ararslan ararslan added external dependencies Involves LLVM, OpenBLAS, or other linked libraries kind:embarrassing-bugfix Whoops! backport 1.10 Change should be backported to the 1.10 release labels Aug 17, 2023
@ararslan ararslan marked this pull request as draft August 17, 2023 17:17
@ararslan
Copy link
Member Author

Actually this needs a couple tweaks

@ararslan ararslan changed the title Drop libssh2 patches Update libssh2 patches Aug 17, 2023
We're now using libssh2 v1.11.0 which includes the two patches we were
carrying. These patches need to be dropped in order to build with
`USE_BINARYBUILDER=0`. We also need to include the patch for v1.11.0
used in Yggdrasil.
@ararslan ararslan marked this pull request as ready for review August 17, 2023 18:07
@staticfloat staticfloat merged commit 315ff53 into master Aug 18, 2023
6 checks passed
@staticfloat staticfloat deleted the aa/fix-libssh2 branch August 18, 2023 16:06
vtjnash pushed a commit to vtjnash/julia that referenced this pull request Aug 18, 2023
We're now using libssh2 v1.11.0 which includes the two patches we were
carrying. The patches need to be dropped in order to build with
`USE_BINARYBUILDER=0`. (This was my bad, I should have made this change
as part of JuliaLang#50826, which updated libssh2 to v1.11.0.)
vtjnash pushed a commit to vtjnash/julia that referenced this pull request Aug 18, 2023
We're now using libssh2 v1.11.0 which includes the two patches we were
carrying. The patches need to be dropped in order to build with
`USE_BINARYBUILDER=0`. (This was my bad, I should have made this change
as part of JuliaLang#50826, which updated libssh2 to v1.11.0.)
IanButterworth pushed a commit that referenced this pull request Aug 19, 2023
We're now using libssh2 v1.11.0 which includes the two patches we were
carrying. The patches need to be dropped in order to build with
`USE_BINARYBUILDER=0`. (This was my bad, I should have made this change
as part of #50826, which updated libssh2 to v1.11.0.)

(cherry picked from commit 315ff53)
KristofferC added a commit that referenced this pull request Oct 2, 2023
Backported PRs:
- [x] #48625 <!-- add replace(io, str, patterns...) -->
- [x] #48387 <!-- Improve documentation of sort-related functions -->
- [x] #48363 <!-- Revise sort.md and docstrings in sort.jl -->
- [x] #48977 <!-- Update SparseArrays.jl stdlib for SuiteSparse 7 -->
- [x] #50719 <!-- fix `CyclePadding(::DataType)` -->
- [x] #50694 <!-- inference: permit recursive type traits -->
- [x] #50860 <!-- Add `Base.get_extension` to docs/API -->
- [x] #50594 <!-- Disallow non-index Integer types in isassigned -->
- [x] #50802 <!-- Makes IntrusiveLinkedListSynchronized mutable to avoid
allocation on poptask -->
- [x] #50858 <!-- Add a `threadpool` parameter to `Channel` constructor
-->
- [x] #50874 <!-- Restrict COFF to a single thread when symbol count is
high -->
- [x] #50822 <!-- Add default method for setmodifiers! -->
- [x] #50730 <!-- Fix integer overflow in `isapprox` -->
- [x] #50850 <!-- Remove weird Rational dispatch and add pi functions to
list -->
- [x] #50809 <!-- Limit type-printing in MethodError -->
- [x] #50915 <!-- Add note the `Task` about sticky bit -->
- [x] #50929 <!-- when widening tuple types in tmerge, only widen the
complex parts -->
- [x] #50928 <!-- Bump JuliaSyntax to 0.4.6 -->
- [x] #50959 <!-- Update libssh2 patches -->
- [x] #50823 <!-- Make ranges more robust with unsigned indexes. -->
- [x] #48542 <!-- Add docs on task-specific buffering using
multithreading -->
- [x] #50912 <!-- Separate foreign threads into a :foreign threadpool
-->
- [x] #51010 <!-- Add ORIGIN to SuiteSparse rpath on Linux/FreeBSD -->
- [x] #50753 <!-- cat: remove unused promote_eltype methods that confuse
inference -->
- [x] #51027 <!-- Implement realloc accounting correctly -->
- [x] #51019 <!-- fix a case of potentially use of undefined variable
when handling error in distributed message processing -->
- [x] #51039 <!-- Revert "Optimize findall(f, ::AbstractArray{Bool})
(#42202)" -->
- [x] #51036 <!-- add missing invoke edge for nospecialize targets -->
- [x] #51042 <!-- inference: fix return_type_tfunc modeling of concrete
functions -->
- [x] #51114 <!-- Workaround upstream FreeBSD issue #272992 -->
- [x] #50892 <!-- Add `JL_DLLIMPORT` to `small_typeof` declaration -->
- [x] #51154 <!-- broadcast: use recursion rather than ntuple to map
over a tuple -->
- [x] #51153 <!-- fix debug typo in "add missing invoke edge for
nospecialize targets (#51036)" -->
- [x] #51222 <!-- Check again if the tty is open inside the IO lock -->
- [x] #51236 <!-- Add lock around uv_unref during init -->
- [x] #51243 <!-- GMP: Gracefully handle more overflows. -->
- [x] #51254 <!-- Ryu: make sure adding zeros does not overwrite
trailing dot -->
- [x] #51175 <!-- shorten stale_age for cachefile lock -->
- [x] #51300 <!-- fix method definition error for bad vararg -->
- [x] #51307 <!-- fix force-throw ctrl-C on Windows -->
- [x] #51303 <!-- ensure revising structs is safe -->
- [x] #51393 
- [x] #51403 

Need manual backport:
- [x] #51009 <!-- fix #50562, regression in `in` of tuple of Symbols -->
- [x] #51053 <!-- Bump Statistics stdlib -->
- [x] #51013 <!-- fix #50709, type bound error due to free typevar in
sparam env -->
- [x] #51305 <!-- reduce test time for rounding and floatfuncs -->

Contains multiple commits, manual intervention needed:
- [ ] #50663 <!-- Fix Expr(:loopinfo) codegen -->
- [ ] #51035 <!-- refactor GC scanning code to reflect jl_binding_t are
now first class -->
- [ ] #51092 <!-- inference: fix bad effects for recursion -->
- [x] #51247 <!-- Check if malloc has succeeded before incrementing gc
stats -->
- [x] #51294 <!-- use LibGit2_jll for LibGit2 library -->

Non-merged PRs with backport label:
- [ ] #51132 <!-- Handle `AbstractQ` in concatenation -->
- [x] #51029 <!-- testdefs: make sure that if a test set changes the
active project, they change it back when they're done -->
- [ ] #50919 <!-- Code loading: do the "skipping mtime check for stdlib"
check regardless of the value of `ispath(f)` -->
- [ ] #50824 <!-- Add some aliasing warnings to docstrings for mutating
functions -->
- [x] #50385 <!-- Precompile pidlocks: add to NEWS and docs -->
- [ ] #49805 <!-- Limit TimeType subtraction to AbstractDateTime -->
@KristofferC KristofferC removed the backport 1.10 Change should be backported to the 1.10 release label Oct 2, 2023
@kpamnany kpamnany added the backport 1.9 Change should be backported to release-1.9 label Oct 20, 2023
kpamnany pushed a commit to RelationalAI/julia that referenced this pull request Oct 21, 2023
We're now using libssh2 v1.11.0 which includes the two patches we were
carrying. The patches need to be dropped in order to build with
`USE_BINARYBUILDER=0`. (This was my bad, I should have made this change
as part of JuliaLang#50826, which updated libssh2 to v1.11.0.)

(cherry picked from commit 315ff53)
kpamnany pushed a commit to RelationalAI/julia that referenced this pull request Oct 21, 2023
We're now using libssh2 v1.11.0 which includes the two patches we were
carrying. The patches need to be dropped in order to build with
`USE_BINARYBUILDER=0`. (This was my bad, I should have made this change
as part of JuliaLang#50826, which updated libssh2 to v1.11.0.)

(cherry picked from commit 315ff53)
KristofferC pushed a commit that referenced this pull request Oct 23, 2023
We're now using libssh2 v1.11.0 which includes the two patches we were
carrying. The patches need to be dropped in order to build with
`USE_BINARYBUILDER=0`. (This was my bad, I should have made this change
as part of #50826, which updated libssh2 to v1.11.0.)

(cherry picked from commit 315ff53)
nalimilan pushed a commit that referenced this pull request Nov 5, 2023
We're now using libssh2 v1.11.0 which includes the two patches we were
carrying. The patches need to be dropped in order to build with
`USE_BINARYBUILDER=0`. (This was my bad, I should have made this change
as part of #50826, which updated libssh2 to v1.11.0.)

(cherry picked from commit 315ff53)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.9 Change should be backported to release-1.9 external dependencies Involves LLVM, OpenBLAS, or other linked libraries kind:embarrassing-bugfix Whoops!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants