sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

4.0.4-alt95.M41.4

Browse Source 
- build/spec.c: don't allow multiple definition of PatchX or SourceX
  (Jindrich Novy, rhbz#458261, rhbz#458260)
This commit is contained in:
Alexey Tourbin 2008-09-16 11:09:57 +04:00
commit f444e26e8e
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/spec.c
View File

@ -308,6 +308,16 @@ int addSource(Spec spec, Package pkg, const char *field, int tag)
} }
} }
/* Check whether tags of the same number haven't already been defined */
for (p = spec->sources; p != NULL; p = p->next) {
if ( p->num != num ) continue;
if ((tag == RPMTAG_SOURCE && p->flags == RPMBUILD_ISSOURCE) ||
(tag == RPMTAG_PATCH && p->flags == RPMBUILD_ISPATCH)) {
rpmlog(RPMLOG_ERR, _("%s %d defined multiple times\n"), name, num);
return RPMRC_FAIL;
}
}
/* Create the entry and link it in */ /* Create the entry and link it in */
p = xmalloc(sizeof(*p)); p = xmalloc(sizeof(*p));
p->num = num; p->num = num;

6
rpm-4_0.spec
View File

@ -4,7 +4,7 @@
Name: %rpm_name Name: %rpm_name
Version: %rpm_version Version: %rpm_version
Release: alt95.M41.3 Release: alt95.M41.4
%define ifdef() %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}} %define ifdef() %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
%define get_dep() %(rpm -q --qf '%%{NAME} >= %%|SERIAL?{%%{SERIAL}:}|%%{VERSION}-%%{RELEASE}' %1 2>/dev/null || echo '%1 >= unknown') %define get_dep() %(rpm -q --qf '%%{NAME} >= %%|SERIAL?{%%{SERIAL}:}|%%{VERSION}-%%{RELEASE}' %1 2>/dev/null || echo '%1 >= unknown')
@ -551,6 +551,10 @@ fi
%endif #with contrib %endif #with contrib
%changelog %changelog
* Tue Sep 16 2008 Alexey Tourbin <at@altlinux.ru> 4.0.4-alt95.M41.4
- build/spec.c: don't allow multiple definition of PatchX or SourceX
(Jindrich Novy, rhbz#458261, rhbz#458260)
* Sun Sep 14 2008 Alexey Tourbin <at@altlinux.ru> 4.0.4-alt95.M41.3 * Sun Sep 14 2008 Alexey Tourbin <at@altlinux.ru> 4.0.4-alt95.M41.3
- shebang.req: check for trailing <CR> in interpreter path or name; - shebang.req: check for trailing <CR> in interpreter path or name;
also, validate argc, since neither execve(2) nor env(1) split arguments also, validate argc, since neither execve(2) nor env(1) split arguments