payload-use-hashed-inode.patch applied upstream

diff --git a/rpm-payload-use-hashed-inode.patch b/rpm-payload-use-hashed-inode.patch
deleted file mode 100644 (file)
index 05e2447..0000000
--- a/rpm-payload-use-hashed-inode.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -ur rpm-5.4.10/build/files.c rpm-5.4.10-collision/build/files.c
---- rpm-5.4.10/build/files.c   2013-03-17 13:17:38.233358389 +0100
-+++ rpm-5.4.10-collision/build/files.c 2013-03-17 13:07:37.468483625 +0100
-@@ -1323,6 +1323,26 @@
-     return dalgo;
- }
- 
-+static int isHardLink(FileListRec flp, FileListRec tlp)
-+{
-+    return ((S_ISREG(flp->fl_mode) && S_ISREG(tlp->fl_mode)) &&
-+            ((flp->fl_nlink > 1) && (flp->fl_nlink == tlp->fl_nlink)) &&
-+            (flp->fl_ino == tlp->fl_ino) &&
-+            (flp->fl_dev == tlp->fl_dev));
-+}
-+
-+static int seenHardLink(FileList fl, FileListRec flp, ino_t *fileid)
-+{
-+    FileListRec ilp;
-+    for (ilp = fl->fileList; ilp < flp; ilp++) {
-+        if (isHardLink(flp, ilp)) {
-+            *fileid = ilp - fl->fileList;
-+            return 1;
-+        }
-+    }
-+    return 0;
-+}
-+
- /**
-  * Add file entries to header.
-  * @todo Should directories have %doc/%config attributes? (#14531)
-@@ -1370,6 +1390,7 @@
- 
-     for (i = 0, flp = fl->fileList; i < fl->fileListRecsUsed; i++, flp++) {
-       const char *s;
-+      ino_t fileid = flp - fl->fileList;
- 
-       /* Merge duplicate entries. */
-       while (i < (fl->fileListRecsUsed - 1) &&
-@@ -1437,6 +1458,13 @@
-       /* Leave room for both dirname and basename NUL's */
-       dpathlen += (strlen(flp->diskURL) + 2);
- 
-+      /* Excludes and dupes have been filtered out by now. */
-+      if (S_ISREG(flp->fl_mode)) {
-+          if (flp->fl_nlink == 1 || !seenHardLink(fl, flp, &fileid)) {
-+              fl->totalFileSize += flp->fl_size;
-+          }
-+      }
-+
-       /*
-        * Make the header, the OLDFILENAMES will get converted to a 
-        * compressed file list write before we write the actual package to
-@@ -1519,7 +1547,11 @@
- 
-       /* XXX Hash instead of 64b->32b truncate to prevent aliasing. */
-       {   ino_t _ino = flp->fl_ino;
--          ui32 = hashFunctionString(0, &_ino, sizeof(_ino));
-+      /* don't use hash here, as hash collisions which happen on large packages
-+         cause bus errors in rpmbuild
-+          ui32 = hashFunctionString(0, &_ino, sizeof(_ino));
-+      */
-+          ui32 = fileid + 1;
-       }
-       he->tag = RPMTAG_FILEINODES;
-       he->t = RPM_UINT32_TYPE;
-@@ -1752,39 +1780,6 @@
-               IOSM_MAP_TYPE | IOSM_MAP_MODE | IOSM_MAP_UID | IOSM_MAP_GID;
-       if (isSrc)
-           fi->fmapflags[i] |= IOSM_FOLLOW_SYMLINKS;
--
--      if (S_ISREG(flp->fl_mode)) {
--          int bingo = 1;
--          /* Hard links need be tallied only once. */
--          if (flp->fl_nlink > 1) {
--              FileListRec jlp = flp + 1;
--              int j = i + 1;
--              for (; (unsigned)j < fi->fc; j++, jlp++) {
--                  /* follow outer loop logic */
--                  while (((jlp - fl->fileList) < (fl->fileListRecsUsed - 1)) &&
--                          !strcmp(jlp->fileURL, jlp[1].fileURL))
--                      jlp++;
--                  if (jlp->flags & RPMFILE_EXCLUDE) {
--                      j--;
--                      /*@innercontinue@*/ continue;
--                  }
--                  if (jlp->flags & RPMFILE_GHOST)
--                      /*@innercontinue@*/ continue;
--                  if (!S_ISREG(jlp->fl_mode))
--                      /*@innercontinue@*/ continue;
--                  if (flp->fl_nlink != jlp->fl_nlink)
--                      /*@innercontinue@*/ continue;
--                  if (flp->fl_ino != jlp->fl_ino)
--                      /*@innercontinue@*/ continue;
--                  if (flp->fl_dev != jlp->fl_dev)
--                      /*@innercontinue@*/ continue;
--                  bingo = 0;  /* don't tally hardlink yet. */
--                  /*@innerbreak@*/ break;
--              }
--          }
--          if (bingo)
--              fl->totalFileSize += flp->fl_size;
--      }
-     }
- 
-     ui32 = fl->totalFileSize;

diff --git a/rpm.spec b/rpm.spec
index 559dce9f4d551ae78ae107f477fcecd0f428def8..d7a83bb64b93e90956f5fe446bebc2be21ee2bfd 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -157,7 +157,7 @@ Patch62:    %{name}-DB_CONFIG.patch
 Patch63:       %{name}-pythoneggs.patch
 Patch64:       %{name}-fix-compress-doc.patch
 Patch65:       %{name}-parseSpec-skip-empty-tags.patch
-Patch66:       %{name}-payload-use-hashed-inode.patch
+
 Patch67:       %{name}-repackage-dont-force-max-compression.patch
 Patch70:       python-%{name}sense-missingok.patch
 Patch71:       %{name}-changelog-encoding.patch
@@ -941,13 +941,13 @@ cd -
 %patch56 -p1
 %{!?with_db61:%patch57 -p1}
 %patch58 -p1
-%patch60 -p1
+#%patch60 -p1 REDIFF
 %patch61 -p1
 %patch62 -p1
 %patch63 -p1
 %patch64 -p1
 %patch65 -p1
-%patch66 -p1
+
 %patch67 -p1
 %patch70 -p1
 %patch71 -p1