[crux-commits] ports/opt (3.3): spamprobe: sync with latest debian patches

29 Oct 2017

commit e6dfb519071c575ed1422dd56d6fbca535f47523
Author: Juergen Daubert <jue@jue.li>
Date:   Sun Oct 29 12:46:58 2017 +0100

    spamprobe: sync with latest debian patches

diff --git a/spamprobe/.md5sum b/spamprobe/.md5sum
index 034913a87..cd873c0d9 100644
--- a/spamprobe/.md5sum
+++ b/spamprobe/.md5sum
@@ -1,3 +1,3 @@
-ab90867f2dda67d96f0cd24e75bbbefc  spamprobe-1.4d-11.patch
+b49ed8e2a1ba51d6f116ff2d0665ed42  spamprobe-1.4d-14.patch
 c696a46122ad899ae1a40955b7f34805  spamprobe-1.4d-giflib5.patch
 5554d6d097346632b16123452283c969  spamprobe-1.4d.tar.gz
diff --git a/spamprobe/.signature b/spamprobe/.signature
index c47391d55..c592cdd6c 100644
--- a/spamprobe/.signature
+++ b/spamprobe/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Y669W2NLZrxvkFnag9CmAkZ8GmaXhYpj09XQQpY4tlpP9m5dgFIRXrMMhbdPru/1NlduPSoCaHMDxT9AQ0oowg=
-SHA256 (Pkgfile) = eac185c891309b2a8da60cdcef65354459c008235e52fb0da22afeda794c0d9d
+RWSE3ohX2g5d/diyfDE4iAu/cJd2gSinXsOZwzOsDOdrRaMDtbcJzlC2enrtNIsIqPwvnBF9yq1bddogBeNvXh6ghaWrsfMfgQ8=
+SHA256 (Pkgfile) = e09148b5d36c4c65e54d593a2b4c9134fe29fdaa8a26a49fdca6ef1a38b56c06
 SHA256 (.footprint) = 18a8e9a9a4743437d61b5a7cf02bfd38a3337a240229441d169b9d8e4c253add
 SHA256 (spamprobe-1.4d.tar.gz) = 217ce47dcc6f58d8201fbb0a5e2dc38b5b06349fadb1378fb3647ad8a3f44d68
-SHA256 (spamprobe-1.4d-11.patch) = 795e11214af8101f28eb2028d0188a19f858e31070763c95c4cc84e4c442ed41
+SHA256 (spamprobe-1.4d-14.patch) = c3a085f05da2504a0681c2bea5e07900239da4d74de218a7ee94dd46a8d4ee24
 SHA256 (spamprobe-1.4d-giflib5.patch) = af1a610bee4f4d4ad68267b88278d837ecde271e371342497f1b048e528d7d36
diff --git a/spamprobe/Pkgfile b/spamprobe/Pkgfile
index 4dab27b3c..6c8888082 100644
--- a/spamprobe/Pkgfile
+++ b/spamprobe/Pkgfile
@@ -5,15 +5,15 @@
 
 name=spamprobe
 version=1.4d
-release=6
+release=7
 source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version...
-        $name-$version-11.patch
+        $name-$version-14.patch
         $name-$version-giflib5.patch)
 
 build () {
     cd $SRC/$name-$version
 
-    patch -p1 -i $SRC/$name-$version-11.patch
+    patch -p1 -i $SRC/$name-$version-14.patch
     patch -p0 -i $SRC/$name-$version-giflib5.patch
     
     ./configure --prefix=/usr \
diff --git a/spamprobe/spamprobe-1.4d-11.patch b/spamprobe/spamprobe-1.4d-14.patch
similarity index 88%
rename from spamprobe/spamprobe-1.4d-11.patch
rename to spamprobe/spamprobe-1.4d-14.patch
index c6b119326..29aa41552 100644
--- a/spamprobe/spamprobe-1.4d-11.patch
+++ b/spamprobe/spamprobe-1.4d-14.patch
@@ -1,86 +1,22 @@
-# Extracted from http://ftp.de.debian.org/debian/pool/main/s/spamprobe/spamprobe_1.4d-11.diff...
+# Extracted from http://ftp.de.debian.org/debian/pool/main/s/spamprobe/spamprobe_1.4d-14.diff...
 
---- spamprobe-1.4d.orig/debian/source/format
-+++ spamprobe-1.4d/debian/source/format
-@@ -0,0 +1 @@
-+1.0
---- 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,
---- 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/parser/MailMessageReader.cc
-+++ spamprobe-1.4d/src/parser/MailMessageReader.cc
-@@ -28,6 +28,7 @@
- //    http://www.cooldevtools.com/qpl.html
- //
+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 <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 "Array.h"
++#include <cassert>
  
-+#include <cstdlib>
- #include <stdexcept>
- #include "MailMessage.h"
- #include "MailMessageList.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/includes/Ref.h
-+++ spamprobe-1.4d/src/includes/Ref.h
-@@ -189,7 +189,7 @@
- 
-   CRef<T> &operator=(const CRef<T> &other)
-   {
--    assign(other);
-+    this->assign(other);
-     return *this;
-   }
- 
-@@ -245,7 +245,7 @@
- 
-   Ref<T> &operator=(const Ref<T> &other)
-   {
--    assign(other);
-+    this->assign(other);
-     return *this;
-   }
- 
+ // 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 @@
@@ -98,86 +34,67 @@
  typedef  unsigned       char ub1;   /* unsigned 1-byte quantities */
  
  #define hashsize(n) ((ub4)1<<(n))
---- 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>
+--- 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
  
- //
- // Similar to Array but handles variable length.
---- 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"
++#include <stdint.h>
++
+ class WordData;
  
---- 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
+ class WordArray
+@@ -47,7 +49,7 @@ public:
+     FLAGS_SIZE = 2,
+   };
  
-+#include <climits>
- #include "AbstractMultiLineString.h"
+-  typedef unsigned long key_t;
++  typedef uint32_t key_t;
  
- class MultiLineSubString : public AbstractMultiLineString
---- spamprobe-1.4d.orig/src/hdl/HdlTokenizer.cc
-+++ spamprobe-1.4d/src/hdl/HdlTokenizer.cc
+   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 "AbstractCharReader.h"
- #include "HdlError.h"
- #include "HdlToken.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 "MailMessage.h"
+ #include "AutoTrainMailMessageReader.h"
  
-+#include <cstdlib>
- #include "SpamFilter.h"
- #include "CommandConfig.h"
- #include "ConfigManager.h"
---- spamprobe-1.4d.orig/src/spamprobe/spamprobe.cc
-+++ spamprobe-1.4d/src/spamprobe/spamprobe.cc
+--- 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 <unistd.h>
- #include <locale.h>
- #include <signal.h>
---- spamprobe-1.4d.orig/src/spamprobe/Command_cleanup.cc
-+++ spamprobe-1.4d/src/spamprobe/Command_cleanup.cc
+ #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 "CleanupManager.h"
  #include "SpamFilter.h"
  #include "FrequencyDB.h"
---- spamprobe-1.4d.orig/src/spamprobe/Command_purge.cc
-+++ spamprobe-1.4d/src/spamprobe/Command_purge.cc
+ #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 "CleanupManager.h"
  #include "SpamFilter.h"
- #include "FrequencyDB.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 @@
@@ -188,36 +105,16 @@
  #include <fstream>
  #include "LineReader.h"
  #include "IstreamCharReader.h"
---- spamprobe-1.4d.orig/src/spamprobe/Command_edit_term.cc
-+++ spamprobe-1.4d/src/spamprobe/Command_edit_term.cc
+--- 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"
- #include "CommandConfig.h"
---- 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 @@
-     FLAGS_SIZE = 2,
-   };
- 
--  typedef unsigned long key_t;
-+  typedef uint32_t key_t;
- 
-   void reset(char *buffer,
-              int num_words);
 --- spamprobe-1.4d.orig/src/database/DatabaseConfig.cc
 +++ spamprobe-1.4d/src/database/DatabaseConfig.cc
 @@ -29,6 +29,7 @@
@@ -228,3 +125,114 @@
  #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;
+   }
+

    

[crux-commits] ports/opt (3.3): spamprobe: sync with latest debian patches

crux＠crux.nu