From 858e616f4169f3579057bb4d4c1ccdbe72964f82 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 30 Oct 2011 10:32:56 +0100
Subject: [PATCH] libxbps: preserve config file if they exist for replaced
 pkgs.

---
 NEWS                              |  4 ++++
 include/xbps_api.h                |  2 +-
 lib/package_unpack.c              | 28 +++++++++++++++++++++++-----
 lib/transaction_package_replace.c |  2 ++
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 802b5403..cb3462d6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 xbps-0.11.0 (???):
 
+ * libxbps: when unpacking a package that replaced another package
+   due to virtual packages, preserve its configuration files if
+   they already existed.
+
  * xbps-bin(8)/xbps-repo(8): new flag '-o' (option). This can be used
    in the 'show' target to print only a set of objects stored in package's
    properties dictionary, example:
diff --git a/include/xbps_api.h b/include/xbps_api.h
index bcbacc57..5dcf7bc9 100644
--- a/include/xbps_api.h
+++ b/include/xbps_api.h
@@ -55,7 +55,7 @@
  */
 #define XBPS_PKGINDEX_VERSION	"1.2"
 
-#define XBPS_API_VERSION	"20111027-1"
+#define XBPS_API_VERSION	"20111030"
 #define XBPS_VERSION		"0.11.0"
 
 /**
diff --git a/lib/package_unpack.c b/lib/package_unpack.c
index 8bed1fed..ee3237e5 100644
--- a/lib/package_unpack.c
+++ b/lib/package_unpack.c
@@ -163,7 +163,7 @@ unpack_archive(prop_dictionary_t pkg_repod,
 	const char *entry_pname, *transact;
 	char *buf;
 	int rv, flags;
-	bool preserve, update;
+	bool preserve, update, replace;
 
 	assert(prop_object_type(pkg_repod) == PROP_TYPE_DICTIONARY);
 	assert(ar != NULL);
@@ -326,6 +326,23 @@ unpack_archive(prop_dictionary_t pkg_repod,
 		xhp->xucd->entry_total_count +=
 		    (ssize_t)prop_array_count(array);
 
+		replace = false;
+		if (prop_dictionary_get_bool(pkg_repod,
+		    "replacing-package", &replace) && replace) {
+			/*
+			 * The package we are currently unpacking replaced
+			 * another package that it was removed, respect
+			 * configuration files if they exist.
+			 */
+			if (S_ISREG(entry_statp->st_mode) &&
+			    xbps_entry_is_a_conf_file(propsd, entry_pname) &&
+			    (access(entry_pname, R_OK) == 0)) {
+				xbps_dbg_printf("%s: preserving conf_file %s.\n",
+				    pkgname, entry_pname);
+				archive_read_data_skip(ar);
+				continue;
+			}
+		}
 		if (update && S_ISREG(entry_statp->st_mode)) {
 			/*
 			 * Handle configuration files. Check if current entry is
@@ -338,6 +355,7 @@ unpack_archive(prop_dictionary_t pkg_repod,
 				/* error */
 				goto out;
 			} else if (rv == 1) {
+				/* configuration file */
 				if (xhp->xucd != NULL)
 					xhp->xucd->entry_is_conf = true;
 
@@ -352,7 +370,6 @@ unpack_archive(prop_dictionary_t pkg_repod,
 					 * as is now and pass to next entry.
 					 */
 					archive_read_data_skip(ar);
-					RUN_PROGRESS_CB();
 					continue;
 				}
 			} else {
@@ -372,8 +389,11 @@ unpack_archive(prop_dictionary_t pkg_repod,
 					goto out;
 				} else if (rv == 0) {
 					/* hash match, skip */
+					xbps_dbg_printf("%s-%s: entry %s "
+					    "matches current SHA256, "
+					    "skipping...\n", pkgname,
+					    version, entry_pname);
 					archive_read_data_skip(ar);
-					RUN_PROGRESS_CB();
 					continue;
 				}
 			}
@@ -392,8 +412,6 @@ unpack_archive(prop_dictionary_t pkg_repod,
 				if (xhp->flags & XBPS_FLAG_VERBOSE)
 					xbps_warn_printf("ignoring existing "
 					    "entry: %s\n", entry_pname);
-
-				RUN_PROGRESS_CB();
 				continue;
 			}
 		}
diff --git a/lib/transaction_package_replace.c b/lib/transaction_package_replace.c
index d74d1b04..bb7be887 100644
--- a/lib/transaction_package_replace.c
+++ b/lib/transaction_package_replace.c
@@ -134,6 +134,8 @@ xbps_transaction_package_replace(prop_dictionary_t transd)
 				}
 				prop_dictionary_set_bool(pkg_repod,
 				    "automatic-install", instd_auto);
+				prop_dictionary_set_bool(pkg_repod,
+				    "replacing-package", true);
 			}
 			/*
 			 * Add package dictionary into the transaction and mark