OpenPKG Specs: john/john.patch@9dacbd1d1aa2

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.

     1 Index: src/params.h

     2 --- src/params.h.orig	2011-11-23 12:08:11.000000000 +0100

     3 +++ src/params.h	2011-11-24 09:04:33.000000000 +0100

     4 @@ -70,15 +70,15 @@

     5   * notes above.

     6   */

     7  #ifndef JOHN_SYSTEMWIDE

     8 -#define JOHN_SYSTEMWIDE			0

     9 +#define JOHN_SYSTEMWIDE			1

    10  #endif

    12  #if JOHN_SYSTEMWIDE

    13  #ifndef JOHN_SYSTEMWIDE_EXEC /* please refer to the notes above */

    14 -#define JOHN_SYSTEMWIDE_EXEC		"/usr/libexec/john"

    15 +#define JOHN_SYSTEMWIDE_EXEC		"@l_prefix@/libexec/john"

    16  #endif

    17  #ifndef JOHN_SYSTEMWIDE_HOME

    18 -#define JOHN_SYSTEMWIDE_HOME		"/usr/share/john"

    19 +#define JOHN_SYSTEMWIDE_HOME		"@l_prefix@/etc/john"

    20  #endif

    21  #define JOHN_PRIVATE_HOME		"~/.john"

    22  #endif

    23 Index: src/recovery.c

    24 --- src/recovery.c.orig	2011-03-20 16:02:41.000000000 +0100

    25 +++ src/recovery.c	2011-11-24 09:04:49.000000000 +0100

    26 @@ -3,7 +3,9 @@

    27   * Copyright (c) 1996-2003,2005,2006,2009,2010 by Solar Designer

    28   */

    30 +#ifndef __FreeBSD__

    31  #define _XOPEN_SOURCE 500 /* for fdopen(3), fileno(3), fsync(2), ftruncate(2) */

    32 +#endif

    33  #include <stdio.h>

    34  #include <unistd.h>

    35  #include <sys/types.h>

OpenPKG Specs / file revision

john/john.patch@9dacbd1d1aa2

john/john.patch