[Buildroot] [PATCH 1/2] vsftpd: bump to 2.3.5

[Buildroot] [PATCH 1/2] vsftpd: bump to 2.3.5

[yegorslists at googlemail.com]

From: Yegor Yefremov <yegorslists@googlemail.com>

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
 package/vsftpd/vsftpd.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index e67ab4a..8d3a01e 100644
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-VSFTPD_VERSION = 2.3.4
+VSFTPD_VERSION = 2.3.5
 VSFTPD_SITE = https://security.appspot.com/downloads
 VSFTPD_LIBS = -lcrypt
 
-- 
1.7.7

[Buildroot] [PATCH 2/2] vsftpd: fix SSL dependency

[yegorslists at googlemail.com]

From: Yegor Yefremov <yegorslists@googlemail.com>

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
 package/vsftpd/vsftpd.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index 8d3a01e..3c9aa65 100644
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -14,7 +14,7 @@ endef
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 VSFTPD_DEPENDENCIES += openssl
-VSFTPD_LIBS += -lssl
+VSFTPD_LIBS += -lssl -lcrypto
 VSFTPD_POST_CONFIGURE_HOOKS += VSFTPD_ENABLE_SSL
 endif
 
-- 
1.7.7

[Buildroot] [PATCH 2/2] vsftpd: fix SSL dependency

[Peter Korsgaard]

>>>>> "yegorslists" == yegorslists  <yegorslists@googlemail.com> writes:

 yegorslists> From: Yegor Yefremov <yegorslists@googlemail.com>
 yegorslists> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>

Can you be a bit more specific about what this fixes? I just did a test
with the default BR (arm926t) toolchain and it works here without it:

/home/peko/source/buildroot/output/host/usr/bin/arm-linux-gcc -o vsftpd
main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o tunables.o
ftpdataio.o secbuf.o ls.o postprivparent.o logging.o str.o netstr.o
sysstr.o strlist.o banner.o filestr.o parseconf.o secutil.o ascii.o
oneprocess.o twoprocess.o privops.o standalone.o hash.o tcpwrap.o
ipaddrparse.o access.o features.o readwrite.o opts.o ssl.o sslslave.o
ptracesandbox.o ftppolicy.o sysutil.o sysdeputil.o -Wl,-s -lcrypt -lssl

..

./output/host/usr/bin/arm-linux-readelf -a output/build/vsftpd-2.3.5/vsftpd |grep NEEDED
 0x00000001 (NEEDED)                     Shared library: [libcrypt.so.0]
 0x00000001 (NEEDED)                     Shared library: [libssl.so.1.0.0]
 0x00000001 (NEEDED)                     Shared library: [libc.so.0]
 0x00000001 (NEEDED)                     Shared library: [libcrypto.so.1.0.0]

So it end up with the libcrypto reference without explicitly linking
with it.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/2] vsftpd: fix SSL dependency

[Yegor Yefremov]

On Fri, Mar 16, 2012 at 10:23 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>> "yegorslists" == yegorslists ?<yegorslists@googlemail.com> writes:
>
> ?yegorslists> From: Yegor Yefremov <yegorslists@googlemail.com>
> ?yegorslists> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
>
> Can you be a bit more specific about what this fixes? I just did a test
> with the default BR (arm926t) toolchain and it works here without it:
>
> /home/peko/source/buildroot/output/host/usr/bin/arm-linux-gcc -o vsftpd
> main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o tunables.o
> ftpdataio.o secbuf.o ls.o postprivparent.o logging.o str.o netstr.o
> sysstr.o strlist.o banner.o filestr.o parseconf.o secutil.o ascii.o
> oneprocess.o twoprocess.o privops.o standalone.o hash.o tcpwrap.o
> ipaddrparse.o access.o features.o readwrite.o opts.o ssl.o sslslave.o
> ptracesandbox.o ftppolicy.o sysutil.o sysdeputil.o -Wl,-s -lcrypt -lssl
>
> ..
>
> ./output/host/usr/bin/arm-linux-readelf -a output/build/vsftpd-2.3.5/vsftpd |grep NEEDED
> ?0x00000001 (NEEDED) ? ? ? ? ? ? ? ? ? ? Shared library: [libcrypt.so.0]
> ?0x00000001 (NEEDED) ? ? ? ? ? ? ? ? ? ? Shared library: [libssl.so.1.0.0]
> ?0x00000001 (NEEDED) ? ? ? ? ? ? ? ? ? ? Shared library: [libc.so.0]
> ?0x00000001 (NEEDED) ? ? ? ? ? ? ? ? ? ? Shared library: [libcrypto.so.1.0.0]
>
> So it end up with the libcrypto reference without explicitly linking
> with it.

This is output from pkg-config:

pkg-config --libs openssl
-lssl -lcrypto

I don't know what is going on exactly, but could it be that other
toolchains bring valid lcrypto with them?
But vsftpd has it's own library finder script and it also defines both libs.

Yegor

[Buildroot] [PATCH 2/2] vsftpd: fix SSL dependency

[Peter Korsgaard]

>>>>> "Yegor" == Yegor Yefremov <yegorslists@googlemail.com> writes:

Hi,

 >> So it end up with the libcrypto reference without explicitly linking
 >> with it.

 Yegor> This is output from pkg-config:

 Yegor> pkg-config --libs openssl
 Yegor> -lssl -lcrypto

 Yegor> I don't know what is going on exactly, but could it be that
 Yegor> other toolchains bring valid lcrypto with them?  But vsftpd has
 Yegor> it's own library finder script and it also defines both libs.

I agree it cannot hurt to explicitly link with libcrypto as well - But
for my interest, in what config did it break?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/2] vsftpd: fix SSL dependency

[Peter Korsgaard]

>>>>> "yegorslists" == yegorslists  <yegorslists@googlemail.com> writes:

 yegorslists> From: Yegor Yefremov <yegorslists@googlemail.com>
 yegorslists> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/2] vsftpd: bump to 2.3.5

[Peter Korsgaard]

>>>>> "yegorslists" == yegorslists  <yegorslists@googlemail.com> writes:

 yegorslists> From: Yegor Yefremov <yegorslists@googlemail.com>
 yegorslists> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard