]> git.pld-linux.org Git - packages/john.git/blob - john-1.6.PLD.diff
- up for 1.6.34
[packages/john.git] / john-1.6.PLD.diff
1 diff -ruN john-1.6./run/john.conf john-1.6/run/john.conf
2 --- john-1.6./run/john.conf     2003-07-12 12:06:08.000000000 +0200
3 +++ john-1.6/run/john.conf      2003-07-12 12:13:22.000000000 +0200
4 @@ -5,7 +5,7 @@
5  
6  [Options]
7  # Wordlist file name, to be used in batch mode
8 -Wordfile = $JOHN/password.lst
9 +Wordfile = /usr/share/dict/words
10  # Use idle cycles only
11  Idle = N
12  # Crash recovery file saving delay in seconds
13 @@ -316,25 +316,25 @@
14  
15  # Incremental modes
16  [Incremental:All]
17 -File = $JOHN/all.chr
18 +File = /usr/lib/john/all.chr
19  MinLen = 0
20  MaxLen = 8
21  CharCount = 95
22  
23  [Incremental:Alpha]
24 -File = $JOHN/alpha.chr
25 +File = /usr/lib/john/alpha.chr
26  MinLen = 1
27  MaxLen = 8
28  CharCount = 26
29  
30  [Incremental:Digits]
31 -File = $JOHN/digits.chr
32 +File = /usr/lib/john/digits.chr
33  MinLen = 1
34  MaxLen = 8
35  CharCount = 10
36  
37  [Incremental:LanMan]
38 -File = $JOHN/lanman.chr
39 +File = /usr/lib/john/lanman.chr
40  MinLen = 0
41  MaxLen = 7
42  CharCount = 69
43 diff -ruN john-1.6./run/mailer john-1.6/run/mailer
44 --- john-1.6./run/mailer        1998-12-03 01:29:50.000000000 +0100
45 +++ john-1.6/run/mailer 2003-07-12 12:06:43.000000000 +0200
46 @@ -10,10 +10,11 @@
47  fi
48  
49  # There's no need to mail users with these shells
50 -SHELLS=-,/bin/false,/dev/null,/bin/sync
51 +SHELLS=-,/bin/false,/dev/null,/bin/sync,/bin/true,/sbin/shutdown
52  
53  # Look for John in the same directory with this script
54 -DIR="`echo "$0" | sed 's,/[^/]*$,,'`"
55 +#DIR="`echo "$0" | sed 's,/[^/]*$,,'`"
56 +DIR="/usr/bin"
57  
58  # Let's start
59  $DIR/john -show "$1" -shells:$SHELLS | sed -n 's/:.*//p' |
60 @@ -21,10 +22,23 @@
61         SENT=0
62  
63         while read LOGIN; do
64 -               echo Sending mail to "$LOGIN"...
65 +               echo Sending mail to / Wysylam maila do "$LOGIN"...
66  
67  # You'll probably want to edit the message below
68 -               mail -s 'Bad password' "$LOGIN" << EOF
69 +               mail -s 'Bad password / Zle haslo' "$LOGIN" << EOF
70 +--------------------------------------------------------------------------
71 +[PL]
72 +
73 +Witaj!
74 +
75 +Twoje has³o dla konta "$LOGIN" nie jest bezpieczne. Proszê zmieñ
76 +je tak szybko jak to jest mo¿liwe.
77 +
78 +Twój,
79 +       Robot Sprawdzaj±cy Has³a.
80 +--------------------------------------------------------------------------
81 +[ENG]
82 +
83  Hello!
84  
85  Your password for account "$LOGIN" is insecure. Please change it as soon
86 @@ -32,6 +46,7 @@
87  
88  Yours,
89         Password Checking Robot.
90 +--------------------------------------------------------------------------
91  EOF
92  
93                 SENT=$(($SENT+1))
94 diff -ruN john-1.6./src/Makefile john-1.6/src/Makefile
95 --- john-1.6./src/Makefile      2003-07-12 12:06:08.000000000 +0200
96 +++ john-1.6/src/Makefile       2003-07-12 12:06:43.000000000 +0200
97 @@ -14,7 +14,7 @@
98  SED = sed
99  NULL = /dev/null
100  CPPFLAGS = -E
101 -CFLAGS = -c -Wall -O2 -fomit-frame-pointer
102 +CFLAGS = -c -Wall -fomit-frame-pointer $(OPT)
103  ASFLAGS = -c
104  LDFLAGS = -s
105  OPT_NORMAL = -funroll-loops
106 diff -ruN john-1.6./src/params.h john-1.6/src/params.h
107 --- john-1.6./src/params.h      2003-07-12 12:06:08.000000000 +0200
108 +++ john-1.6/src/params.h       2003-07-12 12:10:54.000000000 +0200
109 @@ -22,12 +22,12 @@
110   * will probably want to set this to 1 for their builds of John.
111   */
112  #ifndef JOHN_SYSTEMWIDE
113 -#define JOHN_SYSTEMWIDE                        0
114 +#define JOHN_SYSTEMWIDE                        1
115  #endif
116  
117  #if JOHN_SYSTEMWIDE
118 -#define JOHN_SYSTEMWIDE_EXEC           "/usr/libexec/john"
119 -#define JOHN_SYSTEMWIDE_HOME           "/usr/share/john"
120 +#define JOHN_SYSTEMWIDE_EXEC           "/usr/bin/john"
121 +#define JOHN_SYSTEMWIDE_HOME           "/usr/lib/john"
122  #define JOHN_PRIVATE_HOME              "~/.john"
123  #endif
124  
125 @@ -78,7 +78,7 @@
126  #define LOG_NAME                       "$JOHN/john.pot"
127  #define RECOVERY_NAME                  "$JOHN/restore"
128  #endif
129 -#define WORDLIST_NAME                  "$JOHN/password.lst"
130 +#define WORDLIST_NAME                  "/usr/share/dict/words"
131  
132  /*
133   * Configuration file section names.
134 diff -ruN john-1.6./src/params.h.rej john-1.6/src/params.h.rej
135 --- john-1.6./src/params.h.rej  1970-01-01 01:00:00.000000000 +0100
136 +++ john-1.6/src/params.h.rej   2003-07-12 12:06:43.000000000 +0200
137 @@ -0,0 +1,23 @@
138 +***************
139 +*** 52,61 ****
140 +  /*
141 +   * File names.
142 +   */
143 +- #define LOG_NAME                     "~/john.pot"
144 +- #define CFG_NAME                     "~/john.ini"
145 +- #define RECOVERY_NAME                        "~/restore"
146 +- #define WORDLIST_NAME                        "~/password.lst"
147 +  
148 +  /*
149 +   * Configuration file section names.
150 +--- 52,61 ----
151 +  /*
152 +   * File names.
153 +   */
154 ++ #define LOG_NAME                     "~/.john.pot"
155 ++ #define CFG_NAME                     "/usr/lib/john/john.ini"
156 ++ #define RECOVERY_NAME                        "~/.john.restore"
157 ++ #define WORDLIST_NAME                        "/usr/share/dict/words"
158 +  
159 +  /*
160 +   * Configuration file section names.
This page took 0.120762 seconds and 4 git commands to generate.