diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-01-18 12:34:02 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-01-18 12:34:02 +0100 |
| commit | 54729d498af886d933c38f5d79337cc525e665a8 (patch) | |
| tree | 4c81ffa1ac6e3ac9be0251af374128f0acfaf4a7 /package/rpm/rpm-5.2.0_depends-fix.patch | |
| parent | 55f591ed1d45b8eb756d66cfa5459e1527e48cc5 (diff) | |
| parent | f16a9799b65214ffe1b07372676386e31ad51801 (diff) | |
Merge branch 'rpm-update3' of git://git.busybox.net/~nkukard/git/buildroot
Diffstat (limited to 'package/rpm/rpm-5.2.0_depends-fix.patch')
| -rw-r--r-- | package/rpm/rpm-5.2.0_depends-fix.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/package/rpm/rpm-5.2.0_depends-fix.patch b/package/rpm/rpm-5.2.0_depends-fix.patch new file mode 100644 index 000000000..4a9277576 --- /dev/null +++ b/package/rpm/rpm-5.2.0_depends-fix.patch @@ -0,0 +1,19 @@ +Bugfix included upstream + +diff -u --new-file --recursive rpm-5.2.0_vanilla/lib/depends.c rpm-5.2.0_depends-fix/lib/depends.c +--- rpm-5.2.0_vanilla/lib/depends.c 2009-05-23 01:23:46.000000000 +0000 ++++ rpm-5.2.0_depends-fix/lib/depends.c 2009-09-22 06:33:37.950783501 +0000 +@@ -2371,11 +2371,11 @@ + + memset(selected, 0, sizeof(*selected) * ts->orderCount); + +- if ((requires = rpmteDS(p, RPMTAG_REQUIRENAME)) != NULL) { +- + /* Avoid narcisstic relations. */ + selected[rpmtsiOc(pi)] = 1; + ++ if ((requires = rpmteDS(p, RPMTAG_REQUIRENAME)) != NULL) { ++ + /* T2. Next "q <- p" relation. */ + + /* First, do pre-requisites. */ |