diff --git a/build/parsePreamble.c b/build/parsePreamble.c index 86fbb08..c4145d2 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c @@ -769,7 +769,7 @@ static rpmRC handlePreambleTag(rpmSpec spec, Package pkg, rpmTagVal tag, case RPMTAG_VERSION: case RPMTAG_RELEASE: SINGLE_TOKEN_ONLY; - if (rpmCharCheck(spec, field, "._+%{}~")) + if (rpmCharCheck(spec, field, WHITELIST_VERREL)) goto exit; headerPutString(pkg->header, tag, field); break; diff --git a/build/parseReqs.c b/build/parseReqs.c index 705d4cb..ea46331 100644 --- a/build/parseReqs.c +++ b/build/parseReqs.c @@ -57,7 +57,7 @@ static rpmRC checkDep(rpmSpec spec, char *N, char *EVR, char **emsg) rasprintf(emsg, _("Versioned file name not permitted")); return RPMRC_FAIL; } - if (rpmCharCheck(spec, EVR, ".-_+:%{}~")) + if (rpmCharCheck(spec, EVR, WHITELIST_EVR)) return RPMRC_FAIL; if (checkSep(EVR, '-', emsg) != RPMRC_OK || checkSep(EVR, ':', emsg) != RPMRC_OK || diff --git a/build/rpmbuild_internal.h b/build/rpmbuild_internal.h index cc9de88..c76de7c 100644 --- a/build/rpmbuild_internal.h +++ b/build/rpmbuild_internal.h @@ -18,6 +18,8 @@ #undef HTDATATYPE #define WHITELIST_NAME ".-_+%{}" +#define WHITELIST_VERREL "._+%{}~" +#define WHITELIST_EVR WHITELIST_VERREL "-:" struct TriggerFileEntry { int index;