[Merge] ~xypron/ubuntu/+source/rsyslog:merge-lp2045033-noble-8.2312.0-3 into ubuntu/+source/rsyslog:debian/sid

[Nick Rosbrook]

Review: Needs Fixing

Nice find, and thanks for forwarding the patch upstream. I left a couple inline comments about the DEP3 headers, but other than that LGTM.

Diff comments:

> diff --git a/debian/patches/plugins-FromHost-must-be-63-characters-long.patch b/debian/patches/plugins-FromHost-must-be-63-characters-long.patch
> new file mode 100644
> index 0000000..14aac3a
> --- /dev/null
> +++ b/debian/patches/plugins-FromHost-must-be-63-characters-long.patch
> @@ -0,0 +1,47 @@
> +From: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>
> +Date: Mon, 15 Jan 2024 21:42:59 +0100
> +Subject: [PATCH 1/1] plugins: FromHost must be 63 characters long
> +
> +According to RFC 1035 the hostname without domain may be up to 63
> +characters long. Consider this when creating SQL databases.
> +
> +(LP: #2045033)

I am not sure this "pleae merge" bug really contains relevant information to this patch, but if you really want to reference it, then please use the `Bug-Ubuntu: ` DEP3 field.

> +
> +Link: https://github.com/rsyslog/rsyslog/pull/5310

I think the convention here would be to use `Forwarded: https://github.com/rsyslog/rsyslog/pull/5310`, rather than `Link: $URL` and `Forwarded: yes`.

> +Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>
> +Forwarded: yes
> +Last-update 2024-01-15
> +---
> + plugins/ommysql/createDB.sql | 2 +-
> + plugins/ompgsql/createDB.sql | 2 +-
> + 2 files changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/plugins/ommysql/createDB.sql b/plugins/ommysql/createDB.sql
> +index 211cfb0e2..626128465 100644
> +--- a/plugins/ommysql/createDB.sql
> ++++ b/plugins/ommysql/createDB.sql
> +@@ -8,7 +8,7 @@ CREATE TABLE SystemEvents
> +         DeviceReportedTime datetime NULL,
> +         Facility smallint NULL,
> +         Priority smallint NULL,
> +-        FromHost varchar(60) NULL,
> ++        FromHost varchar(63) NULL,
> +         Message text,
> +         NTSeverity int NULL,
> +         Importance int NULL,
> +diff --git a/plugins/ompgsql/createDB.sql b/plugins/ompgsql/createDB.sql
> +index 0c0f7e13a..2f1ade046 100644
> +--- a/plugins/ompgsql/createDB.sql
> ++++ b/plugins/ompgsql/createDB.sql
> +@@ -8,7 +8,7 @@ CREATE TABLE SystemEvents
> +         DeviceReportedTime timestamp without time zone NULL,
> +         Facility smallint NULL,
> +         Priority smallint NULL,
> +-        FromHost varchar(60) NULL,
> ++        FromHost varchar(63) NULL,
> +         Message text,
> +         NTSeverity int NULL,
> +         Importance int NULL,
> +-- 
> +2.43.0
> +


-- 
https://code.launchpad.net/~xypron/ubuntu/+source/rsyslog/+git/rsyslog/+merge/458718
Your team Ubuntu Sponsors is requested to review the proposed merge of ~xypron/ubuntu/+source/rsyslog:merge-lp2045033-noble-8.2312.0-3 into ubuntu/+source/rsyslog:debian/sid.