From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 13 08:40:12 2003 Return-Path: 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 BDB5E16A4BF for ; Mon, 13 Oct 2003 08:40:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F29C43FAF for ; Mon, 13 Oct 2003 08:40:10 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h9DFeAFY029553 for ; Mon, 13 Oct 2003 08:40:10 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h9DFeA0q029552; Mon, 13 Oct 2003 08:40:10 -0700 (PDT) (envelope-from gnats) Resent-Date: Mon, 13 Oct 2003 08:40:10 -0700 (PDT) Resent-Message-Id: <200310131540.h9DFeA0q029552@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, Clement Laforet Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B6DF16A4B3 for ; Mon, 13 Oct 2003 08:38:34 -0700 (PDT) Received: from cultdeadsheep.org (charon.cultdeadsheep.org [80.65.226.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A8DD43FAF for ; Mon, 13 Oct 2003 08:38:32 -0700 (PDT) (envelope-from sheepkiller@cultdeadsheep.org) Received: (qmail 68700 invoked by uid 85); 13 Oct 2003 17:38:30 +0200 Received: from sheepkiller@cultdeadsheep.org by goofy.cultdeadsheep.org by uid 82 with qmail-scanner-1.20rc2 ( Clear:RC:1:. Processed in 0.043036 secs); 13 Oct 2003 15:38:30 -0000 Received: from lucifer.cultdeadsheep.org (192.168.0.2) by goofy.cultdeadsheep.org with SMTP; 13 Oct 2003 17:38:30 +0200 Received: by lucifer.cultdeadsheep.org (sSMTP sendmail emulation); Mon, 13 Oct 2003 17:38:10 +0200 Message-Id: <20031013153832.7A8DD43FAF@mx1.FreeBSD.org> Date: Mon, 13 Oct 2003 17:38:10 +0200 From: Clement Laforet To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: Clement Laforet Subject: ports/57958: [maintainer update] mail/dbmail: update to 1.2 + misc fixes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Clement Laforet List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Oct 2003 15:40:12 -0000 >Number: 57958 >Category: ports >Synopsis: [maintainer update] mail/dbmail: update to 1.2 + misc fixes >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Oct 13 08:40:10 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Clement Laforet >Release: FreeBSD 5.1-CURRENT i386 >Organization: cotds.org >Environment: System: FreeBSD lucifer.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Mon Sep 22 08:20:10 CEST 2003 clement@lucifer.cultdeadsheep.org:/usr/obj/usr/src/sys/LUCIFER i386 >Description: Update dbmail to 1.2. dbmail: Changes: A lot of small bugfixes were made. A big speed improvement and an important security fix were made for the pop3d. This release is very stable, and is running on sites with over 80,000 mail users. A 2.0 branch was started, which includes a lot of speed improvements for the imapd and many extra features. Port Changes. - Fix stupid CLFLAGS (i.e.exporting mysql includes dir even if WITH_PGSQL is set. (quite stupid, isn't it ?)) - use DATADIR - Export LOCALBASE for esoteric install location. >How-To-Repeat: N/A. >Fix: --- dbmail.diff begins here --- Index: dbmail/Makefile =================================================================== RCS file: /WORK/REPO/ports/mail/dbmail/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- dbmail/Makefile 8 Oct 2003 16:24:22 -0000 1.2 +++ dbmail/Makefile 13 Oct 2003 15:29:50 -0000 @@ -6,7 +6,7 @@ # PORTNAME= dbmail -PORTVERSION= 1.1 +PORTVERSION= 1.2 CATEGORIES= mail MASTER_SITES= http://www.dbmail.org/tgz/ PKGNAMESUFFIX= -${DATABASE} @@ -19,23 +19,26 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS= --prefix=${PREFIX} USE_GMAKE= YES +USE_OPENSSL= YES .if defined(WITH_PGSQL) CONFIGURE_ARGS+= --with-pgsql -LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql7 +LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql-client DATABASE= postgresql PLIST_SUB+= PGSQL="" PLIST_SUB+= MYSQL="@comment " +LDFLAGS+= -L${LOCALBASE}/lib/ .else USE_MYSQL= YES CONFIGURE_ARGS+= --with-mysql DATABASE= mysql PLIST_SUB+= MYSQL="" PLIST_SUB+= PGSQL="@comment " +CFLAGS+= -I${LOCALBASE}/include/mysql +LDFLAGS+= -L${LOCALBASE}/lib/mysql .endif -CFLAGS+= -I${LOCALBASE}/include/mysql -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib/ -L${LOCALBASE}/lib/${DATABASE}" +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE} FILES_TO_PATCH= imapd.c main.c maintenance.c pop3d.c user.c DOCS= INSTALL README Index: dbmail/distinfo =================================================================== RCS file: /WORK/REPO/ports/mail/dbmail/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- dbmail/distinfo 7 Oct 2003 01:17:49 -0000 1.1 +++ dbmail/distinfo 13 Oct 2003 15:29:50 -0000 @@ -1 +1 @@ -MD5 (dbmail-1.1.tgz) = e6d7be3eff38b69ab82ae6d47e3c83e2 +MD5 (dbmail-1.2.tgz) = c12f64a94acbe362a3bcd5fc563d091d Index: dbmail/pkg-plist =================================================================== RCS file: /WORK/REPO/ports/mail/dbmail/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- dbmail/pkg-plist 7 Oct 2003 01:17:49 -0000 1.1 +++ dbmail/pkg-plist 13 Oct 2003 15:29:50 -0000 @@ -10,28 +10,31 @@ etc/dbmail.conf-dist %%MYSQL%%lib/libmysqldbmail.a %%PGSQL%%lib/libpgsqldbmail.a -%%MYSQL%%share/dbmail/sql/add-lastlogin.mysql -%%MYSQL%%share/dbmail/sql/add_auto_notification.mysql -%%MYSQL%%share/dbmail/sql/add_auto_reply.mysql -%%MYSQL%%share/dbmail/sql/add_rfcsize.mysql -%%MYSQL%%share/dbmail/sql/create_tables.mysql -%%MYSQL%%share/dbmail/sql/create_tables_innoDB.mysql -%%MYSQL%%share/dbmail/sql/newnames.mysql -%%MYSQL%%share/dbmail/sql/pop_before_smtp.mysql -%%MYSQL%%share/dbmail/sql/update_encryption.mysql -%%MYSQL%%share/dbmail/sql/update_mailbox_subscribed_folders.mysql -%%MYSQL%%share/dbmail/sql/update_mysql_tmptables.mysql -%%MYSQL%%share/dbmail/sql/update_ownerid_aliases.mysql -%%PGSQL%%share/dbmail/sql/add-constraints.pgsql -%%PGSQL%%share/dbmail/sql/add-lastlogin.postgresql -%%PGSQL%%share/dbmail/sql/add_auto_notification.pgsql -%%PGSQL%%share/dbmail/sql/add_auto_reply.pgsql -%%PGSQL%%share/dbmail/sql/add_rfcsize.postgresql -%%PGSQL%%share/dbmail/sql/create_tables.pgsql -%%PGSQL%%share/dbmail/sql/no-constraint-tables.pgsql -%%PGSQL%%share/dbmail/sql/update_encryption.pgsql +%%MYSQL%%%%DATADIR%%/sql/add-lastlogin.mysql +%%MYSQL%%%%DATADIR%%/sql/add_auto_notification.mysql +%%MYSQL%%%%DATADIR%%/sql/add_auto_reply.mysql +%%MYSQL%%%%DATADIR%%/sql/add_rfcsize.mysql +%%MYSQL%%%%DATADIR%%/sql/create_tables.mysql +%%MYSQL%%%%DATADIR%%/sql/create_tables_innoDB.mysql +%%MYSQL%%%%DATADIR%%/sql/newnames.mysql +%%MYSQL%%%%DATADIR%%/sql/pop_before_smtp.mysql +%%MYSQL%%%%DATADIR%%/sql/update_encryption.mysql +%%MYSQL%%%%DATADIR%%/sql/update_mailbox_subscribed_folders.mysql +%%MYSQL%%%%DATADIR%%/sql/update_mysql_tmptables.mysql +%%MYSQL%%%%DATADIR%%/sql/update_ownerid_aliases.mysql +%%PGSQL%%%%DATADIR%%/sql/add-constraints.pgsql +%%PGSQL%%%%DATADIR%%/sql/add-lastlogin.postgresql +%%PGSQL%%%%DATADIR%%/sql/add_auto_notification.pgsql +%%PGSQL%%%%DATADIR%%/sql/add_auto_reply.pgsql +%%PGSQL%%%%DATADIR%%/sql/add_rfcsize.postgresql +%%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql +%%PGSQL%%%%DATADIR%%/sql/no-constraint-tables.pgsql +%%PGSQL%%%%DATADIR%%/sql/update_encryption.pgsql +%%PGSQL%%%%DATADIR%%/sql/md5_alter_users.7.3-pgsql +%%PGSQL%%%%DATADIR%%/sql/md5_alter_users.pre_7.3-pgsql +%%PGSQL%%%%DATADIR%%/sql/pop_before_smtp.pgsql %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README -@dirrm share/dbmail/sql -@dirrm share/dbmail +@dirrm %%DATADIR%%/sql +@dirrm %%DATADIR%% @dirrm %%DOCSDIR%% Index: dbmail/files/patch-configure =================================================================== RCS file: /WORK/REPO/ports/mail/dbmail/files/patch-configure,v retrieving revision 1.1 diff -u -r1.1 patch-configure --- dbmail/files/patch-configure 7 Oct 2003 01:17:49 -0000 1.1 +++ dbmail/files/patch-configure 13 Oct 2003 15:29:50 -0000 @@ -1,12 +1,14 @@ ---- configure.orig Mon Oct 6 18:12:06 2003 -+++ configure Mon Oct 6 18:13:28 2003 -@@ -842,19 +842,22 @@ - +--- configure.orig Mon Mar 17 17:04:08 2003 ++++ configure Mon Oct 13 17:06:33 2003 +@@ -846,23 +846,26 @@ mysqllibpaths="/usr/lib /usr/local/lib /lib /usr/freeware/lib \ -- /usr/freeware/lib32 $HOME/lib $HOME/tcl/lib $HOME" -+ /usr/freeware/lib32 $HOME/lib $HOME/tcl/lib $HOME \ -+ $LOCALBASE/lib $PREFIX/lib" + /usr/freeware/lib32 $HOME/lib $HOME/mysql/lib \ +- /usr/lib/mysql /usr/local/lib/mysql $HOME/lib/mysql $HOME" ++ /usr/lib/mysql /usr/local/lib/mysql $HOME/lib/mysql \ ++ $HOME $LOCALBASE/lib $PREFIX/lib \ ++ $LOCALBASE/lib/mysql $PREFIX/lib/mysql" + mysqlheaderpaths="/usr/include/mysql /usr/include /usr/local/include/mysql \ /usr/local/include /usr/freeware/include/mysql \ /usr/freeware/include $HOME/include $HOME/mysql/include \ @@ -14,15 +16,17 @@ + $HOME $LOCALBASE/include/mysql $PREFIX/include/mysql" pgsqllibpaths="/usr/lib /usr/local/lib /lib /usr/freeware/lib \ -- /usr/freeware/lib32 $HOME/lib $HOME/tcl/lib $HOME" -+ /usr/freeware/lib32 $HOME/lib $HOME/tcl/lib $HOME \ -+ $LOCALBASE/lib $PREFIX/lib" + /usr/freeware/lib32 $HOME/lib $HOME/pgsql/lib \ + /usr/lib/pgsql /usr/local/lib/pgsql /usr/lib/postgresql \ + /usr/local/lib/postgresql $HOME/lib/pgsql $HOME/lib/postgresql \ +- $HOME/postgresql/lib $HOME" ++ $HOME/postgresql/lib $HOME $LOCALBASE/lib $PREFIX/lib" pgsqlheaderpaths="/usr/include/pgsql /usr/include /usr/local/include/pgsql \ /usr/local/include /usr/freeware/include/pgsql \ /usr/freeware/include $HOME/include $HOME/pgsql/include \ -- /usr/local/pgsql/include $HOME" -+ /usr/local/pgsql/include $HOME \ +- /usr/local/pgsql/include /usr/include/postgresql $HOME" ++ /usr/local/pgsql/include /usr/include/postgresql $HOME\ + $LOCALBASE/include/pgsql $PREFIX/include/pgsql" # Check whether --with-mysql or --without-mysql was given. --- dbmail.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: