diff options
| author | joerg <joerg> | 2009-01-08 00:04:53 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2009-01-08 00:04:53 +0000 |
| commit | 71a3f0846bc8ab7a1051b359eaee0cd7e8a5ad27 (patch) | |
| tree | 7000297fb5f16093b0936fb9b3ea64cc454802c6 | |
| parent | 198ddb4db2bad0166f1ff350eb784aaf07b9b6ed (diff) | |
| download | pkgsrc-71a3f0846bc8ab7a1051b359eaee0cd7e8a5ad27.tar.gz | |
Also include support for IGNORE_URL.
| -rw-r--r-- | pkgtools/pkg_install/files/add/perform.c | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c index f911b68b37c..0dda1ec7e5f 100644 --- a/pkgtools/pkg_install/files/add/perform.c +++ b/pkgtools/pkg_install/files/add/perform.c @@ -1,4 +1,4 @@ -/* $NetBSD: perform.c,v 1.70.4.20 2009/01/08 00:01:30 joerg Exp $ */ +/* $NetBSD: perform.c,v 1.70.4.21 2009/01/08 00:04:53 joerg Exp $ */ #if HAVE_CONFIG_H #include "config.h" #endif @@ -6,7 +6,7 @@ #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif -__RCSID("$NetBSD: perform.c,v 1.70.4.20 2009/01/08 00:01:30 joerg Exp $"); +__RCSID("$NetBSD: perform.c,v 1.70.4.21 2009/01/08 00:04:53 joerg Exp $"); /*- * Copyright (c) 2003 Grant Beattie <grant@NetBSD.org> @@ -1170,6 +1170,33 @@ check_signature(struct pkg_task *pkg, void *signature_cookie, int invalid_sig) } static int +check_ignored_entry(struct pkg_vulnerabilities *pv, size_t i) +{ + const char *iter, *next; + size_t entry_len, url_len; + + if (ignore_advisories == NULL) + return 0; + + url_len = strlen(pv->advisory[i]); + + for (iter = ignore_advisories; *iter; iter = next) { + if ((next = strchr(iter, '\n')) == NULL) { + entry_len = strlen(iter); + next = iter + entry_len; + } else { + entry_len = next - iter; + ++next; + } + if (url_len != entry_len) + continue; + if (strncmp(pv->advisory[i], iter, entry_len) == 0) + return 1; + } + return 0; +} + +static int check_vulnerable(struct pkg_task *pkg) { static struct pkg_vulnerabilities *pv; @@ -1198,6 +1225,8 @@ check_vulnerable(struct pkg_task *pkg) } for (i = 0; i < pv->entries; ++i) { + if (check_ignored_entry(pv, i)) + continue; if (!pkg_match(pv->vulnerability[i], pkg->pkgname)) continue; if (strcmp("eol", pv->classification[i]) == 0) |