commit 8fe762fb05e3deb712896dac4f1630b47600ba1b
Author: Elan Ruusamäe <[email protected]>
Date: Wed Mar 16 17:30:56 2016 +0200
applied upstream:
avoid-double-slash-in-path-for-dirname-filetrigger-matching.patch
...-in-path-for-dirname-filetrigger-matching.patch | 23 ----------------------
rpm.spec | 4 +---
2 files changed, 1 insertion(+), 26 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 8c0f770..0418195 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -256,8 +256,6 @@ Patch1031:
%{name}-5.4.9-mire-fix-strings-lacking-null-terminator.patch
Patch1032: %{name}-5.4.9-rpmpython-fix-input.patch
# status: ready
Patch1033: %{name}-5.4.7-no-seqid_init-on-rdonly-database.patch
-# status: probably ready for merging
-Patch1034:
%{name}-5.4.9-avoid-double-slash-in-path-for-dirname-filetrigger-matching.patch
# status: probably ready to merge, discuss on rpm-devel first
Patch1035: %{name}-5.4.9-fix-verify-segfault.patch
# Due to rpmdav/neon being written in a different fashion than other rpmio
clients,
@@ -1000,7 +998,7 @@ cd -
%patch1031 -p1
%patch1032 -p1
%patch1033 -p1
-%patch1034 -p1
+
%patch1035 -p1
%patch1037 -p1
%patch1038 -p1
diff --git
a/rpm-5.4.9-avoid-double-slash-in-path-for-dirname-filetrigger-matching.patch
b/rpm-5.4.9-avoid-double-slash-in-path-for-dirname-filetrigger-matching.patch
deleted file mode 100644
index 7535c34..0000000
---
a/rpm-5.4.9-avoid-double-slash-in-path-for-dirname-filetrigger-matching.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- rpm-5.4.9/lib/psm.c.slash~ 2012-05-15 03:47:32.000000000 +0200
-+++ rpm-5.4.9/lib/psm.c 2012-05-15 03:49:04.075347677 +0200
-@@ -1463,11 +1463,15 @@ static rpmRC runTriggersLoop(rpmpsm psm,
- ARGint_t vals;
-
- depName = _free(depName);
-- depName = (char *) xmalloc(nName + 1 + 1);
-- (void) stpcpy(depName, Name);
-- /* XXX re-add the pesky trailing '/' to dirnames. */
-- depName[nName] = (tagno == RPMTAG_DIRNAMES ? '/' : '\0');
-- depName[nName+1] = '\0';
-+ if (!strcmp(Name, "/"))
-+ depName = xstrdup(Name);
-+ else {
-+ depName = xmalloc(nName + 1 + 1);
-+ (void) stpcpy(depName, Name);
-+ /* XXX re-add the pesky trailing '/' to dirnames. */
-+ depName[nName] = (tagno == RPMTAG_DIRNAMES ? '/' : '\0');
-+ depName[nName+1] = '\0';
-+ }
-
- if (depName[0] == '/' && psm->Tmires != NULL) {
- miRE mire;
================================================================
---- 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
