Date: Mon, 2 Jan 2006 18:15:16 +0100 (CET) From: Stefan Walter <sw@gegenunendlich.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/91232: [PATCH] mail/spamprobe: update to 1.4, take maintainership Message-ID: <20060102171516.C42323A30@kyuzo.dunkelkammer.void> Resent-Message-ID: <200601021720.k02HK8an061244@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 91232
>Category: ports
>Synopsis: [PATCH] mail/spamprobe: update to 1.4, take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 02 17:20:08 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Stefan Walter
>Release: FreeBSD 5.4-STABLE i386
>Organization:
Infinity Approximation Task Force
>Environment:
System: FreeBSD kyuzo.dunkelkammer.void 5.4-STABLE FreeBSD 5.4-STABLE #0: Tue Nov 29 15:11:17 CET 2005
>Description:
- Update to 1.4
- Take maintainership
- Optionally depend on libungif
- Remove local patch for gcc 2.x; instead, depend on gcc 3.2+ (untested on 4.x -
I hope it makes it work without any patches there).
- Remove local patch for using OpenSSL's MD5 implementation.
Removed file(s):
- files/patch-md5
- files/patch-strings
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- spamprobe-1.4.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/cvs/FreeBSD/ports/mail/spamprobe/Makefile,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile
--- Makefile 31 Aug 2005 11:47:31 -0000 1.12
+++ Makefile 2 Jan 2006 17:01:07 -0000
@@ -6,29 +6,37 @@
#
PORTNAME= spamprobe
-PORTVERSION= 1.2a
+PORTVERSION= 1.4
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= sw@gegenunendlich.de
COMMENT= Spam detector using Bayesian analysis of word counts
LIB_DEPENDS= db4:${PORTSDIR}/databases/db4
+USE_GCC= 3.2+
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-default-8bit --enable-cdb
+CPPFLAGS= -I${LOCALBASE}/include/db4
+LDFLAGS= -L${LOCALBASE}/lib -ldb4
MAN1= spamprobe.1
PLIST_FILES= bin/spamprobe
-USE_OPENSSL= yes
-CPPFLAGS= -I${LOCALBASE}/include/db4 -I${OPENSSLINC}
-LDFLAGS= -L${LOCALBASE}/lib -ldb4 -lcrypto
+OPTIONS= UNGIF "Enable tokenization of GIF attachments with libungif" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_UNGIF)
+LIB_DEPENDS+= ungif.5:${PORTSDIR}/graphics/libungif
+CPPFLAGS+= -I${LOCALBASE}/include
+.endif
post-install:
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/FreeBSD/ports/mail/spamprobe/distinfo,v
retrieving revision 1.10
diff -u -u -r1.10 distinfo
--- distinfo 25 Nov 2005 15:30:59 -0000 1.10
+++ distinfo 2 Jan 2006 17:01:07 -0000
@@ -1,3 +1,3 @@
-MD5 (spamprobe-1.2a.tar.gz) = f42b36d8056841bb132bb5c8857896c1
-SHA256 (spamprobe-1.2a.tar.gz) = e2fa882fc3abf7b23e07018652092c47ea9435a0f5009bb55ef875ce9f2f1b18
-SIZE (spamprobe-1.2a.tar.gz) = 189240
+MD5 (spamprobe-1.4.tar.gz) = a108dd7bcc820cce183e9983441b546f
+SHA256 (spamprobe-1.4.tar.gz) = bac63456622c9891281629e0c053fb60bbf21418f105fbc563211c9f4043d7d9
+SIZE (spamprobe-1.4.tar.gz) = 251798
Index: files/patch-md5
===================================================================
RCS file: files/patch-md5
diff -N files/patch-md5
--- files/patch-md5 23 Jun 2005 12:58:01 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,93 +0,0 @@
-Use OpenSSL's optimized MD5-implementation instead of compiling our own
-
- -mi
-
---- Makefile.in Tue Jun 21 22:23:57 2005
-+++ Makefile.in Wed Jun 22 17:29:23 2005
-@@ -135,5 +135,4 @@
- WordArray.cc\
- hash.c\
-- md5.c\
- spamprobe.cc\
- util.cc
-@@ -196,5 +195,4 @@
- MBoxMailMessageReader.h\
- MD5Digester.h\
-- md5.h\
- Message.h\
- MessageHeader.h\
-@@ -266,5 +264,5 @@
- Tokenizer.$(OBJEXT) TraditionalMailMessageParser.$(OBJEXT) \
- UrlOnlyHtmlTokenizer.$(OBJEXT) WordArray.$(OBJEXT) \
-- hash.$(OBJEXT) md5.$(OBJEXT) spamprobe.$(OBJEXT) util.$(OBJEXT)
-+ hash.$(OBJEXT) spamprobe.$(OBJEXT) util.$(OBJEXT)
- spamprobe_OBJECTS = $(am_spamprobe_OBJECTS)
- spamprobe_LDADD = $(LDADD)
-@@ -330,5 +328,5 @@
- @AMDEP_TRUE@ ./$(DEPDIR)/UrlOnlyHtmlTokenizer.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/WordArray.Po ./$(DEPDIR)/hash.Po \
--@AMDEP_TRUE@ ./$(DEPDIR)/md5.Po ./$(DEPDIR)/spamprobe.Po \
-+@AMDEP_TRUE@ ./$(DEPDIR)/spamprobe.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/util.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -460,5 +458,4 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WordArray.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spamprobe.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
---- MD5Digester.h Sun Oct 31 18:10:46 2004
-+++ MD5Digester.h Wed Jun 22 17:30:37 2005
-@@ -33,5 +33,5 @@
-
- #include "util.h"
--#include "md5.h"
-+#include <openssl/md5.h>
-
- class MD5Digester
-@@ -41,3 +41,1 @@
-
-- ~MD5Digester();
--
-@@ -69,5 +69,5 @@
- private:
- string m_digest;
-- md5_state_s m_state;
-+ MD5_CTX m_state;
- bool m_running;
- };
---- MD5Digester.cc Sun Oct 31 18:10:46 2004
-+++ MD5Digester.cc Wed Jun 22 17:40:07 2005
-@@ -37,9 +37,1 @@
-
--MD5Digester::~MD5Digester()
--{
-- if (m_running) {
-- md5_byte_t raw_digest[32];
-- md5_finish(&m_state, raw_digest);
-- }
--}
--
-@@ -49,5 +49,5 @@
-
- m_digest.erase();
-- md5_init(&m_state);
-+ MD5_Init(&m_state);
- m_running = true;
- }
-@@ -58,5 +58,5 @@
-
- if (value.length() > 0) {
-- md5_append(&m_state, (md5_byte_t *)value.data(), value.length());
-+ MD5_Update(&m_state, value.data(), value.length());
- }
- }
-@@ -66,6 +66,6 @@
- assert(m_running);
-
-- md5_byte_t raw_digest[32];
-- md5_finish(&m_state, raw_digest);
-+ unsigned char raw_digest[MD5_DIGEST_LENGTH];
-+ MD5_Final(raw_digest, &m_state);
-
- m_digest.erase();
Index: files/patch-strings
===================================================================
RCS file: files/patch-strings
diff -N files/patch-strings
--- files/patch-strings 23 Jun 2005 12:58:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-g++ before 3.x does not have the clear() method on strings
-
- -mi
-
---- HashDataFile.cc Mon Mar 28 14:58:25 2005
-+++ HashDataFile.cc Wed Jun 22 17:27:02 2005
-@@ -233,5 +233,7 @@
- m_array.reset(0, 0);
- m_base = 0;
-+#if !defined(__GNUC__) || __GNUC__ > 2
- m_filename.clear();
-+#endif
- }
- }
--- spamprobe-1.4.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060102171516.C42323A30>