Index: SPECS/rpm.spec
===================================================================
--- SPECS.orig/rpm.spec
+++ SPECS/rpm.spec
@@ -40,6 +40,7 @@ Patch19: rpm-4.4.2.1-debuginfo-names.pat
 Patch20: rpm-4.4.2.1-perl-reqprov.patch
 Patch21: rpm-4.4.2.1-findlang-omf.patch
 Patch22: rpm-4.4.2-always-mlock.patch
+Patch23: rpm-4.4.2.1-bb-shortcircuit.patch
 # XXX Beware, this is one murky license, partially GPL/LGPL dual-licensed
 # and several different components with their own licenses included...
 License: (GPLv2 and LGPLv2 with exceptions) and BSD and MIT and Sleepycat
@@ -176,6 +177,7 @@ shell-like rules.
 %patch20 -p1 -b .perl-reqprov
 %patch21 -p1 -b .findlang-omf
 %patch22 -p1 -b .mlock
+%patch23 -p1 -b .bb
 
 cp -f %{SOURCE2} scripts/find-debuginfo.sh