Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › a7731a4
Add ip_version to the pkg -vv command
O2 Graphics committed 10 years ago
commit a7731a41d2521279f97f656f353cd85d1ec8db14
parent 1da35f0
4 files changed +16 -0
modified libpkg/libpkg.ver
@@ -124,6 +124,7 @@ global:
	pkg_repo_mirror_type;

	pkg_repo_name;

	pkg_repo_priority;
+ 
	pkg_repo_ip_version;

	pkg_repo_signature_type;

	pkg_repo_url;

	pkg_repos;
modified libpkg/pkg.h.in
@@ -1490,6 +1490,7 @@ signature_t pkg_repo_signature_type(struct pkg_repo *r);
bool pkg_repo_enabled(struct pkg_repo *r);

mirror_t pkg_repo_mirror_type(struct pkg_repo *r);

unsigned pkg_repo_priority(struct pkg_repo *r);
+ 
unsigned pkg_repo_ip_version(struct pkg_repo *r);

struct pkg_repo *pkg_repo_find(const char *name);



/**
modified libpkg/pkg_config.c
@@ -1333,6 +1333,17 @@ pkg_repo_priority(struct pkg_repo *r)
	return (r->priority);

}
+ 
unsigned int
+ 
pkg_repo_ip_version(struct pkg_repo *r)
+ 
{
+ 
	if ((r->flags & PKG_INIT_FLAG_USE_IPV4) == PKG_INIT_FLAG_USE_IPV4)
+ 
		return 4;
+ 
	else if ((r->flags & PKG_INIT_FLAG_USE_IPV6) == PKG_INIT_FLAG_USE_IPV6)
+ 
		return 6;
+ 
	else
+ 
		return 0;
+ 
}
+ 


/* Locate the repo by the file basename / database name */

struct pkg_repo *

pkg_repo_find(const char *reponame)
modified src/main.c
@@ -364,6 +364,9 @@ show_repository_info(void)
		if (pkg_repo_key(repo) != NULL)

			printf(",\n    %-16s: \"%s\"",

			    "pubkey", pkg_repo_key(repo));
+ 
		if (pkg_repo_ip_version(repo) != 0)
+ 
			printf(",\n    %-16s: %u",
+ 
				"ip_version", pkg_repo_ip_version(repo));

		printf("\n  }\n");

	}

}