Muldersoft/cURL-build-win32
Muldersoft/cURL-build-win32
1
0
Fork 0
Code Issues Pull Requests Projects Releases 21 Wiki Activity

Compare commits

base: Muldersoft:master
Branches Tags
Muldersoft:master
Muldersoft:2025-02-08
Muldersoft:2024-12-14
Muldersoft:2024-11-13
Muldersoft:2024-09-18
Muldersoft:2024-09-13
Muldersoft:2024-08-01
Muldersoft:2024-05-26
Muldersoft:2024-03-29
Muldersoft:2024-02-18
Muldersoft:2024-02-06
Muldersoft:2023-12-07
Muldersoft:2023-10-15
Muldersoft:2023-09-25
Muldersoft:2023-09-23
Muldersoft:2023-06-04
Muldersoft:2023-04-04
Muldersoft:2022-12-29
Muldersoft:2022-11-01
Muldersoft:2022-07-10
Muldersoft:2022-06-30
Muldersoft:2022-06-28
Muldersoft:2022-06-23
..
compare: Muldersoft:2024-12-14
Branches Tags
Muldersoft:master
Muldersoft:2025-02-08
Muldersoft:2024-12-14
Muldersoft:2024-11-13
Muldersoft:2024-09-18
Muldersoft:2024-09-13
Muldersoft:2024-08-01
Muldersoft:2024-05-26
Muldersoft:2024-03-29
Muldersoft:2024-02-18
Muldersoft:2024-02-06
Muldersoft:2023-12-07
Muldersoft:2023-10-15
Muldersoft:2023-09-25
Muldersoft:2023-09-23
Muldersoft:2023-06-04
Muldersoft:2023-04-04
Muldersoft:2022-12-29
Muldersoft:2022-11-01
Muldersoft:2022-07-10
Muldersoft:2022-06-30
Muldersoft:2022-06-28
Muldersoft:2022-06-23

No commits in common. "master" and "2024-12-14" have entirely different histories.
master ... 2024-12-14

5 changed files with 18 additions and 18 deletions
Show Stats Expand all files Collapse all files

16
build.sh
View File

@ -11,7 +11,7 @@ trap 'read -p "Press any key..." x || true' EXIT
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# cURL version
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
readonly MY_VERSION=8.12.0
readonly MY_VERSION=8.11.1
###############################################################################
# PREPARATION
@ -137,17 +137,17 @@ fetch_pkg "8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1" "${
fetch_pkg "e720a6ca29428b803f4ad165371771f5398faba397edf6778837a18599ea13ff" "${PKGS_DIR}/brotli.tar.gz" https://github.com/google/brotli/archive/refs/tags/v1.1.0.tar.gz
fetch_pkg "78d675d94c0ac3a8b44073f0c2b373d948c5afd12b25c9e245262f563307a566" "${PKGS_DIR}/openssl.tar.gz" https://github.com/quictls/openssl/archive/refs/tags/openssl-3.3.0-quic1.tar.gz
fetch_pkg "c68e05989a93c002e3ba8df3baef0021c17099aa2123a9c096a5cc8e029caf95" "${PKGS_DIR}/rtmpdump.tar.gz" https://distfiles.macports.org/rtmpdump/f1b83c10d8beb43fcc70a6e88cf4325499f25857.tar.gz
fetch_pkg "3b08f5f4f9b4eb82f151a7040bfd6fe6c6fb922efe4b1659c66ea933276965e8" "${PKGS_DIR}/libiconv.tar.gz" https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.18.tar.gz
fetch_pkg "52a578960fe308742367d75cd1dff8552c5797bd0beba7639e12bdcda28c0e49" "${PKGS_DIR}/gettext.tar.gz" https://ftp.gnu.org/pub/gnu/gettext/gettext-0.23.1.tar.gz
fetch_pkg "8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313" "${PKGS_DIR}/libiconv.tar.gz" https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.17.tar.gz
fetch_pkg "ec1705b1e969b83a9f073144ec806151db88127f5e40fe5a94cb6c8fa48996a0" "${PKGS_DIR}/gettext.tar.gz" https://ftp.gnu.org/pub/gnu/gettext/gettext-0.22.5.tar.gz
fetch_pkg "d9ec76cbe34db98eec3539fe2c899d26b0c837cb3eb466a56b0f109cabf658f7" "${PKGS_DIR}/libssh2.tar.gz" https://www.libssh2.org/download/libssh2-1.11.1.tar.gz
fetch_pkg "20e73f3cf9db3f05988996ac8b3a99ed529f4565ca91a49eb0550498e10621e8" "${PKGS_DIR}/nghttp2.tar.gz" https://github.com/nghttp2/nghttp2/releases/download/v1.64.0/nghttp2-1.64.0.tar.gz
fetch_pkg "79a546ec23263b66f22dfcfce180eb51a7b09bb262afca0973f6e479884d3b26" "${PKGS_DIR}/nghttp3.tar.gz" https://github.com/ngtcp2/nghttp3/releases/download/v1.7.0/nghttp3-1.7.0.tar.gz
fetch_pkg "24c79798650222f932ca443ac5af93b7487b5abd7b852a3bc5129f87008b95bc" "${PKGS_DIR}/ngtcp2.tar.gz" https://github.com/ngtcp2/ngtcp2/releases/download/v1.10.0/ngtcp2-1.10.0.tar.gz
fetch_pkg "a1f92f113c10faca2014b004eb97be363674e23546eb72591c1ac3533f93cba0" "${PKGS_DIR}/nghttp3.tar.gz" https://github.com/ngtcp2/nghttp3/releases/download/v1.6.0/nghttp3-1.6.0.tar.gz
fetch_pkg "0d8ebc929d5aa444d848ac7ae971cb3cadaba7ccec7db21f3117fc7167e582c3" "${PKGS_DIR}/ngtcp2.tar.gz" https://github.com/ngtcp2/ngtcp2/releases/download/v1.9.1/ngtcp2-1.9.1.tar.gz
fetch_pkg "4c21a791b610b9519b9d0e12b8097bf2f359b12f8dd92647611a929e6bfd7d64" "${PKGS_DIR}/libidn2.tar.gz" https://ftp.gnu.org/gnu/libidn/libidn2-2.3.7.tar.gz
fetch_pkg "1dcc9ceae8b128f3c0b3f654decd0e1e891afc6ff81098f227ef260449dae208" "${PKGS_DIR}/libpsl.tar.gz" https://github.com/rockdaboot/libpsl/releases/download/0.21.5/libpsl-0.21.5.tar.gz
fetch_pkg "f1b553384dedbd87478449775546a358d6f5140c15cccc8fb574136fdc77329f" "${PKGS_DIR}/libgsasl.tar.gz" https://ftp.gnu.org/gnu/gsasl/libgsasl-1.10.0.tar.gz
fetch_pkg "b72ec874e403c90462dc3019c5b24cc3cdd895247402bf23893b3b59419353bc" "${PKGS_DIR}/curl.tar.gz" https://curl.se/download/curl-${MY_VERSION}.tar.gz
fetch_pkg "a3f328c21e39ddd1f2be1cea43ac0dec819eaa20a90425d7da901a11531b3aa5" "${PKGS_DIR}/cacert.pem" https://curl.se/ca/cacert-2024-12-31.pem
fetch_pkg "a889ac9dbba3644271bd9d1302b5c22a088893719b72be3487bc3d401e5c4e80" "${PKGS_DIR}/curl.tar.gz" https://curl.se/download/curl-${MY_VERSION}.tar.gz
fetch_pkg "bb1782d281fe60d4a2dcf41bc229abe3e46c280212597d4abcc25bddf667739b" "${PKGS_DIR}/cacert.pem" https://curl.se/ca/cacert-2024-11-26.pem
fetch_pkg "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz" "${PKGS_DIR}/manpage.html" https://curl.se/docs/manpage.html
###############################################################################
@ -345,7 +345,7 @@ patch -p1 -b < "${BASE_DIR}/patch/curl_tool_getparam.diff"
patch -p1 -b < "${BASE_DIR}/patch/curl_tool_operate.diff"
patch -p1 -b < "${BASE_DIR}/patch/curl_tool_parsecfg.diff"
patch -p1 -b < "${BASE_DIR}/patch/curl_tool_util.diff"
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I${DEPS_DIR}/include" CPPFLAGS="-DNDEBUG -D_WIN32_WINNT=0x0501 -DNGHTTP2_STATICLIB -DNGHTTP3_STATICLIB -DNGTCP2_STATICLIB -DUNICODE -D_UNICODE" LDFLAGS="-mconsole -Wl,--trace -static -no-pthread -L${DEPS_DIR}/lib" LIBS="-liconv -lcrypt32 -lwinmm -lbrotlicommon" PKG_CONFIG_PATH="${DEPS_DIR}/lib/pkgconfig" ./configure --enable-static --disable-shared --enable-windows-unicode --disable-libcurl-option --disable-openssl-auto-load-config --enable-ca-search-safe --with-zlib --with-zstd --with-brotli --with-openssl --with-librtmp --with-libssh2 --with-nghttp2="${DEPS_DIR}" --with-ngtcp2="${DEPS_DIR}" --with-nghttp3="${DEPS_DIR}" --with-libidn2 --without-ca-bundle
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I${DEPS_DIR}/include" CPPFLAGS="-DNDEBUG -D_WIN32_WINNT=0x0501 -DNGHTTP2_STATICLIB -DNGHTTP3_STATICLIB -DNGTCP2_STATICLIB -DUNICODE -D_UNICODE" LDFLAGS="-mconsole -Wl,--trace -static -no-pthread -L${DEPS_DIR}/lib" LIBS="-liconv -lcrypt32 -lwinmm -lbrotlicommon" PKG_CONFIG_PATH="${DEPS_DIR}/lib/pkgconfig" ./configure --enable-static --disable-shared --enable-windows-unicode --disable-pthreads --disable-libcurl-option --disable-openssl-auto-load-config --enable-ca-search-safe --with-zlib --with-zstd --with-brotli --with-openssl --with-librtmp --with-libssh2 --with-nghttp2="${DEPS_DIR}" --with-ngtcp2="${DEPS_DIR}" --with-nghttp3="${DEPS_DIR}" --with-libidn2 --without-ca-bundle
make V=1
strip -s src/curl.exe
popd

6
patch/curl_tool_doswin.diff
View File

@ -2,10 +2,10 @@
1 file changed, 8 insertions(+)
diff --git a/src/tool_doswin.c b/src/tool_doswin.c
index 171b063..3ab301a 100644
index 301b2974e..6720ad5d7 100644
--- a/src/tool_doswin.c
+++ b/src/tool_doswin.c
@@ -739,6 +739,8 @@ bool tool_isVistaOrGreater;
@@ -741,6 +741,8 @@ bool tool_isVistaOrGreater;
CURLcode win32_init(void)
{
@ -14,7 +14,7 @@ index 171b063..3ab301a 100644
/* curlx_verify_windows_version must be called during init at least once
because it has its own initialization routine. */
if(curlx_verify_windows_version(6, 0, 0, PLATFORM_WINNT,
@@ -753,6 +755,12 @@ CURLcode win32_init(void)
@@ -755,6 +757,12 @@ CURLcode win32_init(void)
init_terminal();
#endif

4
patch/curl_tool_getparam.diff
View File

@ -2,7 +2,7 @@
1 file changed, 9 insertions(+)
diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index 0ae1466..3e54e51 100644
index d352c80a5..f0c42ddc8 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -23,6 +23,10 @@
@ -16,7 +16,7 @@ index 0ae1466..3e54e51 100644
#include "strcase.h"
#include "curlx.h"
@@ -554,8 +558,13 @@ static void cleanarg(argv_item_t str)
@@ -557,8 +561,13 @@ static void cleanarg(argv_item_t str)
* argument out so that the username:password is not displayed in the
* system process list */
if(str) {

4
patch/curl_tool_operate.diff
View File

@ -2,10 +2,10 @@
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/tool_operate.c b/src/tool_operate.c
index 007a5e0..0358fcf 100644
index 2309495d8..2c494e63f 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -3015,11 +3015,15 @@ static CURLcode cacertpaths(struct OperationConfig *config)
@@ -3017,11 +3017,15 @@ static CURLcode cacertpaths(struct OperationConfig *config)
#ifdef _WIN32
if(!env) {
#if defined(CURL_CA_SEARCH_SAFE)

6
patch/curl_tool_util.diff
View File

@ -3,10 +3,10 @@
2 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/src/tool_util.c b/src/tool_util.c
index 8a07889..7ad3fa9 100644
index 69b1d2b42..00557fdba 100644
--- a/src/tool_util.c
+++ b/src/tool_util.c
@@ -216,28 +216,21 @@ int tool_ftruncate64(int fd, curl_off_t where)
@@ -228,28 +228,21 @@ int tool_ftruncate64(int fd, curl_off_t where)
#endif /* USE_TOOL_FTRUNCATE */
#ifdef _WIN32
@ -49,7 +49,7 @@ index 8a07889..7ad3fa9 100644
}
diff --git a/src/tool_util.h b/src/tool_util.h
index 9a4e87d..8092c14 100644
index 9a4e87dc4..8092c1409 100644
--- a/src/tool_util.h
+++ b/src/tool_util.h
@@ -49,7 +49,7 @@ int struplocompare(const char *p1, const char *p2);