Fix build with -Werror=format-security

[packages/foremost.git] / foremost-sysconfdir.patch

--- foremost-1.3/config.c.orig	2006-12-06 17:38:01.234697000 +0100
+++ foremost-1.3/config.c	2006-12-06 17:40:06.004697000 +0100
@@ -285,11 +285,7 @@
 
 		/*Can't find  a conf in the current directory
     * So lets try the /usr/local/etc*/
-#ifdef __WIN32
-		set_config_file(s, "/Program Files/foremost/foremost.conf");
-#else
-		set_config_file(s, "/usr/local/etc/foremost.conf");
-#endif
+		set_config_file(s, DEFAULT_SYSTEM_CONFIG_FILE);
 		if ((f = fopen(get_config_file(s), "r")) == NULL)
 			{
 			print_error(s, get_config_file(s), strerror(errno));
--- foremost-1.3/main.h.orig	2006-12-06 17:37:56.114697000 +0100
+++ foremost-1.3/main.h	2006-08-26 09:02:14.000000000 +0200
@@ -216,6 +216,13 @@
 
 #define DEFAULT_MODE              mode_none
 #define DEFAULT_CONFIG_FILE       "foremost.conf"
+#ifndef DEFAULT_SYSTEM_CONFIG_FILE
+#ifdef __WIN32
+#define DEFAULT_SYSTEM_CONFIG_FILE "/Program Files/foremost/foremost.conf"
+#else
+#define DEFAULT_SYSTEM_CONFIG_FILE       "/etc/foremost.conf"
+#endif
+#endif
 #define DEFAULT_OUTPUT_DIRECTORY  "output"
 #define AUDIT_FILE_NAME           "audit.txt"
 #define FOREMOST_DIVIDER          "------------------------------------------------------------------"
--- foremost-1.5.6/Makefile~	2009-05-06 05:56:16.000000000 +0200
+++ foremost-1.5.6/Makefile	2010-02-01 11:24:20.000000000 +0100
@@ -26,7 +26,7 @@
 # Where we get installed
 BIN = /usr/local/bin
 MAN = /usr/share/man/man8
-CONF= /usr/local/etc
+CONF= /etc
 # Setup for compiling and cross-compiling for Windows
 # The CR_ prefix refers to cross compiling from OSX to Windows
 CR_CC = $(CR_BASE)/gcc