From patchwork Thu Sep 17 21:43:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Nosthoff X-Patchwork-Id: 1366455 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=busybox.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=heine.tech header.i=@heine.tech header.a=rsa-sha256 header.s=dkim header.b=SL2d+hIo; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bsr8s3gsYz9sRf for ; Fri, 18 Sep 2020 07:44:44 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A2D9687730; Thu, 17 Sep 2020 21:44:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8lyJro7ROA1H; Thu, 17 Sep 2020 21:44:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 2427D876D7; Thu, 17 Sep 2020 21:44:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 97D801BF35E for ; Thu, 17 Sep 2020 21:44:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 945FF870D0 for ; Thu, 17 Sep 2020 21:44:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3VazhtwMvPuS for ; Thu, 17 Sep 2020 21:44:34 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.heine.tech (mail.heine.tech [195.201.24.99]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 7C860870B6 for ; Thu, 17 Sep 2020 21:44:34 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 9DC8718150D; Thu, 17 Sep 2020 23:44:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heine.tech; s=dkim; t=1600379068; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding; bh=nciLEUEgq7H+hNCpFMU7G7efjr6UdIw5z5PZoTAujqU=; b=SL2d+hIosjw4EZvrfjd+q571981FEYMoc4feqeuRHJaLysDadjg5iBZiIDROJHJ+3IDyDc g1CXrd0kHoW4mair28muti7485T3FXHZpVKDdxA3PzfBmCtgkIBgLbJNM9Ar+k5dwvy/lf FLwE3KUIGQdaLltQf6VmdPahTrRNpew= To: buildroot@buildroot.org Date: Thu, 17 Sep 2020 23:43:16 +0200 Message-Id: <20200917214317.23734-1-buildroot@heine.tech> MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 Subject: [Buildroot] [PATCH] package/live555: bump to version 2020.08.19 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Michael Nosthoff via buildroot Reply-To: Michael Nosthoff Cc: Michael Nosthoff Errors-To: buildroot-bounces@busybox.net Sender: "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. Fixes: http://autobuild.buildroot.net/results/f13/f13f1e40a2749fec5ad8a93cd8eea9a6e4e577b [0] http://live555.com/liveMedia/public/changelog.txt Signed-off-by: Michael Nosthoff --- package/live555/live555.hash | 4 ++-- package/live555/live555.mk | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/live555/live555.hash b/package/live555/live555.hash index 52ca068288..5e65cacd7b 100644 --- a/package/live555/live555.hash +++ b/package/live555/live555.hash @@ -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 diff --git a/package/live555/live555.mk b/package/live555/live555.mk index e7be6024c9..59650d2174 100644 --- a/package/live555/live555.mk +++ b/package/live555/live555.mk @@ -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