rpms/rpm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- put in simple workaround for per-file deps with autoreq off (#190488)

Browse Source 
while pnasrat works on a real fix
This commit is contained in:
Jeremy Katz 2006-05-03 21:10:16 +00:00
parent b914fc5b40
commit 94c2b62dd4
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rpm-4.4.2-teCount-assert.patch Normal file
View File

@ -0,0 +1,16 @@
--- rpm-4.4.2/lib/rpmte.c.hack 2006-05-03 16:06:24.000000000 -0400
+++ rpm-4.4.2/lib/rpmte.c 2006-05-03 16:07:42.000000000 -0400
@@ -586,9 +586,10 @@
if (mydt != deptype)
/*@innercontinue@*/ continue;
ix &= 0x00ffffff;
-assert (ix < Count);
- colors[ix] |= val;
- refs[ix]++;
+ if (i < Count) {
+ colors[ix] |= val;
+ refs[ix]++;
+ }
}
}

8
rpm.spec
View File

@ -20,7 +20,7 @@ Name: rpm
%define version 4.4.2 %define version 4.4.2
Version: %{version} Version: %{version}
%{expand: %%define rpm_version %{version}} %{expand: %%define rpm_version %{version}}
Release: 21 Release: 22
Group: System Environment/Base Group: System Environment/Base
Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
Source1: mono-find-provides Source1: mono-find-provides
@ -51,6 +51,7 @@ Patch22: rpm-4.4.2-vercmp.patch
Patch23: rpm-4.4.2-doxy.patch Patch23: rpm-4.4.2-doxy.patch
Patch24: rpm-4.4.2-trust.patch Patch24: rpm-4.4.2-trust.patch
Patch25: rpm-4.4.2-devel-autodep.patch Patch25: rpm-4.4.2-devel-autodep.patch
Patch26: rpm-4.4.2-teCount-assert.patch
License: GPL License: GPL
Conflicts: patch < 2.5 Conflicts: patch < 2.5
%ifos linux %ifos linux
@ -186,6 +187,7 @@ shell-like rules.
%patch23 -p1 -b .doxy %patch23 -p1 -b .doxy
%patch24 -p1 -b .trust %patch24 -p1 -b .trust
%patch25 -p1 -b .develdeps %patch25 -p1 -b .develdeps
%patch26 -p1 -b .assertte
%build %build
@ -579,6 +581,10 @@ exit 0
%{__includedir}/popt.h %{__includedir}/popt.h
%changelog %changelog
* Wed May 3 2006 Jeremy Katz <katzj@redhat.com> - 4.4.2-22
- put in simple workaround for per-file deps with autoreq off (#190488)
while pnasrat works on a real fix
* Fri Apr 28 2006 Jeremy Katz <katzj@redhat.com> - 4.4.2-21 * Fri Apr 28 2006 Jeremy Katz <katzj@redhat.com> - 4.4.2-21
- run ldconfig in -libs subpackage %%post, not main package - run ldconfig in -libs subpackage %%post, not main package
- add patch to generate shared lib deps by following symlinks so that - add patch to generate shared lib deps by following symlinks so that