From root@haanjdj.homeip.net  Wed Dec  5 11:19:57 2007
Return-Path: <root@haanjdj.homeip.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 20A6116A417
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  5 Dec 2007 11:19:57 +0000 (UTC)
	(envelope-from root@haanjdj.homeip.net)
Received: from psmtp08.wxs.nl (psmtp08.wxs.nl [195.121.247.22])
	by mx1.freebsd.org (Postfix) with ESMTP id D905E13C455
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  5 Dec 2007 11:19:56 +0000 (UTC)
	(envelope-from root@haanjdj.homeip.net)
Received: from haanjdj.homeip.net (ip565ab01e.direct-adsl.nl [86.90.176.30])
 by psmtp08.wxs.nl
 (iPlanet Messaging Server 5.2 HotFix 2.15 (built Nov 14 2006))
 with ESMTP id <0JSK00EJVJUMCV@psmtp08.wxs.nl> for
 FreeBSD-gnats-submit@freebsd.org; Wed, 05 Dec 2007 10:04:01 +0100 (MET)
Received: by haanjdj.homeip.net (Postfix, from userid 0)	id 75C4550863; Wed,
 05 Dec 2007 10:03:58 +0100 (CET)
Message-Id: <20071205090358.75C4550863@haanjdj.homeip.net>
Date: Wed, 05 Dec 2007 10:03:58 +0100 (CET)
From: Derkjan de Haan <haanjdj@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] port update libsieve
X-Send-Pr-Version: 3.113
X-GNATS-Notify: mark_sf@kikg.ifmo.ru

>Number:         118446
>Category:       ports
>Synopsis:       [patch] port update mail/libsieve
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 05 11:20:01 UTC 2007
>Closed-Date:    Sat Dec 15 22:14:08 UTC 2007
>Last-Modified:  Sat Dec 15 22:20:01 UTC 2007
>Originator:     Derkjan
>Release:        FreeBSD 7.0-BETA4 amd64
>Organization:
>Environment:
System: FreeBSD olivetti.badmuts.org 7.0-BETA4 FreeBSD 7.0-BETA4 #1: Sun Dec 2 17:39:08 CET 2007 root@olivetti.badmuts.org:/usr/obj/usr/src/sys/CUSTOM amd64

>Description:

I have prepared an update to the mail/libsieve port. Please review and apply. I have removed the FreeBSD4 patch because it didn't apply and FBSD4 is no longer supported anyway.

>How-To-Repeat:
>Fix:
diff -ruN libsieve.ORG/Makefile libsieve/Makefile
--- libsieve.ORG/Makefile       2007-10-17 12:12:47.000000000 +0200
+++ libsieve/Makefile   2007-12-05 09:50:24.000000000 +0100
@@ -6,8 +6,7 @@
 #

 PORTNAME=      libsieve
-PORTVERSION=   2.2.5
-PORTREVISION=  1
+PORTVERSION=   2.2.6
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=    libsieve
diff -ruN libsieve.ORG/distinfo libsieve/distinfo
--- libsieve.ORG/distinfo       2007-02-13 11:44:18.000000000 +0100
+++ libsieve/distinfo   2007-12-05 09:49:48.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (libsieve-2.2.5.tar.gz) = f0adbfa59254d07611d907f78aaa20cd
-SHA256 (libsieve-2.2.5.tar.gz) = c449830592eebe1651f072bda524427134a52d9873b4a2d4725e076388911db8
-SIZE (libsieve-2.2.5.tar.gz) = 573924
+MD5 (libsieve-2.2.6.tar.gz) = c97050a3e823de8f6e960ab92cd8bd98
+SHA256 (libsieve-2.2.6.tar.gz) = dce45d73fba98afbffc6fbb6743b3f727cd41d5d3b09ac398a0cb90b21e7f0f0
+SIZE (libsieve-2.2.6.tar.gz) = 564722
diff -ruN libsieve.ORG/files/patch-freebsd4_fix libsieve/files/patch-freebsd4_fix
--- libsieve.ORG/files/patch-freebsd4_fix       2006-08-08 18:49:12.000000000 +0200
+++ libsieve/files/patch-freebsd4_fix   1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
---- src/sv_interface/tree.h.orig       Tue Jul 18 17:17:23 2006
-+++ src/sv_interface/tree.h    Mon Aug  7 10:11:05 2006
-@@ -30,7 +30,7 @@
-
- #include "comparator.h"
-
--//#include <sys/types.h>
-+#include <sys/types.h>
- #include "regex.h"
-
-
---- src/sv_parser/comparator.h Tue Jul 18 17:15:16 2006
-+++ src/sv_parser/comparator.h Mon Aug  7 10:05:29 2006
-@@ -27,6 +27,8 @@
- #ifndef COMPARATOR_H
- #define COMPARATOR_H
-
-+// sys/types.h was required prior to the FreeBSD 5.0
-+#include <sys/types.h>
- #include "regex.h"
-
- /* compares pat to text; returns 1 if it's true, 0 otherwise
---- src/sv_parser/sieve.y.orig Mon Jul 24 14:24:53 2006
-+++ src/sv_parser/sieve.y      Mon Aug  7 10:28:04 2006
-@@ -36,6 +36,9 @@
- #include <ctype.h>
-
- /* sv_regex */
-+/* POSIX says that <sys/types.h> must be included (by the caller) before
-+   <regex.h>.  */
-+#include <sys/types.h>
- #include "regex.h"
-
- /* sv_parser */
---- src/sv_util/xsize.h.orig   Tue Jul 18 17:15:16 2006
-+++ src/sv_util/xsize.h        Mon Aug  7 10:47:36 2006
-@@ -26,6 +26,10 @@
- #include <limits.h>
- #if HAVE_STDINT_H
- # include <stdint.h>
-+#else
-+// stdint.h was introduced in FreeBSD 5.0
-+// limits.h in 4.0 has SIZE_T_MAX, not SIZE_MAX
-+# define SIZE_MAX SIZE_T_MAX
- #endif
-
- /* The size of memory objects is often computed through expressions of


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Dec 5 21:27:32 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Mark Starovoytov <mark_sf@kikg.ifmo.ru>
To: bug-followup@FreeBSD.org, haanjdj@gmail.com
Cc: Edwin Groothuis <edwin@FreeBSD.org>
Subject: Re: ports/118446: [patch] port update mail/libsieve
Date: Thu, 6 Dec 2007 21:12:48 +0300

 ------------F44833B5827E7
 Content-Type: text/plain; charset=us-ascii
 Content-Transfer-Encoding: 7bit
 
 The patch submitted by Derkjan didn't apply cleanly, so I fixed it a
 bit.
 ------------F44833B5827E7
 Content-Type: application/octet-stream; name="libsieve-2.2.6.diff"
 Content-transfer-encoding: base64
 Content-Disposition: attachment; filename="libsieve-2.2.6.diff"
 
 ZGlmZiAtdXJOIC4vbGlic2lldmUub3JpZy9NYWtlZmlsZSAuL2xpYnNpZXZlL01ha2VmaWxl
 Ci0tLSAuL2xpYnNpZXZlLm9yaWcvTWFrZWZpbGUJU2F0IE5vdiAgMyAxNzo1MzozMCAyMDA3
 CisrKyAuL2xpYnNpZXZlL01ha2VmaWxlCVRodSBEZWMgIDYgMTE6MjQ6NTMgMjAwNwpAQCAt
 Niw4ICs2LDcgQEAKICMKIAogUE9SVE5BTUU9CWxpYnNpZXZlCi1QT1JUVkVSU0lPTj0JMi4y
 LjUKLVBPUlRSRVZJU0lPTj0JMQorUE9SVFZFUlNJT049CTIuMi42CiBDQVRFR09SSUVTPQlt
 YWlsCiBNQVNURVJfU0lURVM9CSR7TUFTVEVSX1NJVEVfU09VUkNFRk9SR0V9CiBNQVNURVJf
 U0lURV9TVUJESVI9CWxpYnNpZXZlCmRpZmYgLXVyTiAuL2xpYnNpZXZlLm9yaWcvZGlzdGlu
 Zm8gLi9saWJzaWV2ZS9kaXN0aW5mbwotLS0gLi9saWJzaWV2ZS5vcmlnL2Rpc3RpbmZvCU1v
 biBNYXIgMTIgMDk6MTI6NTIgMjAwNworKysgLi9saWJzaWV2ZS9kaXN0aW5mbwlUaHUgRGVj
 ICA2IDExOjI1OjIzIDIwMDcKQEAgLTEsMyArMSwzIEBACi1NRDUgKGxpYnNpZXZlLTIuMi41
 LnRhci5neikgPSBmMGFkYmZhNTkyNTRkMDc2MTFkOTA3Zjc4YWFhMjBjZAotU0hBMjU2IChs
 aWJzaWV2ZS0yLjIuNS50YXIuZ3opID0gYzQ0OTgzMDU5MmVlYmUxNjUxZjA3MmJkYTUyNDQy
 NzEzNGE1MmQ5ODczYjRhMmQ0NzI1ZTA3NjM4ODkxMWRiOAotU0laRSAobGlic2lldmUtMi4y
 LjUudGFyLmd6KSA9IDU3MzkyNAorTUQ1IChsaWJzaWV2ZS0yLjIuNi50YXIuZ3opID0gYzk3
 MDUwYTNlODIzZGU4ZjZlOTYwYWI5MmNkOGJkOTgKK1NIQTI1NiAobGlic2lldmUtMi4yLjYu
 dGFyLmd6KSA9IGRjZTQ1ZDczZmJhOThhZmJmZmM2ZmJiNjc0M2IzZjcyN2NkNDFkNWQzYjA5
 YWMzOThhMGNiOTBiMjFlN2YwZjAKK1NJWkUgKGxpYnNpZXZlLTIuMi42LnRhci5neikgPSA1
 NjQ3MjIKZGlmZiAtdXJOIC4vbGlic2lldmUub3JpZy9maWxlcy9wYXRjaC1mcmVlYnNkNF9m
 aXggLi9saWJzaWV2ZS9maWxlcy9wYXRjaC1mcmVlYnNkNF9maXgKLS0tIC4vbGlic2lldmUu
 b3JpZy9maWxlcy9wYXRjaC1mcmVlYnNkNF9maXgJVGh1IEF1ZyAxMCAxMToyNzo1NiAyMDA2
 CisrKyAuL2xpYnNpZXZlL2ZpbGVzL3BhdGNoLWZyZWVic2Q0X2ZpeAlUaHUgSmFuICAxIDAz
 OjAwOjAwIDE5NzAKQEAgLTEsNDcgKzAsMCBAQAotLS0tIHNyYy9zdl9pbnRlcmZhY2UvdHJl
 ZS5oLm9yaWcJVHVlIEp1bCAxOCAxNzoxNzoyMyAyMDA2Ci0rKysgc3JjL3N2X2ludGVyZmFj
 ZS90cmVlLmgJTW9uIEF1ZyAgNyAxMDoxMTowNSAyMDA2Ci1AQCAtMzAsNyArMzAsNyBAQAot
 IAotICNpbmNsdWRlICJjb21wYXJhdG9yLmgiCi0gCi0tLy8jaW5jbHVkZSA8c3lzL3R5cGVz
 Lmg+Ci0rI2luY2x1ZGUgPHN5cy90eXBlcy5oPgotICNpbmNsdWRlICJyZWdleC5oIgotIAot
 IAotLS0tIHNyYy9zdl9wYXJzZXIvY29tcGFyYXRvci5oCVR1ZSBKdWwgMTggMTc6MTU6MTYg
 MjAwNgotKysrIHNyYy9zdl9wYXJzZXIvY29tcGFyYXRvci5oCU1vbiBBdWcgIDcgMTA6MDU6
 MjkgMjAwNgotQEAgLTI3LDYgKzI3LDggQEAKLSAjaWZuZGVmIENPTVBBUkFUT1JfSAotICNk
 ZWZpbmUgQ09NUEFSQVRPUl9ICi0gCi0rLy8gc3lzL3R5cGVzLmggd2FzIHJlcXVpcmVkIHBy
 aW9yIHRvIHRoZSBGcmVlQlNEIDUuMAotKyNpbmNsdWRlIDxzeXMvdHlwZXMuaD4KLSAjaW5j
 bHVkZSAicmVnZXguaCIKLSAKLSAvKiBjb21wYXJlcyBwYXQgdG8gdGV4dDsgcmV0dXJucyAx
 IGlmIGl0J3MgdHJ1ZSwgMCBvdGhlcndpc2UgCi0tLS0gc3JjL3N2X3BhcnNlci9zaWV2ZS55
 Lm9yaWcJTW9uIEp1bCAyNCAxNDoyNDo1MyAyMDA2Ci0rKysgc3JjL3N2X3BhcnNlci9zaWV2
 ZS55CU1vbiBBdWcgIDcgMTA6Mjg6MDQgMjAwNgotQEAgLTM2LDYgKzM2LDkgQEAKLSAjaW5j
 bHVkZSA8Y3R5cGUuaD4KLSAKLSAvKiBzdl9yZWdleCAqLwotKy8qIFBPU0lYIHNheXMgdGhh
 dCA8c3lzL3R5cGVzLmg+IG11c3QgYmUgaW5jbHVkZWQgKGJ5IHRoZSBjYWxsZXIpIGJlZm9y
 ZQotKyAgIDxyZWdleC5oPi4gICovCi0rI2luY2x1ZGUgPHN5cy90eXBlcy5oPgotICNpbmNs
 dWRlICJyZWdleC5oIgotIAotIC8qIHN2X3BhcnNlciAqLwotLS0tIHNyYy9zdl91dGlsL3hz
 aXplLmgub3JpZwlUdWUgSnVsIDE4IDE3OjE1OjE2IDIwMDYKLSsrKyBzcmMvc3ZfdXRpbC94
 c2l6ZS5oCU1vbiBBdWcgIDcgMTA6NDc6MzYgMjAwNgotQEAgLTI2LDYgKzI2LDEwIEBACi0g
 I2luY2x1ZGUgPGxpbWl0cy5oPgotICNpZiBIQVZFX1NURElOVF9ICi0gIyBpbmNsdWRlIDxz
 dGRpbnQuaD4KLSsjZWxzZQotKy8vIHN0ZGludC5oIHdhcyBpbnRyb2R1Y2VkIGluIEZyZWVC
 U0QgNS4wCi0rLy8gbGltaXRzLmggaW4gNC4wIGhhcyBTSVpFX1RfTUFYLCBub3QgU0laRV9N
 QVgKLSsjIGRlZmluZSBTSVpFX01BWCBTSVpFX1RfTUFYCi0gI2VuZGlmCi0gCi0gLyogVGhl
 IHNpemUgb2YgbWVtb3J5IG9iamVjdHMgaXMgb2Z0ZW4gY29tcHV0ZWQgdGhyb3VnaCBleHBy
 ZXNzaW9ucyBvZgo=
 
 ------------F44833B5827E7--
 
State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Sat Dec 15 22:10:05 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/118446: commit references a PR
Date: Sat, 15 Dec 2007 22:13:57 +0000 (UTC)

 pav         2007-12-15 22:13:52 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/libsieve        Makefile distinfo 
   Removed files:
     mail/libsieve/files  patch-freebsd4_fix 
   Log:
   - Update to 2.2.6
   
   PR:             ports/118446
   Submitted by:   Derkjan de Haan <haanjdj@gmail.com>
   Approved by:    Mark Starovoytov <mark_sf@kikg.ifmo.ru> (maintainer)
   
   Revision  Changes    Path
   1.9       +1 -4      ports/mail/libsieve/Makefile
   1.5       +3 -3      ports/mail/libsieve/distinfo
   1.2       +0 -47     ports/mail/libsieve/files/patch-freebsd4_fix (dead)
 _______________________________________________
 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:
