Author: gotar Date: Mon Feb 1 10:30:35 2010 GMT Module: packages Tag: HEAD ---- Log message: - upgraded to 1.5.6
---- Files affected: packages/foremost: foremost-sysconfdir.patch (1.1 -> 1.2) , foremost.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: packages/foremost/foremost-sysconfdir.patch diff -u packages/foremost/foremost-sysconfdir.patch:1.1 packages/foremost/foremost-sysconfdir.patch:1.2 --- packages/foremost/foremost-sysconfdir.patch:1.1 Wed Dec 6 19:14:23 2006 +++ packages/foremost/foremost-sysconfdir.patch Mon Feb 1 11:30:30 2010 @@ -16,25 +16,25 @@ --- 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 + + #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/local/man/man1 + MAN = /usr/share/man/man8 -CONF= /usr/local/etc +CONF= /etc # Setup for compiling and cross-compiling for Windows ================================================================ Index: packages/foremost/foremost.spec diff -u packages/foremost/foremost.spec:1.7 packages/foremost/foremost.spec:1.8 --- packages/foremost/foremost.spec:1.7 Fri Jun 20 20:35:29 2008 +++ packages/foremost/foremost.spec Mon Feb 1 11:30:30 2010 @@ -2,12 +2,12 @@ Summary: Recover files by "carving" them from a raw disk Summary(pl.UTF-8): Odzyskiwanie plików poprzez "wykrawanie" ich z dysku Name: foremost -Version: 1.5.4 +Version: 1.5.6 Release: 1 License: Public Domain Group: Applications/System Source0: http://foremost.sourceforge.net/pkg/%{name}-%{version}.tar.gz -# Source0-md5: 55395b1fef1039a88e02d81682347f6d +# Source0-md5: 1ac068f5681bbee679f99d2f9fa7f39f Patch0: %{name}-sysconfdir.patch URL: http://foremost.sourceforge.net/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -57,17 +57,20 @@ %files %defattr(644,root,root,755) -%doc README CHANGES +%doc CHANGES README %verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/%{name}.conf %attr(755,root,root) %{_bindir}/* %{_mandir}/man?/* -%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <feedb...@pld-linux.org> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.8 2010/02/01 10:30:30 gotar +- upgraded to 1.5.6 + Revision 1.7 2008/06/20 18:35:29 rotom - up to 1.5.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/foremost/foremost-sysconfdir.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/foremost/foremost.spec?r1=1.7&r2=1.8&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit