Index: ports/pkg/nacl.patch |
diff --git a/ports/pkg/nacl.patch b/ports/pkg/nacl.patch |
index 5ff6274df35d7d9d651b32a9fd3b93cda432ff5c..f759a08882d12d7a450f2ceccf6c6e119f342cca 100644 |
--- a/ports/pkg/nacl.patch |
+++ b/ports/pkg/nacl.patch |
@@ -1496,7 +1496,7 @@ diff --git a/libpkg/private/pkg.h b/libpkg/private/pkg.h |
diff --git a/libpkg/private/utils.h b/libpkg/private/utils.h |
--- a/libpkg/private/utils.h |
+++ b/libpkg/private/utils.h |
-@@ -39,6 +39,10 @@ |
+@@ -39,11 +39,16 @@ |
#include <openssl/pem.h> |
#include <openssl/rsa.h> |
@@ -1507,6 +1507,14 @@ diff --git a/libpkg/private/utils.h b/libpkg/private/utils.h |
#define STARTS_WITH(string, needle) (strncasecmp(string, needle, strlen(needle)) == 0) |
#define ERROR_SQLITE(db, query) do { \ |
+- pkg_emit_error("sqlite error while executing %s in file %s:%d: %s", (query), \ |
+- __FILE__, __LINE__, sqlite3_errmsg(db)); \ |
++ pkg_emit_error("sqlite error executing %s on %s at %s:%d: %s", (query), \ |
++ sqlite3_db_filename(db, "main"), bsd_basename(__FILE__), __LINE__, \ |
++ sqlite3_errmsg(db)); \ |
+ } while(0) |
+ |
+ KHASH_MAP_INIT_INT(hardlinks, int) |
diff --git a/libpkg/repo/binary/fetch.c b/libpkg/repo/binary/fetch.c |
--- a/libpkg/repo/binary/fetch.c |
+++ b/libpkg/repo/binary/fetch.c |