583b081 Now WWW is set to UNKNOWN at registration time if not provided maintainer is mandatory — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Now WWW is set to UNKNOWN at registration time if not provided maintainer is mandatory

Baptiste Daroussin committed 15 years ago

commit 583b0819f07d6d98911f80b62784dacc4c4caa26
parent 5acf965

2 files changed +5 -4

modified libpkg/pkg_manifest.c

@@ -328,8 +328,8 @@ pkg_emit_manifest(struct pkg *pkg, char **dest)

 			pkg_get(pkg, PKG_COMMENT),
 			pkg_get(pkg, PKG_ARCH),
 			pkg_get(pkg, PKG_OSVERSION),
 			pkg_get(pkg, PKG_WWW) ? pkg_get(pkg, PKG_WWW) : "UNKNOWN",
 			pkg_get(pkg, PKG_MAINTAINER) ? pkg_get(pkg, PKG_MAINTAINER) : "UNKNOWN",
 			pkg_get(pkg, PKG_WWW),
 			pkg_get(pkg, PKG_MAINTAINER),
 			pkg_get(pkg, PKG_PREFIX),
 			pkg_flatsize(pkg)
 			);

modified pkg/register.c

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

 				arch = strdup(optarg);
 				break;
 			case 'r': /* responsible */
 				pkg_set(pkg, PKG_MAINTAINER, optarg);
 				ret += pkg_set(pkg, PKG_MAINTAINER, optarg);
 				break;
 			case 'w':
 				www = strdup(optarg);

@@ -157,6 +157,8 @@ exec_register(int argc, char **argv)

 			www = strndup(&desc[pmatch[1].rm_so], size);
 			pkg_set(pkg, PKG_WWW, www);
 			free(www);
 		} else {
 			pkg_set(pkg, PKG_WWW, "UNKNOWN");
 		}
 		regfree(&preg);
 	} else {

@@ -164,7 +166,6 @@ exec_register(int argc, char **argv)

 		free(www);
 	}
 	if (strstr(u.release, "RELEASE") == NULL) {
 		asprintf(&v, "%s-%d", u.release, __FreeBSD_version);
 		pkg_set(pkg, PKG_OSVERSION, v);