ec30257 - Fix a the vital type in the manifest - Chase a few more prepared statements missing vital — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

- Fix a the vital type in the manifest - Chase a few more prepared statements missing vital

Brad Davis committed 10 years ago

commit ec30257f72a907fd3a34383cd0eefc67be32ec7e
parent ba6202d

4 files changed +11 -10

modified libpkg/pkg_manifest.c

@@ -202,7 +202,7 @@ static struct pkg_manifest_key {

 			TYPE_SHIFT(UCL_STRING)|TYPE_SHIFT(UCL_INT), pkg_string},
 	{ "vital",            offsetof(struct pkg, vital),
 			TYPE_SHIFT(UCL_INT),    pkg_int},
 			TYPE_SHIFT(UCL_BOOLEAN),    pkg_int},
 	{ "www",                 offsetof(struct pkg, www),
 			TYPE_SHIFT(UCL_STRING), pkg_string},

modified libpkg/pkgdb.c

@@ -1360,10 +1360,10 @@ static sql_prstmt sql_prepared_statements[PRSTMT_LAST] = {

 		"INSERT OR REPLACE INTO packages( "
 			"origin, name, version, comment, desc, message, arch, "
 			"maintainer, www, prefix, flatsize, automatic, "
 			"licenselogic, mtree_id, time, manifestdigest, dep_formula)"
 			"licenselogic, mtree_id, time, manifestdigest, dep_formula, vital)"
 		"VALUES( ?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, "
 		"?13, (SELECT id FROM mtree WHERE content = ?14), NOW(), ?15, ?16 )",
 		"TTTTTTTTTTIIITTT",
 		"?13, (SELECT id FROM mtree WHERE content = ?14), NOW(), ?15, ?16, ?17 )",
 		"TTTTTTTTTTIIITTTI",
 	},
 	[DEPS_UPDATE] = {
 		NULL,

@@ -1701,7 +1701,7 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete, int forced)

 	ret = run_prstmt(PKG, pkg->origin, pkg->name, pkg->version,
 	    pkg->comment, pkg->desc, msg, arch, pkg->maintainer,
 	    pkg->www, pkg->prefix, pkg->flatsize, (int64_t)pkg->automatic,
 	    (int64_t)pkg->licenselogic, NULL, pkg->digest, pkg->dep_formula);
 	    (int64_t)pkg->licenselogic, NULL, pkg->digest, pkg->dep_formula, (int64_t)pkg->vital);
 	if (ret != SQLITE_DONE) {
 		ERROR_SQLITE(s, SQL(PKG));
 		goto cleanup;

modified libpkg/repo/binary/binary_private.h

@@ -50,7 +50,8 @@ static const char binary_repo_initsql[] = ""

 	    "pkg_format_version INTEGER,"
 	    "manifestdigest TEXT NULL,"
 	    "olddigest TEXT NULL,"
 	    "dep_formula TEXT NULL"
 	    "dep_formula TEXT NULL,"
 	    "vital INTEGER NOT NULL DEFAULT 0"
 	");"
 	"CREATE TABLE deps ("
 	    "origin TEXT,"

modified libpkg/repo/binary/common.c

@@ -40,10 +40,10 @@ static sql_prstmt sql_prepared_statements[PRSTMT_LAST] = {

 		NULL,
 		"INSERT OR REPLACE INTO packages ("
 		"origin, name, version, comment, desc, arch, maintainer, www, "
 		"prefix, pkgsize, flatsize, licenselogic, cksum, path, manifestdigest, olddigest"
 		")"
 		"VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16)",
 		"TTTTTTTTTIIITTTT",
 		"prefix, pkgsize, flatsize, licenselogic, cksum, path, manifestdigest, olddigest, "
 		"vital)"
 		"VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16, ?17)",
 		"TTTTTTTTTIIITTTTI",
 	},
 	[DEPS] = {
 		NULL,