mirror of
https://abf.rosa.ru/djam/rpm.git
synced 2025-02-23 10:23:04 +00:00
Fixed CVE-2012-0815, CVE-2012-0060, CVE-2012-0061
This commit is contained in:
Anton Kirilenko
parent
7eb0c2579f
commit
5843aa3023
2 changed files with 196 additions and 48 deletions
146
rpm-5.3.12-cve-2012-0815,0060,0061.patch
Normal file
146
rpm-5.3.12-cve-2012-0815,0060,0061.patch
Normal file
|
|
@ -0,0 +1,146 @@
|
|||
--- rpm-5.3.12/rpmdb/header.c 2010-11-11 22:31:02.000000000 +0300
|
||||
+++ rpm-5.3.12/rpmdb/header.c 2012-04-17 13:48:41.387629216 +0400
|
||||
@@ -516,7 +516,6 @@
|
||||
|
||||
assert(dataEnd != NULL);
|
||||
assert(entry != NULL);
|
||||
-assert(dl == 0); /* XXX eliminate dl argument (its always 0) */
|
||||
|
||||
memset(&ieprev, 0, sizeof(ieprev));
|
||||
for (; il > 0; il--, pe++) {
|
||||
@@ -1031,10 +1030,13 @@
|
||||
|
||||
entry->info.type = (rpmuint32_t) htonl(pe->type);
|
||||
entry->info.count = (rpmuint32_t) htonl(pe->count);
|
||||
+ entry->info.tag = (rpmuint32_t) htonl(pe->tag);
|
||||
|
||||
- if (hdrchkType(entry->info.type))
|
||||
+ if (!ENTRY_IS_REGION(entry))
|
||||
goto errxit;
|
||||
- if (hdrchkTags(entry->info.count))
|
||||
+ if (entry->info.type != REGION_TAG_TYPE)
|
||||
+ goto errxit;
|
||||
+ if (entry->info.count != REGION_TAG_COUNT)
|
||||
goto errxit;
|
||||
|
||||
{ rpmint32_t off = (rpmint32_t) ntohl(pe->offset);
|
||||
@@ -1051,7 +1053,6 @@
|
||||
ril = (rpmuint32_t)(rdl/sizeof(*pe));
|
||||
if (hdrchkTags(ril) || hdrchkData(rdl))
|
||||
goto errxit;
|
||||
- entry->info.tag = (rpmuint32_t) htonl(pe->tag);
|
||||
} else {
|
||||
ril = il;
|
||||
/*@-sizeoftype@*/
|
||||
@@ -1075,13 +1076,12 @@
|
||||
indexEntry newEntry = entry + ril;
|
||||
size_t ne = (h->indexUsed - ril);
|
||||
rpmint32_t rid = entry->info.offset+1;
|
||||
- rpmuint32_t rc;
|
||||
|
||||
/* Load dribble entries from region. */
|
||||
- rc = regionSwab(newEntry, (rpmuint32_t)ne, 0, pe+ril, dataStart, dataEnd, rid);
|
||||
- if (rc == 0)
|
||||
+ rdlen = regionSwab(newEntry, (rpmuint32_t)ne, rdlen, pe+ril,
|
||||
+ dataStart, dataEnd, rid);
|
||||
+ if (rdlen == 0)
|
||||
goto errxit;
|
||||
- rdlen += rc;
|
||||
|
||||
{ indexEntry firstEntry = newEntry;
|
||||
size_t save = h->indexUsed;
|
||||
@@ -1103,6 +1103,10 @@
|
||||
h->indexUsed += ne;
|
||||
}
|
||||
}
|
||||
+
|
||||
+ rdlen += REGION_TAG_COUNT;
|
||||
+ if (rdlen != dl)
|
||||
+ goto errxit;
|
||||
}
|
||||
|
||||
h->flags &= ~HEADERFLAG_SORTED;
|
||||
--- rpm-5.3.12/rpmdb/header_internal.c 2010-11-03 17:06:06.000000000 +0300
|
||||
+++ rpmdb/header_internal.c 2012-04-17 13:48:41.388629216 +0400
|
||||
@@ -58,7 +58,7 @@
|
||||
return (int)i;
|
||||
if (hdrchkAlign(info->type, info->offset))
|
||||
return (int)i;
|
||||
- if (!negate && hdrchkRange((rpmint32_t)dl, info->offset))
|
||||
+ if (hdrchkRange((rpmint32_t)dl, info->offset))
|
||||
return (int)i;
|
||||
if (hdrchkData(info->count))
|
||||
return (int)i;
|
||||
--- rpm-5.3.12/rpmdb/pkgio.c 2010-10-18 10:53:08.000000000 +0400
|
||||
+++ rpm-5.3.12/rpmdb/pkgio.c 2012-04-17 13:48:41.388629216 +0400
|
||||
@@ -869,10 +869,18 @@
|
||||
|
||||
/* Is there an immutable header region tag? */
|
||||
/*@-sizeoftype@*/
|
||||
- if (entry->info.tag == RPMTAG_HEADERSIGNATURES
|
||||
- && entry->info.type == RPM_BIN_TYPE
|
||||
- && entry->info.count == (rpmTagCount)REGION_TAG_COUNT)
|
||||
+ if (entry->info.tag == RPMTAG_HEADERSIGNATURES)
|
||||
{
|
||||
+ /* Is the region tag sane? */
|
||||
+ if (!(entry->info.type == REGION_TAG_TYPE
|
||||
+ && entry->info.count == (rpmTagCount)REGION_TAG_COUNT))
|
||||
+ {
|
||||
+ (void) snprintf(buf, sizeof(buf),
|
||||
+ _("region tag: BAD, tag %u type %u offset %d count %u"),
|
||||
+ (unsigned) entry->info.tag, (unsigned) entry->info.type,
|
||||
+ (int)entry->info.offset, (unsigned) entry->info.count);
|
||||
+ goto exit;
|
||||
+ }
|
||||
/*@=sizeoftype@*/
|
||||
|
||||
/*
|
||||
@@ -900,10 +908,10 @@
|
||||
}
|
||||
dataEnd += REGION_TAG_COUNT;
|
||||
|
||||
- xx = headerVerifyInfo(1, dl, info, &entry->info, 1);
|
||||
+ xx = headerVerifyInfo(1, il * sizeof(*pe), info, &entry->info, 1);
|
||||
if (xx != -1 ||
|
||||
!(entry->info.tag == RPMTAG_HEADERSIGNATURES
|
||||
- && entry->info.type == RPM_BIN_TYPE
|
||||
+ && entry->info.type == REGION_TAG_TYPE
|
||||
&& entry->info.count == (rpmTagCount)REGION_TAG_COUNT))
|
||||
{
|
||||
(void) snprintf(buf, sizeof(buf),
|
||||
@@ -1060,11 +1068,19 @@
|
||||
|
||||
/* Is there an immutable header region tag? */
|
||||
/*@-sizeoftype@*/
|
||||
- if (!(entry->info.tag == RPMTAG_HEADERIMMUTABLE
|
||||
- && entry->info.type == RPM_BIN_TYPE
|
||||
+ if (entry->info.tag != RPMTAG_HEADERIMMUTABLE) {
|
||||
+ rc = RPMRC_NOTFOUND;
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ /* Is the region tag sane? */
|
||||
+ if (!(entry->info.type == RPM_BIN_TYPE
|
||||
&& entry->info.count == (rpmTagCount)REGION_TAG_COUNT))
|
||||
{
|
||||
- rc = RPMRC_NOTFOUND;
|
||||
+ (void) snprintf(buf, sizeof(buf),
|
||||
+ _("region tag: BAD, tag %u type %u offset %d count %u"),
|
||||
+ (unsigned) entry->info.tag, (unsigned) entry->info.type,
|
||||
+ (int)entry->info.offset, (unsigned) entry->info.count);
|
||||
goto exit;
|
||||
}
|
||||
/*@=sizeoftype@*/
|
||||
@@ -1084,10 +1100,10 @@
|
||||
(void) memcpy(info, regionEnd, REGION_TAG_COUNT);
|
||||
regionEnd += REGION_TAG_COUNT;
|
||||
|
||||
- xx = headerVerifyInfo(1, dl, info, &entry->info, 1);
|
||||
+ xx = headerVerifyInfo(1, il * sizeof(*pe), info, &entry->info, 1);
|
||||
if (xx != -1 ||
|
||||
!(entry->info.tag == RPMTAG_HEADERIMMUTABLE
|
||||
- && entry->info.type == RPM_BIN_TYPE
|
||||
+ && entry->info.type == REGION_TAG_TYPE
|
||||
&& entry->info.count == (rpmTagCount)REGION_TAG_COUNT))
|
||||
{
|
||||
(void) snprintf(buf, sizeof(buf),
|
||||
98
rpm.spec
98
rpm.spec
|
|
@ -93,6 +93,7 @@ Patch20: rpm-5.3.11-fix-syslog-b0rkage.patch
|
|||
Patch21: rpm-5.3.12-change-dep-loop-errors-to-warnings.patch
|
||||
Patch22: rpm-5.3.12-55810-rpmevrcmp-again-grf.patch
|
||||
Patch23: rpm-5.3.12-fix-verify-segfault.patch
|
||||
Patch24: rpm-5.3.12-cve-2012-0815,0060,0061.patch
|
||||
|
||||
License: LGPLv2.1+
|
||||
BuildRequires: autoconf >= 2.57 bzip2-devel automake >= 1.8 elfutils-devel
|
||||
|
|
@ -278,6 +279,7 @@ This package contains the RPM API documentation generated in HTML format.
|
|||
%patch21 -p1 -b .loop_warnings~
|
||||
%patch22 -p1 -b .55810~
|
||||
%patch23 -p1 -b .verify-segfault~
|
||||
%patch24 -p1 -b .cve-2012~
|
||||
|
||||
mkdir -p cpu-os-macros
|
||||
tar -zxf %{SOURCE3} -C cpu-os-macros
|
||||
|
|
@ -704,11 +706,11 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Jul 12 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.12-0.20110712.2
|
||||
* Tue Jul 12 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.12-0.20110712.2
|
||||
+ Revision: 689772
|
||||
- revert a previous commit of mine which broke deps without distepoch (rushed)
|
||||
|
||||
* Tue Jul 12 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.12-0.20110712.1
|
||||
* Tue Jul 12 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.12-0.20110712.1
|
||||
+ Revision: 689687
|
||||
- change errors on dependency loops to warnings
|
||||
- update to new cvs snapshot:
|
||||
|
|
@ -717,16 +719,16 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
o fix /usr/lib/rpm/bin/dbconvert segfaulting when no root is provided
|
||||
o automatically install gstreamer.sh dep genereator
|
||||
|
||||
* Wed Jul 06 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.12-0.20110625.3
|
||||
* Wed Jul 06 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.12-0.20110625.3
|
||||
+ Revision: 689009
|
||||
- install gstreamer.sh dependency generator
|
||||
|
||||
* Mon Jul 04 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.12-0.20110625.2
|
||||
* Mon Jul 04 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.12-0.20110625.2
|
||||
+ Revision: 688659
|
||||
- add a conflicts on older beecrypt version to fix upgrade from 2009.0
|
||||
- add a conflicts on older elfutils to handle upgrade from 2009.0
|
||||
|
||||
* Sat Jun 25 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.12-0.20110625.1
|
||||
* Sat Jun 25 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.12-0.20110625.1
|
||||
+ Revision: 687193
|
||||
- new cvs snapshot
|
||||
- add a suggests on db51-utils
|
||||
|
|
@ -735,7 +737,7 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
+ Matthew Dawkins <mattydaw@mandriva.org>
|
||||
- added arm support for rpm5, cpuinfo doesn't support arm
|
||||
|
||||
* Wed Jun 01 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.11-0.20110525.3
|
||||
* Wed Jun 01 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.11-0.20110525.3
|
||||
+ Revision: 682280
|
||||
- add a null pointer check for nvra disttag hack, otherwise we'll easily segfault
|
||||
- update javascript enabler to pass the right arguments
|
||||
|
|
@ -743,7 +745,7 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
on plf packages with disttag should now *finally* be working properly..;)
|
||||
- add buildrequires on db51-utils (required by testsuite)
|
||||
|
||||
* Wed May 25 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.11-0.20110525.1
|
||||
* Wed May 25 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.11-0.20110525.1
|
||||
+ Revision: 679105
|
||||
- reenable regression checks
|
||||
- fix too hasty merged syslog patch (P20)
|
||||
|
|
@ -752,7 +754,7 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
- follow s/ossp_uuid/ossp-uuid/ package name change
|
||||
- update to latest cvs snapshot (for cleaning and also fixes #63318)
|
||||
|
||||
* Mon May 16 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.10-0.20110422.4
|
||||
* Mon May 16 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.10-0.20110422.4
|
||||
+ Revision: 675030
|
||||
- fix c++ compatibility in rpmdb.h api (P22)
|
||||
- fix build of dbconvert & install it by default (P21)
|
||||
|
|
@ -760,7 +762,7 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
- workaround doxygen 1.7.4 issue blocking build (P19 from pcpa)
|
||||
- fix assertion error when trying to extract archives without required perms
|
||||
|
||||
* Mon May 02 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.10-0.20110422.3
|
||||
* Mon May 02 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.10-0.20110422.3
|
||||
+ Revision: 662260
|
||||
- move multiarch-dispatch to main package (#63160)
|
||||
|
||||
|
|
@ -771,7 +773,7 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
+ Revision: 658722
|
||||
- fix wrong path of mkmultiarch script
|
||||
|
||||
* Sun Apr 24 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.10-0.20110422.1
|
||||
* Sun Apr 24 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.10-0.20110422.1
|
||||
+ Revision: 658161
|
||||
- drop redundant %%defattr usage & buildroot cleaning at beginning of %%install
|
||||
- don't load arch specific macros from rpm-mandriva-setup anymore, they've been
|
||||
|
|
@ -779,21 +781,21 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
- obsolete multiarch-utils
|
||||
- new cvs snapshot
|
||||
|
||||
* Sun Apr 10 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110330.7
|
||||
* Sun Apr 10 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110330.7
|
||||
+ Revision: 652164
|
||||
- fix filetriggers firing multiple times hack (P19)
|
||||
|
||||
* Thu Apr 07 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110330.6
|
||||
* Thu Apr 07 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110330.6
|
||||
+ Revision: 651738
|
||||
- add proper fix for i18n descriptions from Jeff
|
||||
- fix %%_arch to be canonical
|
||||
|
||||
* Tue Apr 05 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110330.5
|
||||
* Tue Apr 05 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110330.5
|
||||
+ Revision: 650797
|
||||
- fix translated descriptions not being added to packages (P18, #62979)
|
||||
- add /etc/rpm/sysinfo dir
|
||||
|
||||
* Fri Apr 01 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110330.4
|
||||
* Fri Apr 01 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110330.4
|
||||
+ Revision: 649644
|
||||
- fix stupid typo that managed to sneak itself back in again to mess up db log dir
|
||||
- don't ship find-provides & find-requires, we're using our own version anyways..
|
||||
|
|
@ -803,15 +805,15 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
- fix --without docs
|
||||
- disable sqlite & docs build for bootstrap builds
|
||||
|
||||
* Wed Mar 30 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110330.3
|
||||
* Wed Mar 30 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110330.3
|
||||
+ Revision: 649239
|
||||
- bah, fix incorrect package name in conflicts on db5.1
|
||||
|
||||
* Wed Mar 30 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110330.2
|
||||
* Wed Mar 30 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110330.2
|
||||
+ Revision: 649233
|
||||
- add versioned buildrequires & conflicts to ensure >= db 5.1.25
|
||||
|
||||
* Wed Mar 30 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110330.1
|
||||
* Wed Mar 30 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110330.1
|
||||
+ Revision: 649206
|
||||
- new cvs snapshot
|
||||
- add rpm-helper>rpm to _dependency_whiteout_mandriva
|
||||
|
|
@ -821,18 +823,18 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
- fix duplicate %%clean section (thx andrey for noticing!)
|
||||
- fix mess happening while merging file trigger workaround upstream (#62865)
|
||||
|
||||
* Fri Mar 25 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110324.1
|
||||
* Fri Mar 25 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110324.1
|
||||
+ Revision: 648434
|
||||
- drop %%clean now that it's enabled by default
|
||||
- enable build of augeas support
|
||||
- build with uuid support
|
||||
- new cvs snapshot
|
||||
|
||||
* Sun Mar 06 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110303.2
|
||||
* Sun Mar 06 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110303.2
|
||||
+ Revision: 642259
|
||||
- drop duplicates of of package first independent of distepoch (P16)
|
||||
|
||||
* Thu Mar 03 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110303.1
|
||||
* Thu Mar 03 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.9-0.20110303.1
|
||||
+ Revision: 641499
|
||||
- new cvs snapshot
|
||||
- get rid of some compile warnings for ugly distepoch pattern hack..
|
||||
|
|
@ -840,25 +842,25 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
+ Funda Wang <fwang@mandriva.org>
|
||||
- rebuild to obsolete old packages
|
||||
|
||||
* Mon Feb 21 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110125.5
|
||||
* Mon Feb 21 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110125.5
|
||||
+ Revision: 639230
|
||||
- work around file triggers firing multiple times and a related critical memleak
|
||||
- set count in rpmmiCount() rather than rpmmiNext() for iterators with db cursor
|
||||
set to reduce unnecessary overhead
|
||||
|
||||
* Tue Feb 15 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110125.4
|
||||
* Tue Feb 15 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110125.4
|
||||
+ Revision: 637879
|
||||
- accept NULL as argument for rootDir with mandriva filetriggers (#62395)
|
||||
- fix issue with uninstall triggers always being run during upgrade (#62267)
|
||||
- reset db cursor to NULL at end of rpmmiCount() so iterator won't break (#62279)
|
||||
- drop feeble attempt to hack around disttag/distepoch issues by undefining it...
|
||||
|
||||
* Thu Feb 10 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110125.3
|
||||
* Thu Feb 10 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110125.3
|
||||
+ Revision: 637195
|
||||
- fix typo in russian translation (#62333)
|
||||
- fix %%__dbi_sqlconfig typo (#62386)
|
||||
|
||||
* Sat Feb 05 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110125.2
|
||||
* Sat Feb 05 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110125.2
|
||||
+ Revision: 636294
|
||||
- revert st00pid conflicts->obsoletes change which broke upgrades...
|
||||
- replace conflict on perl-RPM4 with an obsolete
|
||||
|
|
@ -868,7 +870,7 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
- add python link patch
|
||||
- link python module with python lib
|
||||
|
||||
* Mon Jan 31 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110125.1
|
||||
* Mon Jan 31 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110125.1
|
||||
+ Revision: 634521
|
||||
- fix problem with ignored signals causing rpmbuild to break with gnome-terminal
|
||||
(fixes #62262, P7 from Theerud Lawtrakul/Jeff Johnson)
|
||||
|
|
@ -886,11 +888,11 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
+ Funda Wang <fwang@mandriva.org>
|
||||
- really fix tool path
|
||||
|
||||
* Sun Jan 23 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110109.11
|
||||
* Sun Jan 23 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110109.11
|
||||
+ Revision: 632404
|
||||
- d'oh, missed a line in previous patch..
|
||||
|
||||
* Sun Jan 23 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110109.10
|
||||
* Sun Jan 23 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110109.10
|
||||
+ Revision: 632396
|
||||
- replace rpmdsCompare() patch with a simpler and less intrusive for now
|
||||
- if distsuffix is defined, use it for disttag (from Anssi)
|
||||
|
|
@ -921,16 +923,16 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
- fix typo in perl bindings giving issues with 'mdvsys' on missing buildrequires
|
||||
- rpmconstant is part of rpm5, so obsolete/provide this..
|
||||
|
||||
* Sun Jan 09 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110109.3mdv2011.0
|
||||
* Sun Jan 09 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110109.3mdv2011.0
|
||||
+ Revision: 630755
|
||||
- use default directory for %%setup
|
||||
- add missing errno.h header to rpm4compat.h (P0)
|
||||
|
||||
* Sun Jan 09 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110109.2mdv2011.0
|
||||
* Sun Jan 09 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110109.2mdv2011.0
|
||||
+ Revision: 630735
|
||||
- add back conflicts: librpm < 5.3 now that 'abrt' is linked against this version
|
||||
|
||||
* Sun Jan 09 2011 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110109.1mdv2011.0
|
||||
* Sun Jan 09 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.8-0.20110109.1mdv2011.0
|
||||
+ Revision: 630713
|
||||
- new cvs snapshot
|
||||
- get rid of doc-copy workarond and duplication of docs in 'rpm-build'
|
||||
|
|
@ -948,15 +950,15 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
+ Revision: 589999
|
||||
- rebuild for python 2.7
|
||||
|
||||
* Mon Oct 18 2010 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:4.6.1-3mnb2
|
||||
* Mon Oct 18 2010 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:4.6.1-3mnb2
|
||||
+ Revision: 586616
|
||||
- automatically handle ruby gem extraction in %%setup
|
||||
|
||||
* Thu Oct 07 2010 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:4.6.1-2mnb2
|
||||
* Thu Oct 07 2010 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:4.6.1-2mnb2
|
||||
+ Revision: 583901
|
||||
- fix regression introduced with %%exclude change in previous release (fixes #61207)
|
||||
|
||||
* Wed Sep 29 2010 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:4.6.1-1mnb2
|
||||
* Wed Sep 29 2010 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:4.6.1-1mnb2
|
||||
+ Revision: 582007
|
||||
- add '~' suffix to backup files created when using %%apply_patches
|
||||
- finally put copyright & serial tags to death for real
|
||||
|
|
@ -980,7 +982,7 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
+ Pascal Terjan <pterjan@mandriva.org>
|
||||
- Refuse to build a rpm with 2 identical triggers (#60699)
|
||||
|
||||
+ Per Ãyvind Karlsen <peroyvind@mandriva.org>
|
||||
+ Per Øyvind Karlsen <peroyvind@mandriva.org>
|
||||
- reapply fix for #55i810 (if not fully comprehended, those of us who wrote it
|
||||
does, ao removing out of ignorance and lack of insight will not e tolerated.
|
||||
|
||||
|
|
@ -1008,18 +1010,18 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
+ Revision: 506733
|
||||
- rebuild for libpopt file path change
|
||||
|
||||
+ Per Ãyvind Karlsen <peroyvind@mandriva.org>
|
||||
+ Per Øyvind Karlsen <peroyvind@mandriva.org>
|
||||
- fix broken bitwise operator usage (thx to anssi for noticing)
|
||||
- do a new fix for #55810 that doesn't cause same regressions as the previously
|
||||
revert fix and hopefully no other regressions either.. ;)
|
||||
(P1010, http://rpm5.org/community/rpm-devel/4011.html)
|
||||
|
||||
* Fri Nov 20 2009 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:4.6.0-8mnb2
|
||||
* Fri Nov 20 2009 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:4.6.0-8mnb2
|
||||
+ Revision: 467682
|
||||
- revert previous change as it'll break == dependencies on version only
|
||||
(which even requires-on-release policy requires) :/
|
||||
|
||||
* Fri Nov 20 2009 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:4.6.0-7mnb2
|
||||
* Fri Nov 20 2009 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:4.6.0-7mnb2
|
||||
+ Revision: 467652
|
||||
- don't skip release comparision when checking conflicts if release value is
|
||||
missing (P1011 from Jeff Johnson, fixes #55810)
|
||||
|
|
@ -1052,7 +1054,7 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
- map prereq to Requires(pre,preun) instead of nothingness when building
|
||||
(rpm-map-prereq.patch backported from upstream 4.7.1)
|
||||
|
||||
+ Per Ãyvind Karlsen <peroyvind@mandriva.org>
|
||||
+ Per Øyvind Karlsen <peroyvind@mandriva.org>
|
||||
- Avoid adding Lua sources/patches twice when recursing (P1010, git backport)
|
||||
|
||||
* Fri Jul 24 2009 Anssi Hannula <anssi@mandriva.org> 1:4.6.0-4mnb2
|
||||
|
|
@ -1070,7 +1072,7 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
- add missing calls to rpmluaPop to patch 159, might fix #50579
|
||||
- Revert switch to db4.7
|
||||
|
||||
+ Per Ãyvind Karlsen <peroyvind@mandriva.org>
|
||||
+ Per Øyvind Karlsen <peroyvind@mandriva.org>
|
||||
- Expose packagecolor tag and add new tags from rpm5 as rpm otherwise will break
|
||||
when these unknown tags might be found in the rpmdb. Notice that this will only
|
||||
make rpm recognize these, not implement actual support for them.. (P1008)
|
||||
|
|
@ -1095,7 +1097,7 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
- call %%_patch and %%_after_setup for use in rpm-mandriva-setup-build
|
||||
(useful for "--with git_repository")
|
||||
|
||||
+ Per Ãyvind Karlsen <peroyvind@mandriva.org>
|
||||
+ Per Øyvind Karlsen <peroyvind@mandriva.org>
|
||||
- don't wipe out $DOCDIR when using %%doc as it will wipe out any files that would
|
||||
happen to be installed during %%install. (P1008)
|
||||
|
||||
|
|
@ -1106,7 +1108,7 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
- add patch fixing rpmdsMerge on rpmdsSingle (fixes 07dep.t in perl-RPM4)
|
||||
- fix segfault triggered by perl-RPM4 tests
|
||||
|
||||
+ Per Ãyvind Karlsen <peroyvind@mandriva.org>
|
||||
+ Per Øyvind Karlsen <peroyvind@mandriva.org>
|
||||
- fix internal enum value for xz (noticed by jnovy, thx!)
|
||||
- oops, fix a minor glitch with a final api change
|
||||
- add versioned requires on liblzma-devel since we *really* need latest api
|
||||
|
|
@ -1178,13 +1180,13 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
- rediff patch49, patch64, patch70, patch141, patch146, patch147, patch148,
|
||||
patch151, patch2002, patch2005
|
||||
|
||||
* Sun Oct 19 2008 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:4.4.2.3-22mnb2
|
||||
* Sun Oct 19 2008 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:4.4.2.3-22mnb2
|
||||
+ Revision: 295367
|
||||
- rebuild against liblzma which I had to bump the major of yet again
|
||||
- actually remember to bump popt release as well this time (popt should REALLY
|
||||
be split out!!!)
|
||||
|
||||
* Sat Oct 18 2008 Per Ãyvind Karlsen <peroyvind@mandriva.org> 1:4.4.2.3-21mnb2
|
||||
* Sat Oct 18 2008 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:4.4.2.3-21mnb2
|
||||
+ Revision: 294824
|
||||
- fix build with new liblzma (updates P1001)
|
||||
|
||||
|
|
@ -1265,7 +1267,7 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
- checks on "non packaged binary packages" now depend on %%_missing_subpackage_terminate_build (patch147)
|
||||
- checks on "non packaged binary packages" only done on "mdv" packages (patch147)
|
||||
|
||||
+ Per Ãyvind Karlsen <peroyvind@mandriva.org>
|
||||
+ Per Øyvind Karlsen <peroyvind@mandriva.org>
|
||||
- fix version typo
|
||||
- switch to use liblzma for lzma payload (P1000, partly derived from rpm5.org & OpenSuSE)
|
||||
|
||||
|
|
@ -1435,7 +1437,7 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
- don't build apidocs since we don't bundle them
|
||||
- drop patch78 (Do not use futex, but fcntl) which is not doing anything anymore
|
||||
|
||||
+ Per Ãyvind Karlsen <peroyvind@mandriva.org>
|
||||
+ Per Øyvind Karlsen <peroyvind@mandriva.org>
|
||||
- use LZMA_Alone file format, even with newer versions (P131, from cvs)
|
||||
- be more consistent and use unlzma in stead of lzma -d -c in rpm2cpio.sh (lzma patch)
|
||||
- drop unused leftover macros for lzma patch..
|
||||
|
|
@ -1559,7 +1561,7 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
- fix #31535: lowercase OS tag to compare against platform
|
||||
- use upstream patch
|
||||
|
||||
+ Per Ãyvind Karlsen <peroyvind@mandriva.org>
|
||||
+ Per Øyvind Karlsen <peroyvind@mandriva.org>
|
||||
- add requires on lzma
|
||||
|
||||
* Fri Jul 06 2007 Olivier Thauvin <nanardon@mandriva.org> 4.4.8-6mdv2008.0
|
||||
|
|
@ -1601,7 +1603,7 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
o Patch111: trim twice / in buildroot, making unpackaged files check failing
|
||||
o Patch112: avoid a very issue regarding Fopen()
|
||||
|
||||
+ Per Ãyvind Karlsen <peroyvind@mandriva.org>
|
||||
+ Per Øyvind Karlsen <peroyvind@mandriva.org>
|
||||
- use %%{ix86} & %%{sunsparc} macros for x86 & sparc
|
||||
- use %%{sunsparc} macro to ensure sparcv9 gets included too
|
||||
|
||||
|
|
@ -1980,7 +1982,7 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
|
|||
- fix mono patch (bug #7201)
|
||||
|
||||
* Wed Jul 28 2004 Frederic Lepied <flepied@mandrakesoft.com> 4.2.2-13mdk
|
||||
- use mono-find-requires and mono-find-provides if present (Götz Waschk) (bug #7201)
|
||||
- use mono-find-requires and mono-find-provides if present (Götz Waschk) (bug #7201)
|
||||
|
||||
* Wed Jul 28 2004 Frederic Lepied <flepied@mandrakesoft.com> 4.2.2-12mdk
|
||||
- use a correct implementation of cpuid (Gwenole)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue