[Forensics-changes] [magicrescue] 15/19: Imported Upstream version 1.1.8
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Mon Nov 3 19:06:21 UTC 2014
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository magicrescue.
commit 0448cdff1758379e72d3c214635d83b032929f46
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Mon Nov 3 16:59:25 2014 -0200
Imported Upstream version 1.1.8
---
ChangeLog | 36 ++++++++++++++++++++++++++++++++++++
NEWS | 7 +++++++
config.d/50getrlimit | 2 +-
doc/dupemap.1 | 2 +-
doc/magicrescue.1 | 2 +-
doc/magicsort.1 | 2 +-
recipes/zip | 2 +-
src/magicrescue.c | 7 +++++--
8 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a9a93f6..83e4ec4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,42 @@
For less detailed change information, see the NEWS file
------------------------------------------------------------------------
+r824 | jbj | 2009-11-03 10:00:58 +0100 (Tue, 03 Nov 2009) | 1 line
+Changed paths:
+ M /magicrescue/trunk/new_NEWS
+ A /magicrescue/trunk/recipes/mbox
+ A /magicrescue/trunk/recipes/mbox-mozilla-inbox
+ A /magicrescue/trunk/recipes/mbox-mozilla-sent
+
+New mbox recipes
+------------------------------------------------------------------------
+r822 | jbj | 2009-10-01 21:13:49 +0200 (Thu, 01 Oct 2009) | 1 line
+Changed paths:
+ M /magicrescue/trunk/new_NEWS
+ M /magicrescue/trunk/src/magicrescue.c
+
+It appears that there exists a program named safecat. Move tools dir to beginning of path so our safecat takes precedence.
+------------------------------------------------------------------------
+r821 | jbj | 2009-10-01 14:53:12 +0200 (Thu, 01 Oct 2009) | 1 line
+Changed paths:
+ M /magicrescue/trunk/config.d/50getrlimit
+ M /magicrescue/trunk/new_NEWS
+
+Raise maximum virtual memory usage for helper programs from 50MB to 1024MB.
+------------------------------------------------------------------------
+r820 | jbj | 2009-09-04 22:22:31 +0200 (Fri, 04 Sep 2009) | 1 line
+Changed paths:
+ M /magicrescue/trunk/recipes/zip
+
+fix a small oops in release
+------------------------------------------------------------------------
+r818 | jbj | 2009-09-04 19:48:26 +0200 (Fri, 04 Sep 2009) | 1 line
+Changed paths:
+ M /magicrescue/trunk/NEWS
+ M /magicrescue/trunk/new_NEWS
+
+Release 1.1.7
+------------------------------------------------------------------------
r817 | jbj | 2009-09-04 19:44:36 +0200 (Fri, 04 Sep 2009) | 1 line
Changed paths:
M /magicrescue/trunk/new_NEWS
diff --git a/NEWS b/NEWS
index 597f81a..71d219a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Version 1.1.8: Wed Nov 4 16:12:53 CET 2009
+- Add mbox recipes, contributed by Jeff Bucove.
+- Raise maximum virtual memory usage for helper programs from 50MB to 1024MB.
+ It turns out that mencoder needs around 150MB on 64-bit systems.
+- Place tools directory first in path to avoid name clashes with other
+ programs.
+
Version 1.1.7: Fri Sep 4 19:48:14 CEST 2009
- Update zip recipe to work with latest version of Zip and latest
OpenOffice.org file formats (thanks to Fernando)
diff --git a/config.d/50getrlimit b/config.d/50getrlimit
index 58adc2d..06b1a7f 100644
--- a/config.d/50getrlimit
+++ b/config.d/50getrlimit
@@ -10,5 +10,5 @@ int main() {
}
EOF
if conftest_define HAVE_GETRLIMIT "Checking for getrlimit..."; then
- echo "#define MAX_MEMORY 50*1024*1024" >> config.h
+ echo "#define MAX_MEMORY 1024*1024*1024" >> config.h
fi
diff --git a/doc/dupemap.1 b/doc/dupemap.1
index ecb7217..fd776b2 100644
--- a/doc/dupemap.1
+++ b/doc/dupemap.1
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "DUPEMAP 1"
-.TH DUPEMAP 1 "2008-06-26" "1.1.7" "Magic Rescue"
+.TH DUPEMAP 1 "2008-06-26" "1.1.8" "Magic Rescue"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/doc/magicrescue.1 b/doc/magicrescue.1
index c2e4eb4..c8f0d76 100644
--- a/doc/magicrescue.1
+++ b/doc/magicrescue.1
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "MAGICRESCUE 1"
-.TH MAGICRESCUE 1 "2008-10-29" "1.1.7" "Magic Rescue"
+.TH MAGICRESCUE 1 "2008-10-29" "1.1.8" "Magic Rescue"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/doc/magicsort.1 b/doc/magicsort.1
index cd67f50..ad4307a 100644
--- a/doc/magicsort.1
+++ b/doc/magicsort.1
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "MAGICSORT 1"
-.TH MAGICSORT 1 "2008-06-26" "1.1.7" "Magic Rescue"
+.TH MAGICSORT 1 "2008-06-26" "1.1.8" "Magic Rescue"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/recipes/zip b/recipes/zip
index 5075fcf..1d69f81 100644
--- a/recipes/zip
+++ b/recipes/zip
@@ -16,7 +16,7 @@ extension zip
# This command takes a 50MB chunk of the file and tries to repair it. If the
# zip files you are looking for are less than 50MB, you can lower the value of
# the count= parameter for performance.
-command dd bs=1024k count=10 of="$1.tmp" 2>/dev/null; zip -qF "$1.tmp" --out "$1" ; rm -f "$1.tmp"
+command dd bs=1024k count=50 of="$1.tmp" 2>/dev/null; zip -qF "$1.tmp" --out "$1" ; rm -f "$1.tmp"
# Try to guess if it's a JAR archive or an OpenOffice.org file, and rename
# accordingly
diff --git a/src/magicrescue.c b/src/magicrescue.c
index 4ecd7fe..d9a13b1 100644
--- a/src/magicrescue.c
+++ b/src/magicrescue.c
@@ -552,10 +552,13 @@ int main(int argc, char **argv)
buf = malloc(bufsize);
- sprintf(buf, "PATH=%s:%s", getenv("PATH"), "tools");
+ sprintf(buf, "PATH=%s%s%s:%s", "tools",
#ifdef COMMAND_PATH
- sprintf(buf + strlen(buf), ":%s", COMMAND_PATH);
+ ":", COMMAND_PATH,
+#else
+ "", "",
#endif
+ getenv("PATH"));
putenv(strdup(buf));
while ((c = getopt(argc, argv, "b:d:r:I:M:O:")) >= 0) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/magicrescue.git
More information about the forensics-changes
mailing list