SOURCES: foremost-sysconfdir.patch (NEW) - path to use %{_sysconfdir}

undefine undefine at pld-linux.org
Wed Dec 6 19:14:28 CET 2006


Author: undefine                     Date: Wed Dec  6 18:14:28 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- path to use %{_sysconfdir}

---- Files affected:
SOURCES:
   foremost-sysconfdir.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/foremost-sysconfdir.patch
diff -u /dev/null SOURCES/foremost-sysconfdir.patch:1.1
--- /dev/null	Wed Dec  6 19:14:28 2006
+++ SOURCES/foremost-sysconfdir.patch	Wed Dec  6 19:14:23 2006
@@ -0,0 +1,42 @@
+--- 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.3/Makefile~	2006-08-26 09:02:14.000000000 +0200
++++ foremost-1.3/Makefile	2006-12-06 17:40:47.064697000 +0100
+@@ -26,7 +26,7 @@
+ # Where we get installed
+ BIN = /usr/local/bin
+ MAN = /usr/local/man/man1
+-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
================================================================


More information about the pld-cvs-commit mailing list