Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › f1cd65a
Merge remote-tracking branch 'upstream/master'
Shawn Webb committed 2 years ago
commit f1cd65a4e5307fea329134d5f28bfbaff6326693
parent 29f999c
2 files changed +8 -8
modified libpkg/backup.c
@@ -101,10 +101,8 @@ copy_database(sqlite3 *src, sqlite3 *dst)
	sqlite3_exec(dst, "PRAGMA main.locking_mode=NORMAL;"

			   "BEGIN IMMEDIATE;COMMIT;", NULL, NULL, &errmsg);
- 
	if (ret != SQLITE_OK)
- 
		goto out_error;
-
- 
	return ret;
+ 
	if (ret == SQLITE_OK)
+ 
		return (EPKG_OK);



out_error:

	pkg_emit_error("sqlite error -- %s", errmsg);
@@ -145,7 +143,7 @@ pkgdb_dump(struct pkgdb *db, const char *dest)
	ctx.pkg_dbdirfd = savedfd;

	close(savedfd);
- 
	return (ret == SQLITE_OK? EPKG_OK : EPKG_FATAL);
+ 
	return (ret);

}



int
@@ -154,9 +152,8 @@ pkgdb_load(struct pkgdb *db, const char *src)
	sqlite3	*restore;

	int	 ret;
- 
	if (eaccess(src, R_OK)) {
+ 
	if (eaccess(src, R_OK))

		pkg_fatal_errno("Unable to access '%s'", src);
- 
	}



	ret = sqlite3_open(src, &restore);
@@ -171,5 +168,5 @@ pkgdb_load(struct pkgdb *db, const char *src)


	sqlite3_close(restore);
- 
	return (ret == SQLITE_OK? EPKG_OK : EPKG_FATAL);
+ 
	return (ret);

}
modified libpkg/fetch_libcurl.c
@@ -367,6 +367,7 @@ curl_fetch(struct pkg_repo *repo, int dest, struct fetch_item *fi)
	const char *sslkey = getenv("SSL_CLIENT_KEY_FILE");

	const char *sslcert = getenv("SSL_CLIENT_CERT_FILE");

	const char *ssl_ca_cert_file = getenv("SSL_CA_CERT_FILE");
+ 
	const char *ssl_ca_cert_path = getenv("SSL_CA_CERT_PATH");

	const char *netrc_file = getenv("NETRC");



	struct curl_repodata *cr = (struct curl_repodata *)repo->fetch_priv;
@@ -458,6 +459,8 @@ retry:
		curl_easy_setopt(cl, CURLOPT_SSLCERT, sslcert);

	if (ssl_ca_cert_file != NULL)

		curl_easy_setopt(cl, CURLOPT_CAINFO, ssl_ca_cert_file);
+ 
	if (ssl_ca_cert_path != NULL)
+ 
		curl_easy_setopt(cl, CURLOPT_CAPATH, ssl_ca_cert_path);

	if (netrc_file != NULL)

		curl_easy_setopt(cl, CURLOPT_NETRC_FILE, netrc_file);

	curl_easy_setopt(cl, CURLOPT_NETRC, 1L);