From 0cfb890a040574e13f1f09b6e2b619cd8cd81f18 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 22 Jul 2023 23:53:17 +0200 Subject: [PATCH] package/resiprocate: fix Upstream: tags in patches Fixes: package/resiprocate/0002-rutil-OpenSSLInit-disable-use-of-legacy-OpenSSL-memo.patch:0: missing Upstream in the header (http://nightly.buildroot.org/#_additional_patch_documentation) package/resiprocate/0003-rutil-fix-typo-in-preprocessor-condition.patch:0: missing Upstream in the header (http://nightly.buildroot.org/#_additional_patch_documentation) package/resiprocate/0004-resip-stack-ssl-Security-cxx-remove-deprecated-OpenS.patch:0: missing Upstream in the header (http://nightly.buildroot.org/#_additional_patch_documentation) make: *** [Makefile:1253: check-package] Error 1 In: https://gitlab.com/buildroot.org/buildroot/-/jobs/4718833134 and while at it, we also address the same issue in patch 0001, which was currently ignored through .checkpackageignore. Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../0001-Fix-some-issue-compiling-with-Visual-Studio.patch | 4 ++-- ...rutil-OpenSSLInit-disable-use-of-legacy-OpenSSL-memo.patch | 3 +-- .../0003-rutil-fix-typo-in-preprocessor-condition.patch | 3 +-- ...resip-stack-ssl-Security-cxx-remove-deprecated-OpenS.patch | 3 +-- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index dce0c2bf64..5fcb292629 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1314,7 +1314,6 @@ package/redis/0001-uclibc.patch Upstream package/redis/0002-largefile-conditional-define.patch Upstream package/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch Upstream package/redis/S50redis Shellcheck Variables -package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch Upstream package/restorecond/S02restorecond Shellcheck package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch Upstream package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch Upstream diff --git a/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch b/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch index 0efe0d9cfb..2157ea0450 100644 --- a/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch +++ b/package/resiprocate/0001-Fix-some-issue-compiling-with-Visual-Studio.patch @@ -4,8 +4,8 @@ Date: Sat, 22 Aug 2020 23:14:11 +0100 Subject: [PATCH] Fix some issue compiling with Visual Studio 16.7.0 and tidy up Visual Studio 16 project files -[Retrieved (and updated to keep only RendKa.cxx update) from: -https://github.com/resiprocate/resiprocate/commit/be76b10a50749e2e11dce8dcc38b414a7f9d8747] +Upstream: https://github.com/resiprocate/resiprocate/commit/be76b10a50749e2e11dce8dcc38b414a7f9d8747 +[Retrieved (and updated to keep only RendKa.cxx update)] Signed-off-by: Fabrice Fontaine --- VisualStudioReadme.htm | 65 + diff --git a/package/resiprocate/0002-rutil-OpenSSLInit-disable-use-of-legacy-OpenSSL-memo.patch b/package/resiprocate/0002-rutil-OpenSSLInit-disable-use-of-legacy-OpenSSL-memo.patch index fad1c2ef29..c333df849d 100644 --- a/package/resiprocate/0002-rutil-OpenSSLInit-disable-use-of-legacy-OpenSSL-memo.patch +++ b/package/resiprocate/0002-rutil-OpenSSLInit-disable-use-of-legacy-OpenSSL-memo.patch @@ -4,8 +4,7 @@ Date: Thu, 4 Aug 2022 10:55:30 +0200 Subject: [PATCH] rutil: OpenSSLInit: disable use of legacy OpenSSL memory leak checking with OpenSSL 3.0 and later -Upstream: -https://github.com/resiprocate/resiprocate/commit/e7c33f4e078e6e5dfa7dea796fa4ffb88f48a37a +Upstream: https://github.com/resiprocate/resiprocate/commit/e7c33f4e078e6e5dfa7dea796fa4ffb88f48a37a Signed-off-by: Bernd Kuhls --- diff --git a/package/resiprocate/0003-rutil-fix-typo-in-preprocessor-condition.patch b/package/resiprocate/0003-rutil-fix-typo-in-preprocessor-condition.patch index f7ff4d2a57..5cbe5871d0 100644 --- a/package/resiprocate/0003-rutil-fix-typo-in-preprocessor-condition.patch +++ b/package/resiprocate/0003-rutil-fix-typo-in-preprocessor-condition.patch @@ -3,8 +3,7 @@ From: Andrey Semashev Date: Sat, 10 Sep 2022 12:15:06 +0200 Subject: [PATCH] rutil: fix typo in preprocessor condition -Upstream: -https://github.com/resiprocate/resiprocate/commit/53302195c339dfaa104788a50aa900a48dbff777 +Upstream: https://github.com/resiprocate/resiprocate/commit/53302195c339dfaa104788a50aa900a48dbff777 Signed-off-by: Bernd Kuhls --- diff --git a/package/resiprocate/0004-resip-stack-ssl-Security-cxx-remove-deprecated-OpenS.patch b/package/resiprocate/0004-resip-stack-ssl-Security-cxx-remove-deprecated-OpenS.patch index eaa5ae87cf..2b595d64c1 100644 --- a/package/resiprocate/0004-resip-stack-ssl-Security-cxx-remove-deprecated-OpenS.patch +++ b/package/resiprocate/0004-resip-stack-ssl-Security-cxx-remove-deprecated-OpenS.patch @@ -4,8 +4,7 @@ Date: Thu, 4 Aug 2022 11:09:43 +0200 Subject: [PATCH] resip/stack: ssl/Security.cxx: remove deprecated OpenSSL ERR_GET_FUNC, not required -Upstream: -https://github.com/resiprocate/resiprocate/commit/88f98702d908549d888aa7f0ee1b0763e09662b1 +Upstream: https://github.com/resiprocate/resiprocate/commit/88f98702d908549d888aa7f0ee1b0763e09662b1 Signed-off-by: Bernd Kuhls ---