1 # Extracted from http://ftp.de.debian.org/debian/pool/main/s/spamprobe/spamprobe_1.4d-11.diff.gz
2
3 --- spamprobe-1.4d.orig/debian/source/format
4 +++ spamprobe-1.4d/debian/source/format
5 @@ -0,0 +1 @@
6 +1.0
7 --- spamprobe-1.4d.orig/src/parser/PngParser.cc
8 +++ spamprobe-1.4d/src/parser/PngParser.cc
9 @@ -37,6 +37,14 @@
10 #include "StringReader.h"
11 #include "PngParser.h"
12
13 +#ifndef int_p_NULL
14 +#define int_p_NULL NULL
15 +#endif
16 +
17 +#ifndef png_infopp_NULL
18 +#define png_infopp_NULL NULL
19 +#endif
20 +
21 PngParser::PngParser(Message *message,
22 AbstractTokenizer *tokenizer,
23 AbstractTokenReceiver *receiver,
24 --- spamprobe-1.4d.orig/src/parser/AutoTrainMailMessageReader.cc
25 +++ spamprobe-1.4d/src/parser/AutoTrainMailMessageReader.cc
26 @@ -28,6 +28,7 @@
27 // http://www.cooldevtools.com/qpl.html
28 //
29
30 +#include <cstdlib>
31 #include "MailMessage.h"
32 #include "AutoTrainMailMessageReader.h"
33
34 --- spamprobe-1.4d.orig/src/parser/MailMessageReader.cc
35 +++ spamprobe-1.4d/src/parser/MailMessageReader.cc
36 @@ -28,6 +28,7 @@
37 // http://www.cooldevtools.com/qpl.html
38 //
39
40 +#include <cstdlib>
41 #include "RegularExpression.h"
42 #include "MailMessage.h"
43 #include "MailMessageList.h"
44 --- spamprobe-1.4d.orig/src/parser/MbxMailMessageReader.cc
45 +++ spamprobe-1.4d/src/parser/MbxMailMessageReader.cc
46 @@ -28,6 +28,7 @@
47 // http://www.cooldevtools.com/qpl.html
48 //
49
50 +#include <cstdlib>
51 #include <stdexcept>
52 #include "MailMessage.h"
53 #include "MailMessageList.h"
54 --- spamprobe-1.4d.orig/src/parser/HtmlTokenizer.cc
55 +++ spamprobe-1.4d/src/parser/HtmlTokenizer.cc
56 @@ -28,6 +28,7 @@
57 // http://www.cooldevtools.com/qpl.html
58 //
59
60 +#include <cstdlib>
61 #include "AbstractTokenReceiver.h"
62 #include "StringReader.h"
63 #include "RegularExpression.h"
64 --- spamprobe-1.4d.orig/src/includes/Ref.h
65 +++ spamprobe-1.4d/src/includes/Ref.h
66 @@ -189,7 +189,7 @@
67
68 CRef<T> &operator=(const CRef<T> &other)
69 {
70 - assign(other);
71 + this->assign(other);
72 return *this;
73 }
74
75 @@ -245,7 +245,7 @@
76
77 Ref<T> &operator=(const Ref<T> &other)
78 {
79 - assign(other);
80 + this->assign(other);
81 return *this;
82 }
83
84 --- spamprobe-1.4d.orig/src/includes/hash.h
85 +++ spamprobe-1.4d/src/includes/hash.h
86 @@ -10,11 +10,13 @@
87 #ifndef _jenkinshash_h
88 #define _jenkinshash_h
89
90 +#include <stdint.h>
91 +
92 #ifdef __cplusplus
93 extern "C" {
94 #endif
95
96 -typedef unsigned long int ub4; /* unsigned 4-byte quantities */
97 +typedef uint32_t ub4; /* unsigned 4-byte quantities */
98 typedef unsigned char ub1; /* unsigned 1-byte quantities */
99
100 #define hashsize(n) ((ub4)1<<(n))
101 --- spamprobe-1.4d.orig/src/includes/Buffer.h
102 +++ spamprobe-1.4d/src/includes/Buffer.h
103 @@ -32,6 +32,7 @@
104 #define _Buffer_h
105
106 #include "Array.h"
107 +#include <cassert>
108
109 //
110 // Similar to Array but handles variable length.
111 --- spamprobe-1.4d.orig/src/includes/util.h
112 +++ spamprobe-1.4d/src/includes/util.h
113 @@ -42,6 +42,7 @@
114 #include <cassert>
115 #include <iostream>
116 #include <cstdio>
117 +#include <cstring>
118 #include "Ptr.h"
119 #include "Ref.h"
120
121 --- spamprobe-1.4d.orig/src/includes/MultiLineSubString.h
122 +++ spamprobe-1.4d/src/includes/MultiLineSubString.h
123 @@ -31,6 +31,7 @@
124 #ifndef _MultiLineSubString_h
125 #define _MultiLineSubString_h
126
127 +#include <climits>
128 #include "AbstractMultiLineString.h"
129
130 class MultiLineSubString : public AbstractMultiLineString
131 --- spamprobe-1.4d.orig/src/hdl/HdlTokenizer.cc
132 +++ spamprobe-1.4d/src/hdl/HdlTokenizer.cc
133 @@ -28,6 +28,7 @@
134 // http://www.cooldevtools.com/qpl.html
135 //
136
137 +#include <cstdlib>
138 #include "AbstractCharReader.h"
139 #include "HdlError.h"
140 #include "HdlToken.h"
141 --- spamprobe-1.4d.orig/src/spamprobe/Command_exec.cc
142 +++ spamprobe-1.4d/src/spamprobe/Command_exec.cc
143 @@ -28,6 +28,7 @@
144 // http://www.cooldevtools.com/qpl.html
145 //
146
147 +#include <cstdlib>
148 #include "SpamFilter.h"
149 #include "CommandConfig.h"
150 #include "ConfigManager.h"
151 --- spamprobe-1.4d.orig/src/spamprobe/spamprobe.cc
152 +++ spamprobe-1.4d/src/spamprobe/spamprobe.cc
153 @@ -28,6 +28,7 @@
154 // http://www.cooldevtools.com/qpl.html
155 //
156
157 +#include <cstdlib>
158 #include <unistd.h>
159 #include <locale.h>
160 #include <signal.h>
161 --- spamprobe-1.4d.orig/src/spamprobe/Command_cleanup.cc
162 +++ spamprobe-1.4d/src/spamprobe/Command_cleanup.cc
163 @@ -28,6 +28,7 @@
164 // http://www.cooldevtools.com/qpl.html
165 //
166
167 +#include <cstdlib>
168 #include "CleanupManager.h"
169 #include "SpamFilter.h"
170 #include "FrequencyDB.h"
171 --- spamprobe-1.4d.orig/src/spamprobe/Command_purge.cc
172 +++ spamprobe-1.4d/src/spamprobe/Command_purge.cc
173 @@ -28,6 +28,7 @@
174 // http://www.cooldevtools.com/qpl.html
175 //
176
177 +#include <cstdlib>
178 #include "CleanupManager.h"
179 #include "SpamFilter.h"
180 #include "FrequencyDB.h"
181 --- spamprobe-1.4d.orig/src/spamprobe/Command_import.cc
182 +++ spamprobe-1.4d/src/spamprobe/Command_import.cc
183 @@ -28,6 +28,7 @@
184 // http://www.cooldevtools.com/qpl.html
185 //
186
187 +#include <cstdlib>
188 #include <fstream>
189 #include "LineReader.h"
190 #include "IstreamCharReader.h"
191 --- spamprobe-1.4d.orig/src/spamprobe/Command_edit_term.cc
192 +++ spamprobe-1.4d/src/spamprobe/Command_edit_term.cc
193 @@ -28,6 +28,7 @@
194 // http://www.cooldevtools.com/qpl.html
195 //
196
197 +#include <cstdlib>
198 #include "SpamFilter.h"
199 #include "FrequencyDB.h"
200 #include "CommandConfig.h"
201 --- spamprobe-1.4d.orig/src/database/WordArray.h
202 +++ spamprobe-1.4d/src/database/WordArray.h
203 @@ -31,6 +31,8 @@
204 #ifndef _WordArray_h
205 #define _WordArray_h
206
207 +#include <stdint.h>
208 +
209 class WordData;
210
211 class WordArray
212 @@ -47,7 +49,7 @@
213 FLAGS_SIZE = 2,
214 };
215
216 - typedef unsigned long key_t;
217 + typedef uint32_t key_t;
218
219 void reset(char *buffer,
220 int num_words);
221 --- spamprobe-1.4d.orig/src/database/DatabaseConfig.cc
222 +++ spamprobe-1.4d/src/database/DatabaseConfig.cc
223 @@ -29,6 +29,7 @@
224 //
225
226 #include <stdexcept>
227 +#include <cstdlib>
228 #include "File.h"
229 #include "WordData.h"
230 #include "FrequencyDBImpl.h"
|
