Skip to contentSkip to conversation

vsftpd: bump to 2.3.5

PATCH New yegorslists at googlemail.com 2 participants 7 messages Mar 16, 2012 – Mar 17, 2012

lore
Share & tools
lore

yegorslists at googlemail.com

author
#0 lore raw

PATCH 1/2 vsftpd: bump to 2.3.5

From: Yegor Yefremov <[email protected]>

Signed-off-by Yegor Yefremov <[email protected]>
---
 package/vsftpd/vsftpd.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/vsftpd/vsftpd.mk +1 -1
index e67ab4a..8d3a01e 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-VSFTPD_VERSION = 2.3.4
+VSFTPD_VERSION = 2.3.5
 VSFTPD_SITE = https://security.appspot.com/downloads
 VSFTPD_LIBS = -lcrypt
Signature · 1 line
1.7.7
author
#1 lore raw

PATCH 2/2 vsftpd: fix SSL dependency

From: Yegor Yefremov <[email protected]>

Signed-off-by Yegor Yefremov <[email protected]>
---
 package/vsftpd/vsftpd.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/vsftpd/vsftpd.mk +1 -1
index 8d3a01e..3c9aa65 100644
@@ -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
Signature · 1 line
1.7.7
#2 lore raw

PATCH 2/2 vsftpd: fix SSL dependency

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"yegorslists" == yegorslists <[email protected]> writes:

yegorslists> From: Yegor Yefremov <[email protected]> yegorslists> Signed-off-by: Yegor Yefremov <[email protected]>

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.

Signature · 1 line
Bye, Peter Korsgaard
author
#3 lore raw

PATCH 2/2 vsftpd: fix SSL dependency

Quoted 18 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"yegorslists" == yegorslists ?<[email protected]> writes:

?yegorslists> From: Yegor Yefremov <[email protected]> ?yegorslists> Signed-off-by: Yegor Yefremov <[email protected]>

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

..

Quoted 8 lines

./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

#4 lore raw

PATCH 2/2 vsftpd: fix SSL dependency

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yegor" == Yegor Yefremov <[email protected]> writes:

Hi,

Quoted 2 lines
Quoted 2 lines

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?

Signature · 1 line
Bye, Peter Korsgaard