From 9ed8767cb3d29cf06e5aa1a837b6cc6c9d550d43 Mon Sep 17 00:00:00 2001
From: Will Thompson <wjt@endlessm.com>
Date: Fri, 15 Mar 2019 10:52:48 +0000
Subject: [PATCH] Hardcode storage path as /var/lib/fprint

--localstatedir (and --prefix) will now be ignored in favour of this
hardcoded path.  This is in preparation for a change to use systemd's
StateDirectory feature.
---
 data/Makefile.am        | 2 +-
 data/fprintd.service.in | 2 +-
 src/Makefile.am         | 3 +--
 src/file_storage.c      | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/Makefile.am b/data/Makefile.am
index 6043b08..d71c5c5 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -15,7 +15,7 @@ if HAVE_SYSTEMD
 systemdservicedir       = $(systemdsystemunitdir)
 systemdservice_DATA     = $(systemdservice_in_files:.service.in=.service)
 $(systemdservice_DATA): $(systemdservice_in_files) Makefile
-	@sed -e "s|\@libexecdir\@|$(libexecdir)|" -e "s|\@localstatedir\@|$(localstatedir)|" $< > $@
+	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 endif
 
 polkitdir = $(datadir)/polkit-1/actions
diff --git a/data/fprintd.service.in b/data/fprintd.service.in
index 5f46810..f2ebd98 100644
--- a/data/fprintd.service.in
+++ b/data/fprintd.service.in
@@ -11,7 +11,7 @@ ExecStart=@libexecdir@/fprintd
 ProtectSystem=strict
 ProtectKernelTunables=true
 ProtectControlGroups=true
-ReadWritePaths=@localstatedir@/lib/fprint
+ReadWritePaths=/var/lib/fprint
 ProtectHome=true
 PrivateTmp=true
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 3ed2c81..fb0ea94 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,8 +13,7 @@ AM_CFLAGS =						\
 	$(DAEMON_CFLAGS)				\
 	-DG_LOG_DOMAIN=\""fprintd"\"			\
 	-DLOCALEDIR=\""$(datadir)/locale"\"		\
-	-DPLUGINDIR=\""$(libdir)/fprintd/modules"\"	\
-	-DFILE_STORAGE_PATH=\""$(localstatedir)/lib/fprint"\"
+	-DPLUGINDIR=\""$(libdir)/fprintd/modules"\"
 
 libfprintd_la_SOURCES =				\
 	manager.c device.c			\
diff --git a/src/file_storage.c b/src/file_storage.c
index 7f74418..666e491 100644
--- a/src/file_storage.c
+++ b/src/file_storage.c
@@ -39,6 +39,7 @@
 
 #include "file_storage.h"
 
+#define FILE_STORAGE_PATH "/var/lib/fprint"
 #define DIR_PERMS 0700
 
 #define FP_FINGER_IS_VALID(finger) \