aa54fda Merge branch 'master' into repo-with-older-versions — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Merge branch 'master' into repo-with-older-versions

Matthew Seaman committed 13 years ago

commit aa54fdaf538fd799202bb179b37aa1343c274c5b
parent 7962142

3 files changed +5 -10

modified Doxyfile

@@ -31,7 +31,7 @@ PROJECT_NAME = libpkg

 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 PROJECT_NUMBER         = 1.0-beta16
 PROJECT_NUMBER         = 1.0-beta17
 # Using the PROJECT_BRIEF tag one can provide an optional one line description for a project that appears at the top of each page and should give viewer a quick idea about the purpose of the project. Keep the description short.

modified libpkg/pkg.h

@@ -37,10 +37,10 @@

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

modified libpkg/pkgdb.c

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

 			"mtree_id, infos, 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",
 		"TTTTTTTTTTIIITT",
 	},
 	[DEPS_UPDATE] = {
 		NULL,

@@ -1688,9 +1688,6 @@ run_prstmt(sql_prstmt_index s, ...)

 		case 'I':
 			sqlite3_bind_int64(stmt, i + 1, va_arg(ap, int64_t));
 			break;
 		case 'i':
 			sqlite3_bind_int(stmt, i + 1, va_arg(ap, int));
 			break;
 		}
 	}

@@ -1744,9 +1741,7 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)

 	const char *comment, *desc, *message, *infos;
 	const char *arch, *maintainer, *www, *prefix;
 	bool automatic;
 	int64_t flatsize;
 	lic_t licenselogic;
 	int64_t automatic, flatsize, licenselogic;
 	assert(db != NULL);