Skip to contentSkip to conversation

package/proftpd: add mod_sql_sqlite

PATCH New Jared Bents 2 participants 2 messages Dec 3, 2018 – Dec 9, 2018

lore
Share & tools
lore

Jared Bents

author
#0 lore raw

PATCH v3 1/1 package/proftpd: add mod_sql_sqlite

Enable mod_sql_sqlite as a compile time option

Signed-off-by Jared Bents <[email protected]>

--
[v1->v2]: Update for sqlite dependency
[v2->v3]: Update help info from mode_* to mod_* per request
from <[email protected]>

---
 package/proftpd/Config.in  | 14 ++++++++++++--
 package/proftpd/proftpd.mk |  5 +++++
 2 files changed, 17 insertions(+), 2 deletions(-)
package/proftpd/Config.in +12 -2
index b615a5ff4c..7c57fed35a 100644
@@ -29,12 +29,22 @@ config BR2_PACKAGE_PROFTPD_MOD_SFTP
 config BR2_PACKAGE_PROFTPD_MOD_SQL
 	bool "mod_sql support"
 	help
-	  Compile ProFTPD with mode_sql support.
+	  Compile ProFTPD with mod_sql support.
+
+if BR2_PACKAGE_PROFTPD_MOD_SQL
+
+config BR2_PACKAGE_PROFTPD_MOD_SQL_SQLITE
+	bool "mod_sql_sqlite support"
+	select BR2_PACKAGE_SQLITE
+	help
+	  Compile ProFTPD with mod_sql_sqlite support.
+
+endif
 
 config BR2_PACKAGE_PROFTPD_MOD_QUOTATAB
 	bool "mod_quotatab support"
 	help
-	  Compile ProFTPD with mode_quotatab support. This module
+	  Compile ProFTPD with mod_quotatab support. This module
 	  is required in order to support quota tables:
 	        1. mod_quotatab_file
 	        2. mod_quotatab_ldap
package/proftpd/proftpd.mk +5 -0
index 8f3ff5088e..dd71c51e7e 100644
@@ -46,6 +46,11 @@ ifeq ($(BR2_PACKAGE_PROFTPD_MOD_SQL),y)
 PROFTPD_MODULES += mod_sql
 endif
 
+ifeq ($(BR2_PACKAGE_PROFTPD_MOD_SQL_SQLITE),y)
+PROFTPD_MODULES += mod_sql_sqlite
+PROFTPD_DEPENDENCIES += sqlite
+endif
+
 ifeq ($(BR2_PACKAGE_PROFTPD_MOD_QUOTATAB),y)
 PROFTPD_MODULES += mod_quotatab
 endif
Signature · 1 line
2.18.0
#1 lore raw

PATCH v3 1/1 package/proftpd: add mod_sql_sqlite

Hello,

Quoted 17 lines · Jared Bents

Enable mod_sql_sqlite as a compile time option

Signed-off-by Jared Bents <[email protected]>

--
[v1->v2]: Update for sqlite dependency
[v2->v3]: Update help info from mode_* to mod_* per request
from <[email protected]>

---
 package/proftpd/Config.in  | 14 ++++++++++++--
 package/proftpd/proftpd.mk |  5 +++++
 2 files changed, 17 insertions(+), 2 deletions(-)
package/proftpd/Config.in +0 -0
index b615a5ff4c..7c57fed35a 100644

package/proftpd/Config.in config BR2_PACKAGE_PROFTPD_MOD_SFTP · line 32

Quoted 5 lines
package/proftpd/Config.in +1 -1
@@ -29,12 +29,22 @@ config BR2_PACKAGE_PROFTPD_MOD_SFTP
 config BR2_PACKAGE_PROFTPD_MOD_SQL
 	bool "mod_sql support"
 	help
-	  Compile ProFTPD with mode_sql support.
+	  Compile ProFTPD with mod_sql support.

This...

Quoted 6 lines
package/proftpd/Config.in +6 -0
+
+if BR2_PACKAGE_PROFTPD_MOD_SQL
+
+config BR2_PACKAGE_PROFTPD_MOD_SQL_SQLITE
+	bool "mod_sql_sqlite support"
+	select BR2_PACKAGE_SQLITE

package/proftpd/Config.in config BR2_PACKAGE_PROFTPD_MOD_SFTP · line 47

Quoted 10 lines
package/proftpd/Config.in +5 -1
+	help
+	  Compile ProFTPD with mod_sql_sqlite support.
+
+endif
 
 config BR2_PACKAGE_PROFTPD_MOD_QUOTATAB
 	bool "mod_quotatab support"
 	help
-	  Compile ProFTPD with mode_quotatab support. This module
+	  Compile ProFTPD with mod_quotatab support. This module

.. and this are unrelated changes. They should have been made as part of a separate patch. So I did them in a separate preparatory commit, and then applied your change adding mod_sql_sqlite support. Thanks!

Best regards,

Thomas

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