[packages/rpm/dev-5.4.16] 5.4.14-no-assert-abort-with-broken-headers.patch outdated
glen
glen at pld-linux.org
Wed Apr 20 16:58:36 CEST 2016
commit 8422d129dc2ef484d05dcf4bd9ecf32949dd183d
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Apr 20 16:59:47 2016 +0300
5.4.14-no-assert-abort-with-broken-headers.patch outdated
the assert is no longer there
rpm-5.4.14-no-assert-abort-with-broken-headers.patch | 11 -----------
rpm.spec | 3 ---
2 files changed, 14 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index a8fc5f1..12a304f 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -290,8 +290,6 @@ Patch1045: %{name}-5.4.12-fix-rpmpython-module-import-init.patch
# stab at adding support for fixing your specific problem to the util ;)
# https://abf.io/openmandriva/rpm/raw/master/rpm-5.4.14-rpmdbchk.patch
Patch1048: %{name}-5.4.14-rpmdbchk.patch
-# https://abf.io/openmandriva/rpm/raw/master/rpm-5.4.14-no-assert-abort-with-broken-headers.patch
-Patch1049: %{name}-5.4.14-no-assert-abort-with-broken-headers.patch
Patch1050: python-libx32.patch
@@ -1004,7 +1002,6 @@ cd -
%patch1045 -p1
%patch1048 -p1
-%patch1049 -p1
%patch83 -p1
%patch92 -p1
diff --git a/rpm-5.4.14-no-assert-abort-with-broken-headers.patch b/rpm-5.4.14-no-assert-abort-with-broken-headers.patch
deleted file mode 100644
index 0b9278e..0000000
--- a/rpm-5.4.14-no-assert-abort-with-broken-headers.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rpm-5.4.14/rpmdb/header.c.noassert~ 2014-06-25 19:22:35.521902207 +0200
-+++ rpm-5.4.14/rpmdb/header.c 2014-06-25 19:22:37.381920455 +0200
-@@ -1076,7 +1076,7 @@ assert(h != NULL);
- rpmuint32_t * stei = (rpmuint32_t *)
- memcpy(alloca(nb), dataStart + off, nb);
- rdl = (rpmuint32_t)-ntohl(stei[2]); /* negative offset */
--assert((rpmint32_t)rdl >= 0); /* XXX insurance */
-+//assert((rpmint32_t)rdl >= 0); /* XXX insurance */
- ril = (rpmuint32_t)(rdl/sizeof(*pe));
- if (hdrchkTags(ril) || hdrchkData(rdl))
- goto errxit;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/8422d129dc2ef484d05dcf4bd9ecf32949dd183d
More information about the pld-cvs-commit
mailing list