commit 934ae231a4b2309cef83be43ce43286f7436a5ff
Author: Elan Ruusamäe <[email protected]>
Date: Wed Mar 16 17:29:11 2016 +0200
fix-minor-memleaks.patch partially applied upstream
rpm-5.4.7-fix-minor-memleaks.patch | 11 -----------
rpm.spec | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index d461a99..8c0f770 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -992,8 +992,8 @@ cd -
%patch1021 -p1
%patch1022 -p1
%patch1024 -p1
-%patch1026 -p1
-%patch1027 -p1
+#%patch1026 -p1 REDIFF
+#%patch1027 -p1 REDIFF
%patch1028 -p1
%patch1029 -p1
%patch1030 -p1
diff --git a/rpm-5.4.7-fix-minor-memleaks.patch
b/rpm-5.4.7-fix-minor-memleaks.patch
index 78a1899..35f5aae 100644
--- a/rpm-5.4.7-fix-minor-memleaks.patch
+++ b/rpm-5.4.7-fix-minor-memleaks.patch
@@ -1,14 +1,3 @@
---- rpm-5.4.7/build/parseReqs.c.memleak~ 2012-03-21 19:13:54.725053861
+0100
-+++ rpm-5.4.7/build/parseReqs.c 2012-03-21 19:13:57.755057614 +0100
-@@ -177,7 +177,7 @@ rpmRC parseRCPOT(Spec spec, Package pkg,
- if (!(nr > 3 && EVR[0] == '%' && EVR[1] == '{' && EVR[nr-1] == '}'))
- {
- memset(evr, 0, sizeof(*evr));
-- ix = rpmEVRparse(xstrdup(EVR), evr);
-+ ix = rpmEVRparse(EVR, evr);
- evr->str = _free(evr->str);
- }
- if (ix != 0) {
--- rpm-5.4.7/rpmio/macro.c.memleak~ 2012-03-21 19:16:07.453218370 +0100
+++ rpm-5.4.7/rpmio/macro.c 2012-03-21 19:19:33.758488216 +0100
@@ -2818,8 +2818,10 @@ rpmLoadMacroFile(MacroContext mc, const
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/6a66bc249043bebf24d1d7c1254ef126b1c14707
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
