Move ~/.rpmmacros and ~/.rpmrc to ~/.config/rpm/

The XDG cofiguration directory is the new default location for the
macros and rpmrc file. Migrate legacy files automatically. Create
symlinks from the home directory for compatibility with older
rpm versions.

Resolves: #3467

Author: ffesti

lib/rpmrc.cc

@@ -5,6 +5,7 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
+#include <filesystem>
 
 #include <fcntl.h>
 #include <stdarg.h>
@@ -358,6 +359,41 @@ const char * lookupInDefaultTable(const char * name,
     return name;
 }
 
+static void moveConfigFile(const char * from, const char * userdir, const char * name) {
+    std::string home = std::getenv("HOME");
+    std::error_code ec;
+    std::string from_path = from;
+    std::string userdir_path = userdir;
+
+    if (from_path.substr(0, 2) == "~/")
+	from_path.replace(0, 1, home);
+    if (userdir_path.substr(0, 2) == "~/")
+	userdir_path.replace(0, 1, home);
+    std::filesystem::path to_path = std::filesystem::path(userdir_path) / name;
+
+    if (std::filesystem::is_regular_file(from_path) &&
+	!std::filesystem::exists(to_path))
+    {
+	std::filesystem::create_directories(userdir_path, ec);
+	if (ec) goto err;
+	std::filesystem::path target = std::filesystem::relative(to_path, std::filesystem::path(from_path).parent_path(), ec);
+	if (ec) goto err;
+
+	std::filesystem::copy(from_path, to_path, ec);
+	if (ec) goto err;
+	std::filesystem::remove(from_path, ec);
+	if (ec) goto err;
+	std::filesystem::create_symlink(target , from_path, ec);
+	if (ec) goto err;
+	rpmlog(RPMLOG_WARNING, "Moved and symlinked %s to %s\n",
+	       from_path.c_str(), to_path.c_str());
+    }
+    return;
+ err:
+    rpmlog(RPMLOG_ERR, "Could not move %s to %s: %s\n",
+	   from_path.c_str(), to_path.c_str(), ec.message().c_str());
+}
+
 static void setDefaults(void)
 {
     /* If either is missing, we need to go through this whole dance */
@@ -380,6 +416,10 @@ static void setDefaults(void)
 	const char *oldmacros = "~/.rpmmacros";
 	const char *oldrc = "~/.rpmrc";
 	if (rpmGlob(oldmacros, NULL, NULL) == 0 || rpmGlob(oldrc, NULL, NULL) == 0) {
+	    
+	    moveConfigFile(oldmacros, userdir, "macros");
+	    moveConfigFile(oldrc, userdir, "rpmrc");
+	    
 	    free(usermacros);
 	    free(userrc);
 	    usermacros = xstrdup(oldmacros);

tests/rpmmacro.at

@@ -7,14 +7,17 @@ AT_KEYWORDS([macros])
 
 # .rpmmacros exists, new directory not
 RPMTEST_CHECK([[
-rm -rf ~/.config/rpm ~/.rpmmacros
-touch ~/.rpmmacros
-rpm --showrc | awk '/^Macro path/{print(a[split($0,a,":")])}'
+runroot rm -rf /root/.config/rpm /root/.rpmmacros
+runroot touch /root/.rpmmacros
+runroot rpm --showrc | awk '/^Macro path/{print(a[split($0,a,":")])}'
+runroot rpm --showrc | awk '/^Macro path/{print(a[split($0,a,":")])}'
 ]],
 [0],
 [~/.rpmmacros
+~/.config/rpm/macros
 ],
-[])
+[warning: Moved and symlinked /root/.rpmmacros to /root/.config/rpm/macros
+])
 
 # prefer new style if it exists
 RPMTEST_CHECK([[
@@ -50,6 +53,36 @@ SOMENV=/tmp/somewhere rpm --macros "%{getenv:SOMENV}" --eval "%somewhere"
 [])
 RPMTEST_CLEANUP
 
+RPMTEST_SETUP_RW([macro path])
+AT_KEYWORDS([convert .macros])
+RPMTEST_USER
+
+RPMTEST_CHECK([[
+runroot_user rm -f /home/$RPMUSER/.config/rpm
+runroot_user rm -f /home/$RPMUSER/.rpmmacros
+runroot_user rm -f /home/$RPMUSER/.rpmrc
+runroot_user bash -c "echo %foo bar > /home/$RPMUSER/.rpmmacros"
+runroot_user touch "/home/$RPMUSER/.rpmrc"
+
+runroot_user readlink /home/$RPMUSER/.rpmmacros
+runroot_user rpm -E "%{foo}"
+runroot_user readlink /home/$RPMUSER/.rpmmacros
+runroot_user readlink /home/$RPMUSER/.rpmrc
+runroot_user rpm -E "%{foo}"
+runroot_user rpm --showrc | awk '/^Macro path/{print(a[split($0,a,":")])}'
+]],
+[0],
+[bar
+.config/rpm/macros
+.config/rpm/rpmrc
+bar
+~/.config/rpm/macros
+],
+[warning: Moved and symlinked /home/klang/.rpmmacros to /home/klang/.config/rpm/macros
+warning: Moved and symlinked /home/klang/.rpmrc to /home/klang/.config/rpm/rpmrc
+])
+RPMTEST_CLEANUP
+
 # ------------------------------
 RPMTEST_SETUP_RW([macro path: skip editor backups])
 AT_KEYWORDS([macros])