package/minidlna: security bump version to 1.3.0
PATCH 1/1 package/minidlna: security bump version to 1.3.0
Changelog:
https://sourceforge.net/p/minidlna/git/ci/master/tree/NEWS
Fixes CVE-2020-28926 & CVE-2020-12695.
Removed patch 0001 which was applied upstream:
https://sourceforge.net/p/minidlna/git/ci/b5e75ff7d160a02632cab416ff0af66504c7db8b/
Removed patch 0002 which was not applied upstream, upstream applied a different fix for CVE-2020-12695:
https://sourceforge.net/p/minidlna/git/ci/06ee114731612462eb1eb1266f0431ccf59269d2/
--- .../minidlna/0001-fix-build-with-gcc-10.patch | 49 ------- ...x-CallStranger-a.k.a.-CVE-2020-12695.patch | 133 ------------------ package/minidlna/minidlna.hash | 7 +- package/minidlna/minidlna.mk | 2 +- 4 files changed, 4 insertions(+), 187 deletions(-) delete mode 100644 package/minidlna/0001-fix-build-with-gcc-10.patch delete mode 100644 package/minidlna/0002-upnphttp.c-fix-CallStranger-a.k.a.-CVE-2020-12695.patch
package/minidlna/0001-fix-build-with-gcc-10.patch deleted +0 -49
@@ -1,49 +0,0 @@ -From 90e88764f0fb3d981cd0c3cfd07d63323cc64090 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -Date: Tue, 1 Sep 2020 22:55:24 +0200 -Subject: [PATCH] fix build with gcc 10 - -Define setjmp_buffer as static to avoid the following build failure with -gcc 10 (which defaults to -fno-common): - -/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: image_utils.o:(.bss+0x0): multiple definition of `setjmp_buffer'; metadata.o:(.bss+0x0): first defined here -collect2: error: ld returned 1 exit status - -Fixes: - - http://autobuild.buildroot.org/results/8754bb4f7d749f999d5f8ddfec587470ceec4476 - -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - image_utils.c | 2 +- - metadata.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/image_utils.c b/image_utils.c -index 24cfd08..e8d9635 100644 ---- a/image_utils.c -+++ b/image_utils.c -@@ -190,7 +190,7 @@ jpeg_memory_src(j_decompress_ptr cinfo, const unsigned char * buffer, size_t buf - src->pub.bytes_in_buffer = bufsize; - } - --jmp_buf setjmp_buffer; -+static jmp_buf setjmp_buffer; - /* Don't exit on error like libjpeg likes to do */ - static void - libjpeg_error_handler(j_common_ptr cinfo) -diff --git a/metadata.c b/metadata.c -index 9cd86dc..4781db7 100644 ---- a/metadata.c -+++ b/metadata.c -@@ -502,7 +502,7 @@ GetAudioMetadata(const char *path, const char *name) - } - - /* For libjpeg error handling */ --jmp_buf setjmp_buffer; -+static jmp_buf setjmp_buffer; - static void - libjpeg_error_handler(j_common_ptr cinfo) - { --- -2.28.0 -
package/minidlna/0002-upnphttp.c-fix-CallStranger-a.k.a.-CVE-2020-12695.patch deleted +0 -133
133 lines not on this page · raw message
package/minidlna/minidlna.hash +3 -4
@@ -1,7 +1,6 @@ -# From https://sourceforge.net/projects/minidlna/files/minidlna/1.2.1/ -md5 a968d3d84971322471cabda3669cc0f8 minidlna-1.2.1.tar.gz -sha1 79d0032c7055aefd4c8e5178bc86fbf258d449d2 minidlna-1.2.1.tar.gz +# From https://sourceforge.net/projects/minidlna/files/minidlna/1.3.0/ +sha1 6563a881884879b2aef52611934e08bb42985964 minidlna-1.3.0.tar.gz # Locally computed -sha256 67388ba23ab0c7033557a32084804f796aa2a796db7bb2b770fb76ac2a742eec minidlna-1.2.1.tar.gz +sha256 47d9b06b4c48801a4c1112ec23d24782728b5495e95ec2195bbe5c81bc2d3c63 minidlna-1.3.0.tar.gz sha256 79146b7f558e56510b9a714ff75318c05ab93aeccfd6597497b9bce212cf92ea COPYING sha256 94876d7886116e176e702b4902bd9f19731a6883db5f229ac2a7058a22aa6529 LICENCE.miniupnpd
package/minidlna/minidlna.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -MINIDLNA_VERSION = 1.2.1 +MINIDLNA_VERSION = 1.3.0 MINIDLNA_SITE = https://downloads.sourceforge.net/project/minidlna/minidlna/$(MINIDLNA_VERSION) MINIDLNA_LICENSE = GPL-2.0, BSD-3-Clause MINIDLNA_LICENSE_FILES = COPYING LICENCE.miniupnpd
Signature · 1 line
2.27.0
PATCH 1/1 package/minidlna: security bump version to 1.3.0
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernd" == Bernd Kuhls <[email protected]> writes:
Changelog:
https://sourceforge.net/p/minidlna/git/ci/master/tree/NEWSFixes CVE-2020-28926 & CVE-2020-12695.
Quoted 8 lines
Removed patch 0001 which was applied upstream:
https://sourceforge.net/p/minidlna/git/ci/b5e75ff7d160a02632cab416ff0af66504c7db8b/Removed patch 0002 which was not applied upstream, upstream applied a different fix for CVE-2020-12695:
https://sourceforge.net/p/minidlna/git/ci/06ee114731612462eb1eb1266f0431ccf59269d2/Signed-off-by Bernd Kuhls <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 package/minidlna: security bump version to 1.3.0
In reply to Bernd KuhlsQuoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernd" == Bernd Kuhls <[email protected]> writes:
Changelog:
https://sourceforge.net/p/minidlna/git/ci/master/tree/NEWSFixes CVE-2020-28926 & CVE-2020-12695.
Quoted 8 lines
Removed patch 0001 which was applied upstream:
https://sourceforge.net/p/minidlna/git/ci/b5e75ff7d160a02632cab416ff0af66504c7db8b/Removed patch 0002 which was not applied upstream, upstream applied a different fix for CVE-2020-12695:
https://sourceforge.net/p/minidlna/git/ci/06ee114731612462eb1eb1266f0431ccf59269d2/Signed-off-by Bernd Kuhls <[email protected]>
Committed to 2020.02.x and 2020.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard