66132ee fix categories — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

fix categories

Baptiste Daroussin committed 14 years ago

commit 66132ee597ab43fb54ec33e3e8e86170611fdf3c
parent c3e5e00

3 files changed +7 -1

modified libpkg/pkg_manifest.c

@@ -48,6 +48,7 @@ static struct manifest_key {

 	{ "desc", PKG_DESC },
 	{ "scripts", PKG_SCRIPTS},
 	{ "message", PKG_MESSAGE},
 	{ "categories", PKG_CATEGORIES},
 };
 #define manifest_key_len (int)(sizeof(manifest_key)/sizeof(manifest_key[0]))

modified libpkg/pkgdb.c

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

 			" ON UPDATE RESTRICT, "
 		"PRIMARY KEY (package_id, category_id)"
 	");"
 	"CREATE VIEW pkg_categories AS SELECT origin, path FROM packages "
 	"CREATE VIEW pkg_categories AS SELECT origin, categories.name FROM packages "
 	"INNER JOIN pkg_categories_assoc ON packages.id = pkg_categories_assoc.package_id "
 	"INNER JOIN categories ON pkg_categories_assoc.category_id = categories.id;"
 	"CREATE TRIGGER category_insert INSTEAD OF INSERT ON pkg_categories "

modified ports/pkg2ng

@@ -18,6 +18,7 @@ do

 	ORIGIN=$(pkg_info -qo ${PKG})
 	PREFX=$(pkg_info -qp ${PKG})
 	MAINTAINER=$( make -C /usr/ports/${ORIGIN} -V MAINTAINER )
 	CATEGORIES=$( make -C /usr/ports/${ORIGIN} -V CATEGORIES )
 	# +CONTENTS
 	MDIR=$(mktemp -d /tmp/pkg2ngXXXXX)
 	test -f ${DB}/+DISPLAY && cp -f ${DB}/+DISPLAY ${MDIR}

@@ -42,6 +43,10 @@ do

 	egrep -v "^@(name|pkgdep|ignore|conflicts|display)" ${DB}/+CONTENTS >> ${PLIST}
 	echo "conflicts:" >> ${MANIFEST}
 	awk '/^@conflicts/ { print "- "$2 }' ${DB}/+CONTENTS >> ${MANIFEST}
 	echo "categories:" >> ${MANIFEST}
 	for cat in ${CATEGORIES}; do
 		echo "- $cat" >> ${MANIFEST}
 	done
 	OPTIONS=""