From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 30 Sep 2021 14:57:30 +0000 (+0000)
Subject: configure: Add PAKFIRE_TMP_DIR
X-Git-Tag: 0.9.28~913
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93d45f3c299edc30c236f94dc0967d3acb050d02;p=pakfire.git

configure: Add PAKFIRE_TMP_DIR

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/configure.ac b/configure.ac
index 080f0a620..0ec3ae5f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -254,11 +254,13 @@ AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"])
 AC_DEFINE_UNQUOTED([PAKFIRE_CONFIG_DIR], ["${sysconfdir}/${PACKAGE_NAME}"],
 	[The path where Pakfire stores configuration files])
 AC_DEFINE_UNQUOTED([PAKFIRE_CACHE_DIR], ["/var/cache/${PACKAGE_NAME}"],
-	[The path where Pakfire stores temporary data])
+	[The path where Pakfire caches downloaded data])
 AC_DEFINE_UNQUOTED([PAKFIRE_PRIVATE_DIR], ["/var/lib/${PACKAGE_NAME}"],
 	[The path where Pakfire stores its private data])
 AC_DEFINE_UNQUOTED([PAKFIRE_SCRIPTS_DIR], ["${PREFIX}/lib/${PACKAGE_NAME}"],
 	[The path where Pakfire stores its scripts])
+AC_DEFINE_UNQUOTED([PAKFIRE_TMP_DIR], ["/var/tmp/${PACKAGE_NAME}"],
+	[The path where Pakfire stores temporary data])
 
 AC_CONFIG_FILES([
 	Makefile
diff --git a/src/libpakfire/keystore.c b/src/libpakfire/keystore.c
index 6e5b8bb2c..04620705b 100644
--- a/src/libpakfire/keystore.c
+++ b/src/libpakfire/keystore.c
@@ -104,7 +104,7 @@ ERROR:
 }
 
 int pakfire_keystore_init(struct pakfire* pakfire, gpgme_ctx_t* ctx) {
-	char path[PATH_MAX] = PAKFIRE_CACHE_DIR "/tmp/pakfire-keystore.XXXXXX";
+	char path[PATH_MAX] = PAKFIRE_TMP_DIR "/pakfire-keystore.XXXXXX";
 	char* tmp = NULL;
 
 	// Initialise GPGME
diff --git a/src/libpakfire/packager.c b/src/libpakfire/packager.c
index 15148967c..bdce258a1 100644
--- a/src/libpakfire/packager.c
+++ b/src/libpakfire/packager.c
@@ -65,7 +65,7 @@ struct pakfire_packager {
 
 static int pakfire_packager_create_mtree(struct pakfire* pakfire, struct archive** mtree,
 		FILE** f, const char** fields) {
-	char path[] = PAKFIRE_PRIVATE_DIR "/tmp/.pakfire-mtree.XXXXXX";
+	char path[] = PAKFIRE_TMP_DIR "/.pakfire-mtree.XXXXXX";
 	int r;
 
 	// Create an mtree
@@ -133,7 +133,7 @@ ERROR:
 }
 
 static int pakfire_packager_create_payload(struct pakfire_packager* p) {
-	char path[] = PAKFIRE_PRIVATE_DIR "/tmp/.pakfire-payload.XXXXXX";
+	char path[] = PAKFIRE_TMP_DIR "/.pakfire-payload.XXXXXX";
 
 	// Do not compress source packages
 	const int compress = !pakfire_package_is_source(p->pkg);
diff --git a/src/libpakfire/pakfire.c b/src/libpakfire/pakfire.c
index 5b21cf572..8bde301e1 100644
--- a/src/libpakfire/pakfire.c
+++ b/src/libpakfire/pakfire.c
@@ -819,7 +819,7 @@ ERROR:
 PAKFIRE_EXPORT int pakfire_create(struct pakfire** pakfire, const char* path,
 		const char* arch, const char* conf, int flags, pakfire_log_function_t log,
 		void* data) {
-	char tempdir[PATH_MAX] = PAKFIRE_PRIVATE_DIR "/tmp/XXXXXX";
+	char tempdir[PATH_MAX] = PAKFIRE_TMP_DIR "/XXXXXX";
 	int r = 1;
 
 	// Default to the native architecture
diff --git a/src/libpakfire/repo.c b/src/libpakfire/repo.c
index dedd6bacd..542c66bd9 100644
--- a/src/libpakfire/repo.c
+++ b/src/libpakfire/repo.c
@@ -125,7 +125,7 @@ static int pakfire_repo_import_key(struct pakfire_repo* repo, const char* url) {
 	const char* name = pakfire_repo_get_name(repo);
 	DEBUG(repo->pakfire, "Importing key for repository %s from %s...\n", name, url);
 
-	char path[PATH_MAX] = PAKFIRE_CACHE_DIR "/tmp/XXXXXX";
+	char path[PATH_MAX] = PAKFIRE_TMP_DIR "/XXXXXX";
 	struct pakfire_key** keys = NULL;
 
 	// Allocate a temporary file name
diff --git a/src/libpakfire/request.c b/src/libpakfire/request.c
index 59f233815..ab54a191f 100644
--- a/src/libpakfire/request.c
+++ b/src/libpakfire/request.c
@@ -490,7 +490,7 @@ static int pakfire_request_cleanup_file(
 static int pakfire_request_add_url(struct pakfire_request* request, int action,
 		const char* url, int extra_flags) {
 	struct pakfire_downloader* downloader;
-	char path[PATH_MAX] = PAKFIRE_CACHE_DIR "/tmp/XXXXXX";
+	char path[PATH_MAX] = PAKFIRE_TMP_DIR "/XXXXXX";
 
 	// Allocate a temporary file name
 	FILE* f = pakfire_mktemp(path);