f9d4054 Merge remote branch 'pkgng/master' — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Merge remote branch 'pkgng/master'

Will Andrews committed 14 years ago

commit f9d4054d5b495f418856065f645be8e1e4d3ad5e
parent 4582318

2 files changed +5 -3

modified libpkg/pkg_ports.c

@@ -53,9 +53,11 @@ ports_parse_plist(struct pkg *pkg, char *plist)

 	for (i = 0; i <= nbel; i++) {
 		if (plist_p[0] == '@') {
 			if (STARTS_WITH(plist_p, "@cwd ")) {
 			if (STARTS_WITH(plist_p, "@cwd")) {
 				buf = plist_p;
 				buf += 5;
 				buf += 4;
 				while (isspace(buf[0]))
 					buf++;
 				/* with no arguments default to the original
 				 * prefix */
 				if (buf[0] == '\0')

modified pkg/register.c

@@ -156,7 +156,7 @@ exec_register(int argc, char **argv)

 	/* if www is not given then try to determine it from description */
 	if (www == NULL) {
 		desc = pkg_get(pkg, PKG_DESC);
 		regcomp(&preg, "^WWW:[:space:]*(.*)$", REG_EXTENDED|REG_ICASE|REG_NEWLINE);
 		regcomp(&preg, "^WWW:[[:space:]]*(.*)$", REG_EXTENDED|REG_ICASE|REG_NEWLINE);
 		if (regexec(&preg, desc, 2, pmatch, 0) == 0) {
 			size = pmatch[1].rm_eo - pmatch[1].rm_so;
 			www = strndup(&desc[pmatch[1].rm_so], size);