All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3, 2/6] package/gerbera: security bump to version 1.6.4
Date: Mon, 25 Jan 2021 22:29:35 +0100	[thread overview]
Message-ID: <20210125212935.GP2325@scaer> (raw)
In-Reply-To: <20210125194949.1173139-2-fontaine.fabrice@gmail.com>


Fabrice, All,

On 2021-01-25 20:49 +0100, Fabrice Fontaine spake thusly:
> - This version is compatible with libupnp 1.14.x which fix
>   CallStranger a.k.a. CVE-2020-12695
[--SNIP--]
> diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk
> index 7f0ac664fe..f26615a8f8 100644
> --- a/package/gerbera/gerbera.mk
> +++ b/package/gerbera/gerbera.mk
> @@ -4,20 +4,23 @@
>  #
>  ################################################################################
>  
> -GERBERA_VERSION = 1.4.0
> +GERBERA_VERSION = 1.6.4
>  GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION))
>  GERBERA_LICENSE = GPL-2.0
>  GERBERA_LICENSE_FILES = LICENSE.md
>  GERBERA_DEPENDENCIES = \
> -	expat \
> +	fmt \
>  	host-pkgconf \
> -	libupnp18 \
> +	$(if $(BR2_PACKAGE_LIBUPNP),libupnp) \
> +	pugixml \
> +	spdlog \
>  	sqlite \
>  	util-linux \
>  	zlib
>  GERBERA_CONF_OPTS = \
>  	-DWITH_DEBUG=OFF \
> -	-DWITH_JS=OFF
> +	-DWITH_JS=OFF \
> +	-DCXX_FILESYSTEM_NO_LINK_NEEDED=ON
>  
>  # Uses __atomic_fetch_add_4
>  ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
> @@ -70,6 +73,13 @@ else
>  GERBERA_CONF_OPTS += -DWITH_MATROSKA=OFF
>  endif
>  
> +ifeq ($(BR2_PACKAGE_LIBNPUNP),y)
                            ^^
Typo: BR2_PACKAGE_LIBNPUPNP

> +GERBERA_DEPENDENCIES += libnpupnp
> +GERBERA_CONF_OPTS += -DWITH_NPUPNP=ON
> +else
> +GERBERA_CONF_OPTS += -DWITH_NPUPNP=OFF
> +endif

The way you wrote this means that, if both libupnp and libnpupnp
(dmaned, I see why you did that typo!) are enabled, then gerbera will
depend on both, but will only use libnpupnp.

I've changed that so only one of is in the dependency chain, with a
preference toward libnpupnp.

Applied to master, thanks.

Regards,
Yann E. MORIN.

>  ifeq ($(BR2_PACKAGE_MYSQL),y)
>  GERBERA_DEPENDENCIES += mysql
>  GERBERA_CONF_OPTS += -DWITH_MYSQL=ON
> -- 
> 2.29.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

  reply	other threads:[~2021-01-25 21:29 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-25 19:49 [Buildroot] [PATCH v3, 1/6] package/libupnp: security bump to version 1.14.0 Fabrice Fontaine
2021-01-25 19:49 ` [Buildroot] [PATCH v3, 2/6] package/gerbera: security bump to version 1.6.4 Fabrice Fontaine
2021-01-25 21:29   ` Yann E. MORIN [this message]
2021-01-28 19:15   ` Peter Korsgaard
2021-01-29  8:23     ` Peter Korsgaard
2021-01-29  8:56       ` Fabrice Fontaine
2021-01-29  9:06         ` Peter Korsgaard
2021-01-25 19:49 ` [Buildroot] [PATCH v3, 3/6] package/igd2-for-linux: security bump to version 2.0 Fabrice Fontaine
2021-01-28 19:15   ` Peter Korsgaard
2021-01-25 19:49 ` [Buildroot] [PATCH v3, 4/6] package/gmrender-resurrect: add libupnp 1.14.x support Fabrice Fontaine
2021-01-25 21:31   ` Yann E. MORIN
2021-01-28 19:15   ` Peter Korsgaard
2021-01-25 19:49 ` [Buildroot] [PATCH v3, 5/6] package/ushare: " Fabrice Fontaine
2021-01-25 21:34   ` Yann E. MORIN
2021-01-28 19:16   ` Peter Korsgaard
2021-01-25 19:49 ` [Buildroot] [PATCH v3,6/6] package/libupnp18: drop package Fabrice Fontaine
2021-01-28 19:54   ` Peter Korsgaard
2021-01-25 21:26 ` [Buildroot] [PATCH v3, 1/6] package/libupnp: security bump to version 1.14.0 Yann E. MORIN
2021-01-28 19:13 ` Peter Korsgaard
2021-01-29  8:09   ` Peter Korsgaard
2021-01-30  9:28     ` Fabrice Fontaine
2021-01-30  9:37       ` Peter Korsgaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210125212935.GP2325@scaer \
    --to=yann.morin.1998@free.fr \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.