[packages/rpm/dev-5.4.16] rpm-preserve-tag-type.patch outdated

[glen]

commit 9a880087fb2b9c269cb8fd510f298ff43d7c1a80
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Apr 20 16:48:38 2016 +0300

    rpm-preserve-tag-type.patch outdated
    
    the tagTypeValidate method no longer modifies he->t value, see c065c1c1c

 rpm-preserve-tag-type.patch | 51 ---------------------------------------------
 rpm.spec                    |  2 --
 2 files changed, 53 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index ea83883..f6a5eda 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -161,7 +161,6 @@ Patch65:	%{name}-parseSpec-skip-empty-tags.patch
 Patch67:	%{name}-repackage-dont-force-max-compression.patch
 Patch70:	python-%{name}sense-missingok.patch
 Patch71:	%{name}-changelog-encoding.patch
-Patch72:	%{name}-preserve-tag-type.patch
 Patch74:	%{name}-fix-internal-lua-build.patch
 Patch75:	%{name}-double_check_file_deps.patch
 Patch77:	%{name}-lua-expat.patch
@@ -944,7 +943,6 @@ cd -
 %patch67 -p1
 %patch70 -p1
 %patch71 -p1
-%patch72 -p1
 %patch74 -p1
 %patch75 -p1
 %patch77 -p0
diff --git a/rpm-preserve-tag-type.patch b/rpm-preserve-tag-type.patch
deleted file mode 100644
index f4dca9e..0000000
--- a/rpm-preserve-tag-type.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit 8241b884f83153dee9cdcddac7a476c6234cf156
-Author: Kacper Kornet <draenog at pld-linux.org>
-Date:   Sun May 5 21:56:02 2013 +0100
-
-    Don't overwrite type of validated tag
-    
-    It caused  headerGet(h, he, HEADERGET_NOI18NSTRING|HEADERGET_NOEXTENSION)
-    to return always he->t = RPMTAG_STRING even when RPM_I18NSTRING_TYPE (char **)
-    was returned in reality.
-
---- rpm-5.4.16/rpmdb/tagname.c~	2016-03-05 21:00:47.000000000 +0200
-+++ rpm-5.4.16/rpmdb/tagname.c	2016-03-16 18:23:45.265891340 +0200
-@@ -515,25 +515,27 @@
- void tagTypeValidate(HE_t he);
- void tagTypeValidate(HE_t he)
- {
-+    HE_s he_s = *he;
-+
-     /* XXX Re-map RPM_I18NSTRING_TYPE -> RPM_STRING_TYPE */
--    if (he->t == RPM_I18NSTRING_TYPE)
--	he->t = RPM_STRING_TYPE;
-+    if (he_s.t == RPM_I18NSTRING_TYPE)
-+	he_s.t = RPM_STRING_TYPE;
- 
-     /* XXX Arbitrary tags are always strings. */
--    if ((he->tag & 0x40000000)
--     && (he->t == RPM_STRING_TYPE || he->t == RPM_STRING_ARRAY_TYPE))
-+    if ((he_s.tag & 0x40000000)
-+     && (he_s.t == RPM_STRING_TYPE || he_s.t == RPM_STRING_ARRAY_TYPE))
- 	return;
- 
-     /* XXX Make 0x3fffffff disappear for now. Signature? */
--    if (he->tag == 0x3fffffff && he->t == RPM_BIN_TYPE)
-+    if (he_s.tag == 0x3fffffff && he_s.t == RPM_BIN_TYPE)
- 	return;
- 
- /* XXX hack around known borkage for now. */
--if (!(he->tag == 62))
--if (!(he->tag == 261 || he->tag == 269))
--if (!(he->tag == 1000 || he->tag == 1004 || he->tag == 1007))
--if (!(he->tag == 1029 || he->tag == 1086 || he->tag == 1087))
--if (he->t != (tagType(he->tag) & 0xffff))
--fprintf(stderr, "==> warning: tag %u type(0x%x) != implicit type(0x%x)\n", (unsigned) he->tag, he->t, tagType(he->tag));
-+if (!(he_s.tag == 62))
-+if (!(he_s.tag == 261 || he_s.tag == 269))
-+if (!(he_s.tag == 1000 || he_s.tag == 1004 || he_s.tag == 1007))
-+if (!(he_s.tag == 1029 || he_s.tag == 1086 || he_s.tag == 1087))
-+if (he_s.t != (tagType(he_s.tag) & 0xffff))
-+fprintf(stderr, "==> warning: tag %u type(0x%x) != implicit type(0x%x)\n", (unsigned) he_s.tag, he_s.t, tagType(he_s.tag));
- }
- #endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/8422d129dc2ef484d05dcf4bd9ecf32949dd183d