8c7f302 Fix pkg-static upgrading/installing pkg from remote — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix pkg-static upgrading/installing pkg from remote

Bryan Drewery committed 14 years ago

commit 8c7f30270ec5d7b8bb65b39b7b7887df5ffcbf24
parent 49c78c0

3 files changed +10 -4

modified libpkg/pkg.h

@@ -37,6 +37,11 @@

 #include <sys/sbuf.h>
 #include <openssl/pem.h>
 #define PKGVERSION "1.0-beta12"
 /* PORTVERSION equivalent for proper pkg-static->ports-mgmt/pkg version comparison
  * in pkgdb_query_newpkgversion() */
 #define PKG_PORTVERSION "1.0.b12"
 struct pkg;
 struct pkg_dep;
 struct pkg_file;

modified libpkg/pkgdb.c

@@ -2285,8 +2285,9 @@ pkgdb_query_newpkgversion(struct pkgdb *db, const char *repo)

 			"version, flatsize, cksum, repopath, automatic) "
 			"SELECT p.id, p.origin, p.name, p.version as newversion, p.comment, p.desc, "
 			"p.arch, p.maintainer, p.www, p.prefix, p.flatsize as newflatsize, p.pkgsize, "
 			"l.version as version, l.flatsize as flatsize, "
 			"p.cksum, p.path, 0 FROM '%s'.packages as p, packages as l WHERE p.origin='ports-mgmt/pkg' AND l.origin='ports-mgmt/pkg';";
 			/* If not installed from a port, insert the running version in */
 			"COALESCE(l.version, '" PKG_PORTVERSION "') as version, COALESCE(l.flatsize, p.flatsize) as flatsize, "
 			"p.cksum, p.path, 0 FROM '%s'.packages as p LEFT JOIN packages as l ON p.origin = l.origin WHERE p.origin='ports-mgmt/pkg';";
 	assert(db != NULL);
 	assert(db->type == PKGDB_REMOTE);

@@ -2302,7 +2303,8 @@ pkgdb_query_newpkgversion(struct pkgdb *db, const char *repo)

 	sbuf_finish(sql);
 	sql_exec(db->sqlite, sbuf_get(sql));
 	sql_exec(db->sqlite, "DELETE FROM pkgjobs WHERE PKGLT(version, newversion) OR version == newversion;");
 	/* Delete where the current version is higher than the remote version */
 	sql_exec(db->sqlite, "DELETE FROM pkgjobs WHERE PKGGT(version, newversion) OR version == newversion;");
 	if (sqlite3_changes(db->sqlite) > 0) {
 		sbuf_delete(sql);

modified pkg/main.c

@@ -44,7 +44,6 @@

 #include "pkgcli.h"
 #define PKGVERSION "1.0-beta12"
 #ifndef GITHASH
 #define GITHASH ""
 #endif