From 07c40cab5eb0fc0826f033ef34ce0304e9313679 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 16 Mar 2016 17:40:27 +0200 Subject: [PATCH] applied upstream: truncate-output-buffer-after-use.patch --- rpm-5.4.12-truncate-output-buffer-after-use.patch | 11 ----------- rpm.spec | 6 +++--- 2 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 rpm-5.4.12-truncate-output-buffer-after-use.patch diff --git a/rpm-5.4.12-truncate-output-buffer-after-use.patch b/rpm-5.4.12-truncate-output-buffer-after-use.patch deleted file mode 100644 index ff3b418..0000000 --- a/rpm-5.4.12-truncate-output-buffer-after-use.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rpm-5.4.12/rpmio/rpmpython.c.rpmpythontrunc~ 2013-08-09 03:05:39.809947086 +0200 -+++ rpm-5.4.12/rpmio/rpmpython.c 2013-08-09 03:25:25.097372593 +0200 -@@ -229,6 +229,8 @@ fprintf(stderr, "==> %s(%p,%s,%p)\n", __ - if (sys_stdout != NULL && PycStringIO_OutputCheck(sys_stdout)) { - PyObject * o = (*PycStringIO->cgetvalue)(sys_stdout); - *resultp = (PyString_Check(o) ? PyString_AsString(o) : ""); -+ PyObject_CallMethod(sys_stdout, "seek", "i",0); -+ PyObject_CallMethod(sys_stdout, "truncate", NULL); - } else - *resultp = ""; - } diff --git a/rpm.spec b/rpm.spec index 044ca93..6f6f3c7 100644 --- a/rpm.spec +++ b/rpm.spec @@ -285,7 +285,7 @@ Patch1041: %{name}-5.4.9-disable-l10ndir.patch Patch1042: %{name}-5.4.9-fix-rpm_qa-pattern.patch Patch1044: %{name}-5.4.12-fix-rpmlua-print.patch Patch1045: %{name}-5.4.12-fix-rpmpython-module-import-init.patch -Patch1046: %{name}-5.4.12-truncate-output-buffer-after-use.patch + Patch1047: %{name}-5.4.13-perl-bindings-do-not-use-xmalloc.patch # proyvind: # there's a rpmdbchk tool I wrote a while back, which might help you. although @@ -1006,9 +1006,9 @@ cd - #%patch1041 -p1 %patch1042 -p1 -%patch1044 -p1 +#%patch1044 -p1 RECHECK %patch1045 -p1 -%patch1046 -p1 + %patch1047 -p1 %patch1048 -p1 %patch1049 -p1 -- 2.44.0