8ab7285 Rename precious to vital on suggestion from wblock@ — HardenedBSD-pkg

modified libpkg/pkg.c

@@ -279,8 +279,8 @@ pkg_vget(const struct pkg * restrict pkg, va_list ap)

 		case PKG_DEP_FORMULA:
 			*va_arg(ap, const char **) = pkg->dep_formula;
 			break;
 		case PKG_PRECIOUS:
 			*va_arg(ap, bool *) = pkg->precious;
 		case PKG_VITAL:
 			*va_arg(ap, bool *) = pkg->vital;
 			break;
 		}
 	}

@@ -433,8 +433,8 @@ pkg_vset(struct pkg *pkg, va_list ap)

 			free(pkg->dep_formula);
 			pkg->dep_formula = strdup(va_arg(ap, const char *));
 			break;
 		case PKG_PRECIOUS:
 			pkg->precious = (bool)va_arg(ap, int);
 		case PKG_VITAL:
 			pkg->vital = (bool)va_arg(ap, int);
 			break;
 		}
 	}

modified libpkg/pkg.h.in

@@ -281,7 +281,7 @@ typedef enum {

 	PKG_UNIQUEID,
 	PKG_OLD_DIGEST,
 	PKG_DEP_FORMULA,
 	PKG_PRECIOUS,
 	PKG_VITAL,
 	PKG_NUM_FIELDS,		/* end of fields */
 } pkg_attr;

@@ -493,9 +493,9 @@ typedef enum {

 	 */
 	EPKG_NOTINSTALLED,
 	/**
 	 * Can not delete the package because it is precious
 	 * Can not delete the package because it is vital, i.e. a kernel
 	 */
 	EPKG_PRECIOUS
 	EPKG_VITAL
 } pkg_error_t;
 /**

modified libpkg/pkg_jobs.c

@@ -1995,8 +1995,8 @@ pkg_jobs_execute(struct pkg_jobs *j)

 		case PKG_SOLVED_DELETE:
 		case PKG_SOLVED_UPGRADE_REMOVE:
 			p = ps->items[0]->pkg;
 			if (ps->type == PKG_SOLVED_DELETE && p->precious == 1) {
 				pkg_emit_error("Cannot delete precious pkgs!");
 			if (ps->type == PKG_SOLVED_DELETE && p->vital == 1) {
 				pkg_emit_error("Cannot delete vital pkgs!");
 				continue;
 			}
 			if (ps->type == PKG_SOLVED_DELETE &&

modified libpkg/pkg_manifest.c

@@ -165,9 +165,6 @@ static struct pkg_manifest_key {

 	{ "path",                offsetof(struct pkg, repopath),
 			TYPE_SHIFT(UCL_STRING), pkg_string},
 	{ "precious",            offsetof(struct pkg, precious),
 			TYPE_SHIFT(UCL_INT),    pkg_int},
 	{ "repopath",            offsetof(struct pkg, repopath),
 			TYPE_SHIFT(UCL_STRING), pkg_string},

@@ -204,6 +201,9 @@ static struct pkg_manifest_key {

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

modified libpkg/pkgdb.c

@@ -397,7 +397,7 @@ pkgdb_init(sqlite3 *sdb)

 		"manifestdigest TEXT NULL, "
 		"pkg_format_version INTEGER,"
 		"dep_formula TEXT NULL"
 		",precious INTEGER NOT NULL DEFAULT 0"
 		",vital INTEGER NOT NULL DEFAULT 0"
 	");"
 	"CREATE UNIQUE INDEX packages_unique ON packages(name);"
 	"CREATE TABLE mtree ("

@@ -1361,7 +1361,7 @@ static sql_prstmt sql_prepared_statements[PRSTMT_LAST] = {

 			"origin, name, version, comment, desc, message, arch, "
 			"maintainer, www, prefix, flatsize, automatic, "
 			"licenselogic, mtree_id, time, manifestdigest, dep_formula, "
 			"precious) "
 			"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, ?17)",
 		"TTTTTTTTTTIIITTTI",

modified libpkg/pkgdb_iterator.c

@@ -92,7 +92,6 @@ static struct column_mapping {

 	{ "oldversion",	PKG_OLD_VERSION, PKG_SQLITE_STRING },
 	{ "origin",	PKG_ORIGIN, PKG_SQLITE_STRING },
 	{ "pkgsize",	PKG_PKGSIZE, PKG_SQLITE_INT64 },
 	{ "precious",	PKG_PRECIOUS, PKG_SQLITE_BOOL },
 	{ "prefix",	PKG_PREFIX, PKG_SQLITE_STRING },
 	{ "repopath",	PKG_REPOPATH, PKG_SQLITE_STRING },
 	{ "repourl",	PKG_REPOURL, PKG_SQLITE_STRING },

@@ -100,6 +99,7 @@ static struct column_mapping {

 	{ "time",	PKG_TIME, PKG_SQLITE_INT64 },
 	{ "uniqueid",	PKG_UNIQUEID, PKG_SQLITE_STRING },
 	{ "version",	PKG_VERSION, PKG_SQLITE_STRING },
 	{ "vital",	PKG_VITAL, PKG_SQLITE_BOOL },
 	{ "weight",	-1, PKG_SQLITE_INT64 },
 	{ "www",	PKG_WWW, PKG_SQLITE_STRING },
 	{ NULL,		-1, PKG_SQLITE_STRING }

@@ -897,8 +897,8 @@ populate_pkg(sqlite3_stmt *stmt, struct pkg *pkg) {

 			case PKG_PKGSIZE:
 				pkg->pkgsize = sqlite3_column_int64(stmt, icol);
 				break;
 			case PKG_PRECIOUS:
 				pkg->precious = (bool)sqlite3_column_int64(stmt, icol);
 			case PKG_VITAL:
 				pkg->vital = (bool)sqlite3_column_int64(stmt, icol);
 				break;
 			case PKG_TIME:
 				pkg->timestamp = sqlite3_column_int64(stmt, icol);

modified libpkg/pkgdb_query.c

@@ -155,7 +155,7 @@ pkgdb_query(struct pkgdb *db, const char *pattern, match_t match)

 				"version, comment, desc, "
 				"message, arch, maintainer, www, "
 				"prefix, flatsize, licenselogic, automatic, "
 				"locked, time, manifestdigest, precious "
 				"locked, time, manifestdigest, vital "
 			"FROM packages AS p%s "
 			"ORDER BY p.name;", comp);

modified libpkg/private/db_upgrades.h

@@ -672,7 +672,7 @@ static struct db_upgrades {

 	"ALTER TABLE packages ADD COLUMN dep_formula TEXT NULL;"
 	},
 	{33,
 	"ALTER TABLE packages ADD COLUMN precious INTEGER NOT NULL DEFAULT 0;"
 	"ALTER TABLE packages ADD COLUMN vital INTEGER NOT NULL DEFAULT 0;"
 	},
 	/* Mark the end of the array */
 	{ -1, NULL }

modified libpkg/private/pkg.h

@@ -213,7 +213,7 @@ struct pkg {

 	bool		 direct;
 	bool		 locked;
 	bool		 automatic;
 	bool		 precious;
 	bool		 vital;
 	int64_t		 id;
 	struct sbuf	*scripts[PKG_NUM_SCRIPTS];
 	char			*name;

modified libpkg/repo/binary/binary_private.h

@@ -371,9 +371,9 @@ static const struct repo_changes repo_upgrades[] = {

 	},
 	{2012,
 ,
 	 "Add precious field",
 	 "Add vital field",
 	 "ALTER TABLE packages ADD COLUMN precious INTEGER NOT NULL DEFAULT 0;"
 	 "ALTER TABLE packages ADD COLUMN vital INTEGER NOT NULL DEFAULT 0;"
 	},
 	/* Mark the end of the array */
 	{ -1, -1, NULL, NULL, }

@@ -385,7 +385,7 @@ static const struct repo_changes repo_upgrades[] = {

 static const struct repo_changes repo_downgrades[] = {
 	{2013,
 ,
 	 "Drop precious column",
 	 "Drop vital column",
 	 "ALTER TABLE packages RENAME TO packages_old;"
 	 "CREATE TABLE packages ("