|
 |
648606 |
--- rpm-4.11.3/build/parseReqs.c.orig 2015-08-19 16:24:55.343033682 +0200
|
|
|
648606 |
+++ rpm-4.11.3/build/parseReqs.c 2015-08-19 16:25:26.166111719 +0200
|
|
|
648606 |
@@ -35,16 +35,6 @@
|
|
|
648606 |
#define SKIPWHITE(_x) {while(*(_x) && (risspace(*_x) || *(_x) == ',')) (_x)++;}
|
|
|
648606 |
#define SKIPNONWHITE(_x){while(*(_x) &&!(risspace(*_x) || *(_x) == ',')) (_x)++;}
|
|
|
648606 |
|
|
|
648606 |
-static int checkSep(const char *s, char c, char **emsg)
|
|
|
648606 |
-{
|
|
|
648606 |
- const char *sep = strchr(s, c);
|
|
|
648606 |
- if (sep && strchr(sep + 1, c)) {
|
|
|
648606 |
- rasprintf(emsg, "Invalid version (double separator '%c'): %s", c, s);
|
|
|
648606 |
- return 1;
|
|
|
648606 |
- }
|
|
|
648606 |
- return 0;
|
|
|
648606 |
-}
|
|
|
648606 |
-
|
|
|
648606 |
rpmRC parseRCPOT(rpmSpec spec, Package pkg, const char *field, rpmTagVal tagN,
|
|
|
648606 |
int index, rpmsenseFlags tagflags)
|
|
|
648606 |
{
|
|
|
648606 |
@@ -165,10 +155,6 @@
|
|
|
648606 |
rstrlcpy(EVR, v, (ve-v) + 1);
|
|
|
648606 |
if (rpmCharCheck(spec, EVR, ve-v, ".-_+:%{}~")) goto exit;
|
|
|
648606 |
|
|
|
648606 |
- /* While ':' and '-' are valid, only one of each is valid. */
|
|
|
648606 |
- if (checkSep(EVR, '-', &emsg) || checkSep(EVR, ':', &emsg))
|
|
|
648606 |
- goto exit;
|
|
|
648606 |
-
|
|
|
648606 |
re = ve; /* ==> next token after EVR string starts here */
|
|
|
648606 |
} else
|
|
|
648606 |
EVR = NULL;
|