You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@openoffice.apache.org by bu...@apache.org on 2018/09/10 05:37:03 UTC
4.1.6_release_blocker requested: [Issue 127886] Upgraded bundled
curl from 7.19.7 to 7.61.1
Don Lewis <tr...@apache.org> has asked for 4.1.6_release_blocker:
Issue 127886: Upgraded bundled curl from 7.19.7 to 7.61.1
https://bz.apache.org/ooo/show_bug.cgi?id=127886
--- Description ---
These trunk commits should be merged to AOO416 to upgrade the bundled version
of curl from 7.19.7 to 7.61.1:
https://svn.apache.org/viewvc?view=revision&revision=1754469
https://svn.apache.org/viewvc?view=revision&revision=1756017
https://svn.apache.org/viewvc?view=revision&revision=1761808
https://svn.apache.org/viewvc?view=revision&revision=1772139
https://svn.apache.org/viewvc?view=revision&revision=1825850
https://svn.apache.org/viewvc?view=revision&revision=1839837
https://svn.apache.org/viewvc?view=revision&revision=1840427
In the top level directory of AOO416:
svn merge -c 1754469 '^/openoffice/trunk' .
take their side of conflict on external_deps.lst
svn rm main/curl/curl-7.19.7.patch
svn merge -c 1756017 '^/openoffice/trunk' .
svn merge -c 1761808 '^/openoffice/trunk' .
svn merge -c 1772139 '^/openoffice/trunk' .
svn merge -c 1825850 '^/openoffice/trunk' .
svn merge -c 1839837 '^/openoffice/trunk' .
svn merge -c 1840427 '^/openoffice/trunk' .
Tested in 4.1.6 on 32-bit Windows 7 and CentOS 6 x86_64.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org