From 74a866f08eb7d2908e6cb826f7ddec52191d508f Mon Sep 17 00:00:00 2001 From: mr6r4y Date: Wed, 17 Jan 2024 10:47:49 +0200 Subject: [PATCH 1/3] Add zig build system --- .gitignore | 3 + build.zig | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 174 insertions(+) create mode 100644 build.zig diff --git a/.gitignore b/.gitignore index 57e9988..ab3b8bc 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,6 @@ cscope.out compile *~ tags + +zig-cache/ +zig-out/ diff --git a/build.zig b/build.zig new file mode 100644 index 0000000..3ef9c78 --- /dev/null +++ b/build.zig @@ -0,0 +1,171 @@ +const std = @import("std"); + +fn getVersionFromFile() ![]u8 { + const file = try std.fs.cwd().openFile( + "VERSION", + .{}, + ); + defer file.close(); + + const len = 32; + var buffer: [len]u8 = undefined; + try file.seekTo(0); + const bytes_read = try file.readAll(&buffer); + return buffer[0..@min(len, bytes_read)]; +} + +fn getVersionFromGit(allocator: std.mem.Allocator) ![]u8 { + const args = [_][]const u8{ + "bash", + "scripts/version.sh", + }; + + const t = try std.ChildProcess.exec(.{ + .allocator = allocator, + .argv = &args, + .max_output_bytes = 128, + }); + defer { + allocator.free(t.stdout); + allocator.free(t.stderr); + } + + const result = try allocator.alloc(u8, t.stdout.len); + @memcpy(result, t.stdout); + return result; +} + +pub fn build(b: *std.Build) !void { + const optimize = b.standardOptimizeOption(.{}); + const target = b.standardTargetOptions(.{}); + + const allocator = b.allocator; + + const version: []u8 = try getVersionFromGit(allocator); + const package = "tinyproxy"; + const package_name = "Tinyproxy"; + const package_tarname = package; + var package_string_buf: [128:0]u8 = undefined; + var package_string = try std.fmt.bufPrint(&package_string_buf, "{s} {s}", .{ package_name, version }); + // const package_string: []u8 = try allocator.alloc(u8, package_name.len + 1 + version.len); // package_name ++ version; + // package_string[0..package_name.len].* = package_name.*; + // package_string[package_name.len] = ' '; + // package_string[package_name.len + 1 .. package_string.len].* = version.*; + + const config_h = b.addConfigHeader(.{ + .style = .blank, + }, .{ + .VERSION = version, + .TINYPROXY_VERSION = version, + .XTINYPROXY_ENABLE = 1, + .FILTER_ENABLE = 1, + .UPSTREAM_SUPPORT = 1, + .REVERSE_SUPPORT = 1, + .TRANSPARENT_PROXY = 1, + .PACKAGE = package, + .PACKAGE_BUGREPORT = "https://tinyproxy.github.io/", + + .PACKAGE_NAME = package_name, + .PACKAGE_STRING = package_string, + + .PACKAGE_TARNAME = package_tarname, + + .PACKAGE_URL = "", + + .PACKAGE_VERSION = version, + + // /* Define to 1 if you can safely include both and . This + // macro is obsolete. */ + .TIME_WITH_SYS_TIME = 1, + + // /* This controls remote proxy stats display. */ + .TINYPROXY_STATHOST = "tinyproxy.stats", + }); + + const exe = b.addExecutable(.{ + .name = "tinyproxy", + .target = target, + .optimize = optimize, + }); + exe.addConfigHeader(config_h); + exe.addIncludePath(.{ .path = "src/" }); + + exe.defineCMacro("HAVE_CONFIG_H", null); + exe.defineCMacro("SYSCONFDIR", "\"/etc\""); + // exe.defineCMacro("LOCALSTATEDIR", "") + + if (target.isWindows()) { + exe.defineCMacro("_CRT_SECURE_NO_DEPRECATE", "1"); + exe.defineCMacro("HAVE_LIBCRYPT32", null); + exe.defineCMacro("HAVE_WINSOCK2_H", null); + exe.defineCMacro("HAVE_IOCTLSOCKET", null); + exe.defineCMacro("HAVE_SELECT", null); + exe.defineCMacro("LIBSSH2_DH_GEX_NEW", "1"); + + if (target.getAbi().isGnu()) { + exe.defineCMacro("HAVE_UNISTD_H", null); + exe.defineCMacro("HAVE_INTTYPES_H", null); + exe.defineCMacro("HAVE_SYS_TIME_H", null); + exe.defineCMacro("HAVE_GETTIMEOFDAY", null); + } + } else { + exe.defineCMacro("HAVE_UNISTD_H", null); + exe.defineCMacro("HAVE_INTTYPES_H", null); + exe.defineCMacro("HAVE_STDLIB_H", null); + exe.defineCMacro("HAVE_SYS_SELECT_H", null); + exe.defineCMacro("HAVE_SYS_UIO_H", null); + exe.defineCMacro("HAVE_SYS_SOCKET_H", null); + exe.defineCMacro("HAVE_SYS_IOCTL_H", null); + exe.defineCMacro("HAVE_SYS_TIME_H", null); + exe.defineCMacro("HAVE_SYS_UN_H", null); + exe.defineCMacro("HAVE_LONGLONG", null); + exe.defineCMacro("HAVE_GETTIMEOFDAY", null); + exe.defineCMacro("HAVE_INET_ADDR", null); + exe.defineCMacro("HAVE_POLL", null); + exe.defineCMacro("HAVE_SELECT", null); + exe.defineCMacro("HAVE_SOCKET", null); + exe.defineCMacro("HAVE_STRTOLL", null); + exe.defineCMacro("HAVE_SNPRINTF", null); + exe.defineCMacro("HAVE_O_NONBLOCK", null); + exe.defineCMacro("HAVE_SYSEXITS_H", null); + } + + exe.addCSourceFiles(srcs, &.{}); + exe.linkLibC(); + b.installArtifact(exe); +} + +const srcs = &.{ + "src/hostspec.c", + "src/acl.c", + "src/anonymous.c", + "src/buffer.c", + "src/child.c", + "src/conf-tokens.c", + "src/conf.c", + "src/conns.c", + "src/daemon.c", + "src/heap.c", + "src/html-error.c", + "src/http-message.c", + "src/log.c", + "src/network.c", + "src/reqs.c", + "src/sock.c", + "src/stats.c", + "src/text.c", + "src/main.c", + "src/utils.c", + "src/upstream.c", + "src/basicauth.c", + "src/base64.c", + "src/sblist.c", + "src/hsearch.c", + "src/orderedmap.c", + "src/loop.c", + "src/mypoll.c", + "src/connect-ports.c", + "src/filter.c", + "src/reverse-proxy.c", + "src/transparent-proxy.c", +}; From e3b84e745b604710ddcc7c773ce4fa590e3e61f9 Mon Sep 17 00:00:00 2001 From: mr6r4y Date: Thu, 18 Jan 2024 01:49:26 +0200 Subject: [PATCH 2/3] Remove unnecessary macro definitions --- build.zig | 107 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 56 insertions(+), 51 deletions(-) diff --git a/build.zig b/build.zig index 3ef9c78..a0badd1 100644 --- a/build.zig +++ b/build.zig @@ -39,6 +39,9 @@ pub fn build(b: *std.Build) !void { const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); + const gperf = b.option(bool, "gperf", "Whether you have gperf installed for faster config parsing") orelse false; + const xtinyproxy_enable = b.option(bool, "xtinyproxy_header", "Include peer's IP address in a XTinyproxy header") orelse false; + const allocator = b.allocator; const version: []u8 = try getVersionFromGit(allocator); @@ -47,39 +50,68 @@ pub fn build(b: *std.Build) !void { const package_tarname = package; var package_string_buf: [128:0]u8 = undefined; var package_string = try std.fmt.bufPrint(&package_string_buf, "{s} {s}", .{ package_name, version }); - // const package_string: []u8 = try allocator.alloc(u8, package_name.len + 1 + version.len); // package_name ++ version; - // package_string[0..package_name.len].* = package_name.*; - // package_string[package_name.len] = ' '; - // package_string[package_name.len + 1 .. package_string.len].* = version.*; const config_h = b.addConfigHeader(.{ .style = .blank, }, .{ + // /* Version number of package */ .VERSION = version, + // /* Tinyproxy version number */ .TINYPROXY_VERSION = version, - .XTINYPROXY_ENABLE = 1, - .FILTER_ENABLE = 1, - .UPSTREAM_SUPPORT = 1, - .REVERSE_SUPPORT = 1, - .TRANSPARENT_PROXY = 1, + // /* Name of package */ .PACKAGE = package, + // /* Define to the address where bug reports for this package should be sent. */ .PACKAGE_BUGREPORT = "https://tinyproxy.github.io/", - + // /* Define to the full name of this package. */ .PACKAGE_NAME = package_name, + // /* Define to the full name and version of this package. */ .PACKAGE_STRING = package_string, - + // /* Define to the one symbol short name of this package. */ .PACKAGE_TARNAME = package_tarname, - + // /* Define to the home page for this package. */ .PACKAGE_URL = "", - + // /* Define to the version of this package. */ .PACKAGE_VERSION = version, + // /* This controls remote proxy stats display. */ + .TINYPROXY_STATHOST = "tinyproxy.stats", + + // /* Include support for connecting to an upstream proxy. */ + .UPSTREAM_SUPPORT = 1, + // /* Include support for reverse proxy. */ + .REVERSE_SUPPORT = 1, + // /* Include support for using tinyproxy as a transparent proxy. */ + .TRANSPARENT_PROXY = 1, + // /* Defined if you would like filtering code included. */ + .FILTER_ENABLE = 1, // /* Define to 1 if you can safely include both and . This // macro is obsolete. */ .TIME_WITH_SYS_TIME = 1, - - // /* This controls remote proxy stats display. */ - .TINYPROXY_STATHOST = "tinyproxy.stats", + // /* + // * On systems which don't support ftruncate() the best we can + // * do is to close the file and reopen it in create mode, which + // * unfortunately leads to a race condition, however "systems + // * which don't support ftruncate()" is pretty much SCO only, + // * and if you're using that you deserve what you get. + // * ("Little sympathy has been extended") + // */ + .HAVE_FTRUNCATE = 1, + // /* Define to 1 if you have the header file. */ + .HAVE_POLL_H = 1, + // /* Define to 1 if you have the `setgroups' function. */ + .HAVE_SETGROUPS = 1, + // /* Define to 1 if you have the header file. */ + .HAVE_VALUES_H = 1, + // /* Define to 1 if you have the header file. */ + .HAVE_SYS_IOCTL_H = 1, + // /* Define to 1 if you have the header file. */ + .HAVE_ALLOCA_H = 1, + // /* Define to 1 if you have the header file. */ + .HAVE_MEMORY_H = 1, + // /* Define to 1 if you have the header file. */ + .HAVE_MALLOC_H = 1, + // /* Define to 1 if you have the header file. */ + .HAVE_SYSEXITS_H = 1, }); const exe = b.addExecutable(.{ @@ -92,42 +124,15 @@ pub fn build(b: *std.Build) !void { exe.defineCMacro("HAVE_CONFIG_H", null); exe.defineCMacro("SYSCONFDIR", "\"/etc\""); - // exe.defineCMacro("LOCALSTATEDIR", "") - if (target.isWindows()) { - exe.defineCMacro("_CRT_SECURE_NO_DEPRECATE", "1"); - exe.defineCMacro("HAVE_LIBCRYPT32", null); - exe.defineCMacro("HAVE_WINSOCK2_H", null); - exe.defineCMacro("HAVE_IOCTLSOCKET", null); - exe.defineCMacro("HAVE_SELECT", null); - exe.defineCMacro("LIBSSH2_DH_GEX_NEW", "1"); - - if (target.getAbi().isGnu()) { - exe.defineCMacro("HAVE_UNISTD_H", null); - exe.defineCMacro("HAVE_INTTYPES_H", null); - exe.defineCMacro("HAVE_SYS_TIME_H", null); - exe.defineCMacro("HAVE_GETTIMEOFDAY", null); - } - } else { - exe.defineCMacro("HAVE_UNISTD_H", null); - exe.defineCMacro("HAVE_INTTYPES_H", null); - exe.defineCMacro("HAVE_STDLIB_H", null); - exe.defineCMacro("HAVE_SYS_SELECT_H", null); - exe.defineCMacro("HAVE_SYS_UIO_H", null); - exe.defineCMacro("HAVE_SYS_SOCKET_H", null); - exe.defineCMacro("HAVE_SYS_IOCTL_H", null); - exe.defineCMacro("HAVE_SYS_TIME_H", null); - exe.defineCMacro("HAVE_SYS_UN_H", null); - exe.defineCMacro("HAVE_LONGLONG", null); - exe.defineCMacro("HAVE_GETTIMEOFDAY", null); - exe.defineCMacro("HAVE_INET_ADDR", null); - exe.defineCMacro("HAVE_POLL", null); - exe.defineCMacro("HAVE_SELECT", null); - exe.defineCMacro("HAVE_SOCKET", null); - exe.defineCMacro("HAVE_STRTOLL", null); - exe.defineCMacro("HAVE_SNPRINTF", null); - exe.defineCMacro("HAVE_O_NONBLOCK", null); - exe.defineCMacro("HAVE_SYSEXITS_H", null); + // /* Whether you have gperf installed for faster config parsing. */ + if (gperf) { + exe.defineCMacro("HAVE_GPERF", null); + } + // /* Define if you want to have the peer's IP address included in a XTinyproxy + // header sent to the server. */ + if (xtinyproxy_enable) { + exe.defineCMacro("XTINYPROXY_ENABLE", null); } exe.addCSourceFiles(srcs, &.{}); From 172ab6a2d884e21f618c42bbd0bb563c7c646933 Mon Sep 17 00:00:00 2001 From: mr6r4y Date: Thu, 18 Jan 2024 15:33:06 +0200 Subject: [PATCH 3/3] Make basic configurations available --- build.zig | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/build.zig b/build.zig index a0badd1..4ef5220 100644 --- a/build.zig +++ b/build.zig @@ -39,10 +39,16 @@ pub fn build(b: *std.Build) !void { const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); + const allocator = b.allocator; + const gperf = b.option(bool, "gperf", "Whether you have gperf installed for faster config parsing") orelse false; const xtinyproxy_enable = b.option(bool, "xtinyproxy_header", "Include peer's IP address in a XTinyproxy header") orelse false; + const debug_enable = b.option(bool, "debug_enable", "Compile in DEBUG program mode") orelse false; + const sysconfigdir = b.option([]const u8, "sysconfigdir", "System configuration path (/etc)") orelse "/etc"; - const allocator = b.allocator; + var sysconfigdir_macro: []u8 = try allocator.alloc(u8, sysconfigdir.len + 10); + defer allocator.free(sysconfigdir_macro); + sysconfigdir_macro = try std.fmt.bufPrintZ(sysconfigdir_macro, "\"{s}\"", .{sysconfigdir}); const version: []u8 = try getVersionFromGit(allocator); const package = "tinyproxy"; @@ -123,7 +129,8 @@ pub fn build(b: *std.Build) !void { exe.addIncludePath(.{ .path = "src/" }); exe.defineCMacro("HAVE_CONFIG_H", null); - exe.defineCMacro("SYSCONFDIR", "\"/etc\""); + + exe.defineCMacro("SYSCONFDIR", sysconfigdir_macro); // /* Whether you have gperf installed for faster config parsing. */ if (gperf) { @@ -134,6 +141,9 @@ pub fn build(b: *std.Build) !void { if (xtinyproxy_enable) { exe.defineCMacro("XTINYPROXY_ENABLE", null); } + if (!debug_enable) { + exe.defineCMacro("NDEBUG", null); + } exe.addCSourceFiles(srcs, &.{}); exe.linkLibC();