Re: [sleuthkit-users] Patches

[Willi B. <wil...@gm...>]

In general, you can use the `patch` command to apply a patch created by
`diff` to source code. kernel.org maintains a nice writeup on how to do it
here: https://www.kernel.org/doc/Documentation/applying-patches.txt
In summary, you can probably navigate to the directory that contains the
unpatched source code, and execute a command like the following:

    patch -p1 < ../patch-x.y.z

The tool will complain if it cannot patch the files due to conflicts.

Willi


On Tue, May 20, 2014 at 5:00 PM, Derrick Karpo <dk...@gm...> wrote:

> Hello.
>
> All of the Sleuthkit development is done via github so grab a copy of
> the repository, make your changes, then submit a pull request.  Brian
> recently discussed the time it takes to get a patch merged or looked
> at on the [sleuthkit-users] list.
>
>   https://github.com/sleuthkit/sleuthkit
>
> You may also want to take a look at the dev guide:
>
>   http://wiki.sleuthkit.org/index.php?title=TSK_Developer%27s_Guide
>
> Derrick
>
>
> On Tue, May 20, 2014 at 2:45 PM, Brandon Lashmet <bla...@gm...>
> wrote:
> > How does one add patches to SleuthKit?  Specifically, ones that are only
> > code such as this:
> >
> > diff -aurN sleuthkit-1.69/src/fstools/fls.c
> > sleuthkit-1.69-frss/src/fstools/fls.c
> > --- sleuthkit-1.69/src/fstools/fls.c 2004-01-06 17:50:52.000000000 -0500
> > +++ sleuthkit-1.69-frss/src/fstools/fls.c 2004-05-20 14:15:51.000000000
> > -0400
> > @@ -58,7 +58,7 @@
> >
> >
> >  void usage(char *myProg) {
> > - printf("usage: %s [-adDFlpruvV] [-f fstype] [-m dir/] [-z ZONE] [-s
> > seconds] image
> > [inode]\n",
> > + printf("usage: %s [-adDFlxpruvV] [-f fstype] [-m dir/] [-z ZONE] [-s
> > seconds]
> > image [inode]\n",
> >  myProg);
> >  printf("\tIf [inode] is not given, the root directory is used\n");
> >  printf("\t-a: Display \".\" and \"..\" entries\n");
> > @@ -68,6 +68,7 @@
> >  printf("\t-l: Display long version (like ls -l)\n");
> >  printf("\t-m: Display output in mactime input format with\n");
> >  printf("\t dir/ as the actual mount point of the image\n");
> > + printf("\t-x: Display FRSS Scoring\n");
> >  printf("\t-p: Display full path for each file\n");
> >  printf("\t-r: Recurse on directory entries\n");
> >  printf("\t-u: Display undeleted entries only\n");
> > @@ -273,7 +274,7 @@
> >
> >  localFlags = LCL_DIR | LCL_FILE;
> >
> > - while ((ch = getopt(argc, argv, "adDf:Fm:lprs:uvVz:")) > 0) {
> > + while ((ch = getopt(argc, argv, "adDf:Fm:lxprs:uvVz:")) > 0) {
> >  switch (ch) {
> >  case '?':
> >  default:
> > @@ -298,6 +299,9 @@
> >  case 'l':
> >  localFlags |= LCL_LONG;
> >  break;
> > + case 'x':
> > + ent_report =1;
> > + break;
> >  case 'm':
> >  localFlags |= LCL_MAC;
> >  macpre = optarg;
> > diff -aurN sleuthkit-1.69/src/fstools/frss.c
> > sleuthkit-1.69-frss/src/fstools/frss.c
> > --- sleuthkit-1.69/src/fstools/frss.c 1969-12-31 19:00:00.000000000 -0500
> > +++ sleuthkit-1.69-frss/src/fstools/frss.c 2004-05-23 14:46:48.000000000
> > -0400
> > @@ -0,0 +1,233 @@
> > +/*
> > +** frss
> > +** The Sleuth Kit
> > +**
> > +** Given a block number, compute the Forensic Relative Strength Scoring
> > +** values of the block, return them to calling function.
> > +**
> > +** Matthew Shannon [msh...@ag...]
> > +** Copyright (c) 2004 Matthew Shannon. All rights reserved.
> > +**
> > +** Brian Carrier [ca...@sl...]
> > +** Copyright (c) 2003 Brian Carrier. All rights reserved
> > +**
> > +** TASK
> > +** Copyright (c) 2002 Brian Carrier, @stake Inc. All rights reserved
> > +**
> > +** TCTUTILs
> >
> >
> ------------------------------------------------------------------------------
> > "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
> > Instantly run your Selenium tests across 300+ browser/OS combos.
> > Get unparalleled scalability from the best Selenium testing platform
> > available
> > Simple to use. Nothing to install. Get started now for free."
> > http://p.sf.net/sfu/SauceLabs
> > _______________________________________________
> > sleuthkit-users mailing list
> > https://lists.sourceforge.net/lists/listinfo/sleuthkit-users
> > http://www.sleuthkit.org
> >
>
>
> ------------------------------------------------------------------------------
> "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
> Instantly run your Selenium tests across 300+ browser/OS combos.
> Get unparalleled scalability from the best Selenium testing platform
> available
> Simple to use. Nothing to install. Get started now for free."
> http://p.sf.net/sfu/SauceLabs
> _______________________________________________
> sleuthkit-users mailing list
> https://lists.sourceforge.net/lists/listinfo/sleuthkit-users
> http://www.sleuthkit.org
>