Date: Mon, 13 Jun 2005 22:32:45 +0200 From: Matthias Andree <matthias.andree@gmx.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/82208: [MAINTAINER] mail/bogofilter: update to 0.94.14 Message-ID: <E1Dhvbx-0004I7-HH@libertas.emma.line.org> Resent-Message-ID: <200506132040.j5DKeCfn054075@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 82208
>Category: ports
>Synopsis: [MAINTAINER] mail/bogofilter: update to 0.94.14
>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: Mon Jun 13 20:40:11 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Matthias Andree
>Release: FreeBSD 4.11-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD libertas.emma.line.org 4.11-RELEASE-p10 FreeBSD 4.11-RELEASE-p10 #0: Fri Jun 10 15:59:46 CEST 2005
>Description:
- Update to 0.94.14
- Add two post-0.94.14 bugfixes
- reset PORTREVISION in -qdbm port.
Added file(s):
- files/patch-alignment
- files/patch-fdleak
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/Makefile /usr/home/emma/ports/mail/bogofilter/Makefile
--- /usr/ports/mail/bogofilter/Makefile Sun Jun 5 23:15:08 2005
+++ /usr/home/emma/ports/mail/bogofilter/Makefile Mon Jun 13 21:51:01 2005
@@ -6,8 +6,8 @@
#
PORTNAME= bogofilter
-PORTVERSION= 0.94.13
-PORTREVISION?= 1
+PORTVERSION= 0.94.14
+PORTREVISION?= 0
CATEGORIES?= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/distinfo /usr/home/emma/ports/mail/bogofilter/distinfo
--- /usr/ports/mail/bogofilter/distinfo Tue May 31 16:14:44 2005
+++ /usr/home/emma/ports/mail/bogofilter/distinfo Mon Jun 13 21:53:00 2005
@@ -1,2 +1,2 @@
-MD5 (bogofilter-0.94.13.tar.bz2) = 1b3c6f192a361f0825a3decaa7f65e6b
-SIZE (bogofilter-0.94.13.tar.bz2) = 724255
+MD5 (bogofilter-0.94.14.tar.bz2) = 59fa3eefc510458f786c893de271b819
+SIZE (bogofilter-0.94.14.tar.bz2) = 723279
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/files/patch-alignment /usr/home/emma/ports/mail/bogofilter/files/patch-alignment
--- a/ports/mail/bogofilter/files/patch-alignment Thu Jan 1 01:00:00 1970
+++ b/ports/mail/bogofilter/files/patch-alignment Mon Jun 13 21:50:25 2005
@@ -0,0 +1,42 @@
+--- a/src/datastore_tdb.c 31 May 2005 15:04:05 -0000 1.51.22.1
++++ b/src/datastore_tdb.c 10 Jun 2005 08:19:30 -0000 1.51.22.2
+@@ -268,20 +268,34 @@
+ dbv_t dbv_key, dbv_data;
+ userdata_t *hookdata = userdata;
+
+- /* Question: Is there a way to avoid using malloc/free? */
+-
+- /* switch to "dbv_t *" variables */
++ /* TDB happily returns data from odd addresses, so we need to
++ * memcpy() everything to properly aligned storage (malloc() is
++ * fine) if our callee wishes to perform word-sized access - without
++ * memcpy(), the callee will die with SIGBUS (SPARC, m68k) or get
++ * extremely slow (i386). */
++
++ /* XXX FIXME: Possible optimization if this function is only used by
++ * one caller at a time (i. e. no threads): allocate buffers
++ * statically and reuse them as long as they are of sufficient size
++ * and reallocate otherwise. */
++
++ /* copy key */
++ /* XXX FIXME: do we really need to use C-string compatible keys?
++ * Looks wasteful. */
+ dbv_key.leng = key.dsize;
+ dbv_key.data = xmalloc(dbv_key.leng+1);
+ memcpy(dbv_key.data, key.dptr, dbv_key.leng);
+ ((char *)dbv_key.data)[dbv_key.leng] = '\0';
+
+- dbv_data.data = data.dptr;
+- dbv_data.leng = data.dsize; /* read count */
++ /* copy data */
++ dbv_data.leng = data.dsize;
++ dbv_data.data = xmalloc(dbv_data.leng);
++ memcpy(dbv_data.data, data.dptr, dbv_data.leng);
+
+ /* call user function */
+ rc = hookdata->hook(&dbv_key, &dbv_data, hookdata->userdata);
+
++ xfree(dbv_data.data);
+ xfree(dbv_key.data);
+
+ return rc;
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/files/patch-fdleak /usr/home/emma/ports/mail/bogofilter/files/patch-fdleak
--- a/ports/mail/bogofilter/files/patch-fdleak Thu Jan 1 01:00:00 1970
+++ b/ports/mail/bogofilter/files/patch-fdleak Mon Jun 13 21:50:04 2005
@@ -0,0 +1,14 @@
+--- a/src/datastore_db_trans.c 8 Jun 2005 12:18:59 -0000 1.31.4.1
++++ b/src/datastore_db_trans.c 9 Jun 2005 07:54:35 -0000 1.31.4.2
+@@ -943,8 +943,10 @@
+ #else
+ r = ENOENT;
+ #endif
+- if (r == DB_RUNRECOVERY)
++ if (r == DB_RUNRECOVERY) {
++ dbe->close(dbe, 0);
+ return T_ENABLED;
++ }
+
+ if (r == ENOENT) {
+ struct stat st;
--- a/ports/mail/bogofilter-qdbm/Makefile Wed Jun 8 22:34:33 2005
+++ b/ports/mail/bogofilter-qdbm/Makefile Mon Jun 13 21:51:25 2005
@@ -6,7 +6,7 @@
#
PORTNAME= bogofilter
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= mail
PKGNAMESUFFIX= -qdbm
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1Dhvbx-0004I7-HH>