From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Aug 28 19:40:13 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DE33C16A41F for ; Sun, 28 Aug 2005 19:40:12 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E329843D49 for ; Sun, 28 Aug 2005 19:40:11 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j7SJeBO9005007 for ; Sun, 28 Aug 2005 19:40:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j7SJeBs6005006; Sun, 28 Aug 2005 19:40:11 GMT (envelope-from gnats) Resent-Date: Sun, 28 Aug 2005 19:40:11 GMT Resent-Message-Id: <200508281940.j7SJeBs6005006@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Matthias Andree Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 84E5416A41F for ; Sun, 28 Aug 2005 19:39:37 +0000 (GMT) (envelope-from matthias.andree@gmx.de) Received: from mail.dt.e-technik.uni-dortmund.de (krusty.dt.E-Technik.Uni-Dortmund.DE [129.217.163.1]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA74043D45 for ; Sun, 28 Aug 2005 19:39:36 +0000 (GMT) (envelope-from matthias.andree@gmx.de) Received: from localhost (localhost [127.0.0.1]) by mail.dt.e-technik.uni-dortmund.de (Postfix) with ESMTP id 62DA0440DA for ; Sun, 28 Aug 2005 21:39:35 +0200 (CEST) Received: from mail.dt.e-technik.uni-dortmund.de ([127.0.0.1]) by localhost (krusty [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 04997-04 for ; Sun, 28 Aug 2005 21:39:33 +0200 (CEST) Received: from m2a2.dyndns.org (p509127D7.dip0.t-ipconnect.de [80.145.39.215]) by mail.dt.e-technik.uni-dortmund.de (Postfix) with ESMTP id EE534440A0 for ; Sun, 28 Aug 2005 21:39:32 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by merlin.emma.line.org (Postfix) with ESMTP id 3D7E779A8F; Sun, 28 Aug 2005 21:39:32 +0200 (CEST) Received: from m2a2.dyndns.org ([127.0.0.1]) by localhost (m2a2.dyndns.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 31111-18; Sun, 28 Aug 2005 21:39:31 +0200 (CEST) Received: from libertas.emma.line.org (libertas.emma.line.org [192.168.1.2]) by merlin.emma.line.org (Postfix) with ESMTP id 53CA379A8E; Sun, 28 Aug 2005 21:39:31 +0200 (CEST) Received: from emma by libertas.emma.line.org with local (Exim 4.52 (FreeBSD)) id 1E9T0q-000EIO-DO; Sun, 28 Aug 2005 21:40:16 +0200 Message-Id: Date: Sun, 28 Aug 2005 21:40:16 +0200 From: Matthias Andree Sender: Matthias Andree To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/85421: [MAINTAINER] mail/bogofilter{, -qdbm, -sqlite}: update to 0.96.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Aug 2005 19:40:13 -0000 >Number: 85421 >Category: ports >Synopsis: [MAINTAINER] mail/bogofilter{,-qdbm,-sqlite}: update to 0.96.0 >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: Sun Aug 28 19:40:11 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Matthias Andree >Release: FreeBSD 4.11-RELEASE-p11 i386 >Organization: >Environment: System: FreeBSD libertas.emma.line.org 4.11-RELEASE-p11 FreeBSD 4.11-RELEASE-p11 #1: Sat Jul 2 12:53:26 CEST >Description: - Update to 0.96.0 NOTE #1: the patch below touches two ports, bogofilter and bogofilter-qdbm! NOTE #2: this patch breaks the deprecated bogofilter-tdb port, which is to be removed (see: ports/85419), so please commit ports/85419 first. Removed file(s): - files/patch-aa - files/patch-ab 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 Wed Jul 27 11:43:20 2005 +++ /usr/home/emma/ports/mail/bogofilter/Makefile Sun Aug 28 21:19:40 2005 @@ -6,7 +6,7 @@ # PORTNAME= bogofilter -PORTVERSION= 0.95.2 +PORTVERSION= 0.96.0 PORTREVISION?= 0 CATEGORIES?= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -88,7 +88,7 @@ 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/README.tdb doc/bogofilter-SA-2004-01 GETTING.STARTED \ + doc/bogofilter-SA-2004-01 GETTING.STARTED \ doc/bogofilter-faq.html doc/bogofilter-faq-fr.html ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/distinfo /usr/home/emma/ports/mail/bogofilter/distinfo --- /usr/ports/mail/bogofilter/distinfo Wed Jul 27 11:43:20 2005 +++ /usr/home/emma/ports/mail/bogofilter/distinfo Sun Aug 28 21:12:55 2005 @@ -1,2 +1,2 @@ -MD5 (bogofilter-0.95.2.tar.bz2) = 43da78d185f6a206923e6fb8e50c6fe7 -SIZE (bogofilter-0.95.2.tar.bz2) = 725106 +MD5 (bogofilter-0.96.0.tar.bz2) = ca946b43212d8a2909e86f7140e535db +SIZE (bogofilter-0.96.0.tar.bz2) = 721819 diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/files/patch-aa /usr/home/emma/ports/mail/bogofilter/files/patch-aa --- /usr/ports/mail/bogofilter/files/patch-aa Mon Jul 25 17:15:06 2005 +++ /usr/home/emma/ports/mail/bogofilter/files/patch-aa Thu Jan 1 01:00:00 1970 @@ -1,47 +0,0 @@ ---- a/src/tests/t.encoding 30 Jun 2005 11:17:54 -0000 1.5 -+++ b/src/tests/t.encoding 9 Jul 2005 22:24:12 -0000 1.8 -@@ -84,21 +84,34 @@ - $BOGOUTIL -C -y 0 -m ${WORDLIST} --unicode=no - $BOGOUTIL -C -y 0 -d ${WORDLIST} | sort > ${TMPDIR}/wordlist.old.txt - --cat < ${TMPDIR}/md5sum.ref --4ff193bff18e44bd6af0992497565df2 - wordlist.iconv.txt --4ff193bff18e44bd6af0992497565df2 - wordlist.new.txt --a36783e5753e6254167ffe32835e96d0 - wordlist.no.txt --a36783e5753e6254167ffe32835e96d0 - wordlist.old.txt --a36783e5753e6254167ffe32835e96d0 - wordlist.raw.txt --4ff193bff18e44bd6af0992497565df2 - wordlist.yes.txt -+echo "This is a test." >${TMPDIR}/empty.txt -+if ! cksum >${TMPDIR}/empty.sum ${TMPDIR}/empty.txt ; then -+ echo >&2 'cksum utility not found' -+ exit 77 -+fi -+tr ' ' ' ' <${TMPDIR}/empty.sum|cut -d " " -f 1-2 >${TMPDIR}/empty.sumonly -+if ! echo "2711662207 16" | cmp -s - ${TMPDIR}/empty.sumonly -+then -+ echo >&2 'cksum utility not POSIX compliant!' -+ exit 1 -+fi -+ -+cat < ${TMPDIR}/cksum.ref -+1059676362 909 wordlist.iconv.txt -+1059676362 909 wordlist.new.txt -+3303802408 880 wordlist.no.txt -+3303802408 880 wordlist.old.txt -+3303802408 880 wordlist.raw.txt -+1059676362 909 wordlist.yes.txt - EOF - - for FILE in ${TMPDIR}/wordlist.*.txt ; do -- ( echo `md5sum < $FILE` " " `basename $FILE` ) >> ${TMPDIR}/md5sum.out -+ cksum "$FILE" | $AWK '{ printf "%s %s ", $1, $2 }' >>${TMPDIR}/cksum.out -+ basename "$FILE" >>${TMPDIR}/cksum.out - done - - if [ $verbose -eq 0 ] ; then -- cmp ${TMPDIR}/md5sum.ref ${TMPDIR}/md5sum.out -+ cmp ${TMPDIR}/cksum.ref ${TMPDIR}/cksum.out - else -- diff ${TMPDIR}/md5sum.ref ${TMPDIR}/md5sum.out -+ diff -s ${TMPDIR}/cksum.ref ${TMPDIR}/cksum.out - fi diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/files/patch-ab /usr/home/emma/ports/mail/bogofilter/files/patch-ab --- /usr/ports/mail/bogofilter/files/patch-ab Mon Jul 25 17:15:06 2005 +++ /usr/home/emma/ports/mail/bogofilter/files/patch-ab Thu Jan 1 01:00:00 1970 @@ -1,154 +0,0 @@ ---- a/src/charset.c 23 Jun 2005 22:39:55 -0000 1.32 -+++ b/src/charset.c 4 Jul 2005 18:41:20 -0000 1.33 -@@ -25,7 +25,9 @@ - - #include "charset.h" - #include "convert_charset.h" -+#ifndef DISABLE_UNICODE - #include "convert_unicode.h" -+#endif - #include "xmalloc.h" - #include "xstrdup.h" - ---- a/src/datastore_sqlite.c 21 May 2005 03:39:21 -0000 1.38 -+++ b/src/datastore_sqlite.c 10 Jul 2005 00:21:03 -0000 1.40 -@@ -152,6 +152,16 @@ - return rc; - } - -+static sqlite3_stmt *sqlprep(dbh_t *dbh, const char *cmd) { -+ const char *tail; /* dummy */ -+ sqlite3_stmt *ptr; -+ if (sqlite3_prepare(dbh->db, cmd, strlen(cmd), &ptr, &tail) != SQLITE_OK) { -+ print_error(__FILE__, __LINE__, "cannot compile %s: %s\n", cmd, sqlite3_errmsg(dbh->db)); -+ exit(EX_ERROR); -+ } -+ return ptr; -+} -+ - /** Short trace handler function, passed to SQLite if debugging is - * enabled. */ - static void db_trace(void *userdata /** unused */, -@@ -236,6 +246,31 @@ - return 1; - } - -+static void check_sqlite_version(void) -+{ -+#if SIZEOF_LONG > 4 -+ unsigned int vmaj, vmin, vpl; -+ int count; -+ static int complained; -+ const char *v; -+ -+ if (complained) -+ return; -+ complained = 1; -+ v = sqlite3_libversion(); -+ sscanf(v, "%u.%u.%u", &vmaj, &vmin, &vpl); -+ if (vmaj > 3) return; -+ if (vmaj == 3 && vmin > 2) return; -+ if (vmaj == 3 && vmin == 2 && vpl >= 2) return; -+ fprintf(stderr, -+ "\n" -+ "WARNING: sqlite %s is not supported on %u-bit machines!\n" -+ "WARNING: If you see bus errors, update sqlite to 3.2.2 or newer.\n" -+ "\n", -+ v, SIZEOF_LONG * 8); -+#endif -+} -+ - void *db_open(void *dummyenv, bfpath *bfp, dbmode_t mode) - { - int rc; -@@ -244,6 +279,8 @@ - - (void)dummyenv; - -+ check_sqlite_version(); -+ - dbh = dbh_init(bfp); - - /* open database file */ -@@ -320,16 +357,8 @@ - * dbh->insert is not here as it's needed earlier, - * so it sets itself up lazily - */ --#define PREP(cmd, ptr) \ -- { const char *tail; /* dummy */ \ -- if (sqlite3_prepare(dbh->db, cmd, strlen(cmd), ptr, &tail) != SQLITE_OK) { \ -- print_error(__FILE__, __LINE__, "cannot compile %s: %s\n", cmd, sqlite3_errmsg(dbh->db)); \ -- exit(EX_ERROR); \ -- } \ -- } -- -- PREP("SELECT value FROM bogofilter WHERE key=? LIMIT 1;", &dbh->select); -- PREP("DELETE FROM bogofilter WHERE(key = ?);", &dbh->delete); -+ dbh->select = sqlprep(dbh, "SELECT value FROM bogofilter WHERE key=? LIMIT 1;"); -+ dbh->delete = sqlprep(dbh, "DELETE FROM bogofilter WHERE(key = ?);"); - - /* check if byteswapped */ - { -@@ -398,7 +427,7 @@ - static char buf[80]; - - if (!buf[0]) -- snprintf(buf, sizeof(buf), "SQLite %s", sqlite3_version); -+ snprintf(buf, sizeof(buf), "SQLite %s", sqlite3_libversion()); - return buf; - } - -@@ -426,8 +455,8 @@ - dbh_t *dbh, /**< database handle */ - const char *func, /**< function name to report in errors */ - sqlite3_stmt *stmt, /**< SQLite3 statement to execute/reset */ -- int retnotfound, /**< return value if no rows found */ -- dbv_t *val /** OUT value from first row, NULL ok */ -+ dbv_t *val, /**< OUT value from first row, NULL ok */ -+ int retnotfound /** return value if no rows found */ - ) - { - int rc; -@@ -468,25 +497,25 @@ - dbh_t *dbh = vhandle; - - sqlite3_bind_blob(dbh->delete, 1, key->data, key->leng, SQLITE_STATIC); -- return sql_fastpath(dbh, "db_delete", dbh->delete, 0, NULL); -+ return sql_fastpath(dbh, "db_delete", dbh->delete, NULL, 0); - } - - int db_set_dbvalue(void *vhandle, const dbv_t *key, const dbv_t *val) { - dbh_t *dbh = vhandle; - - if (!dbh->insert) -- PREP("INSERT OR REPLACE INTO bogofilter VALUES(?,?);", &dbh->insert); -+ dbh->insert = sqlprep(dbh, "INSERT OR REPLACE INTO bogofilter VALUES(?,?);"); - - sqlite3_bind_blob(dbh->insert, 1, key->data, key->leng, SQLITE_STATIC); - sqlite3_bind_blob(dbh->insert, 2, val->data, val->leng, SQLITE_STATIC); -- return sql_fastpath(dbh, "db_set_dbvalue", dbh->insert, 0, NULL); -+ return sql_fastpath(dbh, "db_set_dbvalue", dbh->insert, NULL, 0); - } - - int db_get_dbvalue(void *vhandle, const dbv_t* key, /*@out@*/ dbv_t *val) { - dbh_t *dbh = vhandle; - - sqlite3_bind_blob(dbh->select, 1, key->data, key->leng, SQLITE_STATIC); -- return sql_fastpath(dbh, "db_get_dbvalue", dbh->select, DS_NOTFOUND, val); -+ return sql_fastpath(dbh, "db_get_dbvalue", dbh->select, val, DS_NOTFOUND); - } - - ex_t db_foreach(void *vhandle, db_foreach_t hook, void *userdata) { ---- a/src/maint.c 25 Jun 2005 16:42:44 -0000 1.64 -+++ b/src/maint.c 4 Jul 2005 18:41:20 -0000 1.65 -@@ -19,8 +19,10 @@ - #include "datastore.h" - #include "error.h" - #include "charset.h" -+#ifndef DISABLE_UNICODE - #include "convert_unicode.h" - #include "iconvert.h" -+#endif - #include "maint.h" - #include "transaction.h" - #include "wordlists.h" --- /usr/ports/mail/bogofilter-qdbm/Makefile Sat Jul 30 15:21:04 2005 +++ /usr/home/emma/ports/mail/bogofilter-qdbm/Makefile Sun Aug 28 21:14:57 2005 @@ -6,7 +6,7 @@ # PORTNAME= bogofilter -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= mail PKGNAMESUFFIX= -qdbm >Release-Note: >Audit-Trail: >Unformatted: