From: Francis Dupont <fdupont@isc.org>
Date: Fri, 31 May 2019 22:44:42 +0000 (+0200)
Subject: [538-kea-should-not-store-anything-in-var-kea-lsb-violation] Moved to localstatedir... 
X-Git-Tag: Kea-1.6.0-beta2~277
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a11fe9e53ee960832d6eb5bd302f5ccaa9d5245;p=thirdparty%2Fkea.git

[538-kea-should-not-store-anything-in-var-kea-lsb-violation] Moved to localstatedir/lib/kea for state files
---

diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
index 378e07e31d..0db7d30fc3 100644
--- a/src/lib/dhcpsrv/Makefile.am
+++ b/src/lib/dhcpsrv/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 SUBDIRS = . testutils tests benchmarks
 
-dhcp_data_dir = @localstatedir@/@PACKAGE@
+dhcp_data_dir = @localstatedir@/lib/@PACKAGE@
 kea_lfc_location = @prefix@/sbin/kea-lfc
 
 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib -DDHCP_DATA_DIR="\"$(dhcp_data_dir)\""
diff --git a/src/share/database/scripts/cql/upgrade_2.0_to_3.0.sh.in b/src/share/database/scripts/cql/upgrade_2.0_to_3.0.sh.in
index f722830a0a..d7110590dc 100644
--- a/src/share/database/scripts/cql/upgrade_2.0_to_3.0.sh.in
+++ b/src/share/database/scripts/cql/upgrade_2.0_to_3.0.sh.in
@@ -10,10 +10,10 @@ else
 fi
 
 # Need a path for temporary files created during upgrade data migration
-# Use the state directory in the  install path directory if it exists, otherwise
+# Use the state directory in the install path directory if it exists, otherwise
 # use the build tree
-if [ -e "@localstatedir@/@PACKAGE_NAME@" ]; then
-    temp_file_dir="@localstatedir@/@PACKAGE_NAME@"
+if [ -e "@localstatedir@/lib/@PACKAGE_NAME@" ]; then
+    temp_file_dir="@localstatedir@/lib/@PACKAGE_NAME@"
 else
     temp_file_dir="@abs_top_builddir@/src/share/database/scripts/cql"
 fi
diff --git a/src/share/database/scripts/cql/upgrade_3.0_to_4.0.sh.in b/src/share/database/scripts/cql/upgrade_3.0_to_4.0.sh.in
index 8a2a8b493c..aa3bdf8ef5 100644
--- a/src/share/database/scripts/cql/upgrade_3.0_to_4.0.sh.in
+++ b/src/share/database/scripts/cql/upgrade_3.0_to_4.0.sh.in
@@ -10,10 +10,10 @@ else
 fi
 
 # Need a path for temporary files created during upgrade data migration
-# Use the state directory in the  install path directory if it exists, otherwise
+# Use the state directory in the install path directory if it exists, otherwise
 # use the build tree
-if [ -e "@localstatedir@/@PACKAGE_NAME@" ]; then
-    temp_file_dir="@localstatedir@/@PACKAGE_NAME@"
+if [ -e "@localstatedir@/lib/@PACKAGE_NAME@" ]; then
+    temp_file_dir="@localstatedir@/lib/@PACKAGE_NAME@"
 else
     temp_file_dir="@abs_top_builddir@/src/share/database/scripts/cql"
 fi