From: Jan Rękorajski Date: Thu, 1 Aug 2013 17:23:48 +0000 (+0200) Subject: - fix regression X-Git-Tag: auto/th/rpm-5.4.12-2 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=221ad2139824219bf49e3d9fb4b88f4ee4cb8b26;p=packages%2Frpm.git - fix regression - rel 2 --- diff --git a/rpm-5.4.12-copy-Value-string.patch b/rpm-5.4.12-copy-Value-string.patch new file mode 100644 index 0000000..fb2af38 --- /dev/null +++ b/rpm-5.4.12-copy-Value-string.patch @@ -0,0 +1,11 @@ +--- rpm-5.4.12/build/expression.c.strdup~ 2013-07-31 18:10:52.556444318 +0200 ++++ rpm-5.4.12/build/expression.c 2013-07-31 18:10:30.794081121 +0200 +@@ -63,7 +63,7 @@ static Value valueMakeString(/*@only@*/ + + v = (Value) xmalloc(sizeof(*v)); + v->type = VALUE_TYPE_STRING; +- v->data.s = s; ++ v->data.s = xstrdup(s); + return v; + } + diff --git a/rpm.spec b/rpm.spec index 01b00f8..5be9aef 100644 --- a/rpm.spec +++ b/rpm.spec @@ -43,7 +43,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 5.4.12 -Release: 1 +Release: 2 License: LGPL v2.1 Group: Base # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.12-0.20130725.src.rpm @@ -265,6 +265,8 @@ Patch1040: %{name}-5.4.9-support-signatures-and-digest-disablers.patch Patch1041: %{name}-5.4.9-disable-l10ndir.patch # status: ready for merge Patch1042: %{name}-5.4.9-fix-rpm_qa-pattern.patch +# warning: introduces memory leak +Patch1043: %{name}-5.4.12-copy-Value-string.patch URL: http://rpm5.org/ BuildRequires: %{reqdb_pkg}-devel >= %{reqdb_pkgver} @@ -936,6 +938,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch1040 -p1 %patch1041 -p1 %patch1042 -p1 +%patch1043 -p1 %patch68 -p1 %patch69 -p1