commit: 37adb2ae9cd11291254be667c56b3440566d8205 parent 2dd81085804912d85affed9df0d2c3f1825ca6ac Author: Michael Forney <mforney@mforney.org> Date: Sun, 17 Nov 2019 17:05:29 -0800 Start to document patch upstream statusDiffstat:
15 files changed, 15 insertions(+), 0 deletions(-)diff --git a/pkg/byacc/patch/0001-Prevent-multiple-definitions-of-code_lines.patch b/pkg/byacc/patch/0001-Prevent-multiple-definitions-of-code_lines.patch@@ -2,6 +2,7 @@ From 71ddf61cc892a771d15d95937f1f13a9ce17e98b Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Mon, 4 Nov 2019 18:20:04 -0800 Subject: [PATCH] Prevent multiple definitions of `code_lines` +Upstream: Yes, applied by maintainer --- defs.h | 2 +-diff --git a/pkg/curl/patch/0001-Add-BearSSL-vtls-implementation.patch b/pkg/curl/patch/0001-Add-BearSSL-vtls-implementation.patch@@ -2,6 +2,7 @@ From 7500502be5490e60f62ecc8be8e96f1f23405684 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Thu, 7 Nov 2019 20:17:18 -0800 Subject: [PATCH] Add BearSSL vtls implementation +Upstream: https://github.com/curl/curl/pull/4597 --- CMake/FindBearSSL.cmake | 9 +diff --git a/pkg/efibootmgr/patch/0001-remove-extra-decl.patch b/pkg/efibootmgr/patch/0001-remove-extra-decl.patch@@ -2,6 +2,7 @@ From b60ba776eb8969d7631a6fecafd5040d7331a050 Mon Sep 17 00:00:00 2001 From: Peter Jones <pjones@redhat.com> Date: Wed, 13 Jun 2018 09:41:01 -0400 Subject: [PATCH] remove extra decl +Upstream: 99b578501643377e0b1994b2a068b790d189d5ad Signed-off-by: Peter Jones <pjones@redhat.com> ---diff --git a/pkg/less/patch/0001-Remove-after-function-definition.patch b/pkg/less/patch/0001-Remove-after-function-definition.patch@@ -2,6 +2,7 @@ From 5c87a344bc528c1878708c5e497f0e8e1742b7d4 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Fri, 5 Jul 2019 22:05:36 -0700 Subject: [PATCH] Remove ';' after function definition +Upstream: f0475cce07567696a7cb9ac4da2119ce09195c1d The STR_TO_TYPE_FUNC macro expands to a function definition, so the ';' is treated as an empty top-level declaration, which is not valid in ISO C.diff --git a/pkg/less/patch/0002-Make-sure-public-functions-parameters-are-unaffected.patch b/pkg/less/patch/0002-Make-sure-public-functions-parameters-are-unaffected.patch@@ -3,6 +3,7 @@ From: Michael Forney <mforney@mforney.org> Date: Fri, 5 Jul 2019 21:50:22 -0700 Subject: [PATCH] Make sure public functions parameters are unaffected by argument promotion +Upstream: 2436151e2c5c2f30e0071bcf0edaf376ba13c268 In order for a prototype declaration and non-prototype function definition to be compatible, the promoted type of the non-prototypediff --git a/pkg/libass/patch/0001-Avoid-unnecessary-VLAs.patch b/pkg/libass/patch/0001-Avoid-unnecessary-VLAs.patch@@ -2,6 +2,7 @@ From 4988f2d5bf0ecb941320cfe2cde517c860b792a0 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sun, 16 Jun 2019 22:59:39 -0700 Subject: [PATCH] Avoid unnecessary VLAs +Upstream: Equivalent patches applied upstream (891ada89c9 and c80f332798) --- libass/ass_outline.c | 4 ++--diff --git a/pkg/openntpd/patch/0003-Provide-fallback-definition-for-__packed.patch b/pkg/openntpd/patch/0003-Provide-fallback-definition-for-__packed.patch@@ -2,6 +2,7 @@ From 1a01dd331508160aeda3563dbbb6f62aa60c2156 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Thu, 20 Jun 2019 13:52:22 -0700 Subject: [PATCH] Provide fallback definition for __packed +Upstream: https://github.com/openntpd-portable/openntpd-portable/pull/56 Otherwise, systems that don't support it will treat it as a name for a global `struct ntp_msg` variable.diff --git a/pkg/pixman/patch/0001-Prevent-empty-top-level-declaration.patch b/pkg/pixman/patch/0001-Prevent-empty-top-level-declaration.patch@@ -2,6 +2,7 @@ From 66f8839181d4cf81efc9beb8bd85cb8263795b56 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Thu, 11 Jul 2019 00:12:19 -0700 Subject: [PATCH] Prevent empty top-level declaration +Upstream: https://lists.freedesktop.org/archives/pixman/2019-November/004896.html The expansion of PIXMAN_DEFINE_THREAD_LOCAL(...) may end in a function definition, so the following semicolon is considered andiff --git a/pkg/syslinux/patch/0001-extlinux-pull-in-sys-sysmacros.h-for-major-minor-mak.patch b/pkg/syslinux/patch/0001-extlinux-pull-in-sys-sysmacros.h-for-major-minor-mak.patch@@ -2,6 +2,7 @@ From a46f0d695cea1e237247aa6118d5959f0e79e695 Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier@gentoo.org> Date: Tue, 19 Apr 2016 06:50:31 -0400 Subject: [PATCH] extlinux: pull in sys/sysmacros.h for major/minor/makedev +Upstream: 1a74985b2a404639b08882c57f3147229605dfd5 These functions are defined in sys/sysmacros.h, so add the include to main.c. This is already handled correctly in mountinfo.c. Otherwisediff --git a/pkg/texi2mdoc/patch/0001-Add-the-d-option-to-specify-the-.Dd-date.patch b/pkg/texi2mdoc/patch/0001-Add-the-d-option-to-specify-the-.Dd-date.patch@@ -4,6 +4,7 @@ Date: Tue, 13 Nov 2018 08:45:29 +0000 Subject: [PATCH] Add the -d option to specify the .Dd date, and fall back to the mtime before resorting to the current time. Patch from Michael Forney <mforney at mforney dot org> with minimal tweaks by me. +Upstream: Yes, main.c@1.72 util.c@1.35 While here, fix the date format, "%F" is wrong for mdoc(7). Change it to "%B %e, %Y" which isn't perfect due to thediff --git a/pkg/the_silver_searcher/patch/0001-Remove-after-function-definition.patch b/pkg/the_silver_searcher/patch/0001-Remove-after-function-definition.patch@@ -2,6 +2,7 @@ From 76adb32c89184406278fd51a3fe138314b134a12 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sat, 15 Jun 2019 20:58:00 -0700 Subject: [PATCH] Remove `;` after function definition +Upstream: https://github.com/ggreer/the_silver_searcher/pull/1324 --- src/ignore.c | 2 +-diff --git a/pkg/the_silver_searcher/patch/0002-Use-inline-function-for-min-instead-of-statement-exp.patch b/pkg/the_silver_searcher/patch/0002-Use-inline-function-for-min-instead-of-statement-exp.patch@@ -2,6 +2,7 @@ From dc1be161f9155e92367714b38f6a45d05d4f90cd Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sat, 15 Jun 2019 20:58:46 -0700 Subject: [PATCH] Use inline function for min instead of statement expression +Upstream: https://github.com/ggreer/the_silver_searcher/pull/1324 --- src/zfile.c | 9 +++++----diff --git a/pkg/the_silver_searcher/patch/0003-Prevent-duplicate-definitions-of-global-variables.patch b/pkg/the_silver_searcher/patch/0003-Prevent-duplicate-definitions-of-global-variables.patch@@ -2,6 +2,7 @@ From 159e026212ba551981dc522690901b9291b8e235 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sun, 16 Jun 2019 01:49:32 -0700 Subject: [PATCH] Prevent duplicate definitions of global variables +Upstream: https://github.com/ggreer/the_silver_searcher/pull/1324 Multiple external definitions of an object is invalid in ISO C[0].diff --git a/pkg/wayland/patch/0002-Avoid-pointer-arithmetic-on-void.patch b/pkg/wayland/patch/0002-Avoid-pointer-arithmetic-on-void.patch@@ -2,6 +2,7 @@ From 09b452f0ac177bd95258ec54f9540fec1a1a817d Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sat, 1 Jun 2019 15:01:23 -0700 Subject: [PATCH] Avoid pointer arithmetic on `void *` +Upstream: 678c8681e28739da1fea667ae59118cfc0968497 The pointer operand to the binary `+` operator must be to a complete object type. Since we are working with byte sizes, use `char *` fordiff --git a/pkg/wayland/patch/0003-Use-wl_container_of-internally.patch b/pkg/wayland/patch/0003-Use-wl_container_of-internally.patch@@ -2,6 +2,7 @@ From 1ad3dc70e7961e7bf1d27a9572644a5153fc8e2d Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sat, 1 Jun 2019 15:11:48 -0700 Subject: [PATCH] Use wl_container_of internally +Upstream: 55d044810ca32ae24499d2c6aee6084d7e31d576 --- src/event-loop.c | 4 ++--