logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: cab61fb72a47eca746837ae66367b90cc99e3d73
parent e75123286610275c320dafe0b7674f88ec892ba4
Author: Michael Forney <mforney@mforney.org>
Date:   Wed,  5 Feb 2020 18:13:37 -0800

Note some patch upstream status

Diffstat:

Mpkg/nsd/patch/0003-Avoid-pointer-arithmetic-on-void.patch1+
Mpkg/squashfs-tools/patch/0001-Avoid-pointer-arithmetic-with-void.patch1+
Mpkg/squashfs-tools/patch/0002-Don-t-omit-second-operand-to-conditional-operator.patch1+
Mpkg/squashfs-tools/patch/0003-Convert-TOK_TO_STR-to-an-inline-function.patch1+
4 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/pkg/nsd/patch/0003-Avoid-pointer-arithmetic-on-void.patch b/pkg/nsd/patch/0003-Avoid-pointer-arithmetic-on-void.patch @@ -2,6 +2,7 @@ From ecde6ced1a7d7649510c5428646e2a96477f6c6f Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sun, 16 Jun 2019 23:17:47 -0700 Subject: [PATCH] Avoid pointer arithmetic on `void *` +Upstream: https://github.com/NLnetLabs/nsd/pull/60 The pointer operand to the binary `+` operator must be to a complete object type. diff --git a/pkg/squashfs-tools/patch/0001-Avoid-pointer-arithmetic-with-void.patch b/pkg/squashfs-tools/patch/0001-Avoid-pointer-arithmetic-with-void.patch @@ -2,6 +2,7 @@ From 7668bc8b07dec7eeb8f2682e50ae5c740c25c704 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Thu, 30 Jan 2020 11:38:23 -0800 Subject: [PATCH] Avoid pointer arithmetic with `void *` +Upstream: https://github.com/plougher/squashfs-tools/pull/86 `void *` is a pointer to an incomplete type, so cannot be used in pointer arithmetic. diff --git a/pkg/squashfs-tools/patch/0002-Don-t-omit-second-operand-to-conditional-operator.patch b/pkg/squashfs-tools/patch/0002-Don-t-omit-second-operand-to-conditional-operator.patch @@ -2,6 +2,7 @@ From 4f371cd8042d8b574a49d07c5bca1417e08d366c Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Thu, 30 Jan 2020 11:40:49 -0800 Subject: [PATCH] Don't omit second operand to conditional operator +Upstream: https://github.com/plougher/squashfs-tools/pull/86 This is a GNU C extension, and not valid in ISO C. --- diff --git a/pkg/squashfs-tools/patch/0003-Convert-TOK_TO_STR-to-an-inline-function.patch b/pkg/squashfs-tools/patch/0003-Convert-TOK_TO_STR-to-an-inline-function.patch @@ -2,6 +2,7 @@ From 5bab68afaeaab209cde2ddb8767f0aa3f5b30e9f Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Fri, 31 Jan 2020 17:59:06 -0800 Subject: [PATCH] Convert TOK_TO_STR to an inline function +Upstream: https://github.com/plougher/squashfs-tools/pull/86 This avoids the use of statement expressions, which are a GNU C extension.