diff mbox

shairport-sync: bump to version 3.0

Message ID 20170310204105.29179-1-joerg.krause@embedded.rocks
State Accepted
Headers show

Commit Message

Jörg Krause March 10, 2017, 8:41 p.m. UTC
Support for PolarSSL is deprecated and the usage of mbedTLS is
recommended, if not OpenSSL is used as crypto backend.

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
---
 package/shairport-sync/Config.in           | 2 +-
 package/shairport-sync/shairport-sync.hash | 2 +-
 package/shairport-sync/shairport-sync.mk   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

Comments

Thomas Petazzoni March 10, 2017, 9:22 p.m. UTC | #1
Hello,

On Fri, 10 Mar 2017 21:41:05 +0100, Jörg Krause wrote:
> Support for PolarSSL is deprecated and the usage of mbedTLS is
> recommended, if not OpenSSL is used as crypto backend.
> 
> Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
> ---
>  package/shairport-sync/Config.in           | 2 +-
>  package/shairport-sync/shairport-sync.hash | 2 +-
>  package/shairport-sync/shairport-sync.mk   | 6 +++---
>  3 files changed, 5 insertions(+), 5 deletions(-)

Applied to master, thanks.

Thomas
Thomas Petazzoni March 10, 2017, 9:54 p.m. UTC | #2
Hello,

On Fri, 10 Mar 2017 22:22:45 +0100, Thomas Petazzoni wrote:

> On Fri, 10 Mar 2017 21:41:05 +0100, Jörg Krause wrote:
> > Support for PolarSSL is deprecated and the usage of mbedTLS is
> > recommended, if not OpenSSL is used as crypto backend.
> > 
> > Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
> > ---
> >  package/shairport-sync/Config.in           | 2 +-
> >  package/shairport-sync/shairport-sync.hash | 2 +-
> >  package/shairport-sync/shairport-sync.mk   | 6 +++---
> >  3 files changed, 5 insertions(+), 5 deletions(-)  
> 
> Applied to master, thanks.

And I've reverted because it causes a Config.in circular dependency:

package/openssl/Config.in:1:error: recursive dependency detected!
package/openssl/Config.in:1:	symbol BR2_PACKAGE_OPENSSL is selected by BR2_PACKAGE_MBEDTLS
package/mbedtls/Config.in:1:	symbol BR2_PACKAGE_MBEDTLS is selected by BR2_PACKAGE_OPENSSL

Try out yourself: no such warning right before your patch at commit
cd8e5b819ff31c96dbc7ad94c28a5ad2eb838631. And at commit
7670dcc43e3b023b9bd613fa464533ecde7aca70, right after your patch is
applied, we have this Config.in warning.

Best regards,

Thomas
Arnout Vandecappelle March 10, 2017, 11:08 p.m. UTC | #3
On 10-03-17 22:54, Thomas Petazzoni wrote:
> Hello,
> 
> On Fri, 10 Mar 2017 22:22:45 +0100, Thomas Petazzoni wrote:
> 
>> On Fri, 10 Mar 2017 21:41:05 +0100, Jörg Krause wrote:
>>> Support for PolarSSL is deprecated and the usage of mbedTLS is
>>> recommended, if not OpenSSL is used as crypto backend.
>>>
>>> Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
>>> ---
>>>  package/shairport-sync/Config.in           | 2 +-
>>>  package/shairport-sync/shairport-sync.hash | 2 +-
>>>  package/shairport-sync/shairport-sync.mk   | 6 +++---
>>>  3 files changed, 5 insertions(+), 5 deletions(-)  
>>
>> Applied to master, thanks.
> 
> And I've reverted because it causes a Config.in circular dependency:
> 
> package/openssl/Config.in:1:error: recursive dependency detected!
> package/openssl/Config.in:1:	symbol BR2_PACKAGE_OPENSSL is selected by BR2_PACKAGE_MBEDTLS
> package/mbedtls/Config.in:1:	symbol BR2_PACKAGE_MBEDTLS is selected by BR2_PACKAGE_OPENSSL

 This is due to ustream-ssl:

select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS

so either the direction in ustream-ssl has to be inverted, or the one in
shairport-sync.

 Regards,
 Arnout

> 
> Try out yourself: no such warning right before your patch at commit
> cd8e5b819ff31c96dbc7ad94c28a5ad2eb838631. And at commit
> 7670dcc43e3b023b9bd613fa464533ecde7aca70, right after your patch is
> applied, we have this Config.in warning.
> 
> Best regards,
> 
> Thomas
>
diff mbox

Patch

diff --git a/package/shairport-sync/Config.in b/package/shairport-sync/Config.in
index c558a64c5..2213a9663 100644
--- a/package/shairport-sync/Config.in
+++ b/package/shairport-sync/Config.in
@@ -6,7 +6,7 @@  config BR2_PACKAGE_SHAIRPORT_SYNC
 	select BR2_PACKAGE_ALSA_LIB_MIXER
 	select BR2_PACKAGE_LIBCONFIG
 	select BR2_PACKAGE_LIBDAEMON
-	select BR2_PACKAGE_POLARSSL if !BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_MBEDTLS if !BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_POPT
 	help
 	  Shairport Sync emulates an AirPort Express for the purpose of
diff --git a/package/shairport-sync/shairport-sync.hash b/package/shairport-sync/shairport-sync.hash
index 45bce1016..fb837a4ad 100644
--- a/package/shairport-sync/shairport-sync.hash
+++ b/package/shairport-sync/shairport-sync.hash
@@ -1,2 +1,2 @@ 
 # Locally calculated
-sha256  2e73416ac8fdda1657034afaa143f1710852ebed06e0aa43dafc2b7dc5eb653d  shairport-sync-2.8.6.tar.gz
+sha256  d02697810da0a2c10d3b39e8c9e0795af1e81fff065db1e27514cdb5da696108  shairport-sync-3.0.tar.gz
diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk
index 00d6a695b..ab4fdaee2 100644
--- a/package/shairport-sync/shairport-sync.mk
+++ b/package/shairport-sync/shairport-sync.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-SHAIRPORT_SYNC_VERSION = 2.8.6
+SHAIRPORT_SYNC_VERSION = 3.0
 SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION))
 
 SHAIRPORT_SYNC_LICENSE = MIT, BSD-3c
@@ -36,8 +36,8 @@  ifeq ($(BR2_PACKAGE_OPENSSL),y)
 SHAIRPORT_SYNC_DEPENDENCIES += openssl
 SHAIRPORT_SYNC_CONF_OPTS += --with-ssl=openssl
 else
-SHAIRPORT_SYNC_DEPENDENCIES += polarssl
-SHAIRPORT_SYNC_CONF_OPTS += --with-ssl=polarssl
+SHAIRPORT_SYNC_DEPENDENCIES += mbedtls
+SHAIRPORT_SYNC_CONF_OPTS += --with-ssl=mbedtls
 endif
 
 ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR),y)