Skip to contentSkip to conversation

package/libnice: bump version to 0.1.16

PATCH Superseded Bernd Kuhls 3 participants 7 messages Aug 31, 2019 – Dec 16, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/libnice: bump version to 0.1.16

Release notes:
https://lists.freedesktop.org/archives/nice/2018-December/001443.html
https://lists.freedesktop.org/archives/nice/2019-May/001444.html

---
 package/libnice/libnice.hash | 2 +-
 package/libnice/libnice.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/libnice/libnice.hash +1 -1
index 3c1f0d845a..61be9517e3 100644
@@ -1,5 +1,5 @@
 # Locally computed after checking pgp signature
-sha256 be120ba95d4490436f0da077ffa8f767bf727b82decf2bf499e39becc027809c libnice-0.1.14.tar.gz
+sha256 06b678066f94dde595a4291588ed27acd085ee73775b8c4e8399e28c01eeefdf libnice-0.1.16.tar.gz
 
 # Hash for license files:
 sha256 9246b2ee8b1db30cf03d5d9719ad8bb5edce1cadc85f8cfef319c23d24d950b5 COPYING
package/libnice/libnice.mk +1 -1
index 49c29f9a60..b2fea4d66c 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBNICE_VERSION = 0.1.14
+LIBNICE_VERSION = 0.1.16
 LIBNICE_SITE = http://nice.freedesktop.org/releases
 LIBNICE_LICENSE = MPL-1.1 or LGPL-2.1
 LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 package/libnice: add optional dependency to openssl

Support for OpenSSL was added in version 0.1.15:
https://lists.freedesktop.org/archives/nice/2018-December/001443.html

---
 package/libnice/Config.in  |  2 +-
 package/libnice/libnice.mk | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)
package/libnice/Config.in +1 -1
index af8e814618..1f62c0b5c8 100644
@@ -4,7 +4,7 @@ config BR2_PACKAGE_LIBNICE
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # fork()
-	select BR2_PACKAGE_GNUTLS
+	select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Libnice is an implementation of the IETF's Interactive
package/libnice/libnice.mk +9 -1
index b2fea4d66c..4921deab33 100644
@@ -8,9 +8,17 @@ LIBNICE_VERSION = 0.1.16
 LIBNICE_SITE = http://nice.freedesktop.org/releases
 LIBNICE_LICENSE = MPL-1.1 or LGPL-2.1
 LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL
-LIBNICE_DEPENDENCIES = gnutls libglib2 host-pkgconf
+LIBNICE_DEPENDENCIES = libglib2 host-pkgconf
 LIBNICE_INSTALL_STAGING = YES
 
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+LIBNICE_CONF_OPTS += --without-openssl
+LIBNICE_DEPENDENCIES += gnutls
+else
+LIBNICE_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr
+LIBNICE_DEPENDENCIES += openssl
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y)
 LIBNICE_CONF_OPTS += --with-gstreamer-0.10
 LIBNICE_DEPENDENCIES += gst-plugins-base
Signature · 1 line
2.20.1
#2 lore raw

PATCH 2/2 package/libnice: add optional dependency to openssl

Hi Bernd,

Quoted 14 lines · Bernd Kuhls

Support for OpenSSL was added in version 0.1.15:
https://lists.freedesktop.org/archives/nice/2018-December/001443.html

---
 package/libnice/Config.in  |  2 +-
 package/libnice/libnice.mk | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)
package/libnice/Config.in +0 -0
index af8e814618..1f62c0b5c8 100644

package/libnice/Config.in config BR2_PACKAGE_LIBNICE · line 7

Quoted 5 lines
package/libnice/Config.in +1 -1
@@ -4,7 +4,7 @@ config BR2_PACKAGE_LIBNICE
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # fork()
-	select BR2_PACKAGE_GNUTLS
+	select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS

Is there a reason to change the default selected crypto library from Gnutls to Openssl?

baruch

Quoted 16 lines
package/libnice/Config.in +0 -0
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Libnice is an implementation of the IETF's Interactive
package/libnice/libnice.mk +2 -1
index b2fea4d66c..4921deab33 100644
@@ -8,9 +8,17 @@ LIBNICE_VERSION = 0.1.16
 LIBNICE_SITE = http://nice.freedesktop.org/releases
 LIBNICE_LICENSE = MPL-1.1 or LGPL-2.1
 LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL
-LIBNICE_DEPENDENCIES = gnutls libglib2 host-pkgconf
+LIBNICE_DEPENDENCIES = libglib2 host-pkgconf
 LIBNICE_INSTALL_STAGING = YES
 
+ifeq ($(BR2_PACKAGE_GNUTLS),y)

package/libnice/libnice.mk LIBNICE_VERSION = 0.1.16 · line 24

Quoted 10 lines
package/libnice/libnice.mk +7 -0
+LIBNICE_CONF_OPTS += --without-openssl
+LIBNICE_DEPENDENCIES += gnutls
+else
+LIBNICE_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr
+LIBNICE_DEPENDENCIES += openssl
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y)
 LIBNICE_CONF_OPTS += --with-gstreamer-0.10
 LIBNICE_DEPENDENCIES += gst-plugins-base

--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

#3 lore raw

PATCH 2/2 package/libnice: add optional dependency to openssl

Am Sat, 31 Aug 2019 23:07:35 +0300 schrieb Baruch Siach:

Quoted 5 lines

package/libnice/Config.in config BR2_PACKAGE_LIBNICE · line 7

Quoted 2 lines
package/libnice/Config.in +1 -1
-	select BR2_PACKAGE_GNUTLS
+	select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS

Is there a reason to change the default selected crypto library from Gnutls to Openssl?

Hi Baruch,

yes, if

select BR2_PACKAGE_GNUTLS if !BR2_PACKAGE_OPENSSL

is used, menuconfig throws this warning:

package/openssl/Config.in:4:error: recursive dependency detected!
package/openssl/Config.in:4: symbol BR2_PACKAGE_OPENSSL is selected by BR2_PACKAGE_GNUTLS
package/gnutls/Config.in:1: symbol BR2_PACKAGE_GNUTLS is selected by BR2_PACKAGE_OPENSSL

Regards, Bernd

#4 lore raw

PATCH 2/2 package/libnice: add optional dependency to openssl

Hi Bernd,

Quoted 10 lines · Bernd Kuhls

Am Sat, 31 Aug 2019 23:07:35 +0300 schrieb Baruch Siach:

Quoted 5 lines

package/libnice/Config.in config BR2_PACKAGE_LIBNICE · line 7

Quoted 2 lines
package/libnice/Config.in +1 -1
-	select BR2_PACKAGE_GNUTLS
+	select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS

Is there a reason to change the default selected crypto library from Gnutls to Openssl?

yes, if

Quoted 7 lines

select BR2_PACKAGE_GNUTLS if !BR2_PACKAGE_OPENSSL

is used, menuconfig throws this warning:

package/openssl/Config.in:4:error: recursive dependency detected!
package/openssl/Config.in:4: symbol BR2_PACKAGE_OPENSSL is selected by BR2_PACKAGE_GNUTLS
package/gnutls/Config.in:1: symbol BR2_PACKAGE_GNUTLS is selected by BR2_PACKAGE_OPENSSL

I see.

I think this should be mentioned in the commit log. Especially since Config.in defaults to openssl, while .mk defaults to gnutls.

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
#5 lore raw

PATCH 2/2 package/libnice: add optional dependency to openssl

In reply to Bernd Kuhls
Quoted 8 lines · On Sat, 31 Aug 2019 15:04:17 +0200 Bernd Kuhls <[email protected]> wrote:

Support for OpenSSL was added in version 0.1.15:
https://lists.freedesktop.org/archives/nice/2018-December/001443.html

---
 package/libnice/Config.in  |  2 +-
 package/libnice/libnice.mk | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

As requested by Baruch, I've extended the commit log to explain why we need to select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS.

I've also changed the .mk file to pass --with-crypto-library={openssl,gnutls}, and dropped the use of --without-openssl in the gnutls case.

Applied to master with those changes. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#6 lore raw

PATCH 1/2 package/libnice: bump version to 0.1.16

In reply to Bernd Kuhls
Quoted 9 lines · On Sat, 31 Aug 2019 15:04:16 +0200 Bernd Kuhls <[email protected]> wrote:

Release notes:
https://lists.freedesktop.org/archives/nice/2018-December/001443.html
https://lists.freedesktop.org/archives/nice/2019-May/001444.html

---
 package/libnice/libnice.hash | 2 +-
 package/libnice/libnice.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

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