Patchwork [meta-networking,dylan] vsftpd: fix compile-time dependence

login
register
mail settings
Submitter Javier Viguera
Date Aug. 1, 2013, 1:39 p.m.
Message ID <1375364341-35086-1-git-send-email-javier.viguera@digi.com>
Download mbox | patch
Permalink /patch/54907/
State Superseded, archived
Headers show

Comments

Javier Viguera - Aug. 1, 2013, 1:39 p.m.
vsftpd links with openssl libraries (libssl and libcrypto) so there is a
compile-time dependence on openssl package.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Martin Jansa - Aug. 1, 2013, 1:47 p.m.
On Thu, Aug 01, 2013 at 03:39:01PM +0200, Javier Viguera wrote:
> vsftpd links with openssl libraries (libssl and libcrypto) so there is a
> compile-time dependence on openssl package.
> 
> Signed-off-by: Javier Viguera <javier.viguera@digi.com>
> ---
>  meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb
> index c02ee9c..f146910 100644
> --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb
> +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb
> @@ -4,7 +4,7 @@ SECTION = "network"
>  LICENSE = "GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271"
>  
> -DEPENDS = "libcap"
> +DEPENDS = "libcap openssl"
>  

It was fixed a month ago:

commit 46354a697c18a64c5836159adf8dbd92e6547e85
Author: Martin Jansa <martin.jansa@gmail.com>
Date:   Tue Jul 2 20:31:56 2013 +0200

    vsftpd: add missing dependency on openssl

And current vsftpd is 3.0.0:

commit 441502b68d03a4ce7796436a53c5e95399724ad2
Author: Roy.Li <rongqing.li@windriver.com>
Date:   Fri Jul 19 10:19:25 2013 +0800

    Upgrade vsftpd to 3.0.0


>  SRC_URI = "https://security.appspot.com/downloads/vsftpd-${PV}.tar.gz \
>             file://makefile-destdir.patch \
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Javier Viguera - Aug. 1, 2013, 1:53 p.m.
Hi Martin,

I just subscribed to the list so I didn't know it was already fixed.

Anyway:

# git branch -a --contains 46354a697c18a64c5836159adf8dbd92e6547e85

shows that it's only fixed on *master*.

I was bitten by this using stable dylan branches, that's why my patch 
was sent to apply on dylan.

Could this fix be backported to dylan?

-
Regards,

Javier Viguera


On 01/08/13 15:47, Martin Jansa wrote:
> On Thu, Aug 01, 2013 at 03:39:01PM +0200, Javier Viguera wrote:
>> vsftpd links with openssl libraries (libssl and libcrypto) so there is a
>> compile-time dependence on openssl package.
>>
>> Signed-off-by: Javier Viguera <javier.viguera@digi.com>
>> ---
>>   meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb
>> index c02ee9c..f146910 100644
>> --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb
>> +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb
>> @@ -4,7 +4,7 @@ SECTION = "network"
>>   LICENSE = "GPLv2"
>>   LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271"
>>
>> -DEPENDS = "libcap"
>> +DEPENDS = "libcap openssl"
>>
>
> It was fixed a month ago:
>
> commit 46354a697c18a64c5836159adf8dbd92e6547e85
> Author: Martin Jansa <martin.jansa@gmail.com>
> Date:   Tue Jul 2 20:31:56 2013 +0200
>
>      vsftpd: add missing dependency on openssl
>
> And current vsftpd is 3.0.0:
>
> commit 441502b68d03a4ce7796436a53c5e95399724ad2
> Author: Roy.Li <rongqing.li@windriver.com>
> Date:   Fri Jul 19 10:19:25 2013 +0800
>
>      Upgrade vsftpd to 3.0.0
>
>
>>   SRC_URI = "https://security.appspot.com/downloads/vsftpd-${PV}.tar.gz \
>>              file://makefile-destdir.patch \
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
Martin Jansa - Aug. 1, 2013, 2:08 p.m.
On Thu, Aug 01, 2013 at 03:53:10PM +0200, Javier Viguera wrote:
> Hi Martin,
> 
> I just subscribed to the list so I didn't know it was already fixed.
> 
> Anyway:
> 
> # git branch -a --contains 46354a697c18a64c5836159adf8dbd92e6547e85
> 
> shows that it's only fixed on *master*.
> 
> I was bitten by this using stable dylan branches, that's why my patch 
> was sent to apply on dylan.

Backports for dylan need to be marked as such (see README in root of
meta-oe).
 
> Could this fix be backported to dylan?

It's already in my branch with fixes for backport to dylan
http://git.openembedded.org/meta-openembedded-contrib/log/?h=jansa/dylan-backports

> 
> -
> Regards,
> 
> Javier Viguera
> 
> 
> On 01/08/13 15:47, Martin Jansa wrote:
> > On Thu, Aug 01, 2013 at 03:39:01PM +0200, Javier Viguera wrote:
> >> vsftpd links with openssl libraries (libssl and libcrypto) so there is a
> >> compile-time dependence on openssl package.
> >>
> >> Signed-off-by: Javier Viguera <javier.viguera@digi.com>
> >> ---
> >>   meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb | 2 +-
> >>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb
> >> index c02ee9c..f146910 100644
> >> --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb
> >> +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb
> >> @@ -4,7 +4,7 @@ SECTION = "network"
> >>   LICENSE = "GPLv2"
> >>   LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271"
> >>
> >> -DEPENDS = "libcap"
> >> +DEPENDS = "libcap openssl"
> >>
> >
> > It was fixed a month ago:
> >
> > commit 46354a697c18a64c5836159adf8dbd92e6547e85
> > Author: Martin Jansa <martin.jansa@gmail.com>
> > Date:   Tue Jul 2 20:31:56 2013 +0200
> >
> >      vsftpd: add missing dependency on openssl
> >
> > And current vsftpd is 3.0.0:
> >
> > commit 441502b68d03a4ce7796436a53c5e95399724ad2
> > Author: Roy.Li <rongqing.li@windriver.com>
> > Date:   Fri Jul 19 10:19:25 2013 +0800
> >
> >      Upgrade vsftpd to 3.0.0
> >
> >
> >>   SRC_URI = "https://security.appspot.com/downloads/vsftpd-${PV}.tar.gz \
> >>              file://makefile-destdir.patch \
> >> _______________________________________________
> >> Openembedded-devel mailing list
> >> Openembedded-devel@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >
>

Patch

diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb
index c02ee9c..f146910 100644
--- a/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb
+++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb
@@ -4,7 +4,7 @@  SECTION = "network"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271"
 
-DEPENDS = "libcap"
+DEPENDS = "libcap openssl"
 
 SRC_URI = "https://security.appspot.com/downloads/vsftpd-${PV}.tar.gz \
            file://makefile-destdir.patch \