From 193dd3819e55870493c30fdc0dcf824d2510b9c1 Mon Sep 17 00:00:00 2001
From: Sergei Kolobov <sergei@FreeBSD.org>
Date: Fri, 24 Oct 2003 06:51:27 +0000
Subject: [PATCH] - Update to 1.2.1:   This update fixes a security bug in the
 SMTP handling code and adds   some indexes to the PostgreSQL table layout for
 speed improvements

PR:		58470
Submitted by:	maintainer
Approved by:	krion (implicit)
---
 mail/dbmail-devel/Makefile  | 7 ++-----
 mail/dbmail-devel/distinfo  | 2 +-
 mail/dbmail-devel/pkg-plist | 4 +++-
 mail/dbmail/Makefile        | 7 ++-----
 mail/dbmail/distinfo        | 2 +-
 mail/dbmail/pkg-plist       | 4 +++-
 mail/dbmail20/Makefile      | 7 ++-----
 mail/dbmail20/distinfo      | 2 +-
 mail/dbmail20/pkg-plist     | 4 +++-
 mail/dbmail21/Makefile      | 7 ++-----
 mail/dbmail21/distinfo      | 2 +-
 mail/dbmail21/pkg-plist     | 4 +++-
 mail/dbmail22/Makefile      | 7 ++-----
 mail/dbmail22/distinfo      | 2 +-
 mail/dbmail22/pkg-plist     | 4 +++-
 15 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/mail/dbmail-devel/Makefile b/mail/dbmail-devel/Makefile
index 301089ea7420..7c8cef3cc616 100644
--- a/mail/dbmail-devel/Makefile
+++ b/mail/dbmail-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/tgz/
 PKGNAMESUFFIX=	-${DATABASE}
@@ -63,9 +62,7 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/sql/${DATABASE}/* ${DATADIR}/sql
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for docs in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
-.endfor
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/dbmail-devel/distinfo b/mail/dbmail-devel/distinfo
index 51b9101a6107..5e8cf72b3498 100644
--- a/mail/dbmail-devel/distinfo
+++ b/mail/dbmail-devel/distinfo
@@ -1 +1 @@
-MD5 (dbmail-1.2.tgz) = cf841ed657fc87a9a186c9b0ac9189ed
+MD5 (dbmail-1.2.1.tgz) = 5721d9d15fa1a3d1aaee8e1290cc3954
diff --git a/mail/dbmail-devel/pkg-plist b/mail/dbmail-devel/pkg-plist
index 88c7b286d496..2b086d113b91 100644
--- a/mail/dbmail-devel/pkg-plist
+++ b/mail/dbmail-devel/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/dbmail-smtp
 bin/dbmail-pop3d
 bin/dbmail-imapd
@@ -23,6 +24,7 @@ etc/dbmail.conf-dist
 %%MYSQL%%%%DATADIR%%/sql/update_mysql_tmptables.mysql
 %%MYSQL%%%%DATADIR%%/sql/update_ownerid_aliases.mysql
 %%PGSQL%%%%DATADIR%%/sql/add-constraints.pgsql
+%%PGSQL%%%%DATADIR%%/sql/add-indexes-fkeys-to-1.2.pgsql
 %%PGSQL%%%%DATADIR%%/sql/add-lastlogin.postgresql
 %%PGSQL%%%%DATADIR%%/sql/add_auto_notification.pgsql
 %%PGSQL%%%%DATADIR%%/sql/add_auto_reply.pgsql
@@ -35,6 +37,6 @@ etc/dbmail.conf-dist
 %%PGSQL%%%%DATADIR%%/sql/pop_before_smtp.pgsql
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/sql
 @dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 301089ea7420..7c8cef3cc616 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/tgz/
 PKGNAMESUFFIX=	-${DATABASE}
@@ -63,9 +62,7 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/sql/${DATABASE}/* ${DATADIR}/sql
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for docs in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
-.endfor
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/dbmail/distinfo b/mail/dbmail/distinfo
index 51b9101a6107..5e8cf72b3498 100644
--- a/mail/dbmail/distinfo
+++ b/mail/dbmail/distinfo
@@ -1 +1 @@
-MD5 (dbmail-1.2.tgz) = cf841ed657fc87a9a186c9b0ac9189ed
+MD5 (dbmail-1.2.1.tgz) = 5721d9d15fa1a3d1aaee8e1290cc3954
diff --git a/mail/dbmail/pkg-plist b/mail/dbmail/pkg-plist
index 88c7b286d496..2b086d113b91 100644
--- a/mail/dbmail/pkg-plist
+++ b/mail/dbmail/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/dbmail-smtp
 bin/dbmail-pop3d
 bin/dbmail-imapd
@@ -23,6 +24,7 @@ etc/dbmail.conf-dist
 %%MYSQL%%%%DATADIR%%/sql/update_mysql_tmptables.mysql
 %%MYSQL%%%%DATADIR%%/sql/update_ownerid_aliases.mysql
 %%PGSQL%%%%DATADIR%%/sql/add-constraints.pgsql
+%%PGSQL%%%%DATADIR%%/sql/add-indexes-fkeys-to-1.2.pgsql
 %%PGSQL%%%%DATADIR%%/sql/add-lastlogin.postgresql
 %%PGSQL%%%%DATADIR%%/sql/add_auto_notification.pgsql
 %%PGSQL%%%%DATADIR%%/sql/add_auto_reply.pgsql
@@ -35,6 +37,6 @@ etc/dbmail.conf-dist
 %%PGSQL%%%%DATADIR%%/sql/pop_before_smtp.pgsql
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/sql
 @dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
diff --git a/mail/dbmail20/Makefile b/mail/dbmail20/Makefile
index 301089ea7420..7c8cef3cc616 100644
--- a/mail/dbmail20/Makefile
+++ b/mail/dbmail20/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/tgz/
 PKGNAMESUFFIX=	-${DATABASE}
@@ -63,9 +62,7 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/sql/${DATABASE}/* ${DATADIR}/sql
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for docs in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
-.endfor
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/dbmail20/distinfo b/mail/dbmail20/distinfo
index 51b9101a6107..5e8cf72b3498 100644
--- a/mail/dbmail20/distinfo
+++ b/mail/dbmail20/distinfo
@@ -1 +1 @@
-MD5 (dbmail-1.2.tgz) = cf841ed657fc87a9a186c9b0ac9189ed
+MD5 (dbmail-1.2.1.tgz) = 5721d9d15fa1a3d1aaee8e1290cc3954
diff --git a/mail/dbmail20/pkg-plist b/mail/dbmail20/pkg-plist
index 88c7b286d496..2b086d113b91 100644
--- a/mail/dbmail20/pkg-plist
+++ b/mail/dbmail20/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/dbmail-smtp
 bin/dbmail-pop3d
 bin/dbmail-imapd
@@ -23,6 +24,7 @@ etc/dbmail.conf-dist
 %%MYSQL%%%%DATADIR%%/sql/update_mysql_tmptables.mysql
 %%MYSQL%%%%DATADIR%%/sql/update_ownerid_aliases.mysql
 %%PGSQL%%%%DATADIR%%/sql/add-constraints.pgsql
+%%PGSQL%%%%DATADIR%%/sql/add-indexes-fkeys-to-1.2.pgsql
 %%PGSQL%%%%DATADIR%%/sql/add-lastlogin.postgresql
 %%PGSQL%%%%DATADIR%%/sql/add_auto_notification.pgsql
 %%PGSQL%%%%DATADIR%%/sql/add_auto_reply.pgsql
@@ -35,6 +37,6 @@ etc/dbmail.conf-dist
 %%PGSQL%%%%DATADIR%%/sql/pop_before_smtp.pgsql
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/sql
 @dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
diff --git a/mail/dbmail21/Makefile b/mail/dbmail21/Makefile
index 301089ea7420..7c8cef3cc616 100644
--- a/mail/dbmail21/Makefile
+++ b/mail/dbmail21/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/tgz/
 PKGNAMESUFFIX=	-${DATABASE}
@@ -63,9 +62,7 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/sql/${DATABASE}/* ${DATADIR}/sql
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for docs in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
-.endfor
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/dbmail21/distinfo b/mail/dbmail21/distinfo
index 51b9101a6107..5e8cf72b3498 100644
--- a/mail/dbmail21/distinfo
+++ b/mail/dbmail21/distinfo
@@ -1 +1 @@
-MD5 (dbmail-1.2.tgz) = cf841ed657fc87a9a186c9b0ac9189ed
+MD5 (dbmail-1.2.1.tgz) = 5721d9d15fa1a3d1aaee8e1290cc3954
diff --git a/mail/dbmail21/pkg-plist b/mail/dbmail21/pkg-plist
index 88c7b286d496..2b086d113b91 100644
--- a/mail/dbmail21/pkg-plist
+++ b/mail/dbmail21/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/dbmail-smtp
 bin/dbmail-pop3d
 bin/dbmail-imapd
@@ -23,6 +24,7 @@ etc/dbmail.conf-dist
 %%MYSQL%%%%DATADIR%%/sql/update_mysql_tmptables.mysql
 %%MYSQL%%%%DATADIR%%/sql/update_ownerid_aliases.mysql
 %%PGSQL%%%%DATADIR%%/sql/add-constraints.pgsql
+%%PGSQL%%%%DATADIR%%/sql/add-indexes-fkeys-to-1.2.pgsql
 %%PGSQL%%%%DATADIR%%/sql/add-lastlogin.postgresql
 %%PGSQL%%%%DATADIR%%/sql/add_auto_notification.pgsql
 %%PGSQL%%%%DATADIR%%/sql/add_auto_reply.pgsql
@@ -35,6 +37,6 @@ etc/dbmail.conf-dist
 %%PGSQL%%%%DATADIR%%/sql/pop_before_smtp.pgsql
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/sql
 @dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index 301089ea7420..7c8cef3cc616 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/tgz/
 PKGNAMESUFFIX=	-${DATABASE}
@@ -63,9 +62,7 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/sql/${DATABASE}/* ${DATADIR}/sql
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for docs in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
-.endfor
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/dbmail22/distinfo b/mail/dbmail22/distinfo
index 51b9101a6107..5e8cf72b3498 100644
--- a/mail/dbmail22/distinfo
+++ b/mail/dbmail22/distinfo
@@ -1 +1 @@
-MD5 (dbmail-1.2.tgz) = cf841ed657fc87a9a186c9b0ac9189ed
+MD5 (dbmail-1.2.1.tgz) = 5721d9d15fa1a3d1aaee8e1290cc3954
diff --git a/mail/dbmail22/pkg-plist b/mail/dbmail22/pkg-plist
index 88c7b286d496..2b086d113b91 100644
--- a/mail/dbmail22/pkg-plist
+++ b/mail/dbmail22/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/dbmail-smtp
 bin/dbmail-pop3d
 bin/dbmail-imapd
@@ -23,6 +24,7 @@ etc/dbmail.conf-dist
 %%MYSQL%%%%DATADIR%%/sql/update_mysql_tmptables.mysql
 %%MYSQL%%%%DATADIR%%/sql/update_ownerid_aliases.mysql
 %%PGSQL%%%%DATADIR%%/sql/add-constraints.pgsql
+%%PGSQL%%%%DATADIR%%/sql/add-indexes-fkeys-to-1.2.pgsql
 %%PGSQL%%%%DATADIR%%/sql/add-lastlogin.postgresql
 %%PGSQL%%%%DATADIR%%/sql/add_auto_notification.pgsql
 %%PGSQL%%%%DATADIR%%/sql/add_auto_reply.pgsql
@@ -35,6 +37,6 @@ etc/dbmail.conf-dist
 %%PGSQL%%%%DATADIR%%/sql/pop_before_smtp.pgsql
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/sql
 @dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%