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

windows: add links to dependencies #225

Merged
merged 1 commit into from
Apr 1, 2024

Conversation

vszakats
Copy link
Member

@vszakats vszakats commented Mar 24, 2023

Change each dependency + version line into a link to the original source (or package) that we used for the build.

Also include curl sources in the list. This isn't stricly necessary, but otherwise curl would be the only component without a direct link to its source code.

Caveat: Needs an fcpp update bumping up NBUFF and NWORK to make it process the longer DEP_TOOLS (356 bytes) and DEP_PKGS (1013 bytes) macros.

https://github.com/bagder/fcpp:

diff --git a/cppdef.h b/cppdef.h
index c188a22..c5b44b5 100644
--- a/cppdef.h
+++ b/cppdef.h
@@ -299,11 +299,11 @@
 #endif

 #ifndef NBUFF
-#define NBUFF			512
+#define NBUFF			2048
 #endif

 #ifndef NWORK
-#define NWORK			512
+#define NWORK			2048
 #endif

 #ifndef NEXP

Or, build it with CPPFLAGS='-DNBUFF=2048 -DNWORK=2048' for curl-www purposes.

Live sample urls.txt from the curl-for-win package:

.clang 15.0.6
.clang 16.0.0 (ARM64)
.curl-for-win 29b99783 https://github.com/curl/curl-for-win/archive/29b997832d92414a960e51fbd5a4e78e39b38c1b.tar.gz
.llvm-mingw 20230320 https://github.com/mstorsjo/llvm-mingw/releases/download/20230320/llvm-mingw-20230320-ucrt-ubuntu-18.04-x86_64.tar.xz (ARM64)
.mingw-w64 10.0.0-3
brotli 1.0.9 https://github.com/google/brotli/archive/v1.0.9.tar.gz
cacert 2023-01-10 https://curl.se/ca/cacert-2023-01-10.pem
curl 8.0.1 https://curl.se/download/curl-8.0.1.tar.xz
gsasl 2.2.0 https://ftp.gnu.org/gnu/gsasl/gsasl-2.2.0.tar.gz
libssh2 1.10.0 https://www.libssh2.org/download/libssh2-1.10.0.tar.gz
nghttp2 1.52.0 https://github.com/nghttp2/nghttp2/releases/download/v1.52.0/nghttp2-1.52.0.tar.xz
nghttp3 0.9.0 https://github.com/ngtcp2/nghttp3/releases/download/v0.9.0/nghttp3-0.9.0.tar.xz
ngtcp2 0.13.1 https://github.com/ngtcp2/ngtcp2/releases/download/v0.13.1/ngtcp2-0.13.1.tar.xz
quictls 3.0.8 https://github.com/quictls/openssl/archive/refs/heads/openssl-3.0.8+quic.tar.gz
zlib 1.2.13 https://zlib.net/zlib-1.2.13.tar.xz
zstd 1.5.4 https://github.com/facebook/zstd/releases/download/v1.5.4/zstd-1.5.4.tar.gz

Webpage:
Screen Shot

@vszakats
Copy link
Member Author

vszakats commented Mar 24, 2023

Well, for fcpp it might suffice to build it with CPPFLAGS='-DNBUFF=2048 -DNWORK=2048' for curl-www purposes.

@vszakats
Copy link
Member Author

vszakats commented Mar 27, 2023

Probably not terribly useful/important, besides maybe transparency.

@vszakats vszakats closed this Mar 27, 2023
@vszakats vszakats reopened this Apr 1, 2024
@vszakats
Copy link
Member Author

vszakats commented Apr 1, 2024

Reopening this 10 months later. I think transparency can only help. This patch adds links to the source packages used for building curl-for-win.

@vszakats
Copy link
Member Author

vszakats commented Apr 1, 2024

@bagder: Do you think you can update fcpp to have the above changes in default buffer sizes, and/or set the these custom options for the build used on the server?

@vszakats
Copy link
Member Author

vszakats commented Apr 1, 2024

Oh, I just checked and you already did it, thanks!: bagder/fcpp@761e27e

Is this change there in the live binary?

@vszakats
Copy link
Member Author

vszakats commented Apr 1, 2024

Hm, NWORK remained 512, I'll have to check if this would work.

Change each dependency + version line into a link to the original
source (or package) that we used for the build.

Also include curl sources in the list. This isn't stricly necessary,
but otherwise curl would be the only component without a direct link
to its source code.

Caveat: Needs an `fcpp` update bumping up `NBUFF` and `NWORK` to make it
        process the longer `DEP_TOOLS` (356 bytes) and `DEP_PKGS` (1013
        bytes) macros.

https://github.com/bagder/fcpp:
```diff
diff --git a/cppdef.h b/cppdef.h
index c188a22..c5b44b5 100644
--- a/cppdef.h
+++ b/cppdef.h
@@ -299,11 +299,11 @@
 #endif

 #ifndef NBUFF
-#define NBUFF			512
+#define NBUFF			2048
 #endif

 #ifndef NWORK
-#define NWORK			512
+#define NWORK			2048
 #endif

 #ifndef NEXP
```

Live sample `urls.txt` from the curl-for-win package:
```
.clang 15.0.6
.clang 16.0.0 (ARM64)
.curl-for-win 29b99783 https://github.com/curl/curl-for-win/archive/29b997832d92414a960e51fbd5a4e78e39b38c1b.tar.gz
.llvm-mingw 20230320 https://github.com/mstorsjo/llvm-mingw/releases/download/20230320/llvm-mingw-20230320-ucrt-ubuntu-18.04-x86_64.tar.xz (ARM64)
.mingw-w64 10.0.0-3
brotli 1.0.9 https://github.com/google/brotli/archive/v1.0.9.tar.gz
cacert 2023-01-10 https://curl.se/ca/cacert-2023-01-10.pem
curl 8.0.1 https://curl.se/download/curl-8.0.1.tar.xz
gsasl 2.2.0 https://ftp.gnu.org/gnu/gsasl/gsasl-2.2.0.tar.gz
libssh2 1.10.0 https://www.libssh2.org/download/libssh2-1.10.0.tar.gz
nghttp2 1.52.0 https://github.com/nghttp2/nghttp2/releases/download/v1.52.0/nghttp2-1.52.0.tar.xz
nghttp3 0.9.0 https://github.com/ngtcp2/nghttp3/releases/download/v0.9.0/nghttp3-0.9.0.tar.xz
ngtcp2 0.13.1 https://github.com/ngtcp2/ngtcp2/releases/download/v0.13.1/ngtcp2-0.13.1.tar.xz
quictls 3.0.8 https://github.com/quictls/openssl/archive/refs/heads/openssl-3.0.8+quic.tar.gz
zlib 1.2.13 https://zlib.net/zlib-1.2.13.tar.xz
zstd 1.5.4 https://github.com/facebook/zstd/releases/download/v1.5.4/zstd-1.5.4.tar.gz
```
vszakats added a commit to vszakats/fcpp that referenced this pull request Apr 1, 2024
@vszakats
Copy link
Member Author

vszakats commented Apr 1, 2024

NWORK needs to be bigger, because DEP_PKGS needs to fit the HTML with all URLs in it. This is about 1 KB at the moment.

PR: bagder/fcpp#9

bagder pushed a commit to bagder/fcpp that referenced this pull request Apr 1, 2024
@bagder
Copy link
Member

bagder commented Apr 1, 2024

I upgraded and deployed fccp with larger NWORK on the website server.

@vszakats
Copy link
Member Author

vszakats commented Apr 1, 2024

Thank you!

@vszakats vszakats merged commit fb2d1d4 into curl:master Apr 1, 2024
2 checks passed
@vszakats vszakats deleted the windows-dep-links branch April 1, 2024 20:52
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.

2 participants