From f9070949a63a9c186ec17586312d2b6e93dfc435 Mon Sep 17 00:00:00 2001 From: Lukas Kastern Date: Sat, 3 Oct 2026 17:21:53 +0200 Subject: [PATCH 1/3] upgrade to 0.17.0 --- build.zig | 28 ++++------------------------ build.zig.zon | 4 ++-- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/build.zig b/build.zig index 4b56633..d3487b3 100644 --- a/build.zig +++ b/build.zig @@ -177,10 +177,7 @@ pub fn build(b: *std.Build) !void { const run_cmd = b.addRunArtifact(exe); run_cmd.step.dependOn(b.getInstallStep()); - - if (b.args) |args| { - run_cmd.addArgs(args); - } + run_cmd.addPassthruArgs(); const run_step = b.step("run", "Run curl"); run_step.dependOn(&run_cmd.step); @@ -768,7 +765,6 @@ pub fn build(b: *std.Build) !void { .HAVE_INET_NTOP = target.result.os.tag != .windows, .HAVE_INET_PTON = target.result.os.tag != .windows, .HAVE_SA_FAMILY_T = target.result.os.tag != .windows, - .HAVE_ADDRESS_FAMILY = target.result.os.tag == .windows, .HAVE_IOCTLSOCKET = target.result.os.tag == .windows, .HAVE_IOCTLSOCKET_CAMEL = null, .HAVE_IOCTLSOCKET_CAMEL_FIONBIO = null, @@ -798,7 +794,6 @@ pub fn build(b: *std.Build) !void { .HAVE_NETINET_UDP_H = target.result.os.tag != .windows, .HAVE_LINUX_TCP_H = target.result.os.tag == .linux, .HAVE_NET_IF_H = target.result.os.tag != .windows, - .HAVE_OLD_GSSMIT = null, .HAVE_PIPE = target.result.os.tag != .windows and target.result.os.tag != .wasi, .HAVE_PIPE2 = switch (target.result.os.tag) { .linux => true, @@ -883,7 +878,6 @@ pub fn build(b: *std.Build) !void { .HAVE_SYS_RESOURCE_H = target.result.os.tag != .windows and target.result.os.tag != .wasi, .HAVE_SYS_SELECT_H = target.result.os.tag != .windows, .HAVE_SYS_SOCKIO_H = target.result.os.tag.isBSD(), - .HAVE_SYS_STAT_H = true, .HAVE_SYS_TYPES_H = true, .HAVE_SYS_UN_H = target.result.os.tag != .windows, .HAVE_SYS_UTIME_H = target.result.os.tag == .windows, @@ -897,20 +891,14 @@ pub fn build(b: *std.Build) !void { .HAVE_TIME_T_UNSIGNED = null, .NEED_REENTRANT = null, .CURL_OS = b.fmt("\"{s}\"", .{target.result.zigTriple(b.allocator) catch @panic("OOM")}), - .SIZEOF_INT_CODE = b.fmt("#define SIZEOF_INT {d}", .{target.result.cTypeByteSize(.int)}), - .SIZEOF_LONG_CODE = b.fmt("#define SIZEOF_LONG {d}", .{target.result.cTypeByteSize(.long)}), - .SIZEOF_LONG_LONG_CODE = b.fmt("#define SIZEOF_LONG_LONG {d}", .{target.result.cTypeByteSize(.longlong)}), + .SIZEOF_INT_CODE = b.fmt("#define SIZEOF_INT {d}", .{target.result.cTypeByteSize(.int).?}), + .SIZEOF_LONG_CODE = b.fmt("#define SIZEOF_LONG {d}", .{target.result.cTypeByteSize(.long).?}), + .SIZEOF_LONG_LONG_CODE = b.fmt("#define SIZEOF_LONG_LONG {d}", .{target.result.cTypeByteSize(.longlong).?}), .SIZEOF_OFF_T_CODE = b.fmt("#define SIZEOF_OFF_T {d}", .{8}), .SIZEOF_CURL_OFF_T_CODE = b.fmt("#define SIZEOF_CURL_OFF_T {d}", .{8}), .SIZEOF_CURL_SOCKET_T_CODE = b.fmt("#define SIZEOF_CURL_SOCKET_T {d}", .{@as(i64, if (target.result.os.tag == .windows) 8 else 4)}), .SIZEOF_SIZE_T_CODE = b.fmt("#define SIZEOF_SIZE_T {d}", .{target.result.ptrBitWidth() / 8}), .SIZEOF_TIME_T_CODE = b.fmt("#define SIZEOF_TIME_T {d}", .{8}), - .PACKAGE = "", - .PACKAGE_BUGREPORT = "curl", - .PACKAGE_NAME = "a suitable curl mailing list: https://curl.se/mail/", - .PACKAGE_STRING = "curl", - .PACKAGE_TARNAME = "curl", - .PACKAGE_VERSION = b.fmt("{f}", .{version}), .STDC_HEADERS = true, .USE_ARES = enable_ares, .USE_THREADS_POSIX = enable_threaded_resolver and target.result.os.tag != .windows and !target.result.os.tag.isBSD(), @@ -921,8 +909,6 @@ pub fn build(b: *std.Build) !void { .USE_RUSTLS = use_rustls, .USE_WOLFSSL = use_wolfssl, .HAVE_WOLFSSL_DES_ECB_ENCRYPT = use_wolfssl and false, // TODO - .HAVE_WOLFSSL_BIO = use_wolfssl and false, // TODO - .HAVE_WOLFSSL_FULL_BIO = use_wolfssl and false, // TODO .USE_LIBSSH = use_libssh and !use_libssh2, .USE_LIBSSH2 = use_libssh2, .USE_LIBPSL = use_libpsl, @@ -941,17 +927,11 @@ pub fn build(b: *std.Build) !void { .USE_OPENSSL_QUIC = use_openssl_quic, .HAVE_QUICHE_CONN_SET_QLOG_FD = null, // TODO .USE_UNIX_SOCKETS = target.result.os.tag == .windows or enable_unix_sockets, - .USE_WIN32_LARGE_FILES = target.result.os.tag == .windows, .USE_WINDOWS_SSPI = enable_windows_sspi, .USE_SCHANNEL = use_schannel, .USE_WATT32 = null, // DOS .CURL_WITH_MULTI_SSL = with_multi_ssl, - .VERSION = b.fmt("{f}", .{version}), ._FILE_OFFSET_BITS = 64, - ._LARGE_FILES = null, // OS/400 - ._THREAD_SAFE = null, // AIX 4.3 - .@"const" = null, - .size_t = null, .ssize_t = null, .HAVE_MACH_ABSOLUTE_TIME = target.result.os.tag.isDarwin(), .USE_WIN32_IDN = target.result.os.tag == .windows and use_win32_idn, diff --git a/build.zig.zon b/build.zig.zon index 61e0290..b1a2c9a 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -33,8 +33,8 @@ .lazy = true, }, .boringssl = .{ - .url = "git+https://github.com/allyourcodebase/boringssl.git#ec7cca75cbf5381ba4a9e111d1f12236f8f2bd6a", - .hash = "boringssl-0.20260526.0-EhtkNaI5AAAUWRtpFwiFhqdvxjAMMWkcx-iHkKIppGBV", + .url = "git+https://github.com/allyourcodebase/boringssl.git#2bd755df0ce26ea196951b96f74602dd3ab6b58d", + .hash = "boringssl-0.20260526.0-EhtkNao-AAA8mv7IUtNDiDYgB7ILL4doC1mLG8YKOvGN", .lazy = true, }, }, From 9d3ff4792f5d93d675f641e2f73441d86a15c57f Mon Sep 17 00:00:00 2001 From: Lukas Kastern Date: Sat, 3 Oct 2026 17:26:42 +0200 Subject: [PATCH 2/3] remove boringssl bcm which is now part of crypto --- build.zig | 1 - 1 file changed, 1 deletion(-) diff --git a/build.zig b/build.zig index d3487b3..46d11de 100644 --- a/build.zig +++ b/build.zig @@ -320,7 +320,6 @@ pub fn build(b: *std.Build) !void { .target = target, .optimize = optimize, })) |dependency| { - curl.root_module.linkLibrary(dependency.artifact("bcm")); curl.root_module.linkLibrary(dependency.artifact("ssl")); curl.root_module.linkLibrary(dependency.artifact("crypto")); curl.root_module.addIncludePath(dependency.namedLazyPath("ssl_include")); From 4fa7064e9e527fcc9932d6bd8957231ed9b93ba8 Mon Sep 17 00:00:00 2001 From: Lukas Kastern Date: Wed, 7 Oct 2026 20:54:17 +0200 Subject: [PATCH 3/3] bump minimum_zig_version --- build.zig.zon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.zig.zon b/build.zig.zon index b1a2c9a..5747b8b 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -1,7 +1,7 @@ .{ .name = .curl, .version = "8.18.0", - .minimum_zig_version = "0.16.0", + .minimum_zig_version = "0.17.0", .dependencies = .{ .curl = .{ .url = "git+https://github.com/curl/curl?ref=curl-8_18_0#2eebc58c4b8d68c98c8344381a9f6df4cca838fd",