18:15 delphij 

Replace port supplied patch with a vendor fix for BDB bug 16415
(DB_ENV->lock_get() may self deadlock if user defined locks are
used and there is only one lock partition defined).

This fix is required for recent OpenLDAP versions if BDB 4.7 is
being used.

09:41 delphij 

Apply vendor fix 4.7.25.1;
Apply a vendor patch (via OpenLDAP) that fixes locking issues
on single CPU systems [1]

Thanks to:      rafan@ for --ignore-whitespace trick

[1] http://www.openldap.org/devel/cvsweb.cgi/build/db.4.7.52.patch