From ler@lerctr.org  Tue Mar 13 00:34:25 2007
Return-Path: <ler@lerctr.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3A9D116A404
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 Mar 2007 00:34:25 +0000 (UTC)
	(envelope-from ler@lerctr.org)
Received: from thebighonker.lerctr.org (thebighonker.lerctr.org [192.147.25.65])
	by mx1.freebsd.org (Postfix) with ESMTP id 22B9813C45E
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 Mar 2007 00:34:25 +0000 (UTC)
	(envelope-from ler@lerctr.org)
Received: from ler by thebighonker.lerctr.org with local (Exim 4.66 (FreeBSD))
	(envelope-from <ler@lerctr.org>)
	id 1HQuy6-000BWD-1q; Mon, 12 Mar 2007 19:34:22 -0500
Message-Id: <E1HQuy6-000BWD-1q@thebighonker.lerctr.org>
Date: Mon, 12 Mar 2007 19:34:22 -0500
From: Larry Rosenman <ler@lerctr.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: mark_sf@kikg.ifmo.ru
Subject: [PATCH] mail/dbmail: update to 2.2.4
X-Send-Pr-Version: 3.113
X-GNATS-Notify: mark_sf@kikg.ifmo.ru

>Number:         110245
>Category:       ports
>Synopsis:       [PATCH] mail/dbmail: update to 2.2.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 13 00:40:09 GMT 2007
>Closed-Date:    Fri Mar 16 11:24:14 GMT 2007
>Last-Modified:  Fri Mar 16 11:30:27 GMT 2007
>Originator:     Larry Rosenman
>Release:        FreeBSD 6.2-STABLE amd64
>Organization:
LERCTR Consulting
>Environment:
System: FreeBSD thebighonker.lerctr.org 6.2-STABLE FreeBSD 6.2-STABLE #9: Mon Mar 12 07:02:32 CST 2007
>Description:
- Update to 2.2.4

Removed file(s):
- files/patch-rfc822_headername_case

Port maintainer (mark_sf@kikg.ifmo.ru) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- dbmail-2.2.4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/dbmail/Makefile /usr/home/ler/ports/mail/dbmail/Makefile
--- /usr/ports/mail/dbmail/Makefile	Thu Mar  1 13:32:00 2007
+++ /usr/home/ler/ports/mail/dbmail/Makefile	Mon Mar 12 19:27:09 2007
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTVERSION=	2.2.4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/2.2/
 
diff -ruN --exclude=CVS /usr/ports/mail/dbmail/distinfo /usr/home/ler/ports/mail/dbmail/distinfo
--- /usr/ports/mail/dbmail/distinfo	Wed Feb 14 12:31:39 2007
+++ /usr/home/ler/ports/mail/dbmail/distinfo	Mon Mar 12 19:27:54 2007
@@ -1,3 +1,3 @@
-MD5 (dbmail-2.2.2.tar.gz) = 7a1a0940d3ec07dc55c7e49412298b0a
-SHA256 (dbmail-2.2.2.tar.gz) = fdf8327addcd6edb379debffe56584020e7e477a3d101e8c8d0d5d992e00b4c2
-SIZE (dbmail-2.2.2.tar.gz) = 855310
+MD5 (dbmail-2.2.4.tar.gz) = b7f56437df764e7046438f81f4b7df18
+SHA256 (dbmail-2.2.4.tar.gz) = 2fdf2f22e9d0437e8331d33a956f12ca85d7370651c943f09f8886e94a93f379
+SIZE (dbmail-2.2.4.tar.gz) = 873538
diff -ruN --exclude=CVS /usr/ports/mail/dbmail/files/patch-rfc822_headername_case /usr/home/ler/ports/mail/dbmail/files/patch-rfc822_headername_case
--- /usr/ports/mail/dbmail/files/patch-rfc822_headername_case	Sun Feb 25 09:35:31 2007
+++ /usr/home/ler/ports/mail/dbmail/files/patch-rfc822_headername_case	Wed Dec 31 18:00:00 1969
@@ -1,26 +0,0 @@
---- dbmail-message.c
-+++ dbmail-message.c
-@@ -885,9 +885,13 @@ static int _header_get_id(const struct D
- 	u64_t tmp;
- 	gpointer cacheid;
- 	gchar *safe_header;
-+	gchar *tmpheader;
- 
--	if (! (safe_header = dm_strnesc(header,CACHE_WIDTH_NAME)))
-+	// rfc822 headernames are case-insensitive
-+	if (! (tmpheader = dm_strnesc(header,CACHE_WIDTH_NAME)))
- 		return -1;
-+	safe_header = g_ascii_strdown(tmpheader,-1);
-+	g_free(tmpheader);
- 
- 	cacheid = g_hash_table_lookup(self->header_dict, (gconstpointer)safe_header);
- 	if (cacheid) {
-@@ -897,7 +901,7 @@ static int _header_get_id(const struct D
- 	}
- 		
- 	GString *q = g_string_new("");
--	g_string_printf(q, "SELECT id FROM %sheadername WHERE headername='%s'", DBPFX, safe_header);
-+	g_string_printf(q, "SELECT id FROM %sheadername WHERE lower(headername)='%s'", DBPFX, safe_header);
- 	if (db_query(q->str) == -1) {
- 		g_string_free(q,TRUE);
- 		g_free(safe_header);
--- dbmail-2.2.4.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Mar 13 00:40:19 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110245 

From: Mark Starovoytov <mark_sf@kikg.ifmo.ru>
To: bug-followup@FreeBSD.ORG
Cc:  
Subject: Re: ports/110245: [PATCH] mail/dbmail: update to 2.2.4
Date: Tue, 13 Mar 2007 10:48:31 +0300

 approved
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Tue Mar 13 08:33:37 UTC 2007 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110245 
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Tue Mar 13 08:34:36 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110245 
State-Changed-From-To: open->feedback 
State-Changed-By: miwi 
State-Changed-When: Tue Mar 13 08:54:36 UTC 2007 
State-Changed-Why:  
Ask for maintainer fix. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110245 

From: Mark Starovoytov <mark_sf@kikg.ifmo.ru>
To: bug-followup@FreeBSD.ORG
Cc:  
Subject: Re: ports/110245: [PATCH] mail/dbmail: update to 2.2.4
Date: Tue, 13 Mar 2007 16:23:46 +0300

 --y0ulUmNC+osPPQO6
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 The following patch fixes build error.
 
 --y0ulUmNC+osPPQO6
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="dbmail-2.2.4.diff"
 
 diff -urN ./dbmail.orig/Makefile ./dbmail/Makefile
 --- ./dbmail.orig/Makefile	Mon Mar 12 09:14:12 2007
 +++ ./dbmail/Makefile	Tue Mar 13 14:06:15 2007
 @@ -6,8 +6,7 @@
  #
  
  PORTNAME=	dbmail
 -PORTVERSION=	2.2.2
 -PORTREVISION=	1
 +PORTVERSION=	2.2.4
  CATEGORIES=	mail
  MASTER_SITES=	http://www.dbmail.org/download/2.2/
  
 @@ -35,6 +34,7 @@
  CFLAGS+=	-fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
  LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
  CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
 +MAKE_ARGS+=	mandir=${PREFIX}/man
  
  PORTDOCS=	AUTHORS BUGS COPYING INSTALL NEWS README \
  		README.aliases README.exim README.ldap \
 @@ -96,6 +96,9 @@
  .if defined(WITH_LDAP)
  CONFIGURE_ARGS+=--with-auth-ldap=${LOCALBASE}/include
  USE_OPENLDAP=	yes
 +PLIST_SUB+=	LDAP=""
 +.else
 +PLIST_SUB+=	LDAP="@comment "
  .endif
  
  .if defined(WITHOUT_MYSQL) && !defined(WITH_POSTGRESQL) && !defined(WITH_SQLITE)
 diff -urN ./dbmail.orig/distinfo ./dbmail/distinfo
 --- ./dbmail.orig/distinfo	Mon Mar 12 09:12:51 2007
 +++ ./dbmail/distinfo	Tue Mar 13 10:42:00 2007
 @@ -1,3 +1,3 @@
 -MD5 (dbmail-2.2.2.tar.gz) = 7a1a0940d3ec07dc55c7e49412298b0a
 -SHA256 (dbmail-2.2.2.tar.gz) = fdf8327addcd6edb379debffe56584020e7e477a3d101e8c8d0d5d992e00b4c2
 -SIZE (dbmail-2.2.2.tar.gz) = 855310
 +MD5 (dbmail-2.2.4.tar.gz) = b7f56437df764e7046438f81f4b7df18
 +SHA256 (dbmail-2.2.4.tar.gz) = 2fdf2f22e9d0437e8331d33a956f12ca85d7370651c943f09f8886e94a93f379
 +SIZE (dbmail-2.2.4.tar.gz) = 873538
 diff -urN ./dbmail.orig/files/patch-rfc822_headername_case ./dbmail/files/patch-rfc822_headername_case
 --- ./dbmail.orig/files/patch-rfc822_headername_case	Mon Mar 12 09:14:12 2007
 +++ ./dbmail/files/patch-rfc822_headername_case	Thu Jan  1 03:00:00 1970
 @@ -1,26 +0,0 @@
 ---- dbmail-message.c
 -+++ dbmail-message.c
 -@@ -885,9 +885,13 @@ static int _header_get_id(const struct D
 - 	u64_t tmp;
 - 	gpointer cacheid;
 - 	gchar *safe_header;
 -+	gchar *tmpheader;
 - 
 --	if (! (safe_header = dm_strnesc(header,CACHE_WIDTH_NAME)))
 -+	// rfc822 headernames are case-insensitive
 -+	if (! (tmpheader = dm_strnesc(header,CACHE_WIDTH_NAME)))
 - 		return -1;
 -+	safe_header = g_ascii_strdown(tmpheader,-1);
 -+	g_free(tmpheader);
 - 
 - 	cacheid = g_hash_table_lookup(self->header_dict, (gconstpointer)safe_header);
 - 	if (cacheid) {
 -@@ -897,7 +901,7 @@ static int _header_get_id(const struct D
 - 	}
 - 		
 - 	GString *q = g_string_new("");
 --	g_string_printf(q, "SELECT id FROM %sheadername WHERE headername='%s'", DBPFX, safe_header);
 -+	g_string_printf(q, "SELECT id FROM %sheadername WHERE lower(headername)='%s'", DBPFX, safe_header);
 - 	if (db_query(q->str) == -1) {
 - 		g_string_free(q,TRUE);
 - 		g_free(safe_header);
 diff -urN ./dbmail.orig/pkg-plist ./dbmail/pkg-plist
 --- ./dbmail.orig/pkg-plist	Tue Nov 28 10:00:28 2006
 +++ ./dbmail/pkg-plist	Tue Mar 13 14:07:55 2007
 @@ -2,30 +2,30 @@
  etc/dbmail.conf-dist
  @exec if [ ! -f %D/etc/dbmail.conf ] ; then cp -p %D/%F %B/dbmail.conf; fi
  @exec mkdir -p %D/lib/dbmail
 -lib/dbmail/libmysql.a
 -lib/dbmail/libmysql.la
 -lib/dbmail/libmysql.so
 -lib/dbmail/libmysql.so.0
 -lib/dbmail/libpgsql.a
 -lib/dbmail/libpgsql.la
 -lib/dbmail/libpgsql.so
 -lib/dbmail/libpgsql.so.0
 -lib/dbmail/libsqlite.a
 -lib/dbmail/libsqlite.la
 -lib/dbmail/libsqlite.so
 -lib/dbmail/libsqlite.so.0
 -lib/dbmail/libsort_sieve.a
 -lib/dbmail/libsort_sieve.la
 -lib/dbmail/libsort_sieve.so
 -lib/dbmail/libsort_sieve.so.0
 +%%MYSQL%%lib/dbmail/libmysql.a
 +%%MYSQL%%lib/dbmail/libmysql.la
 +%%MYSQL%%lib/dbmail/libmysql.so
 +%%MYSQL%%lib/dbmail/libmysql.so.0
 +%%PGSQL%%lib/dbmail/libpgsql.a
 +%%PGSQL%%lib/dbmail/libpgsql.la
 +%%PGSQL%%lib/dbmail/libpgsql.so
 +%%PGSQL%%lib/dbmail/libpgsql.so.0
 +%%SQLITE%%lib/dbmail/libsqlite.a
 +%%SQLITE%%lib/dbmail/libsqlite.la
 +%%SQLITE%%lib/dbmail/libsqlite.so
 +%%SQLITE%%lib/dbmail/libsqlite.so.0
 +%%SIEVE%%lib/dbmail/libsort_sieve.a
 +%%SIEVE%%lib/dbmail/libsort_sieve.la
 +%%SIEVE%%lib/dbmail/libsort_sieve.so
 +%%SIEVE%%lib/dbmail/libsort_sieve.so.0
 +%%LDAP%%lib/dbmail/libauth_ldap.a
 +%%LDAP%%lib/dbmail/libauth_ldap.la
 +%%LDAP%%lib/dbmail/libauth_ldap.so
 +%%LDAP%%lib/dbmail/libauth_ldap.so.0
  lib/dbmail/libauth_sql.a
  lib/dbmail/libauth_sql.la
  lib/dbmail/libauth_sql.so
  lib/dbmail/libauth_sql.so.0
 -lib/dbmail/libauth_ldap.a
 -lib/dbmail/libauth_ldap.la
 -lib/dbmail/libauth_ldap.so
 -lib/dbmail/libauth_ldap.so.0
  lib/dbmail/libdbmail.a
  lib/dbmail/libdbmail.la
  lib/dbmail/libdbmail.so
 
 --y0ulUmNC+osPPQO6--
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Fri Mar 16 11:24:12 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110245 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/110245: commit references a PR
Date: Fri, 16 Mar 2007 11:24:14 +0000 (UTC)

 miwi        2007-03-16 11:23:59 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/dbmail          Makefile distinfo pkg-plist 
   Removed files:
     mail/dbmail/files    patch-rfc822_headername_case 
   Log:
   - Update to 2.2.4
   
   PR:             110245
   Submitted by:   Larry Rosenman <ler@lerctr.org>
   Approved by:    maintainer
   
   Revision  Changes    Path
   1.33      +5 -2      ports/mail/dbmail/Makefile
   1.18      +3 -3      ports/mail/dbmail/distinfo
   1.2       +0 -26     ports/mail/dbmail/files/patch-rfc822_headername_case (dead)
   1.15      +20 -20    ports/mail/dbmail/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
