From 17d9a00529681da102d7a656ffc580e50a4dc349 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Fri, 25 Jan 2019 12:50:12 +0100 Subject: [PATCH] - fix trigger flag int type check --- rpm-trigger-flags-int-type.patch | 12 ++++++++++++ rpm.spec | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 rpm-trigger-flags-int-type.patch diff --git a/rpm-trigger-flags-int-type.patch b/rpm-trigger-flags-int-type.patch new file mode 100644 index 0000000..b3ed60a --- /dev/null +++ b/rpm-trigger-flags-int-type.patch @@ -0,0 +1,12 @@ +diff -ur rpm-4.5.orig/lib/formats.c rpm-4.5/lib/formats.c +--- rpm-4.5.orig/lib/formats.c 2008-06-10 01:19:16.000000000 +0200 ++++ rpm-4.5/lib/formats.c 2019-01-24 21:42:07.736000000 +0100 +@@ -900,7 +900,7 @@ + char * val; + + assert(ix == 0); +- if (he->t != RPM_INT64_TYPE) { ++ if (he->t != RPM_INT32_TYPE) { + val = xstrdup(_("(invalid type)")); + } else { + int anint = data.i64p[ix]; diff --git a/rpm.spec b/rpm.spec index aa9ef4e..f582a33 100644 --- a/rpm.spec +++ b/rpm.spec @@ -42,7 +42,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 4.5 -Release: 84 +Release: 85 License: LGPL Group: Base Source0: %{name}-%{version}.tar.gz @@ -175,6 +175,7 @@ Patch112: notrans.patch Patch113: %{name}-rubyprov.patch Patch114: %{name}-ruby-gem-build.patch Patch115: %{name}-glibc.patch +Patch116: %{name}-trigger-flags-int-type.patch URL: http://rpm5.org/ BuildRequires: autoconf >= 2.57 BuildRequires: automake >= 1.4 @@ -817,6 +818,7 @@ install %{SOURCE13} scripts/perl.prov %patch113 -p1 %patch114 -p1 %patch115 -p1 +%patch116 -p1 mv -f po/{sr,sr@Latn}.po rm -rf sqlite zlib popt -- 2.46.0