diff -Nru dpkg-1.17.5ubuntu5.7/debian/changelog dpkg-1.17.5ubuntu5.8/debian/changelog --- dpkg-1.17.5ubuntu5.7/debian/changelog 2016-06-14 20:31:28.000000000 +0200 +++ dpkg-1.17.5ubuntu5.8/debian/changelog 2017-03-17 08:50:40.000000000 +0100 @@ -1,3 +1,12 @@ +dpkg (1.17.5ubuntu5.8) trusty; urgency=medium + + * src/archives.c: + - handle a conffile moving from pkg-a to pkg-b correctly when + dpkg --root=/dir is used. Thanks to Guillem Jover. + LP: #1673247 + + -- Michael Vogt Fri, 17 Mar 2017 08:50:40 +0100 + dpkg (1.17.5ubuntu5.7) trusty; urgency=medium * Backport from Debian (LP: #1587667): diff -Nru dpkg-1.17.5ubuntu5.7/.mailmap dpkg-1.17.5ubuntu5.8/.mailmap --- dpkg-1.17.5ubuntu5.7/.mailmap 2013-10-20 05:53:23.000000000 +0200 +++ dpkg-1.17.5ubuntu5.8/.mailmap 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -# Spell names properly -Raphaël Hertzog -Nicolas François -Javier Fernández-Sanguino Peña -Javier Fernández-Sanguino Peña -Eddy Petrișor -Jiří Paleček -# Use full names -Felipe E. F. de Castro -Marcos Alvarez Costales -Kenshi Muto -# Handle alias disparity -Felipe Augusto van de Wiel -Daniel Nylander -Bart Cornelis -Bart Cornelis -Andrei Popescu -Christian Perrier -# Name changes -Peter Krefting -Peter Krefting -Peter Krefting -# Use real mail addresses - - - diff -Nru dpkg-1.17.5ubuntu5.7/src/archives.c dpkg-1.17.5ubuntu5.8/src/archives.c --- dpkg-1.17.5ubuntu5.7/src/archives.c 2013-12-10 07:15:02.000000000 +0100 +++ dpkg-1.17.5ubuntu5.8/src/archives.c 2017-03-17 08:50:23.000000000 +0100 @@ -971,14 +971,7 @@ conff = conff->next) { if (!conff->obsolete) continue; - if (stat(conff->name, &stabtmp)) { - if (errno == ENOENT || errno == ENOTDIR || errno == ELOOP) - continue; - else - ohshite(_("cannot stat file '%s'"), conff->name); - } - if (stabtmp.st_dev == stab.st_dev && - stabtmp.st_ino == stab.st_ino) + if (strcmp(conff->name, nifd->namenode->name) == 0) break; } if (conff) {