From: Alberto Leiva Popper Date: Fri, 12 Sep 2025 18:39:11 +0000 (-0600) Subject: Protocolary updates for release 1.6.7 X-Git-Tag: 1.6.7^0 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a60fabdda61040e7aa20a28bbdabef070495859;p=thirdparty%2FFORT-validator.git Protocolary updates for release 1.6.7 --- diff --git a/configure.ac b/configure.ac index 6de3506c..83d5559d 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([fort],[1.6.6],[validadorfort@fortproject.net]) +AC_INIT([fort],[1.6.7],[validadorfort@fortproject.net]) AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE([subdir-objects]) diff --git a/docker/Dockerfile b/docker/Dockerfile index 86194103..ac1328fb 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ #--- Alpine build container --- FROM alpine:latest AS builder -ARG FORT_VERSION=1.6.6 +ARG FORT_VERSION=1.6.7 # Install compiler and dependencies RUN apk --update --no-cache add build-base autoconf automake pkgconfig jansson-dev check-dev \ diff --git a/docs/_config.yml b/docs/_config.yml index 5e9fea3d..90d9c6d0 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -8,7 +8,7 @@ defaults: layout: "default" image: "/img/logo_validador_og.png" -fort-latest-version: 1.6.6 +fort-latest-version: 1.6.7 plugins: - jekyll-seo-tag - jekyll-sitemap diff --git a/docs/usage.md b/docs/usage.md index aa1b09a0..84223472 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -1003,17 +1003,14 @@ The configuration options are mostly the same as the ones from the `argv` interf "tal": "/tmp/fort/tal/", "local-repository": "/tmp/fort/repository", "maximum-certificate-depth": 32, - "slurm": "/tmp/fort/test.slurm", + "slurm": null, "mode": "server", "work-offline": false, "daemon": false, "server": { - "address": [ - "192.0.2.1", - "2001:db8::1" - ], - "port": 8323, + "address": [ "::" ], + "port": 323, "backlog": 4096, "interval": { "validation": 3600, @@ -1026,6 +1023,10 @@ The configuration options are mostly the same as the ones from the `argv` interf } }, + "prometheus": { + "port": 0 + }, + "rsync": { "enabled": true, "priority": 50, @@ -1068,14 +1069,15 @@ The configuration options are mostly the same as the ones from the `argv` interf "low-speed-limit": 100000, "low-speed-time": 10, "max-file-size": 2000000000, - "ca-path": "/usr/local/ssl/certs" + "ca-path": null, + "proxy": null }, "log": { "enabled": true, "output": "console", "level": "warning", - "tag": "Op", + "tag": null, "facility": "daemon", "file-name-format": "global-url", "color-output": false @@ -1114,8 +1116,8 @@ The configuration options are mostly the same as the ones from the `argv` interf ], "output": { - "roa": "/tmp/fort/roas.csv", - "bgpsec": "/tmp/fort/bgpsec.csv", + "roa": null, + "bgpsec": null, "format": "csv" }, diff --git a/man/fort.8 b/man/fort.8 index 71b62b6d..40b5af82 100644 --- a/man/fort.8 +++ b/man/fort.8 @@ -1,4 +1,4 @@ -.TH fort 8 "2025-02-05" "v1.6.6" "FORT validator" +.TH fort 8 "2025-09-12" "v1.6.7" "FORT validator" .SH NAME fort \- RPKI validator and RTR server @@ -1126,7 +1126,7 @@ to a specific value: "192.0.2.1", "2001:db8::1" ], - "port": "8323", + "port": 8323, "backlog": 4096, "interval": { "validation": 3600, @@ -1139,6 +1139,10 @@ to a specific value: } }, + "prometheus": { + "port": 0 + }, + "rsync": { "enabled": true, "priority": 50, @@ -1174,14 +1178,15 @@ to a specific value: "count": 1, "interval": 4 }, - "user-agent": "fort/1.6.4", + "user-agent": "fort/1.6.7", "max-redirs": 10, "connect-timeout": 30, "transfer-timeout": 900, "low-speed-limit": 100000, "low-speed-time": 10, "max-file-size": 2000000000, - "ca-path": "/usr/local/ssl/certs" + "ca-path": "/usr/local/ssl/certs", + "proxy": "https://example.com:1234" }, "log": { diff --git a/src/config.c b/src/config.c index c11b2e2b..25a5c767 100644 --- a/src/config.c +++ b/src/config.c @@ -436,7 +436,7 @@ static const struct option_field options[] = { .doc = "Port to bind the Prometheus server to. " "Prometheus requires this value and 'server' mode to start. " "Unlike server.port, prometheus.port will not be resolved.", - .min = 1, + .min = 0, .max = 0xFFFF, }, @@ -610,7 +610,7 @@ static const struct option_field options[] = { .offset = offsetof(struct rpki_config, http.ca_path), .doc = "Directory where CA certificates are found, used to verify the peer", .arg_doc = "", - .json_null_allowed = false, + .json_null_allowed = true, }, { .id = 9013, .name = "http.proxy", diff --git a/src/config/str.c b/src/config/str.c index 2b32ee34..44e61c00 100644 --- a/src/config/str.c +++ b/src/config/str.c @@ -96,7 +96,7 @@ service_parse_json(struct option_field const *opt, json_t *json, void *result) } strval = pmalloc(6); - written = snprintf(strval, 6, JSON_INTEGER_FORMAT, intval); + written = snprintf(strval, 6, "%" JSON_INTEGER_FORMAT, intval); if (written < 0 || 6 <= written) return pr_op_err("Cannot convert '%s' to string: snprintf returned %d", opt->name, written);