package/live555: bump to version 2020.08.19

PATCH New Michael Nosthoff 2 participants 3 messages Sep 17, 2020 – Sep 21, 2020

lore

Share & tools

lore

Michael Nosthoff

author

2020-09-17 21:43 UTC #0 lore raw

PATCH 1/1 package/live555: bump to version 2020.08.19

According to [0] this version fixes memory leaks and buffer overflows.

Commit bc80c9121b70b576 added LIBS_FOR_LIVEMEDIA_LIB also for static builds. That broke those builds.
With this commit it now only alters this parameter if it's there by replacing echo with sed.
Also it explicitly links static against -pthread -lz as this seems neccessary.

Fixes:
http://autobuild.buildroot.net/results/f13/f13f1e40a2749fec5ad8a93cd8eea9a6e4e577b

[0] http://live555.com/liveMedia/public/changelog.txt

Signed-off-by Michael Nosthoff <[email protected]>

---
 package/live555/live555.hash | 4 ++--
 package/live555/live555.mk   | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

package/live555/live555.hash +2 -2

index 52ca068288..5e65cacd7b 100644
@@ -1,5 +1,5 @@
 # From http://www.live555.com/liveMedia/public/live555-latest-md5.txt
-md5  327bc53f60361c6d703d52e86f476f11  live.2020.06.25.tar.gz
+md5  4645d2a0c865505c85b48af5317bcb4a  live.2020.08.19.tar.gz
 # Locally generated
-sha256  f206309f10d281990889b7a0c92c26a7fa55ac0e8568bf594b9b27433b4db585  live.2020.06.25.tar.gz
+sha256  af3af7f2510b0b45f38892c232abca2cee2ab36a62503e7085b47ed2c3c2c537  live.2020.08.19.tar.gz
 sha256  da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768  COPYING.LESSER

package/live555/live555.mk +6 -3

index e7be6024c9..59650d2174 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIVE555_VERSION = 2020.06.25
+LIVE555_VERSION = 2020.08.19
 LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz
 LIVE555_SITE = http://www.live555.com/liveMedia/public
 # There is a COPYING file with the GPL-3.0 license text, but none of

@@ -29,6 +29,9 @@ endif
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIVE555_DEPENDENCIES += openssl
 LIVE555_LIBS = -lssl -lcrypto
+ifeq ($(BR2_STATIC_LIBS),y)
+LIVE555_LIBS += $(if $(BR2_TOOLCHAIN_HAS_THREADS),-lpthread) -lz
+endif
 else
 LIVE555_CFLAGS += -DNO_OPENSSL
 endif

@@ -48,8 +51,8 @@ define LIVE555_CONFIGURE_CMDS
 	# Must have a whitespace at the end of LIBRARY_LINK, otherwise static link
 	# fails
 	echo 'LIBRARY_LINK = $(LIVE555_LIBRARY_LINK) ' >> $(@D)/config.$(LIVE555_CONFIG_TARGET)
-	echo 'LIBS_FOR_CONSOLE_APPLICATION = $(LIVE555_LIBS)' >> $(@D)/config.$(LIVE555_CONFIG_TARGET)
-	echo 'LIBS_FOR_LIVEMEDIA_LIB = $(LIVE555_LIBS)' >> $(@D)/config.$(LIVE555_CONFIG_TARGET)
+	sed -i 's:^LIBS_FOR_CONSOLE_APPLICATION =.*:LIBS_FOR_CONSOLE_APPLICATION = $(LIVE555_LIBS):g' $(@D)/config.$(LIVE555_CONFIG_TARGET)
+	sed -i 's:^LIBS_FOR_LIVEMEDIA_LIB =.*:LIBS_FOR_LIVEMEDIA_LIB = $(LIVE555_LIBS):g' $(@D)/config.$(LIVE555_CONFIG_TARGET)
 	(cd $(@D); ./genMakefiles $(LIVE555_CONFIG_TARGET))
 endef

Signature · 1 line

2.25.1

Thomas Petazzoni

2020-09-19 12:52 UTC #1 lore raw

PATCH 1/1 package/live555: bump to version 2020.08.19

Hello Michael,

+Fabrice in Cc.

Quoted 9 lines · On Thu, 17 Sep 2020 23:43:16 +0200 Michael Nosthoff via buildroot…

According to [0] this version fixes memory leaks and buffer overflows.
Commit bc80c9121b70b576 added LIBS_FOR_LIVEMEDIA_LIB also for static builds. That broke those builds.
With this commit it now only alters this parameter if it's there by replacing echo with sed.
Also it explicitly links static against -pthread -lz as this seems neccessary.

Quoted 6 lines

Fixes:
http://autobuild.buildroot.net/results/f13/f13f1e40a2749fec5ad8a93cd8eea9a6e4e577b
[0] http://live555.com/liveMedia/public/changelog.txt
Signed-off-by Michael Nosthoff <[email protected]>

The static linking fix seems unrelated to the version bump, and this is the sort of fix we might want to backport.

However, Fabrice already took a look at that static linking issue and has submitted a while ago some patches:

https://patchwork.ozlabs.org/project/buildroot/patch/20200713155135.1214109-1-fontaine.fabrice at gmail.com/
https://patchwork.ozlabs.org/project/buildroot/patch/20200713155135.1214109-2-fontaine.fabrice at gmail.com/

I guess we should try to apply these and then the version bump on its own.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Michael Nosthoff

author

2020-09-21 08:28 UTC #2 lore raw

PATCH 1/1 package/live555: bump to version 2020.08.19

HI,

Quoted 7 lines · Thomas Petazzoni

Hello Michael,
(quoted diff) +1 -1
+Fabrice in Cc.
-by: Michael Nosthoff <[email protected]>
The static linking fix seems unrelated to the version bump, and this is the sort of fix we might want to backport.

Quoted 5 lines

However, Fabrice already took a look at that static linking issue and has submitted a while ago some patches:
https://patchwork.ozlabs.org/project/buildroot/patch/20200713155135.1214109-1-fontaine.fabrice at gmail.com/
https://patchwork.ozlabs.org/project/buildroot/patch/20200713155135.1214109-2-fontaine.fabrice at gmail.com/

Oops, I wasn't aware of this patch. It is nicer than mine with finding the dependencies :)
I don't have the original message so I can't reply to it directly. But I compile tested it with

armv7-eabihf glibc bleeding-edge 2020.02-2
armv7m uclibc bleeding-edge 2018.11-1

and it runs through fine. So from my side that one is good to go.

I'll resend just the version bump.

Regards,
Michael