From e4f80724ecef30e4e0d28d71a45e93831b6b2d92fe4d2010e4697c6ec7e82ccc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Schr=C3=B6der?= <mls@suse.com>
Date: Wed, 14 Feb 2018 12:11:32 +0000
Subject: [PATCH] update

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=442
---
 hardlinks.diff | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/hardlinks.diff b/hardlinks.diff
index f69a1d0..dba3a6b 100644
--- a/hardlinks.diff
+++ b/hardlinks.diff
@@ -52,15 +52,17 @@
  }
  
  /**
-@@ -491,6 +502,7 @@ static void handleInstInstalledFile(const rpmts ts, rpmte p, rpmfiles fi, int fx
- static void handleOverlappedFiles(rpmts ts, fingerPrintCache fpc, rpmte p, rpmfiles fi)
- {
-     rpm_loff_t fixupSize = 0;
-+    rpm_loff_t fileSize = 0;
-     int i, j;
-     rpmfs fs = rpmteGetFileStates(p);
-     rpmfs otherFs;
-@@ -628,7 +640,8 @@ assert(otherFi != NULL);
+@@ -506,6 +517,9 @@ static void handleOverlappedFiles(rpmts ts, fingerPrintCache fpc, rpmte p, rpmfi
+ 	rpmfileAttrs FFlags;
+ 	struct rpmffi_s * recs;
+ 	int numRecs;
++	rpm_loff_t fileSize;
++	int nlink;
++	const int *links;
+ 
+ 	if (XFA_SKIPPING(rpmfsGetAction(fs, i)))
+ 	    continue;
+@@ -628,7 +642,8 @@ assert(otherFi != NULL);
  		break;
  
  	    /* Try to get the disk accounting correct even if a conflict. */
@@ -70,7 +72,7 @@
  
  	    if (rpmfilesConfigConflict(fi, i)) {
  		/* Here is an overlapped  pre-existing config file. */
-@@ -675,9 +688,16 @@ assert(otherFi != NULL);
+@@ -675,9 +690,16 @@ assert(otherFi != NULL);
  	}
  	rpmfilesFree(otherFi);