john/john.patch@9dacbd1d1aa2 (annotated)
john/john.patch
Fri, 07 Sep 2012 19:08:07 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Fri, 07 Sep 2012 19:08:07 +0200
- changeset 667
- 9dacbd1d1aa2
- permissions
- -rw-r--r--
Correct build configuration in Solaris subdir, correct english grammar,
remove irrelevant strip notice, introduce custom CFLAG logic, facilitate
use of Solaris Studio compiler with needed build configuration
adjustments, conditionally build 64 bit position independent code,
and accommodate tun(7) in newer Solaris releases by renaming driver
and module from conflicting 'tun' to 'vtun'. These changes include
some nonstandard 'I give up' logic causing out of tree builds by
manipulating the PATH, for example.
| michael@644 | 1 | Index: src/params.h |
| michael@644 | 2 | --- src/params.h.orig 2011-11-23 12:08:11.000000000 +0100 |
| michael@644 | 3 | +++ src/params.h 2011-11-24 09:04:33.000000000 +0100 |
| michael@644 | 4 | @@ -70,15 +70,15 @@ |
| michael@644 | 5 | * notes above. |
| michael@644 | 6 | */ |
| michael@644 | 7 | #ifndef JOHN_SYSTEMWIDE |
| michael@644 | 8 | -#define JOHN_SYSTEMWIDE 0 |
| michael@644 | 9 | +#define JOHN_SYSTEMWIDE 1 |
| michael@644 | 10 | #endif |
| michael@644 | 11 | |
| michael@644 | 12 | #if JOHN_SYSTEMWIDE |
| michael@644 | 13 | #ifndef JOHN_SYSTEMWIDE_EXEC /* please refer to the notes above */ |
| michael@644 | 14 | -#define JOHN_SYSTEMWIDE_EXEC "/usr/libexec/john" |
| michael@644 | 15 | +#define JOHN_SYSTEMWIDE_EXEC "@l_prefix@/libexec/john" |
| michael@644 | 16 | #endif |
| michael@644 | 17 | #ifndef JOHN_SYSTEMWIDE_HOME |
| michael@644 | 18 | -#define JOHN_SYSTEMWIDE_HOME "/usr/share/john" |
| michael@644 | 19 | +#define JOHN_SYSTEMWIDE_HOME "@l_prefix@/etc/john" |
| michael@644 | 20 | #endif |
| michael@644 | 21 | #define JOHN_PRIVATE_HOME "~/.john" |
| michael@644 | 22 | #endif |
| michael@644 | 23 | Index: src/recovery.c |
| michael@644 | 24 | --- src/recovery.c.orig 2011-03-20 16:02:41.000000000 +0100 |
| michael@644 | 25 | +++ src/recovery.c 2011-11-24 09:04:49.000000000 +0100 |
| michael@644 | 26 | @@ -3,7 +3,9 @@ |
| michael@644 | 27 | * Copyright (c) 1996-2003,2005,2006,2009,2010 by Solar Designer |
| michael@644 | 28 | */ |
| michael@644 | 29 | |
| michael@644 | 30 | +#ifndef __FreeBSD__ |
| michael@644 | 31 | #define _XOPEN_SOURCE 500 /* for fdopen(3), fileno(3), fsync(2), ftruncate(2) */ |
| michael@644 | 32 | +#endif |
| michael@644 | 33 | #include <stdio.h> |
| michael@644 | 34 | #include <unistd.h> |
| michael@644 | 35 | #include <sys/types.h> |
