# Extracted from http://ftp.de.debian.org/debian/pool/main/s/spamprobe/spamprobe_1.4d-14.diff.gz

Description: missing cassert includes
Author: Martin Michlmayr <tbm@cyrius.com>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357478
--- spamprobe-1.4d.orig/src/includes/Buffer.h
+++ spamprobe-1.4d/src/includes/Buffer.h
@@ -32,6 +32,7 @@
 #define _Buffer_h
 
 #include "Array.h"
+#include <cassert>
 
 //
 // Similar to Array but handles variable length.
Description: Hash target doesn't work
Author: Francis Russell <francis+dbts@unchartedbackwaters.co.uk>
Bug: http://sourceforge.net/tracker/?func=detail&aid=2998863&group_id=61201&atid=496457
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=564643
--- spamprobe-1.4d.orig/src/includes/hash.h
+++ spamprobe-1.4d/src/includes/hash.h
@@ -10,11 +10,13 @@
 #ifndef _jenkinshash_h
 #define _jenkinshash_h
 
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef  unsigned long  int  ub4;   /* unsigned 4-byte quantities */
+typedef             uint32_t ub4;   /* unsigned 4-byte quantities */
 typedef  unsigned       char ub1;   /* unsigned 1-byte quantities */
 
 #define hashsize(n) ((ub4)1<<(n))
--- spamprobe-1.4d.orig/src/database/WordArray.h
+++ spamprobe-1.4d/src/database/WordArray.h
@@ -31,6 +31,8 @@
 #ifndef _WordArray_h
 #define _WordArray_h
 
+#include <stdint.h>
+
 class WordData;
 
 class WordArray
@@ -47,7 +49,7 @@ public:
     FLAGS_SIZE = 2,
   };
 
-  typedef unsigned long key_t;
+  typedef uint32_t key_t;
 
   void reset(char *buffer,
              int num_words);
Description: include cstdlib, climits and cstring
--- spamprobe-1.4d.orig/src/parser/AutoTrainMailMessageReader.cc
+++ spamprobe-1.4d/src/parser/AutoTrainMailMessageReader.cc
@@ -28,6 +28,7 @@
 //    http://www.cooldevtools.com/qpl.html
 //
 
+#include <cstdlib>
 #include "MailMessage.h"
 #include "AutoTrainMailMessageReader.h"
 
--- spamprobe-1.4d.orig/src/spamprobe/Command_cleanup.cc
+++ spamprobe-1.4d/src/spamprobe/Command_cleanup.cc
@@ -28,6 +28,7 @@
 //    http://www.cooldevtools.com/qpl.html
 //
 
+#include <cstdlib>
 #include "CleanupManager.h"
 #include "SpamFilter.h"
 #include "FrequencyDB.h"
--- spamprobe-1.4d.orig/src/spamprobe/Command_edit_term.cc
+++ spamprobe-1.4d/src/spamprobe/Command_edit_term.cc
@@ -28,6 +28,7 @@
 //    http://www.cooldevtools.com/qpl.html
 //
 
+#include <cstdlib>
 #include "SpamFilter.h"
 #include "FrequencyDB.h"
 #include "CommandConfig.h"
--- spamprobe-1.4d.orig/src/spamprobe/Command_exec.cc
+++ spamprobe-1.4d/src/spamprobe/Command_exec.cc
@@ -28,6 +28,7 @@
 //    http://www.cooldevtools.com/qpl.html
 //
 
+#include <cstdlib>
 #include "SpamFilter.h"
 #include "CommandConfig.h"
 #include "ConfigManager.h"
--- spamprobe-1.4d.orig/src/spamprobe/Command_import.cc
+++ spamprobe-1.4d/src/spamprobe/Command_import.cc
@@ -28,6 +28,7 @@
 //    http://www.cooldevtools.com/qpl.html
 //
 
+#include <cstdlib>
 #include <fstream>
 #include "LineReader.h"
 #include "IstreamCharReader.h"
--- spamprobe-1.4d.orig/src/spamprobe/Command_purge.cc
+++ spamprobe-1.4d/src/spamprobe/Command_purge.cc
@@ -28,6 +28,7 @@
 //    http://www.cooldevtools.com/qpl.html
 //
 
+#include <cstdlib>
 #include "CleanupManager.h"
 #include "SpamFilter.h"
 #include "FrequencyDB.h"
--- spamprobe-1.4d.orig/src/database/DatabaseConfig.cc
+++ spamprobe-1.4d/src/database/DatabaseConfig.cc
@@ -29,6 +29,7 @@
 //
 
 #include <stdexcept>
+#include <cstdlib>
 #include "File.h"
 #include "WordData.h"
 #include "FrequencyDBImpl.h"
--- spamprobe-1.4d.orig/src/hdl/HdlTokenizer.cc
+++ spamprobe-1.4d/src/hdl/HdlTokenizer.cc
@@ -28,6 +28,7 @@
 //    http://www.cooldevtools.com/qpl.html
 //
 
+#include <cstdlib>
 #include "AbstractCharReader.h"
 #include "HdlError.h"
 #include "HdlToken.h"
--- spamprobe-1.4d.orig/src/parser/HtmlTokenizer.cc
+++ spamprobe-1.4d/src/parser/HtmlTokenizer.cc
@@ -28,6 +28,7 @@
 //    http://www.cooldevtools.com/qpl.html
 //
 
+#include <cstdlib>
 #include "AbstractTokenReceiver.h"
 #include "StringReader.h"
 #include "RegularExpression.h"
--- spamprobe-1.4d.orig/src/parser/MailMessageReader.cc
+++ spamprobe-1.4d/src/parser/MailMessageReader.cc
@@ -28,6 +28,7 @@
 //    http://www.cooldevtools.com/qpl.html
 //
 
+#include <cstdlib>
 #include "RegularExpression.h"
 #include "MailMessage.h"
 #include "MailMessageList.h"
--- spamprobe-1.4d.orig/src/parser/MbxMailMessageReader.cc
+++ spamprobe-1.4d/src/parser/MbxMailMessageReader.cc
@@ -28,6 +28,7 @@
 //    http://www.cooldevtools.com/qpl.html
 //
 
+#include <cstdlib>
 #include <stdexcept>
 #include "MailMessage.h"
 #include "MailMessageList.h"
--- spamprobe-1.4d.orig/src/includes/MultiLineSubString.h
+++ spamprobe-1.4d/src/includes/MultiLineSubString.h
@@ -31,6 +31,7 @@
 #ifndef _MultiLineSubString_h
 #define _MultiLineSubString_h
 
+#include <climits>
 #include "AbstractMultiLineString.h"
 
 class MultiLineSubString : public AbstractMultiLineString
--- spamprobe-1.4d.orig/src/spamprobe/spamprobe.cc
+++ spamprobe-1.4d/src/spamprobe/spamprobe.cc
@@ -28,6 +28,7 @@
 //    http://www.cooldevtools.com/qpl.html
 //
 
+#include <cstdlib>
 #include <unistd.h>
 #include <locale.h>
 #include <signal.h>
--- spamprobe-1.4d.orig/src/includes/util.h
+++ spamprobe-1.4d/src/includes/util.h
@@ -42,6 +42,7 @@
 #include <cassert>
 #include <iostream>
 #include <cstdio>
+#include <cstring>
 #include "Ptr.h"
 #include "Ref.h"
 
Description: Build with libpng 1.5
Author: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=641890
--- spamprobe-1.4d.orig/src/parser/PngParser.cc
+++ spamprobe-1.4d/src/parser/PngParser.cc
@@ -37,6 +37,14 @@
 #include "StringReader.h"
 #include "PngParser.h"
 
+#ifndef int_p_NULL
+#define int_p_NULL NULL
+#endif
+
+#ifndef png_infopp_NULL
+#define png_infopp_NULL NULL
+#endif
+
 PngParser::PngParser(Message *message,
                      AbstractTokenizer *tokenizer,
                      AbstractTokenReceiver *receiver,
Description: UNKNOWN
--- spamprobe-1.4d.orig/src/includes/Ref.h
+++ spamprobe-1.4d/src/includes/Ref.h
@@ -189,7 +189,7 @@ public:
 
   CRef<T> &operator=(const CRef<T> &other)
   {
-    assign(other);
+    this->assign(other);
     return *this;
   }
 
@@ -245,7 +245,7 @@ public:
 
   Ref<T> &operator=(const Ref<T> &other)
   {
-    assign(other);
+    this->assign(other);
     return *this;
   }