[packages/rpm/dev-5.4.16] do_not_write_before_macro_buffer.patch seems applied

[glen]

commit e3721e11d26c6503b94f0e55819f1d95393b0f65
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Apr 20 18:07:17 2016 +0300

    do_not_write_before_macro_buffer.patch seems applied

 do_not_write_before_macro_buffer.patch | 23 -----------------------
 rpm.spec                               |  2 --
 2 files changed, 25 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 12a304f..d87dd21 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -180,7 +180,6 @@ Patch90:	%{name}-cppcompat.patch
 Patch91:	py-disable-fetch.patch
 Patch92:	fast_python_deps.patch
 Patch93:	python2_explicit.patch
-Patch94:	do_not_write_before_macro_buffer.patch
 
 # Patches imported from Mandriva
 
@@ -1006,7 +1005,6 @@ cd -
 %patch83 -p1
 %patch92 -p1
 %patch93 -p1
-%patch94 -p1
 
 %patch1050 -p1
 
diff --git a/do_not_write_before_macro_buffer.patch b/do_not_write_before_macro_buffer.patch
deleted file mode 100644
index 14fbd82..0000000
--- a/do_not_write_before_macro_buffer.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2015-November/thread.html#24537
-
---- rpm-5.4.15.orig/rpmio/macro.c	2015-11-28 20:47:15.000000000 +0100
-+++ rpm-5.4.15/rpmio/macro.c	2015-11-28 20:51:05.634724202 +0100
-@@ -706,7 +706,9 @@
-     FILE *shf;
-     int rc;
-     int c;
-+    char * start;
- 
-+    start = mb->t;
-     strncpy(buf, cmd, clen);
-     buf[clen] = '\0';
-     rc = expandU(mb, buf, bufn);
-@@ -720,7 +722,7 @@
-     (void) pclose(shf);
- 
-     /* XXX delete trailing \r \n */
--    while (iseol(mb->t[-1])) {
-+    while (mb->t > start && iseol(mb->t[-1])) {
- 	*(mb->t--) = '\0';
- 	mb->nb++;
-     }
================================================================

---- gitweb:

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