From 1949761951ada4088cd8b7d8a842d03df797416a Mon Sep 17 00:00:00 2001
From: Niels Thykier <niels@thykier.net>
Date: Sun, 3 May 2020 18:08:54 +0000
Subject: [PATCH 2/5] Remove DPKGDISTEXT variant of conffile

Signed-off-by: Niels Thykier <niels@thykier.net>
---
 src/configure.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/configure.c b/src/configure.c
index e19ba5bdb0..aed5739a82 100644
--- a/src/configure.c
+++ b/src/configure.c
@@ -402,6 +402,12 @@ deferred_configure_conffile(struct pkginfo *pkg, struct conffile *conff)
 	/* From now on we can just strcpy(cdr2rest, extension); */
 
 	if (conff->remove_on_upgrade) {
+		/* remove DPKGDISTEXT variant if still present */
+		strcpy(cdr2rest, DPKGOLDEXT);
+		if (unlink(cdr2.buf) && errno != ENOENT)
+			warning(_("%s: failed to remove '%.250s': %s"),
+				  pkg_name(pkg, pnaw_nonambig), cdr2.buf,
+				  strerror(errno));
 		if (strcmp(currenthash, NONEXISTENTFLAG) == 0) {
 			/* Already removed (e.g. by local admin) */
 			return;
-- 
2.26.2

