Skip to content

Conversation

patrikjuvonen
Copy link
Contributor

@patrikjuvonen patrikjuvonen commented Jul 17, 2019

Summary

Tests

Validation

To help validate the integrity of the update I have created the following bash script that diffs between my PR branch and the official package provided from the curl website.

#!/bin/bash

CURL_UPDATE_VERSION=7.65.3
CURL_PATH_NAME=curl-$CURL_UPDATE_VERSION

# curl released new patch after the PR was submitted, hence the old branch below
GIT_REPO_BRANCH=vendor/curl-7.65.2
GIT_REPO_URL=git@github.com:patrikjuvonen/mtasa-blue.git
GIT_DEST_DIR=mtasa-blue
GIT_REPO_CURL_PATH=$GIT_DEST_DIR/vendor/curl/

echo 1. Download and extract $CURL_PATH_NAME...
curl https://curl.haxx.se/download/$CURL_PATH_NAME.tar.xz | tar -xJ

echo 2. Clone the vendor update branch $GIT_REPO_BRANCH from $GIT_REPO_URL into $GIT_DEST_DIR...
git clone --depth 1 -b $GIT_REPO_BRANCH $GIT_REPO_URL $GIT_DEST_DIR

echo 3. Start checking integrity...
diff -r $GIT_REPO_CURL_PATH $CURL_PATH_NAME

echo 4. Completed.

Past curl updates in MTA

Date From To Link
July 2019 7.64.1 7.65.1 (current) #1018
April 2019 7.64.0 7.64.1 #898
February 2019 7.63.0 7.64.0 #819
January 2019 7.61.1 7.63.0 #744
September 2018 7.61.0 7.61.1 #428
August 2018 7.59.0 7.61.0 #271
March 2018 7.54.0 7.59.0 b99e343
June 2017 7.32.0 7.54.0 c15d999
August 2013 7.19.4 7.32.0 aaf3e21

Copy of curl changelogs

Fixed in 7.65.3 - July 19 2019

Bugfixes:

progress: make the progress meter appear again

Fixed in 7.65.2 - July 17 2019

Bugfixes:

CIPHERS.md: Explain Schannel error SEC_E_ALGORITHM_MISMATCH
CMake: Convert errant elseif() to else()
CMake: Fix finding Brotli on case-sensitive file systems
CURLMOPT_SOCKETFUNCTION.3: clarified
CURLMOPT_SOCKETFUNCTION.3: fix typo
CURLOPT_CAINFO.3: polished wording
CURLOPT_HEADEROPT.3: Fix example
CURLOPT_RANGE.3: Caution against using it for HTTP PUT
CURLOPT_SEEKDATA.3: fix variable name
DEPRECATE: fixup versions and spelling
bindlocal: detect and avoid IP version mismatches in bind()
build: fix Codacy warnings
buildconf.bat: fix header filename
c-ares: honor port numbers in CURLOPT_DNS_SERVERS
config-os400: add getpeername and getsockname defines
configure: --disable-progress-meter
configure: fix --disable-code-coverage
configure: fix typo '--disable-http-uath'
configure: more --disable switches to toggle off individual features
configure: remove CURL_DISABLE_TLS_SRP
conn_maxage: move the check to prune_dead_connections()
curl: skip CURLOPT_PROXY_CAPATH for disabled-proxy builds
curl_multi_wait.3: escape backslash in example
docs: Explain behavior change in --tlsv1. options since 7.54
docs: Fix links to OpenSSL docs
docs: fix string suggesting HTTP/2 is not the default
examples/fopen: fix comparison
examples/htmltitle: use C++ casts between pointer types
headers: Remove no longer exported functions
http2: call done_sending on end of upload
http2: don't call stream-close on already closed streams
http2: remove CURL_DISABLE_TYPECHECK define
http: allow overriding timecond with custom header
http: clarify header buffer size calculation
krb5: fix compiler warning
lib: Use UTF-8 encoding in comments
libcurl-tutorial.3: Fix small typo (mutipart -> multipart)
libcurl: Restrict redirect schemes to HTTP, HTTPS, FTP and FTPS
multi: enable multiplexing by default (again)
multi: fix the transfer hashes in the socket hash entries
multi: make sure 'data' can present in several sockhash entries
netrc: Return the correct error code when out of memory
nss: don't set unused parameter
nss: inspect returnvalue of token check
nss: only cache valid CRL entries
nss: support using libnss on macOS
openssl: define HAVE_SSL_GET_SHUTDOWN based on version number
openssl: disable engine if OPENSSL_NO_UI_CONSOLE is defined
openssl: fix pubkey/signature algorithm detection in certinfo
openssl: remove outdated comment
os400: make vsetopt() non-static as Curl_vsetopt() for os400 support
quote.d: asterisk prefix works for SFTP as well
runtests: keep logfiles around by default
runtests: report single test time + total duration
smb: Use the correct error code for access denied on file open
sws: remove unused variables
system_win32: fix clang warning
system_win32: fix typo
test1165: verify that CURL_DISABLE_ symbols are in sync
test1521: adapt to SLISTPOINT
test1523: test CURLOPT_LOW_SPEED_LIMIT
test153: fix content-length to avoid occasional hang
test188/189: fix Content-Length
tests: have runtests figure out disabled features
tests: support non-localhost HOSTIP for dict/smb servers
tests: update fixed IP for hostip/clientip split
tool_cb_prg: Fix integer overflow in progress bar
travis: disable threaded resolver for coverage build
travis: enable alt-svc for coverage build
travis: enable brotli for all xenial jobs
travis: enable libssh2 for coverage build
travis: enable warnings-as-errors for coverage build
travis: update scan-build job to xenial
typecheck: CURLOPT_CONNECT_TO takes an slist too
typecheck: add 3 missing strings and a callback data pointer
unit1654: cleanup on memory failure
unpause: trigger a timeout for event-based transfers
url: Fix CURLOPT_MAXAGE_CONN time comparison
win32: make DLL loading a no-op for UWP
winbuild: Change Makefile to honor ENABLE_OPENSSL_AUTO_LOAD_CONFIG
winbuild: use WITH_PREFIX if given
wolfssl: refer to it as wolfSSL only

@patrikjuvonen patrikjuvonen added the enhancement New feature or request label Jul 17, 2019
@patrikjuvonen patrikjuvonen added this to the 1.5.7 milestone Jul 17, 2019
@patrikjuvonen patrikjuvonen changed the title Update curl from 7.65.1 to 7.65.2 WIP: Update curl from 7.65.1 to 7.65.2 Jul 19, 2019
@patrikjuvonen patrikjuvonen added the feedback Further information is requested label Jul 19, 2019
@patrikjuvonen
Copy link
Contributor Author

patrikjuvonen commented Jul 19, 2019

Whilst unnecessary, will update this PR tonight to just released 7.65.3 patch. Doesn't apply to us though.

Done.

@patrikjuvonen patrikjuvonen changed the title WIP: Update curl from 7.65.1 to 7.65.2 Update curl from 7.65.1 to 7.65.3 Jul 19, 2019
@patrikjuvonen patrikjuvonen removed the feedback Further information is requested label Jul 19, 2019
@qaisjp qaisjp merged commit 8ff182f into multitheftauto:master Aug 16, 2019
@patrikjuvonen patrikjuvonen deleted the vendor/curl-7.65.2 branch September 2, 2019 18:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants