Switch back versions to release versions (also show CVS ids), re-added patch for PEAR