diff --git a/.gitignore b/.gitignore index 799c105..4a3e685 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /rpm-4.9.90.git11505.tar.bz2 /rpm-4.9.90.git11519.tar.bz2 +/rpm-4.9.90.git11536.tar.bz2 diff --git a/rpm.spec b/rpm.spec index fadfae0..9a17b85 100644 --- a/rpm.spec +++ b/rpm.spec @@ -12,7 +12,7 @@ %define rpmhome /usr/lib/rpm %define rpmver 4.9.90 -%define snapver git11519 +%define snapver git11536 %define srcver %{rpmver}%{?snapver:.%{snapver}} %define bdbname libdb @@ -22,7 +22,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}12%{?dist} +Release: %{?snapver:0.%{snapver}.}1%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 @@ -325,7 +325,7 @@ make check # XXX this is klunky and ugly, rpm itself should handle this dbstat=/usr/lib/rpm/rpmdb_stat if [ -x "$dbstat" ]; then - if "$dbstat" -e -h /var/lib/rpm 2>&1 | grep -q "doesn't match environment version \| Invalid argument"; then + if "$dbstat" -e -h /var/lib/rpm 2>&1 | grep -q "doesn't match library version \| Invalid argument"; then rm -f /var/lib/rpm/__db.* fi fi @@ -440,6 +440,10 @@ exit 0 %doc COPYING doc/librpm/html/* %changelog +* Mon Apr 16 2012 Panu Matilainen - 4.9.90-0.git11536.1 +- newer git snapshot (#809402, #808750) +- adjust posttrans script wrt bdb string change (#803866, #805613) + * Thu Apr 05 2012 Panu Matilainen - 4.9.90-0.git11519.1 - newer git snapshot to keep patch-count down - fixes CVE-2012-0060, CVE-2012-0061 and CVE-2012-0815 diff --git a/sources b/sources index e97334f..1a4940f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e59625daeda485a9aef80c175712d1a rpm-4.9.90.git11519.tar.bz2 +95e7db9edc17486f8b8683dc3f30f937 rpm-4.9.90.git11536.tar.bz2