Merge from bittboy/buildroot@db180c0

package/sqlcipher/Config.in

@@ -0,0 +1,38 @@
+config BR2_PACKAGE_SQLCIPHER
+	bool "sqlcipher"
+	depends on !BR2_PACKAGE_SQLITE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
+	help
+	  SQLCipher is an SQLite extension that provides 256 bits AES
+	  encryption of database files. Note that it is a fork of
+	  SQLite and they cannot be installed side-by-side.
+
+	  http://sqlcipher.net
+
+if BR2_PACKAGE_SQLCIPHER
+
+config BR2_PACKAGE_SQLCIPHER_READLINE
+	bool "Command-line editing"
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_READLINE
+	help
+	  Enable command-line editing. This requires ncurses and
+	  readline.
+
+config BR2_PACKAGE_SQLCIPHER_STAT3
+	bool "Additional query optimizations (stat3)"
+	help
+	  Adds additional logic to the ANALYZE command and to the
+	  query planner that can help SQLite to choose a better query
+	  plan under certain situations.
+
+endif
+
+comment "sqlcipher conflicts with sqlite"
+	depends on BR2_PACKAGE_SQLITE
+
+comment "sqlcipher needs a toolchain w/ threads"
+	depends on !BR2_PACKAGE_SQLITE
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

package/sqlcipher/sqlcipher.hash

@@ -0,0 +1,3 @@
+# locally computed
+sha256  2f803017378c7479cb791be59b7bad8392a15acddbcc094e4433581fe421f4ca  sqlcipher-4.0.1.tar.gz
+sha256  3eee3c7964a9becc94d747bd36703d31fc86eb994680b06a61bfd4f2661eaac8  LICENSE

package/sqlcipher/sqlcipher.mk

@@ -0,0 +1,42 @@
+################################################################################
+#
+# sqlcipher
+#
+################################################################################
+
+SQLCIPHER_VERSION = 4.0.1
+SQLCIPHER_SITE = $(call github,sqlcipher,sqlcipher,v$(SQLCIPHER_VERSION))
+SQLCIPHER_LICENSE = BSD-3-Clause
+SQLCIPHER_LICENSE_FILES = LICENSE
+SQLCIPHER_DEPENDENCIES = host-pkgconf openssl host-tcl
+SQLCIPHER_INSTALL_STAGING = YES
+
+SQLCIPHER_CONF_ENV = \
+	CFLAGS="$(TARGET_CFLAGS) $(SQLCIPHER_CFLAGS)" \
+	TCLSH_CMD=$(HOST_DIR)/bin/tclsh$(TCL_VERSION_MAJOR)
+
+SQLCIPHER_CONF_OPTS = \
+	--enable-threadsafe \
+	--disable-tcl
+
+SQLCIPHER_CFLAGS += -DSQLITE_HAS_CODEC # Required according to the README
+SQLCIPHER_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
+
+ifeq ($(BR2_PACKAGE_SQLCIPHER_STAT3),y)
+SQLCIPHER_CFLAGS += -DSQLITE_ENABLE_STAT3
+endif
+
+ifeq ($(BR2_PACKAGE_SQLCIPHER_READLINE),y)
+SQLCIPHER_DEPENDENCIES += ncurses readline
+SQLCIPHER_CONF_OPTS += --with-readline-inc="-I$(STAGING_DIR)/usr/include"
+else
+SQLCIPHER_CONF_OPTS += --disable-readline
+endif
+
+ifeq ($(BR2_STATIC_LIBS),y)
+SQLCIPHER_CONF_OPTS += --disable-load-extension
+else
+SQLCIPHER_CONF_OPTS += --enable-load-extension
+endif
+
+$(eval $(autotools-package))