Patchwork [3/9] firefox: sqlite dependency needs new compile-time options

login
register
mail settings
Submitter Stefan Fröberg
Date Sept. 5, 2012, 2:28 p.m.
Message ID <1346855344-15081-4-git-send-email-stefan.froberg@petroprogram.com>
Download mbox | patch
Permalink /patch/181874/
State Deferred
Headers show

Comments

Stefan Fröberg - Sept. 5, 2012, 2:28 p.m.
Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
---
 package/sqlite/Config.in |   34 ++++++++++++++++++++++++++++++++++
 package/sqlite/sqlite.mk |   12 ++++++++++++
 2 files changed, 46 insertions(+), 0 deletions(-)
Arnout Vandecappelle - Sept. 11, 2012, 9:51 p.m.
On 09/05/12 16:28, Stefan Fröberg wrote:
>
> Signed-off-by: Stefan Fröberg<stefan.froberg@petroprogram.com>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

  Small comments below.

> ---
>   package/sqlite/Config.in |   34 ++++++++++++++++++++++++++++++++++
>   package/sqlite/sqlite.mk |   12 ++++++++++++
>   2 files changed, 46 insertions(+), 0 deletions(-)
>
> diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in
> index 25aaa3f..75bce70 100644
> --- a/package/sqlite/Config.in
> +++ b/package/sqlite/Config.in
> @@ -22,3 +22,37 @@ config BR2_PACKAGE_SQLITE_STAT3
>   	  planner that can help SQLite to choose a better query plan under
>   	  certain situations.
>
> +config BR2_PACKAGE_SQLITE_ENABLE_FTS3
> +	bool "Enables version 3 of the full-text search engine"

  "Full-text search engine (fts3)"

> +	depends on BR2_PACKAGE_SQLITE

  Instead of a "depends on" every time, just enclose all the options in an
if block.

> +	help
> +	  When this option is defined in the amalgamation
> +	  (see http://www.sqlite.org/amalgamation.html), version 3 of
> +	  the full-text search engine is added to the build automatically.

  Is it relevant whether it's an amalgamation or a split build?

  I'd just write:

Adds the full-text search engine (version 3) to the build.

> +
> +config BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY
> +	bool "Enables sqlite3_unlock_notify() interface"

  "sqlite3_unlock_notify() interface"

> +	depends on BR2_PACKAGE_SQLITE
> +	help
> +	  This option enables the sqlite3_unlock_notify() interface and its
> +	  accosiated functionality. See the documentation

  associated

> +	  http://www.sqlite.org/unlock_notify.html for additional information.
> +
> +config BR2_PACKAGE_SQLITE_SECURE_DELETE
> +	bool "Sets the secure_delete pragma on by default"
> +	depends on BR2_PACKAGE_SQLITE
> +	help
> +	  This compile-time option changes the default settings of the
> +	  secure_delete pragma. When this option is not used, secure_delete
> +	  defaults to off. When this option is present, secure_delete defaults
> +	  to on.
> +
> +	  The secure_delete setting causes deleted content to be overwritten
> +	  with zeros. There is a small performance penalty for this since
> +	  additional I/O must occur. On the other hand, secure_delete can
> +	  prevent sensitive information from lingering in unused parts
> +	  of the database file after it has allegedly been deleted.
> +	  See the documentation on the
> +	  http://www.sqlite.org/pragma.html#pragma_secure_delete
> +	  for additional information.

  Is this needed for firefox?  (Not that it matters, mind you.)

[snip]

  Regards,
  Arnout
Stefan Fröberg - Sept. 11, 2012, 11:35 p.m.
Hello Arnout

12.9.2012 0:51, Arnout Vandecappelle kirjoitti:
> On 09/05/12 16:28, Stefan Fröberg wrote:
>>
>> Signed-off-by: Stefan Fröberg<stefan.froberg@petroprogram.com>
>
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>
>  Small comments below.
>
>> ---
>>   package/sqlite/Config.in |   34 ++++++++++++++++++++++++++++++++++
>>   package/sqlite/sqlite.mk |   12 ++++++++++++
>>   2 files changed, 46 insertions(+), 0 deletions(-)
>>
>> diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in
>> index 25aaa3f..75bce70 100644
>> --- a/package/sqlite/Config.in
>> +++ b/package/sqlite/Config.in
>> @@ -22,3 +22,37 @@ config BR2_PACKAGE_SQLITE_STAT3
>>         planner that can help SQLite to choose a better query plan under
>>         certain situations.
>>
>> +config BR2_PACKAGE_SQLITE_ENABLE_FTS3
>> +    bool "Enables version 3 of the full-text search engine"
>
>  "Full-text search engine (fts3)"
>

Okay

>> +    depends on BR2_PACKAGE_SQLITE
>
>  Instead of a "depends on" every time, just enclose all the options in an
> if block.
>

No problem

>> +    help
>> +      When this option is defined in the amalgamation
>> +      (see http://www.sqlite.org/amalgamation.html), version 3 of
>> +      the full-text search engine is added to the build automatically.
>
>  Is it relevant whether it's an amalgamation or a split build?
>

Well, no ...

>  I'd just write:
>
> Adds the full-text search engine (version 3) to the build.
>

Ok

>> +
>> +config BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY
>> +    bool "Enables sqlite3_unlock_notify() interface"
>
>  "sqlite3_unlock_notify() interface"
>
>> +    depends on BR2_PACKAGE_SQLITE
>> +    help
>> +      This option enables the sqlite3_unlock_notify() interface and its
>> +      accosiated functionality. See the documentation
>
>  associated
>
>> +      http://www.sqlite.org/unlock_notify.html for additional
>> information.
>> +
>> +config BR2_PACKAGE_SQLITE_SECURE_DELETE
>> +    bool "Sets the secure_delete pragma on by default"
>> +    depends on BR2_PACKAGE_SQLITE
>> +    help
>> +      This compile-time option changes the default settings of the
>> +      secure_delete pragma. When this option is not used, secure_delete
>> +      defaults to off. When this option is present, secure_delete
>> defaults
>> +      to on.
>> +
>> +      The secure_delete setting causes deleted content to be
>> overwritten
>> +      with zeros. There is a small performance penalty for this since
>> +      additional I/O must occur. On the other hand, secure_delete can
>> +      prevent sensitive information from lingering in unused parts
>> +      of the database file after it has allegedly been deleted.
>> +      See the documentation on the
>> +      http://www.sqlite.org/pragma.html#pragma_secure_delete
>> +      for additional information.
>
>  Is this needed for firefox?  (Not that it matters, mind you.)
>

Yes. It is needed. Otherwise firefox starts barfing.

I cook a new patch later tomorrow for this based on your suggestions and
fixes.

Thanks!
Stefan
> [snip]
>
>  Regards,
>  Arnout

Patch

diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in
index 25aaa3f..75bce70 100644
--- a/package/sqlite/Config.in
+++ b/package/sqlite/Config.in
@@ -22,3 +22,37 @@  config BR2_PACKAGE_SQLITE_STAT3
 	  planner that can help SQLite to choose a better query plan under
 	  certain situations.
 
+config BR2_PACKAGE_SQLITE_ENABLE_FTS3
+	bool "Enables version 3 of the full-text search engine"
+	depends on BR2_PACKAGE_SQLITE
+	help
+	  When this option is defined in the amalgamation 
+	  (see http://www.sqlite.org/amalgamation.html), version 3 of
+	  the full-text search engine is added to the build automatically.
+
+config BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY
+	bool "Enables sqlite3_unlock_notify() interface"
+	depends on BR2_PACKAGE_SQLITE
+	help
+	  This option enables the sqlite3_unlock_notify() interface and its
+	  accosiated functionality. See the documentation 
+	  http://www.sqlite.org/unlock_notify.html for additional information.
+
+config BR2_PACKAGE_SQLITE_SECURE_DELETE
+	bool "Sets the secure_delete pragma on by default"
+	depends on BR2_PACKAGE_SQLITE
+	help
+	  This compile-time option changes the default settings of the
+	  secure_delete pragma. When this option is not used, secure_delete
+	  defaults to off. When this option is present, secure_delete defaults
+	  to on.
+
+	  The secure_delete setting causes deleted content to be overwritten
+	  with zeros. There is a small performance penalty for this since 
+	  additional I/O must occur. On the other hand, secure_delete can
+	  prevent sensitive information from lingering in unused parts 
+	  of the database file after it has allegedly been deleted.
+	  See the documentation on the 
+	  http://www.sqlite.org/pragma.html#pragma_secure_delete
+	  for additional information.
+
diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 7b5b4aa..0320cc4 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -21,6 +21,18 @@  ifeq ($(BR2_PACKAGE_SQLITE_STAT3),y)
 SQLITE_CFLAGS += -DSQLITE_ENABLE_STAT3
 endif
 
+ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_FTS3),y)
+SQLITE_CFLAGS += -DSQLITE_ENABLE_FTS3
+endif
+
+ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY),y)
+SQLITE_CFLAGS += -DSQLITE_ENABLE_UNLOCK_NOTIFY
+endif
+
+ifeq ($(BR2_PACKAGE_SQLITE_SECURE_DELETE),y)
+SQLITE_CFLAGS += -DSQLITE_SECURE_DELETE
+endif
+
 SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(SQLITE_CFLAGS)"
 
 SQLITE_CONF_OPT = \