Bug 178502

Comment 1 Edwin Groothuis 2013-05-11 08:40:07 UTC

Maintainer of mail/dovecot2,

Please note that PR ports/178502 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/178502

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org

Comment 2 Edwin Groothuis 2013-05-11 08:40:08 UTC

State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)

Hi,

$LICENSE for mail/dovecot2/ in the diff is incorrect per COPYING[0].  An
improved diff follows:

Index: Makefile
===================================================================
--- Makefile	(revision 317908)
+++ Makefile	(working copy)
@@ -2,13 +2,16 @@
 # $FreeBSD$

 PORTNAME=	dovecot
-PORTVERSION=	2.1.16
+PORTVERSION=	2.2.1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/${PORTVERSION:R}/

 MAINTAINER=	bra@fsn.hu
 COMMENT=	Secure and compact IMAP and POP3 servers

+LICENSE=	BSD LGPLv2 MIT
+LICENSE_COMB=	multi
+
 LATEST_LINK=	dovecot2
 CONFLICTS=	dovecot-1.[0-9]*

[0]: http://hg.dovecot.org/dovecot-2.2/file/62874b472dc6/COPYING

Cheers
--
Q:	What regular expression do you often see around Christmas?
A:	[^L]

Hi,

mail/dovecot2-antispam-plugin/files/patch-src_mailbox.c is included in the
upstream release[0]  I had forgotten to include this in the original diff:
Index: files/patch-src_mailbox.c
===================================================================
--- files/patch-src_mailbox.c   (revision 318261)
+++ files/patch-src_mailbox.c   (working copy)
@@ -1,23 +0,0 @@
-diff -r 43880985e3dd -r 5e8351bcfb29 src/mailbox.c
---- src/mailbox.c      Wed Dec 22 22:34:22 2010 +0200
-+++ src/mailbox.c      Sun Feb 26 21:34:05 2012 +0200
-@@ -135,7 +135,7 @@
-     struct mailbox_transaction_context *t = ctx->transaction;
      -     struct antispam_mailbox *asmb = STORAGE_CONTEXT(t->box);
            -
             --    if (ctx->copying == 0)
-+    if (ctx->copying_via_save == 0)
-     {
      -       struct antispam_user *asu =
              USER_CONTEXT(t->box->storage->user);
-
 -@@ -171,7 +171,7 @@
-
 -     // if we are copying then copy() code will do everything needed
       -     int ret = asmb->module_ctx.super.save_finish(ctx);
             --    if (ctx->copying != 0 || ret != 0)
-+    if (ctx->copying_via_save != 0 || ret != 0)
-       return ret;
        -
         -     // since there is no source mailbox, let's assume
               -
                -


[0]:
http://hg.dovecot.org/dovecot-antispam-plugin/diff/5e8351bcfb29/src/mailbox.c

Thanks.
alastair
--
How to Raise Your I.Q. by Eating Gifted Children
		-- Book title by Lewis B. Frumkes

Doesn't seem to care about pkg-plists... BTW, I've just submitted 
ports/178832 with an upgrade to the latest versions.

On 05/11/13 09:40, Edwin Groothuis wrote:
> Maintainer of mail/dovecot2,
>
> Please note that PR ports/178502 has just been submitted.
>
> If it contains a patch for an upgrade, an enhancement or a bug fix
> you agree on, reply to this email stating that you approve the patch
> and a committer will take care of it.
>
> The full text of the PR can be found at:
>      http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/178502
>

Comment 6 Martin Wilke 2013-05-24 04:52:10 UTC

Responsible Changed
From-To: freebsd-ports-bugs->miwi

I'll take it.

Hi,

Thanks for updating the dovecot2 & dovecot2-pigeonhole ports.  Would it be
possible to add $LICENSE to the dovecot port? Also any chance on updating
dovecot2-antispam-plugin?

Index: dovecot2/Makefile
===================================================================
--- dovecot2/Makefile	(revision 318915)
+++ dovecot2/Makefile	(working copy)
@@ -9,6 +9,9 @@
 MAINTAINER=	bra@fsn.hu
 COMMENT=	Secure and compact IMAP and POP3 servers
 
+LICENSE=       BSD LGPLv2 MIT
+LICENSE_COMB=  multi
+
 LATEST_LINK=	dovecot2
 CONFLICTS=	dovecot-1.[0-9]*
 
Index: dovecot2-antispam-plugin/Makefile
===================================================================
--- dovecot2-antispam-plugin/Makefile	(revision 318915)
+++ dovecot2-antispam-plugin/Makefile	(working copy)
@@ -2,21 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	dovecot2-antispam-plugin
-PORTVERSION=	20101222
-PORTREVISION=	7
+PORTVERSION=	5ebc6aae4d7c
+PORTREVISION=	8
 CATEGORIES=	mail
-MASTER_SITES=	http://www.bamus.cz/distfiles/
-DISTFILES=	dovecot-antispam-plugin-${DISTVERSION}${EXTRACT_SUFX}
+MASTER_SITES=	http://hg.dovecot.org/dovecot-antispam-plugin/archive/
+DISTFILES=	${PORTVERSION}.tar.bz2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dovecot 2.x plugin for spam systems training
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	dovecot>=2.0.7:${PORTSDIR}/mail/dovecot2 \
 		gawk:${PORTSDIR}/lang/gawk
 RUN_DEPENDS=	dovecot>=2.0.7:${PORTSDIR}/mail/dovecot2
 
 CONFLICTS=	dovecot-antispam-1.*
-WRKSRC=		${WRKDIR}/dovecot-antispam-plugin-43880985e3dd
+WRKSRC=		${WRKDIR}/dovecot-antispam-plugin-${PORTVERSION}
 
 USE_AUTOTOOLS=	aclocal autoheader autoconf
 USE_BZIP2=	yes
Index: dovecot2-antispam-plugin/distinfo
===================================================================
--- dovecot2-antispam-plugin/distinfo	(revision 318915)
+++ dovecot2-antispam-plugin/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (dovecot-antispam-plugin-20101222.tar.bz2) = 3b72e3d6ac639abb64356ca330a2e41f183c11452d563ed8ac4a0f7b4ea55582
-SIZE (dovecot-antispam-plugin-20101222.tar.bz2) = 55753
+SHA256 (5ebc6aae4d7c.tar.bz2) = d615b8667b053741336aa1506558dd23f92e5b23f35f8addf1d8bb564cf1a816
+SIZE (5ebc6aae4d7c.tar.bz2) = 56340
Index: dovecot2-antispam-plugin/files/patch-src_mailbox.c
===================================================================
--- dovecot2-antispam-plugin/files/patch-src_mailbox.c	(revision 318915)
+++ dovecot2-antispam-plugin/files/patch-src_mailbox.c	(working copy)
@@ -1,23 +0,0 @@
-diff -r 43880985e3dd -r 5e8351bcfb29 src/mailbox.c
---- src/mailbox.c	Wed Dec 22 22:34:22 2010 +0200
-+++ src/mailbox.c	Sun Feb 26 21:34:05 2012 +0200
-@@ -135,7 +135,7 @@
-     struct mailbox_transaction_context *t = ctx->transaction;
-     struct antispam_mailbox *asmb = STORAGE_CONTEXT(t->box);
- 
--    if (ctx->copying == 0)
-+    if (ctx->copying_via_save == 0)
-     {
- 	struct antispam_user *asu = USER_CONTEXT(t->box->storage->user);
- 
-@@ -171,7 +171,7 @@
- 
-     // if we are copying then copy() code will do everything needed
-     int ret = asmb->module_ctx.super.save_finish(ctx);
--    if (ctx->copying != 0 || ret != 0)
-+    if (ctx->copying_via_save != 0 || ret != 0)
- 	return ret;
- 
-     // since there is no source mailbox, let's assume
-
-
Index: dovecot2-antispam-plugin/pkg-message
===================================================================
--- dovecot2-antispam-plugin/pkg-message	(revision 318915)
+++ dovecot2-antispam-plugin/pkg-message	(working copy)
@@ -1,6 +1,6 @@
 ---------------------------------------------------------------------
 
-This port assumes you are known with Dovecot and have it installed and
+This port assumes you are familiar with Dovecot and have it installed and
 running on the system you have installed this plugin on.
 
 Further information on configuration can be found at:

Cheers
alastair
--
A is for Apple.
		-- Hester Pryne

Comment 8 Martin Wilke 2013-06-04 11:10:28 UTC

State Changed
From-To: feedback->closed

this got fixed already