]> git.pld-linux.org Git - packages/foremost.git/blob - foremost-sysconfdir.patch
Fix build with -Werror=format-security
[packages/foremost.git] / foremost-sysconfdir.patch
1 --- foremost-1.3/config.c.orig  2006-12-06 17:38:01.234697000 +0100
2 +++ foremost-1.3/config.c       2006-12-06 17:40:06.004697000 +0100
3 @@ -285,11 +285,7 @@
4  
5                 /*Can't find  a conf in the current directory
6      * So lets try the /usr/local/etc*/
7 -#ifdef __WIN32
8 -               set_config_file(s, "/Program Files/foremost/foremost.conf");
9 -#else
10 -               set_config_file(s, "/usr/local/etc/foremost.conf");
11 -#endif
12 +               set_config_file(s, DEFAULT_SYSTEM_CONFIG_FILE);
13                 if ((f = fopen(get_config_file(s), "r")) == NULL)
14                         {
15                         print_error(s, get_config_file(s), strerror(errno));
16 --- foremost-1.3/main.h.orig    2006-12-06 17:37:56.114697000 +0100
17 +++ foremost-1.3/main.h 2006-08-26 09:02:14.000000000 +0200
18 @@ -216,6 +216,13 @@
19  
20  #define DEFAULT_MODE              mode_none
21  #define DEFAULT_CONFIG_FILE       "foremost.conf"
22 +#ifndef DEFAULT_SYSTEM_CONFIG_FILE
23 +#ifdef __WIN32
24 +#define DEFAULT_SYSTEM_CONFIG_FILE "/Program Files/foremost/foremost.conf"
25 +#else
26 +#define DEFAULT_SYSTEM_CONFIG_FILE       "/etc/foremost.conf"
27 +#endif
28 +#endif
29  #define DEFAULT_OUTPUT_DIRECTORY  "output"
30  #define AUDIT_FILE_NAME           "audit.txt"
31  #define FOREMOST_DIVIDER          "------------------------------------------------------------------"
32 --- foremost-1.5.6/Makefile~    2009-05-06 05:56:16.000000000 +0200
33 +++ foremost-1.5.6/Makefile     2010-02-01 11:24:20.000000000 +0100
34 @@ -26,7 +26,7 @@
35  # Where we get installed
36  BIN = /usr/local/bin
37  MAN = /usr/share/man/man8
38 -CONF= /usr/local/etc
39 +CONF= /etc
40  # Setup for compiling and cross-compiling for Windows
41  # The CR_ prefix refers to cross compiling from OSX to Windows
42  CR_CC = $(CR_BASE)/gcc
This page took 0.034795 seconds and 3 git commands to generate.