Date: Tue, 08 Nov 2005 10:51:47 +0100 From: Matthias Andree <matthias.andree@gmx.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/88654: [MAINTAINER] mail/bogofilter: update to 0.96.5 Message-ID: <E1EZQ8p-000Kz8-4H@libertas.emma.line.org> Resent-Message-ID: <200511081030.jA8AURjX070257@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 88654
>Category: ports
>Synopsis: [MAINTAINER] mail/bogofilter: update to 0.96.5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 08 10:30:27 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Matthias Andree
>Release: FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD libertas.emma.line.org 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Mon Nov 7 16:10:51 CET
>Description:
- Update to 0.96.5 (some fixes; contrib/ shuffled around a bit)
Removed file(s):
- files/patch-bashisms
- files/patch-mimetypes
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- bogofilter-0.96.5.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/Makefile /usr/home/emma/ports/mail/bogofilter/Makefile
--- /usr/ports/mail/bogofilter/Makefile Sat Oct 29 17:58:20 2005
+++ /usr/home/emma/ports/mail/bogofilter/Makefile Tue Nov 8 08:59:51 2005
@@ -6,8 +6,8 @@
#
PORTNAME= bogofilter
-PORTVERSION= 0.96.3
-PORTREVISION?= 2
+PORTVERSION= 0.96.5
+PORTREVISION?= 0
CATEGORIES?= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -54,13 +54,7 @@
post-patch:
${REINPLACE_CMD} -e 's|^#!.*perl|#! ${PERL}|' \
${WRKSRC}/src/tests/unsort.pl \
- ${WRKSRC}/contrib/bfproxy \
- ${WRKSRC}/contrib/bogofilter-milter.pl \
- ${WRKSRC}/contrib/bogominitrain.pl \
- ${WRKSRC}/contrib/mime.get.rfc822 \
- ${WRKSRC}/contrib/printmaildir.pl \
- ${WRKSRC}/contrib/spamitarium \
- ${WRKSRC}/contrib/stripsearch
+ ${WRKSRC}/contrib/*.pl
${REINPLACE_CMD} -e 's/INTEGRITY_TESTS = t.lock1 t.lock3 t.valgrind/INTEGRITY_TESTS = t.lock1 t.lock3/' \
${WRKSRC}/src/tests/Makefile.in
@@ -81,11 +75,10 @@
@${MKDIR} ${DOCSDIR}/${i}
.endfor
.for i in AUTHORS COPYING INSTALL NEWS README README.cvs \
- doc/README.validation TODO \
+ doc/README.validation TODO GETTING.STARTED \
RELEASE.NOTES doc/README.db doc/README.sqlite \
doc/integrating-with-postfix doc/integrating-with-qmail \
- doc/bogofilter-tuning.HOWTO.html doc/bogofilter-SA-2002-01 \
- doc/bogofilter-SA-2004-01 GETTING.STARTED \
+ doc/bogofilter-tuning.HOWTO.html doc/bogofilter-SA-* \
doc/bogofilter-faq.html doc/bogofilter-faq-fr.html
${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
@@ -97,11 +90,11 @@
${INSTALL_DATA} ${WRKSRC}/doc/*.xml ${DOCSDIR}/xml
${INSTALL_DATA} ${WRKSRC}/doc/programmer/README.freebsd ${DOCSDIR}/programmer
.endif
- ${INSTALL_PROGRAM} ${WRKSRC}/contrib/bogogrep ${PREFIX}/bin/
-.for i in bfproxy bogofilter-milter.pl bogo.R bogofilter-qfe \
- mime.get.rfc822 parmtest.sh printmaildir.pl \
+ ${INSTALL_PROGRAM} ${WRKSRC}/bogogrep ${PREFIX}/bin/
+.for i in bfproxy.pl bogofilter-milter.pl bogo.R bogofilter-qfe.sh \
+ mime.get.rfc822.pl parmtest.sh printmaildir.pl \
bogominitrain.pl \
- randomtrain scramble spamitarium stripsearch trainbogo.sh
+ randomtrain.sh scramble.sh spamitarium.pl stripsearch.pl trainbogo.sh
${INSTALL_SCRIPT} ${WRKSRC}/contrib/${i} ${DOCSDIR}/contrib/${i}
.endfor
.for i in dot-qmail-bogofilter-default \
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/distinfo /usr/home/emma/ports/mail/bogofilter/distinfo
--- /usr/ports/mail/bogofilter/distinfo Wed Oct 26 21:44:36 2005
+++ /usr/home/emma/ports/mail/bogofilter/distinfo Tue Nov 8 01:48:47 2005
@@ -1,2 +1 @@
-MD5 (bogofilter-0.96.3.tar.bz2) = eeb9a0374fbfa10cd22907b44bcb0711
-SIZE (bogofilter-0.96.3.tar.bz2) = 740218
+MD5 (bogofilter-0.96.5.tar.bz2) = 77ec9fc84f51a183800a615b59c97da8
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/files/patch-bashisms /usr/home/emma/ports/mail/bogofilter/files/patch-bashisms
--- /usr/ports/mail/bogofilter/files/patch-bashisms Fri Oct 28 13:17:04 2005
+++ /usr/home/emma/ports/mail/bogofilter/files/patch-bashisms Thu Jan 1 01:00:00 1970
@@ -1,79 +0,0 @@
---- ./contrib/randomtrain~ 2005/10/26 22:05:55 1.1
-+++ ./contrib/randomtrain 2005/10/27 07:54:15 1.2
-@@ -4,15 +4,17 @@
- #
- # randomtrain -- bogofilter messages from files in random order
- # and train if the result is wrong or uncertain
--# needs: bash basename rm grep awk wc perl dd bogofilter
-+# needs: POSIX compliant sh, basename rm grep awk wc perl dd bogofilter
- # usage: see function usage() of this file
- #
- # original author: Greg Louis <glouis@dynamicro.on.ca>
- # modified by: David Relson <relson@osagesoftware.com>
-
-+# Note: on Solaris, use /usr/xpg4/bin/sh -- /bin/sh will not work.
-+
- BOGOFILTER="bogofilter"
-
--function usage() {
-+usage() {
- name=$(basename $0)
- echo "Usage: $name [-d bogodir] [-p pid] [-c cfg] [-]n|s filename [-]n|s filename [...]"
- echo " Messages contained in the files are fed to bogofilter"
-@@ -34,7 +36,7 @@
- exit 1
- }
-
--function train_mbox() {
-+train_mbox() {
- # go through the list, extract the messages, eval with bogofilter
- # and train if bogofilter is wrong or uncertain
- cnt=0; nspam=0; ngood=0; rspam=0; rgood=0;
-@@ -63,7 +65,7 @@
- printf "\r%5d%5d %5d%5d\n" $nspam $rspam $ngood $rgood
- }
-
--function train_maildir() {
-+train_maildir() {
- # go through the list, extract the messages, eval with bogofilter
- # and train if bogofilter is wrong or uncertain
- cnt=0; nspam=0; ngood=0; rspam=0; rgood=0;
-@@ -103,9 +105,9 @@
- mdir=2 # maildir mode
-
- while [ ${#*} -gt 1 ]; do
-- indic=${1:0-1:1} ; shift
-+ indic=$1 ; shift
- case "$indic" in
-- s | n )
-+ s|-s|n|-n)
- path=$1 ; shift
- cmd="$cmd -c $indic $path"
- if [ ! -r $path ]; then echo "file '$path' not found"; usage; fi
-@@ -118,22 +120,22 @@
- fi
- fi
- ;;
-- c )
-+ c|-c)
- file=$1 ; shift
- cfg="-c $file"
- if [ ! -r $file ]; then echo "file '$file' not found"; usage; fi
- ;;
-- p )
-+ p|-p)
- pid=$1; shift;
- ;;
-- d )
-+ d|-d)
- [ -n "$bogodir" ] && usage
- bogodir=$1 ; shift
- if [ ! -d $bogodir ]; then echo "directory '$bogodir' not found"; usage; fi
- [ ! -f $bogodir/spamlist.db ] && $BOGOFILTER -d $bogodir -s -C < /dev/null
- [ ! -f $bogodir/goodlist.db ] && $BOGOFILTER -d $bogodir -n -C < /dev/null
- ;;
-- * )
-+ *)
- usage
- esac
- done
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/files/patch-mimetypes /usr/home/emma/ports/mail/bogofilter/files/patch-mimetypes
--- /usr/ports/mail/bogofilter/files/patch-mimetypes Fri Oct 28 11:07:24 2005
+++ /usr/home/emma/ports/mail/bogofilter/files/patch-mimetypes Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- ./src/mime.c.orig Wed Oct 26 10:24:05 2005
-+++ ./src/mime.c Wed Oct 26 10:24:09 2005
-@@ -48,7 +48,7 @@
- { MIME_APPLICATION, "application/", 12 },
- { MIME_MESSAGE, "message/", 8 },
- { MIME_MULTIPART, "multipart/", 10 },
-- { MIME_IMAGE, "image/bmp", 9 },
-+ { MIME_IMAGE, "image/", 6 },
- { MIME_AUDIO, "audio/", 6 },
- { MIME_VIDEO, "video/", 6 },
- };
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/pkg-plist /usr/home/emma/ports/mail/bogofilter/pkg-plist
--- /usr/ports/mail/bogofilter/pkg-plist Sat Oct 29 17:58:20 2005
+++ /usr/home/emma/ports/mail/bogofilter/pkg-plist Tue Nov 8 08:31:55 2005
@@ -8,21 +8,21 @@
bin/bogoutil
bin/bogoupgrade
etc/bogofilter.cf.example
-%%CONTRIB%%%%DOCSDIR%%/contrib/bfproxy
+%%CONTRIB%%%%DOCSDIR%%/contrib/bfproxy.pl
%%CONTRIB%%%%DOCSDIR%%/contrib/bogo.R
%%CONTRIB%%%%DOCSDIR%%/contrib/bogofilter-milter.pl
-%%CONTRIB%%%%DOCSDIR%%/contrib/bogofilter-qfe
+%%CONTRIB%%%%DOCSDIR%%/contrib/bogofilter-qfe.sh
%%CONTRIB%%%%DOCSDIR%%/contrib/bogominitrain.pl
%%CONTRIB%%%%DOCSDIR%%/contrib/dot-qmail-bogofilter-default
%%CONTRIB%%%%DOCSDIR%%/contrib/mailfilter.example
-%%CONTRIB%%%%DOCSDIR%%/contrib/mime.get.rfc822
+%%CONTRIB%%%%DOCSDIR%%/contrib/mime.get.rfc822.pl
%%CONTRIB%%%%DOCSDIR%%/contrib/parmtest.sh
%%CONTRIB%%%%DOCSDIR%%/contrib/printmaildir.pl
%%CONTRIB%%%%DOCSDIR%%/contrib/procmailrc.example
-%%CONTRIB%%%%DOCSDIR%%/contrib/randomtrain
-%%CONTRIB%%%%DOCSDIR%%/contrib/scramble
-%%CONTRIB%%%%DOCSDIR%%/contrib/spamitarium
-%%CONTRIB%%%%DOCSDIR%%/contrib/stripsearch
+%%CONTRIB%%%%DOCSDIR%%/contrib/randomtrain.sh
+%%CONTRIB%%%%DOCSDIR%%/contrib/scramble.sh
+%%CONTRIB%%%%DOCSDIR%%/contrib/spamitarium.pl
+%%CONTRIB%%%%DOCSDIR%%/contrib/stripsearch.pl
%%CONTRIB%%%%DOCSDIR%%/contrib/trainbogo.sh
%%CONTRIB%%@dirrm %%DOCSDIR%%/contrib
%%CONTRIB%%@dirrm %%DOCSDIR%%
--- bogofilter-0.96.5.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?E1EZQ8p-000Kz8-4H>