Skip to contentSkip to conversation

package/proftpd: add BR2_PACKAGE_PROFTPD_MOD_SFTP

PATCH New Matt Weber 3 participants 5 messages Aug 7, 2018 – Aug 9, 2018

lore
Share & tools
lore

Matt Weber

author
#0 lore raw

PATCH 1/1 package/proftpd: add BR2_PACKAGE_PROFTPD_MOD_SFTP

From: Paresh Chaudhary <[email protected]>

This patch adds BR2_PACKAGE_PROFTPD_MOD_SFTP support and also changes the .mk file to add required modules as a list in a separate variable. This new variable will help in future to add more module support in proftpd package.

Signed-off-by Paresh Chaudhary <[email protected]>
Signed-off-by Matt Weber <[email protected]>
---
 package/proftpd/Config.in  |  5 +++++
 package/proftpd/proftpd.mk | 18 +++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
package/proftpd/Config.in +5 -0
index e979d40..12b8c93 100644
@@ -20,4 +20,9 @@ config BR2_PACKAGE_PROFTPD_MOD_REDIS
 	  The mod_redis module enables ProFTPD support for caching
 	  data in Redis servers, using the hiredis client library.
 
+config BR2_PACKAGE_PROFTPD_MOD_SFTP
+	bool "mod_sftp support"
+	help
+	  Compile ProFTPD with mod_sftp support
+
 endif
package/proftpd/proftpd.mk +17 -1
index 3e165c6..1ee88a8 100644
@@ -23,8 +23,11 @@ PROFTPD_CONF_OPTS = \
 	--enable-shadow \
 	--with-gnu-ld
 
+#Append all required modules in PROFTPD_MODULES variable
+#Use 'space' seperator for more than one module
+#e.g. PROFTPD_MODULES += mod_readme mod_ifsession
 ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REWRITE),y)
-PROFTPD_CONF_OPTS += --with-modules=mod_rewrite
+PROFTPD_MODULES = mod_rewrite
 endif
 
 ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REDIS),y)

@@ -34,6 +37,19 @@ else
 PROFTPD_CONF_OPTS += --disable-redis
 endif
 
+ifeq ($(BR2_PACKAGE_PROFTPD_MOD_SFTP),y)
+PROFTPD_CONF_OPTS += --enable-openssl
+PROFTPD_MODULES += mod_sftp
+endif
+
+#Make ":" separated final modules list
+PROFTPD_MODULES_LIST = \
+	$(shell for l in $(PROFTPD_MODULES); do \
+	modlist=$$modlist$$l:; done \
+	&& echo $${modlist%?})
+
+PROFTPD_CONF_OPTS += --with-modules=$(PROFTPD_MODULES_LIST)
+
 # configure script doesn't handle detection of %llu format string
 # support for printing the file size when cross compiling, breaking
 # access for large files.
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 package/proftpd: add BR2_PACKAGE_PROFTPD_MOD_SFTP

Hi Matt,

package/proftpd/proftpd.mk else · line 41

Quoted 2 lines · Matt Weber
package/proftpd/proftpd.mk +2 -0
+ifeq ($(BR2_PACKAGE_PROFTPD_MOD_SFTP),y)
+PROFTPD_CONF_OPTS += --enable-openssl

Don't you need openssl/libressl as build time dependency?

package/proftpd/proftpd.mk else · line 43

Quoted 2 lines
package/proftpd/proftpd.mk +2 -0
+PROFTPD_MODULES += mod_sftp
+endif

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 -
author
#2 lore raw

PATCH 1/1 package/proftpd: add BR2_PACKAGE_PROFTPD_MOD_SFTP

Baruch,

Quoted 8 lines · Baruch Siach

Hi Matt,

package/proftpd/proftpd.mk else · line 41

Quoted 2 lines · Matt Weber
package/proftpd/proftpd.mk +2 -0
+ifeq ($(BR2_PACKAGE_PROFTPD_MOD_SFTP),y)
+PROFTPD_CONF_OPTS += --enable-openssl

Don't you need openssl/libressl as build time dependency?

Yeah, I'll add a check for BR2_PACKAGE_OPENSSL. By chance, do you
know if there is a risk of library compatibility between libopenssl and libressl?

Matt

#3 lore raw

PATCH 1/1 package/proftpd: add BR2_PACKAGE_PROFTPD_MOD_SFTP

Hi Matt,

Quoted 10 lines · Matthew Weber
Quoted 5 lines · Baruch Siach

package/proftpd/proftpd.mk else · line 41

Quoted 2 lines · Matt Weber
package/proftpd/proftpd.mk +2 -0
+ifeq ($(BR2_PACKAGE_PROFTPD_MOD_SFTP),y)
+PROFTPD_CONF_OPTS += --enable-openssl

Don't you need openssl/libressl as build time dependency?

Yeah, I'll add a check for BR2_PACKAGE_OPENSSL. By chance, do you
know if there is a risk of library compatibility between libopenssl and libressl?

There are some minor API differences between openssl and libressl. You should probably build test against both of them.

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 -
#4 lore raw

PATCH 1/1 package/proftpd: add BR2_PACKAGE_PROFTPD_MOD_SFTP

In reply to Matt Weber

Hello,

package/proftpd/proftpd.mk else · line 49

Quoted 5 lines · Matt Weber
package/proftpd/proftpd.mk +5 -0
+#Make ":" separated final modules list
+PROFTPD_MODULES_LIST = \
+	$(shell for l in $(PROFTPD_MODULES); do \
+	modlist=$$modlist$$l:; done \
+	&& echo $${modlist%?})

Meh. Please use this instead:

  --with-modules=$(subst $(space),:,$(PROFTPD_MODULES))

It's a bit more make-ish :-)

Thanks!

Thomas

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