remove all remnants of commented out curl

for #96

if anyone still needs this, likely best to inherit from the image and adding in this step.
CI is already slow with the libraries we have and trying to make room for aws's crypto lib without going insane #141.

Signed-off-by: clux <[email protected]>

Author: clux

Dockerfile.arm64

@@ -54,7 +54,6 @@ RUN chmod a+X /root
 # Convenience list of versions and variables for compilation later on
 # This helps continuing manually if anything breaks.
 ENV SSL_VER="1.1.1w" \
-    CURL_VER="8.12.1" \
     ZLIB_VER="1.3.1" \
     PQ_VER="11.12" \
     SQLITE_VER="3490100" \
@@ -95,7 +94,7 @@ RUN curl -sSL https://zlib.net/zlib-$ZLIB_VER.tar.gz | tar xz && \
     make -j$(nproc) && make install && \
     cd .. && rm -rf zlib-$ZLIB_VER
 
-# Build openssl (used in curl and pq)
+# Build openssl (used in pq)
 # Would like to use zlib here, but can't seem to get it to work properly
 # TODO: fix so that it works
 RUN curl -sSL https://www.openssl.org/source/openssl-$SSL_VER.tar.gz | tar xz && \
@@ -105,17 +104,6 @@ RUN curl -sSL https://www.openssl.org/source/openssl-$SSL_VER.tar.gz | tar xz &&
     make -j$(nproc) && make all install_sw && \
     cd .. && rm -rf openssl-$SSL_VER
 
-# Build curl (needs with-zlib and all this stuff to allow https)
-# curl_LDFLAGS needed on stretch to avoid fPIC errors - though not sure from what
-# RUN curl -sSL https://curl.se/download/curl-$CURL_VER.tar.gz | tar xz && \
-    # cd curl-$CURL_VER && \
-    # CC="musl-gcc -fPIC -pie" LDFLAGS="-L$PREFIX/lib" CFLAGS="-I$PREFIX/include" ./configure \
-      # --enable-shared=no --with-zlib --enable-static=ssl --enable-optimize --prefix=$PREFIX \
-      # --with-ca-path=/etc/ssl/certs/ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --without-ca-fallback \
-      # --with-openssl --without-libpsl && \
-    # make -j$(nproc) curl_LDFLAGS="-all-static" && make install && \
-    # cd .. && rm -rf curl-$CURL_VER
-
 # Build libpq
 RUN curl -sSL https://ftp.postgresql.org/pub/source/v$PQ_VER/postgresql-$PQ_VER.tar.gz | tar xz && \
     cd postgresql-$PQ_VER && \

Dockerfile.x86_64

@@ -53,7 +53,6 @@ RUN chmod a+X /root
 # Convenience list of versions and variables for compilation later on
 # This helps continuing manually if anything breaks.
 ENV SSL_VER="1.1.1w" \
-    CURL_VER="8.12.1" \
     ZLIB_VER="1.3.1" \
     PQ_VER="11.12" \
     SQLITE_VER="3490100" \
@@ -94,7 +93,7 @@ RUN curl -sSL https://zlib.net/zlib-$ZLIB_VER.tar.gz | tar xz && \
     make -j$(nproc) && make install && \
     cd .. && rm -rf zlib-$ZLIB_VER
 
-# Build openssl (used in curl and pq)
+# Build openssl (used in pq)
 # Would like to use zlib here, but can't seem to get it to work properly
 # TODO: fix so that it works
 RUN curl -sSL https://www.openssl.org/source/openssl-$SSL_VER.tar.gz | tar xz && \
@@ -104,17 +103,6 @@ RUN curl -sSL https://www.openssl.org/source/openssl-$SSL_VER.tar.gz | tar xz &&
     make -j$(nproc) && make all install_sw && \
     cd .. && rm -rf openssl-$SSL_VER
 
-# Build curl (needs with-zlib and all this stuff to allow https)
-# curl_LDFLAGS needed on stretch to avoid fPIC errors - though not sure from what
-# RUN curl -sSL https://curl.se/download/curl-$CURL_VER.tar.gz | tar xz && \
-    # cd curl-$CURL_VER && \
-    # CC="musl-gcc -fPIC -pie" LDFLAGS="-L$PREFIX/lib" CFLAGS="-I$PREFIX/include" ./configure \
-      # --enable-shared=no --with-zlib --enable-static=ssl --enable-optimize --prefix=$PREFIX \
-      # --with-ca-path=/etc/ssl/certs/ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --without-ca-fallback \
-      # --with-openssl --without-libpsl && \
-    # make -j$(nproc) curl_LDFLAGS="-all-static" && make install && \
-    # cd .. && rm -rf curl-$CURL_VER
-
 # Build libpq
 RUN curl -sSL https://ftp.postgresql.org/pub/source/v$PQ_VER/postgresql-$PQ_VER.tar.gz | tar xz && \
     cd postgresql-$PQ_VER && \

README.md

@@ -54,10 +54,11 @@ The following system libraries are compiled against `musl-gcc`:
 - [x] pq ([pq-sys crate](https://github.com/sgrif/pq-sys) used by [diesel](https://github.com/diesel-rs/diesel))
 - [x] sqlite3 ([libsqlite3-sys crate](https://github.com/jgallagher/rusqlite/tree/master/libsqlite3-sys) used by [diesel](https://github.com/diesel-rs/diesel))
 - [x] zlib (used by pq and openssl)
-- [~] curl ([curl crate](https://github.com/carllerche/curl-rust)) - dropped [#96](https://github.com/clux/muslrust/issues/96)
 
 We **[try](https://github.com/clux/muslrust/blob/main/update_libs.py)** to keep these up to date.
 
+NB: C library for `curl` has been removed in newer tags from 2025. See [#96](https://github.com/clux/muslrust/issues/96).
+
 ## Developing
 
 Clone, tweak, build, and run tests:
@@ -79,7 +80,6 @@ Before we push a new version of muslrust we [test](https://github.com/clux/muslr
 - [x] [openssl](https://crates.io/crates/openssl)
 - [x] [flate2](https://crates.io/crates/flate2)
 - [x] [rand](https://crates.io/crates/rand)
-- [~] [curl](https://crates.io/crates/curl) - dropped [#96](https://github.com/clux/muslrust/issues/96)
 
 ## Caching
 

justfile

@@ -49,7 +49,6 @@ _t_macos_aarch64 crate:
 test: (_ti "plain") (_ti "ssl") (_ti "rustls") (_ti "pq") (_ti "serde") (_ti "zlib") (_ti "hyper") (_ti "dieselpg") (_ti "dieselsqlite")
 # Test all crates against built container in ci (inheriting set PLATFORM/TARGET_DIR/AR vars)
 test-ci: (_t "plain") (_t "ssl") (_t "rustls") (_t "pq") (_t "serde") (_t "zlib") (_t "hyper") (_t "dieselpg") (_t "dieselsqlite")
-# NB: taken out curl for #96 and build issuse
 
 # Cleanup everything
 clean: clean-docker clean-tests

test/curlcrate/Cargo.toml

@@ -82,7 +82,6 @@ def rustup_version():
 
 if __name__ == '__main__':
     PACKAGES = {
-        'CURL': pkgver('curl'),
         #'PQ': pkgver('postgresql-old-upgrade'), # see https://github.com/clux/muslrust/issues/81
         'SQLITE': convert_sqlite_version(pkgver('sqlite')),
         'SSL': convert_openssl_version(pkgver('openssl-1.1')),