applied upstream: avoid-double-slash-in-path-for-dirname-filetrigger-matching.patch

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 (file)
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;

diff --git a/rpm.spec b/rpm.spec
index 8c0f770471805beeeae4e5546116aa36940a253b..04181959ca94950f85ed5adc35b95c52960f86d2 100644 (file)
--- 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