8938697 Nuke PKG_INFOS from orbit (it's the only way to be sure.) — HardenedBSD-pkg

modified libpkg/pkg.c

@@ -53,7 +53,6 @@ static struct _fields {

 	[PKG_MAINTAINER] = {"maintainer", PKG_FILE|PKG_REMOTE|PKG_INSTALLED, 0},
 	[PKG_WWW] = {"www", PKG_FILE|PKG_REMOTE|PKG_INSTALLED, 0},
 	[PKG_PREFIX] = {"prefix", PKG_FILE|PKG_REMOTE|PKG_INSTALLED, 0},
 	[PKG_INFOS] = {"information", PKG_FILE|PKG_REMOTE|PKG_INSTALLED, 1},
 	[PKG_REPOPATH] = {"repopath", PKG_REMOTE, 0},
 	[PKG_CKSUM] = {"checksum", PKG_REMOTE, 0},
 	[PKG_OLD_VERSION] = {"oldversion", PKG_REMOTE, 1},

modified libpkg/pkg.h.in

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

  * Used by pkg_get() and pkg_set()
  */
 typedef enum {
 	PKG_ORIGIN = 1U,
 	PKG_ORIGIN = 0U,
 	PKG_NAME,
 	PKG_VERSION,
 	PKG_COMMENT,

@@ -207,7 +207,6 @@ typedef enum {

 	PKG_MAINTAINER,
 	PKG_WWW,
 	PKG_PREFIX,
 	PKG_INFOS,
 	PKG_REPOPATH,
 	PKG_CKSUM,
 	PKG_OLD_VERSION,

@@ -215,7 +214,7 @@ typedef enum {

 	PKG_REPOURL,
 	PKG_DIGEST,
 	PKG_REASON,
 	/* end of fields */
 	PKG_NUM_FIELDS, 	/* end of fields */
 	PKG_FLATSIZE = 64U,
 	PKG_OLD_FLATSIZE,
 	PKG_PKGSIZE,

modified libpkg/pkg_manifest.c

@@ -59,9 +59,11 @@

 #define PKG_SHLIBS_REQUIRED -12
 #define PKG_SHLIBS_PROVIDED -13
 #define PKG_ANNOTATIONS -14
 #define PKG_INFOS -15		/* Deprecated field: treat as an annotation for backwards compatibility */
 static int pkg_set_from_node(struct pkg *, yaml_node_t *, yaml_document_t *, int);
 static int pkg_set_size_from_node(struct pkg *, yaml_node_t *, yaml_document_t *, int);
 static int pkg_infos_from_node(struct pkg *, yaml_node_t *, yaml_document_t *, int);
 static int pkg_set_licenselogic_from_node(struct pkg *, yaml_node_t *, yaml_document_t *, int);
 static int pkg_set_deps_from_node(struct pkg *, yaml_node_t *, yaml_document_t *, const char *);
 static int pkg_set_files_from_node(struct pkg *, yaml_node_t *, yaml_document_t *, const char *);

@@ -90,7 +92,7 @@ static struct manifest_key {

 	{ "flatsize", PKG_FLATSIZE, YAML_SCALAR_NODE, pkg_set_size_from_node},
 	{ "groups", PKG_GROUPS, YAML_MAPPING_NODE, parse_mapping},
 	{ "groups", PKG_GROUPS, YAML_SEQUENCE_NODE, parse_sequence},
 	{ "infos", PKG_INFOS, YAML_SCALAR_NODE, pkg_set_from_node},
 	{ "infos", PKG_INFOS, YAML_SCALAR_NODE, pkg_infos_from_node}, /* Deprecated: treat as an annotation */
 	{ "licenselogic", -1, YAML_SCALAR_NODE, pkg_set_licenselogic_from_node},
 	{ "licenses", PKG_LICENSES, YAML_SEQUENCE_NODE, parse_sequence},
 	{ "maintainer", PKG_MAINTAINER, YAML_SCALAR_NODE, pkg_set_from_node},

@@ -274,6 +276,21 @@ pkg_set_from_node(struct pkg *pkg, yaml_node_t *val,

 }
 static int
 pkg_infos_from_node(struct pkg *pkg, yaml_node_t *val,
     __unused yaml_document_t *doc, __unused int attr)
 {
 	while (val->data.scalar.length > 0 &&
 	    val->data.scalar.value[val->data.scalar.length - 1] == '\n') {
 		val->data.scalar.value[val->data.scalar.length - 1] = '\0';
 		val->data.scalar.length--;
 	}
 	pkg_addannotation(pkg, "_INFOS_", val->data.scalar.value);
 	return (EPKG_OK);
 }
 static int
 pkg_set_size_from_node(struct pkg *pkg, yaml_node_t *val,
     __unused yaml_document_t *doc, int attr)
 {

@@ -951,7 +968,7 @@ emit_manifest(struct pkg *pkg, yaml_emitter_t *emitter, short flags)

 	int i;
 /*	int users = -1;
 	int groups = -1;*/
 	const char *comment, *desc, *infos, *message, *name, *pkgarch;
 	const char *comment, *desc, *message, *name, *pkgarch;
 	const char *pkgmaintainer, *pkgorigin, *prefix, *version, *www;
 	const char *repopath, *pkgsum;
 	const char *script_types = NULL;

@@ -973,7 +990,7 @@ emit_manifest(struct pkg *pkg, yaml_emitter_t *emitter, short flags)

 	    PKG_MAINTAINER, &pkgmaintainer, PKG_PREFIX, &prefix,
 	    PKG_LICENSE_LOGIC, &licenselogic, PKG_DESC, &desc,
 	    PKG_FLATSIZE, &flatsize, PKG_MESSAGE, &message,
 	    PKG_VERSION, &version, PKG_INFOS, &infos, PKG_REPOPATH, &repopath,
 	    PKG_VERSION, &version, PKG_REPOPATH, &repopath,
 	    PKG_CKSUM, &pkgsum, PKG_PKGSIZE, &pkgsize);
 	manifest_append_kv(mapping, "name", name, PLAIN);
 	manifest_append_kv(mapping, "version", version, PLAIN);

@@ -1134,11 +1151,6 @@ emit_manifest(struct pkg *pkg, yaml_emitter_t *emitter, short flags)

 			    LITERAL);
 		}
 	}
 	if (infos != NULL && *infos != '\0') {
 		urlencode(infos, &tmpsbuf);
 		manifest_append_kv(mapping, "message", sbuf_get(tmpsbuf),
 		    LITERAL);
 	}
 	if (message != NULL && *message != '\0') {
 		urlencode(message, &tmpsbuf);

modified libpkg/pkg_printf.c

@@ -127,9 +127,7 @@

  * f
  * g
  * h
  *
  * i  pkg          additional info
  *
  * i
  * j
  *
  * k  pkg          lock status

@@ -572,15 +570,6 @@ static const struct pkg_printf_fmt fmt[] = {

 		PP_ALL,
 		&format_description,
 	},
 	[PP_PKG_ADDITIONAL_INFO] =
 	{
 		'i',
 		'\0',
 		false,
 		true,
 		PP_ALL,
 		&format_add_info,
 	},
 	[PP_PKG_LOCK_STATUS] =
 	{
 		'k',

@@ -1487,19 +1476,6 @@ format_description(struct sbuf *sbuf, const void *data, struct percent_esc *p)

 }
 /*
  * %i -- Additional info. string. Accepts field-width, left-align
  */
 struct sbuf *
 format_add_info(struct sbuf *sbuf, const void *data, struct percent_esc *p)
 {
 	const struct pkg	*pkg = data;
 	const char		*info;
 	pkg_get(pkg, PKG_INFOS, &info);
 	return (string_val(sbuf, info, p));
 }
 /*
  * %k -- Locked flag. boolean.  Accepts field-width, left-align.
  * Standard form: 0, 1.  Alternate form1: no, yes.  Alternate form2:
  * false, true

modified libpkg/pkgdb.c

@@ -71,7 +71,7 @@

 */
 #define DB_SCHEMA_MAJOR	0
 #define DB_SCHEMA_MINOR	18
 #define DB_SCHEMA_MINOR	19
 #define DBVERSION (DB_SCHEMA_MAJOR * 1000 + DB_SCHEMA_MINOR)

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

 	{ "desc",	PKG_DESC },
 	{ "flatsize",	PKG_FLATSIZE },
 	{ "id",		PKG_ROWID },
 	{ "infos",	PKG_INFOS },
 	{ "licenselogic", PKG_LICENSE_LOGIC },
 	{ "locked",	PKG_LOCKED },
 	{ "maintainer",	PKG_MAINTAINER },

@@ -537,7 +536,6 @@ pkgdb_init(sqlite3 *sdb)

 		"automatic INTEGER NOT NULL,"
 		"locked INTEGER NOT NULL DEFAULT 0,"
 		"licenselogic INTEGER NOT NULL,"
 		"infos TEXT, "
 		"time INTEGER, "
 		"manifestdigest TEXT NULL, "
 		"pkg_format_version INTEGER"

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

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

@@ -1496,7 +1494,7 @@ pkgdb_query_which(struct pkgdb *db, const char *path, bool glob)

 	sqlite3_snprintf(sizeof(sql), sql,
 			"SELECT p.id, p.origin, p.name, p.version, p.comment, p.desc, "
 			"p.message, p.arch, p.maintainer, p.www, "
 			"p.prefix, p.flatsize, p.time, p.infos "
 			"p.prefix, p.flatsize, p.time "
 			"FROM packages AS p "
 			"LEFT JOIN files AS f ON p.id = f.package_id "
 			"WHERE f.path %s ?1 GROUP BY p.id;", glob ? "GLOB" : "=");

@@ -1518,7 +1516,7 @@ pkgdb_query_shlib_required(struct pkgdb *db, const char *shlib)

 	const char	 sql[] = ""
 		"SELECT p.id, p.origin, p.name, p.version, p.comment, p.desc, "
 			"p.message, p.arch, p.maintainer, p.www, "
 			"p.prefix, p.flatsize, p.time, p.infos "
 			"p.prefix, p.flatsize, p.time "
 			"FROM packages AS p, pkg_shlibs_required AS ps, shlibs AS s "
 			"WHERE p.id = ps.package_id "
 				"AND ps.shlib_id = s.id "

@@ -1543,7 +1541,7 @@ pkgdb_query_shlib_provided(struct pkgdb *db, const char *shlib)

 	const char	 sql[] = ""
 		"SELECT p.id, p.origin, p.name, p.version, p.comment, p.desc, "
 			"p.message, p.arch, p.maintainer, p.www, "
 			"p.prefix, p.flatsize, p.time, p.infos "
 			"p.prefix, p.flatsize, p.time "
 			"FROM packages AS p, pkg_shlibs_provided AS ps, shlibs AS s "
 			"WHERE p.id = ps.package_id "
 				"AND ps.shlib_id = s.id "

@@ -2099,10 +2097,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, infos, time) "
 			"licenselogic, mtree_id, time) "
 		"VALUES( ?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, "
 		"?13, (SELECT id FROM mtree WHERE content = ?14), ?15, NOW())",
 		"TTTTTTTTTTIIITT",
 		"?13, (SELECT id FROM mtree WHERE content = ?14), NOW())",
 		"TTTTTTTTTTIIIT",
 	},
 	[DEPS_UPDATE] = {
 		NULL,

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

 	int64_t			 package_id;
 	const char		*mtree, *origin, *name, *version, *name2;
 	const char		*version2, *comment, *desc, *message, *infos;
 	const char		*version2, *comment, *desc, *message;
 	const char		*arch, *maintainer, *www, *prefix;
 	bool			 automatic;

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

 		PKG_FLATSIZE,	&flatsize,
 		PKG_AUTOMATIC,	&automatic,
 		PKG_LICENSE_LOGIC, &licenselogic,
 		PKG_NAME,	&name,
 		PKG_INFOS,	&infos);
 		PKG_NAME,	&name);
 	/*
 	 * Insert mtree record

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

 	 */
 	ret = run_prstmt(PKG, origin, name, version, comment, desc, message,
 	    arch, maintainer, www, prefix, flatsize, (int64_t)automatic,
 	    (int64_t)licenselogic, mtree, infos);
 	    (int64_t)licenselogic, mtree);
 	if (ret != SQLITE_DONE) {
 		ERROR_SQLITE(s);
 		goto cleanup;

modified libpkg/private/db_upgrades.h

@@ -354,6 +354,54 @@ static struct db_upgrades {

 		"AND package_id = old.package_id; "
 	"END;"
 	},
 	{19,
 	"INSERT OR IGNORE INTO annotation(annotation) VALUES ('_INFOS_');"
 	"INSERT OR IGNORE INTO annotation(annotation) SELECT DISTINCT infos"
                 " FROM packages;"
 	"INSERT OR IGNORE INTO pkg_annotation(package_id, tag_id, value_id)"
                 " SELECT p.id, (SELECT annotation_id FROM annotation"
 	        "   WHERE annotation = '_INFOS_'), a.annotation_id"
 	        " FROM packages p JOIN annotation a"
 	        " ON (p.infos = a.annotation);"
         "DELETE FROM annotation WHERE "
                 "annotation_id NOT IN ( SELECT DISTINCT tag_id FROM "
 	        "   pkg_annotation) AND "
 	        "annotation_id NOT IN ( SELECT DISTINCT value_id FROM "
 	        "   pkg_annotation);"
         "ALTER TABLE packages RENAME TO oldpkgs;"
 	"CREATE TABLE packages ("
 		"id INTEGER PRIMARY KEY,"
 		"origin TEXT UNIQUE NOT NULL,"
 		"name TEXT NOT NULL,"
 		"version TEXT NOT NULL,"
 		"comment TEXT NOT NULL,"
 		"desc TEXT NOT NULL,"
 		"mtree_id INTEGER REFERENCES mtree(id) ON DELETE RESTRICT"
 			" ON UPDATE CASCADE,"
 		"message TEXT,"
 		"arch TEXT NOT NULL,"
 		"maintainer TEXT NOT NULL, "
 		"www TEXT,"
 		"prefix TEXT NOT NULL,"
 		"flatsize INTEGER NOT NULL,"
 		"automatic INTEGER NOT NULL,"
 		"locked INTEGER NOT NULL DEFAULT 0,"
 		"licenselogic INTEGER NOT NULL,"
 		"time INTEGER, "
 		"manifestdigest TEXT NULL, "
 		"pkg_format_version INTEGER"
 	");"
 	"INSERT INTO packages (id, origin, name, version, comment, desc, "
 		"mtree_id, message, arch, maintainer, www, prefix, flatsize, "
 		"automatic, locked, licenselogic, time, manifestdigest, "
 	        "pkg_format_version) "
 		"SELECT id, origin, name, version, comment, desc, "
 		"mtree_id, message, arch, maintainer, www, prefix, flatsize, "
 		"automatic, locked, licenselogic, time, manifestdigest, "
 	        "pkg_format_version "
 		"FROM oldpkgs;"
 	"DROP TABLE oldpkgs;"
 	},
 	/* Mark the end of the array */
 	{ -1, NULL }

modified libpkg/private/pkg.h

@@ -48,7 +48,6 @@

 #endif
 #include "private/utils.h"
 #define PKG_NUM_FIELDS 20
 #define PKG_NUM_SCRIPTS 8
 #if ARCHIVE_VERSION_NUMBER < 3000002

modified libpkg/private/pkg_printf.h

@@ -118,7 +118,6 @@ typedef enum _fmt_code_t {

 	PP_PKG_DEPENDENCY_VERSION,
 	PP_PKG_DEPENDENCIES,
 	PP_PKG_DESCRIPTION,
 	PP_PKG_ADDITIONAL_INFO,
 	PP_PKG_LOCK_STATUS,
 	PP_PKG_LICENSE_LOGIC,
 	PP_PKG_MAINTAINER,

@@ -197,7 +196,6 @@ _static struct sbuf *format_dependency_name(struct sbuf *, const void *, struct

 _static struct sbuf *format_dependency_origin(struct sbuf *, const void *, struct percent_esc *);
 _static struct sbuf *format_dependency_version(struct sbuf *, const void *, struct percent_esc *);
 _static struct sbuf *format_description(struct sbuf *, const void *, struct percent_esc *);
 _static struct sbuf *format_add_info(struct sbuf *, const void *, struct percent_esc *);
 _static struct sbuf *format_lock_status(struct sbuf *, const void *, struct percent_esc *);
 _static struct sbuf *format_license_logic(struct sbuf *, const void *, struct percent_esc *);
 _static struct sbuf *format_maintainer(struct sbuf *, const void *, struct percent_esc *);

modified tests/lib/pkg_printf_test.c

@@ -1391,7 +1391,6 @@ ATF_TC_BODY(format_code, tc)

 		{ "dv", PP_PKG, PP_PKG_DEPENDENCY_VERSION,  2, '\0', },
 		{ "d",  PP_PKG, PP_PKG_DEPENDENCIES,        1, '\0', },
 		{ "e",  PP_PKG, PP_PKG_DESCRIPTION,         1, '\0', },
 		{ "i",  PP_PKG, PP_PKG_ADDITIONAL_INFO,     1, '\0', },
 		{ "k",  PP_PKG, PP_PKG_LOCK_STATUS,         1, '\0', },
 		{ "l",  PP_PKG, PP_PKG_LICENSE_LOGIC,       1, '\0', },
 		{ "m",  PP_PKG, PP_PKG_MAINTAINER,          1, '\0', },

@@ -1451,7 +1450,6 @@ ATF_TC_BODY(format_code, tc)

 		{ "dv", PP_B, PP_UNKNOWN,                 0, 'd',  },
 		{ "d",  PP_B, PP_UNKNOWN,                 0, 'd',  },
 		{ "e",  PP_B, PP_PKG_DESCRIPTION,         1, '\0', },
 		{ "i",  PP_B, PP_PKG_ADDITIONAL_INFO,     1, '\0', },
 		{ "k",  PP_B, PP_PKG_LOCK_STATUS,         1, '\0', },
 		{ "l",  PP_B, PP_PKG_LICENSE_LOGIC,       1, '\0', },
 		{ "m",  PP_B, PP_PKG_MAINTAINER,          1, '\0', },

@@ -1511,7 +1509,6 @@ ATF_TC_BODY(format_code, tc)

 		{ "dv", PP_C, PP_UNKNOWN,                 0, 'd',  },
 		{ "d",  PP_C, PP_UNKNOWN,                 0, 'd',  },
 		{ "e",  PP_C, PP_PKG_DESCRIPTION,         1, '\0', },
 		{ "i",  PP_C, PP_PKG_ADDITIONAL_INFO,     1, '\0', },
 		{ "k",  PP_C, PP_PKG_LOCK_STATUS,         1, '\0', },
 		{ "l",  PP_C, PP_PKG_LICENSE_LOGIC,       1, '\0', },
 		{ "m",  PP_C, PP_PKG_MAINTAINER,          1, '\0', },

@@ -1571,7 +1568,6 @@ ATF_TC_BODY(format_code, tc)

 		{ "dv", PP_D, PP_UNKNOWN,                 0, 'd',  },
 		{ "d",  PP_D, PP_UNKNOWN,                 0, 'd',  },
 		{ "e",  PP_D, PP_PKG_DESCRIPTION,         1, '\0', },
 		{ "i",  PP_D, PP_PKG_ADDITIONAL_INFO,     1, '\0', },
 		{ "k",  PP_D, PP_PKG_LOCK_STATUS,         1, '\0', },
 		{ "l",  PP_D, PP_PKG_LICENSE_LOGIC,       1, '\0', },
 		{ "m",  PP_D, PP_PKG_MAINTAINER,          1, '\0', },

@@ -1631,7 +1627,6 @@ ATF_TC_BODY(format_code, tc)

 		{ "dv", PP_F, PP_UNKNOWN,                 0, 'd',  },
 		{ "d",  PP_F, PP_UNKNOWN,                 0, 'd',  },
 		{ "e",  PP_F, PP_PKG_DESCRIPTION,         1, '\0', },
 		{ "i",  PP_F, PP_PKG_ADDITIONAL_INFO,     1, '\0', },
 		{ "k",  PP_F, PP_PKG_LOCK_STATUS,         1, '\0', },
 		{ "l",  PP_F, PP_PKG_LICENSE_LOGIC,       1, '\0', },
 		{ "m",  PP_F, PP_PKG_MAINTAINER,          1, '\0', },

@@ -1691,7 +1686,6 @@ ATF_TC_BODY(format_code, tc)

 		{ "dv", PP_G, PP_UNKNOWN,                 0, 'd',  },
 		{ "d",  PP_G, PP_UNKNOWN,                 0, 'd',  },
 		{ "e",  PP_G, PP_PKG_DESCRIPTION,         1, '\0', },
 		{ "i",  PP_G, PP_PKG_ADDITIONAL_INFO,     1, '\0', },
 		{ "k",  PP_G, PP_PKG_LOCK_STATUS,         1, '\0', },
 		{ "l",  PP_G, PP_PKG_LICENSE_LOGIC,       1, '\0', },
 		{ "m",  PP_G, PP_PKG_MAINTAINER,          1, '\0', },

@@ -1751,7 +1745,6 @@ ATF_TC_BODY(format_code, tc)

 		{ "dv", PP_L, PP_UNKNOWN,                 0, 'd',  },
 		{ "d",  PP_L, PP_UNKNOWN,                 0, 'd',  },
 		{ "e",  PP_L, PP_PKG_DESCRIPTION,         1, '\0', },
 		{ "i",  PP_L, PP_PKG_ADDITIONAL_INFO,     1, '\0', },
 		{ "k",  PP_L, PP_PKG_LOCK_STATUS,         1, '\0', },
 		{ "l",  PP_L, PP_PKG_LICENSE_LOGIC,       1, '\0', },
 		{ "m",  PP_L, PP_PKG_MAINTAINER,          1, '\0', },

@@ -1811,7 +1804,6 @@ ATF_TC_BODY(format_code, tc)

 		{ "dv", PP_O, PP_UNKNOWN,                 0, 'd',  },
 		{ "d",  PP_O, PP_UNKNOWN,                 0, 'd',  },
 		{ "e",  PP_O, PP_PKG_DESCRIPTION,         1, '\0', },
 		{ "i",  PP_O, PP_PKG_ADDITIONAL_INFO,     1, '\0', },
 		{ "k",  PP_O, PP_PKG_LOCK_STATUS,         1, '\0', },
 		{ "l",  PP_O, PP_PKG_LICENSE_LOGIC,       1, '\0', },
 		{ "m",  PP_O, PP_PKG_MAINTAINER,          1, '\0', },

@@ -1871,7 +1863,6 @@ ATF_TC_BODY(format_code, tc)

 		{ "dv", PP_U, PP_UNKNOWN,                 0, 'd',  },
 		{ "d",  PP_U, PP_UNKNOWN,                 0, 'd',  },
 		{ "e",  PP_U, PP_PKG_DESCRIPTION,         1, '\0', },
 		{ "i",  PP_U, PP_PKG_ADDITIONAL_INFO,     1, '\0', },
 		{ "k",  PP_U, PP_PKG_LOCK_STATUS,         1, '\0', },
 		{ "l",  PP_U, PP_PKG_LICENSE_LOGIC,       1, '\0', },
 		{ "m",  PP_U, PP_PKG_MAINTAINER,          1, '\0', },

@@ -1931,7 +1922,6 @@ ATF_TC_BODY(format_code, tc)

 		{ "dv", PP_b, PP_UNKNOWN,                 0, 'd',  },
 		{ "d",  PP_b, PP_UNKNOWN,                 0, 'd',  },
 		{ "e",  PP_b, PP_PKG_DESCRIPTION,         1, '\0', },
 		{ "i",  PP_b, PP_PKG_ADDITIONAL_INFO,     1, '\0', },
 		{ "k",  PP_b, PP_PKG_LOCK_STATUS,         1, '\0', },
 		{ "l",  PP_b, PP_PKG_LICENSE_LOGIC,       1, '\0', },
 		{ "m",  PP_b, PP_PKG_MAINTAINER,          1, '\0', },

@@ -1992,7 +1982,6 @@ ATF_TC_BODY(format_code, tc)

 		{ "dv", PP_d, PP_PKG_DEPENDENCY_VERSION,  2, '\0', },
 		{ "d",  PP_d, PP_UNKNOWN,                 0, 'd',  },
 		{ "e",  PP_d, PP_PKG_DESCRIPTION,         1, '\0', },
 		{ "i",  PP_d, PP_PKG_ADDITIONAL_INFO,     1, '\0', },
 		{ "k",  PP_d, PP_PKG_LOCK_STATUS,         1, '\0', },
 		{ "l",  PP_d, PP_PKG_LICENSE_LOGIC,       1, '\0', },
 		{ "m",  PP_d, PP_PKG_MAINTAINER,          1, '\0', },

@@ -2052,7 +2041,6 @@ ATF_TC_BODY(format_code, tc)

 		{ "dv", PP_r, PP_UNKNOWN,                 0, 'd',  },
 		{ "d",  PP_r, PP_UNKNOWN,                 0, 'd',  },
 		{ "e",  PP_r, PP_PKG_DESCRIPTION,         1, '\0', },
 		{ "i",  PP_r, PP_PKG_ADDITIONAL_INFO,     1, '\0', },
 		{ "k",  PP_r, PP_PKG_LOCK_STATUS,         1, '\0', },
 		{ "l",  PP_r, PP_PKG_LICENSE_LOGIC,       1, '\0', },
 		{ "m",  PP_r, PP_PKG_MAINTAINER,          1, '\0', },