ports/opt
4
3
Fork 1
Code Issues 1 Pull Requests Activity

spamprobe: sync with latest debian patches

Browse Source
This commit is contained in:
Juergen Daubert 2017-10-29 12:46:58 +01:00
parent 57206bcfe2
commit e6dfb51907
4 changed files with 184 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spamprobe/.md5sum
View File

@ -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

6
spamprobe/.signature
View File

@ -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

6
spamprobe/Pkgfile
View File

@ -5,15 +5,15 @@
name=spamprobe
version=1.4d
release=6
release=7
source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz
$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 \

346
spamprobe/spamprobe-1.4d-11.patch → spamprobe/spamprobe-1.4d-14.patch
View File

@ -1,26 +1,60 @@
# Extracted from http://ftp.de.debian.org/debian/pool/main/s/spamprobe/spamprobe_1.4d-11.diff.gz
# Extracted from http://ftp.de.debian.org/debian/pool/main/s/spamprobe/spamprobe_1.4d-14.diff.gz
--- 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"
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
+#ifndef int_p_NULL
+#define int_p_NULL NULL
+#endif
#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>
+
+#ifndef png_infopp_NULL
+#define png_infopp_NULL NULL
+#endif
#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>
+
PngParser::PngParser(Message *message,
AbstractTokenizer *tokenizer,
AbstractTokenReceiver *receiver,
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 @@
@ -31,6 +65,86 @@
#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 @@
@ -51,73 +165,6 @@
#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;
}
--- 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/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.
--- 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"
--- spamprobe-1.4d.orig/src/includes/MultiLineSubString.h
+++ spamprobe-1.4d/src/includes/MultiLineSubString.h
@@ -31,6 +31,7 @@
@ -128,26 +175,6 @@
#include "AbstractMultiLineString.h"
class MultiLineSubString : public AbstractMultiLineString
--- 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/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/spamprobe.cc
+++ spamprobe-1.4d/src/spamprobe/spamprobe.cc
@@ -28,6 +28,7 @@
@ -158,73 +185,54 @@
#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
@@ -28,6 +28,7 @@
// http://www.cooldevtools.com/qpl.html
//
--- 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 <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
@@ -28,6 +28,7 @@
// http://www.cooldevtools.com/qpl.html
//
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"
+#include <cstdlib>
#include "CleanupManager.h"
#include "SpamFilter.h"
#include "FrequencyDB.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_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/database/WordArray.h
+++ spamprobe-1.4d/src/database/WordArray.h
@@ -31,6 +31,8 @@
#ifndef _WordArray_h
#define _WordArray_h
+#include <stdint.h>
+#ifndef int_p_NULL
+#define int_p_NULL NULL
+#endif
+
class WordData;
+#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:
class WordArray
@@ -47,7 +49,7 @@
FLAGS_SIZE = 2,
};
CRef<T> &operator=(const CRef<T> &other)
{
- assign(other);
+ this->assign(other);
return *this;
}
- typedef unsigned long key_t;
+ typedef uint32_t key_t;
@@ -245,7 +245,7 @@ public:
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 @@
//
Ref<T> &operator=(const Ref<T> &other)
{
- assign(other);
+ this->assign(other);
return *this;
}
#include <stdexcept>
+#include <cstdlib>
#include "File.h"
#include "WordData.h"
#include "FrequencyDBImpl.h"