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