Skip site navigation (1)Skip section navigation (2)
Date:      Mon,  2 Jan 2006 12:39:10 -0700 (MST)
From:      Zach Thompson <hideo@lastamericanempire.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/91234: Update port: mail/spamprobe from 1.2a to 1.4 
Message-ID:  <20060102193910.2F28233C22@darwin.lastamericanempire.com>
Resent-Message-ID: <200601021940.k02Je8pR069358@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         91234
>Category:       ports
>Synopsis:       Update port: mail/spamprobe from 1.2a to 1.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 02 19:40:03 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     hideo
>Release:        FreeBSD 7.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD darwin.lastamericanempire.com 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Sun Jan 1 13:27:17 MST 2006 hideo@darwin.lastamericanempire.com:/usr/obj/usr/src/sys/darwin amd64


	
>Description:
Update mail/spamprobe from version 1.2a to 1.4

* Files removed from port *
	- files/patch-strings: the call to clear() has been replaced with erase(). 
	- pkg-message: the message refers to a three year old version that had a life-span
	  of a few weeks. The utility no longer exists either. 

* Spamprobe now has "preliminary gif parser support using libungif." graphics/libungif is 
  pulled in as a LIB_DEPEND unless WITHOUT_X11 is specified.
>How-To-Repeat:
	
>Fix:

	

--- spamprobe-1.4 begins here ---
diff -ruN /usr/ports/mail/spamprobe/Makefile spamprobe/Makefile
--- /usr/ports/mail/spamprobe/Makefile	Wed Aug 31 05:47:31 2005
+++ spamprobe/Makefile	Mon Jan  2 10:13:40 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spamprobe
-PORTVERSION=	1.2a
+PORTVERSION=	1.4
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -28,7 +28,11 @@
 CPPFLAGS=	-I${LOCALBASE}/include/db4 -I${OPENSSLINC}
 LDFLAGS=	-L${LOCALBASE}/lib -ldb4 -lcrypto
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.mk>
+.if !defined(WITHOUT_X11)
+LIB_DEPENDS+=	ungif:${PORTSDIR}/graphics/libungif
+CPPFLAGS+=	-I${LOCALBASE}/include
+.endif
+
+.include <bsd.port.post.mk>
diff -ruN /usr/ports/mail/spamprobe/distinfo spamprobe/distinfo
--- /usr/ports/mail/spamprobe/distinfo	Fri Nov 25 08:30:59 2005
+++ spamprobe/distinfo	Sun Jan  1 16:19:52 2006
@@ -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
diff -ruN /usr/ports/mail/spamprobe/files/patch-md5 spamprobe/files/patch-md5
--- /usr/ports/mail/spamprobe/files/patch-md5	Thu Jun 23 06:58:01 2005
+++ spamprobe/files/patch-md5	Mon Jan  2 11:58:42 2006
@@ -2,92 +2,123 @@
 
 	-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 @@
+--- src/includes/MD5Digester.h	Thu Dec 29 07:23:06 2005
++++ src/includes/MD5Digester.h	Mon Jan  2 11:24:01 2006
+@@ -32,16 +32,13 @@
+ #define _MD5Digester_h
  
  #include "util.h"
--#include "md5.h"
+-
+-struct md5_state_s;
 +#include <openssl/md5.h>
  
  class MD5Digester
-@@ -41,3 +41,1 @@
+ {
+ public:
+   MD5Digester();
  
 -  ~MD5Digester();
-- 
-@@ -69,5 +69,5 @@
+-
+   void start();
+ 
+   void add(const string &value);
+@@ -70,7 +67,7 @@
+ 
  private:
    string m_digest;
--  md5_state_s m_state;
-+  MD5_CTX m_state;
+-  NewPtr<md5_state_s> m_state;
++  NewPtr<MD5state_st> 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 @@
+ 
+--- src/utility/MD5Digester.cc	Thu Dec 29 07:23:06 2005
++++ src/utility/MD5Digester.cc	Mon Jan  2 11:24:26 2006
+@@ -28,29 +28,20 @@
+ //    http://www.cooldevtools.com/qpl.html
+ //
+ 
+-#include "md5.h"
+ #include "MD5Digester.h"
+ 
+ MD5Digester::MD5Digester()
+   : m_running(false),
+-    m_state(new md5_state_s)
++    m_state(new MD5state_st)
+ {
+ }
  
 -MD5Digester::~MD5Digester()
 -{
 -  if (m_running) {
 -    md5_byte_t raw_digest[32];
--    md5_finish(&m_state, raw_digest);
+-    md5_finish(m_state.get(), raw_digest);
 -  }
 -}
 -
-@@ -49,5 +49,5 @@
+ void MD5Digester::start()
+ {
+   assert(!m_running);
  
    m_digest.erase();
--  md5_init(&m_state);
-+  MD5_Init(&m_state);
+-  md5_init(m_state.get());
++  MD5_Init(m_state.get());
    m_running = true;
  }
-@@ -58,5 +58,5 @@
+ 
+@@ -59,7 +50,7 @@
+   assert(m_running);
  
    if (value.length() > 0) {
--    md5_append(&m_state, (md5_byte_t *)value.data(), value.length());
-+    MD5_Update(&m_state, value.data(), value.length());
+-    md5_append(m_state.get(), (md5_byte_t *)value.data(), value.length());
++    MD5_Update(m_state.get(), value.data(), value.length());
+   }
+ }
+ 
+@@ -69,7 +60,7 @@
+   assert(m_running);
+ 
+   if (num_bytes > 0) {
+-    md5_append(m_state.get(), (md5_byte_t *)bytes, num_bytes);
++    MD5_Update(m_state.get(), bytes, num_bytes);
    }
  }
-@@ -66,6 +66,6 @@
+ 
+@@ -77,8 +68,8 @@
+ {
    assert(m_running);
  
 -  md5_byte_t raw_digest[32];
--  md5_finish(&m_state, raw_digest);
+-  md5_finish(m_state.get(), raw_digest);
 +  unsigned char raw_digest[MD5_DIGEST_LENGTH];
-+  MD5_Final(raw_digest, &m_state);
++  MD5_Final(raw_digest, m_state.get());
  
    m_digest.erase();
+   for (int i = 0; i < 16; ++i) {
+--- src/utility/Makefile.in	Wed Dec 28 13:55:21 2005
++++ src/utility/Makefile.in	Mon Jan  2 11:24:01 2006
+@@ -52,7 +52,7 @@
+ libutility_a_LIBADD =
+ am_libutility_a_OBJECTS = AbstractMultiLineString.$(OBJEXT) \
+ 	File.$(OBJEXT) hash.$(OBJEXT) LockFD.$(OBJEXT) \
+-	LockFile.$(OBJEXT) MD5Digester.$(OBJEXT) md5.$(OBJEXT) \
++	LockFile.$(OBJEXT) MD5Digester.$(OBJEXT) \
+ 	MultiLineJoinedString.$(OBJEXT) MultiLineString.$(OBJEXT) \
+ 	MultiLineSubString.$(OBJEXT) RegularExpression.$(OBJEXT) \
+ 	util.$(OBJEXT)
+@@ -163,8 +163,6 @@
+ 	LockFD.cc\
+ 	LockFile.cc\
+ 	MD5Digester.cc\
+-	md5.c\
+-	md5.h\
+ 	MultiLineJoinedString.cc\
+ 	MultiLineString.cc\
+ 	MultiLineSubString.cc\
+@@ -228,7 +226,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MultiLineSubString.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RegularExpression.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)/util.Po@am__quote@
+ 
+ .c.o:
diff -ruN /usr/ports/mail/spamprobe/files/patch-strings spamprobe/files/patch-strings
--- /usr/ports/mail/spamprobe/files/patch-strings	Thu Jun 23 06:58:01 2005
+++ spamprobe/files/patch-strings	Wed Dec 31 17:00:00 1969
@@ -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
-   }
- }
diff -ruN /usr/ports/mail/spamprobe/pkg-message spamprobe/pkg-message
--- /usr/ports/mail/spamprobe/pkg-message	Mon Apr 28 18:18:11 2003
+++ spamprobe/pkg-message	Wed Dec 31 17:00:00 1969
@@ -1,15 +0,0 @@
-
-
-			*** WARNING ***
-
-If you are using a version of SpamProbe earlier than 0.7 the database
-format has changed!  You will need to rebuild your database.
-
-You may convert your database using the following command:
-
-		spamprobe-export_0.6 | spamprobe import
-
-			*** WARNING ***
-
-
-
--- spamprobe-1.4 ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060102193910.2F28233C22>