From sunpoet@sunpoet.net  Mon Nov 15 14:36:00 2010
Return-Path: <sunpoet@sunpoet.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8B91B1065695
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 15 Nov 2010 14:36:00 +0000 (UTC)
	(envelope-from sunpoet@sunpoet.net)
Received: from mail-gw0-f54.google.com (mail-gw0-f54.google.com [74.125.83.54])
	by mx1.freebsd.org (Postfix) with ESMTP id 3CCFE8FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 15 Nov 2010 14:35:59 +0000 (UTC)
Received: by gwj20 with SMTP id 20so2655250gwj.13
        for <multiple recipients>; Mon, 15 Nov 2010 06:35:59 -0800 (PST)
Received: by 10.42.224.136 with SMTP id io8mr279004icb.39.1289831758206;
        Mon, 15 Nov 2010 06:35:58 -0800 (PST)
Received: from sunpoet.net (sunpoet.net [220.133.12.240])
        by mx.google.com with ESMTPS id d21sm33659ibg.3.2010.11.15.06.35.55
        (version=TLSv1/SSLv3 cipher=RC4-MD5);
        Mon, 15 Nov 2010 06:35:57 -0800 (PST)
Received: by sunpoet.net (Postfix, from userid 1000)
	id 4713E2AEC95E; Mon, 15 Nov 2010 22:35:48 +0800 (CST)
Message-Id: <20101115143548.4713E2AEC95E@sunpoet.net>
Date: Mon, 15 Nov 2010 22:35:48 +0800 (CST)
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Sender: Sunpoet Hsieh <sunpoet@sunpoet.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: ume@FreeBSD.org
Subject: [PATCH] security/cyrus-sasl: remove invalid option, use dirrmtry, pet portlint
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         152261
>Category:       ports
>Synopsis:       [PATCH] security/cyrus-sasl2: remove invalid option, use dirrmtry, pet portlint
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ume
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 15 14:40:09 UTC 2010
>Closed-Date:    Wed Nov 24 11:50:03 UTC 2010
>Last-Modified:  Wed Nov 24 11:50:10 UTC 2010
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 8.1-STABLE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.1-STABLE FreeBSD 8.1-STABLE #0: Sat Oct 23 16:01:16 CST 2010
>Description:
- Remove invalid KERBEROS4 option which depends on a removed port (security/krb4)
- Use dirrmtry on PREFIX/lib/sasl2 where configurations may stay [1]
- Pet portlint

[1]
===>  Deinstalling for security/cyrus-sasl2
===>   Deinstalling cyrus-sasl-2.1.23
pkg_delete: unable to completely remove directory '/usr/local/lib/sasl2'
pkg_delete: couldn't entirely delete package (perhaps the packing list is incorrectly specified?)
To delete Cyrus user permanently, use 'pw userdel cyrus'
To delete Cyrus group permanently, use 'pw groupdel cyrus'

% ls -A`l /usr/local/lib/sasl2/
total 1
drwxr-xr-x   2 root  wheel   1024 Oct  8 10:41 .
drwxr-xr-x  66 root  wheel  41472 Nov 15 22:06 ..
-rwxr-xr-x   1 root  wheel     43 May 13  2008 smtpd.conf

Port maintainer (ume@FreeBSD.org) is cc'd.

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

--- cyrus-sasl-2.1.23.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/cyrus-sasl2/Makefile,v
retrieving revision 1.141
diff -u -u -r1.141 Makefile
--- Makefile	2 Aug 2009 19:35:25 -0000	1.141
+++ Makefile	15 Nov 2010 14:20:20 -0000
@@ -137,7 +137,7 @@
 
 .if defined(WITHOUT_PLAIN)
 CONFIGURE_ARGS+=--disable-plain
-PLAIN= "@comment "
+PLAIN=	"@comment "
 .endif
 
 .if defined(WITHOUT_OTP)
@@ -177,15 +177,6 @@
 GSSAPI=	"@comment "
 .endif
 
-# KERBEROS 4 was removed in FreeBSD 5.0-CURRENT
-.if defined(WITH_KERBEROS4)
-LIB_DEPENDS+=	krb.2:${PORTSDIR}/security/krb4
-CONFIGURE_ARGS+=--enable-krb4=${LOCALBASE}/krb4
-.else
-CONFIGURE_ARGS+=--disable-krb4
-EBONES=	"@comment "
-.endif
-
 .if ${OPENSSLBASE} == /usr
 CONFIGURE_ARGS+=--with-openssl=yes
 .else
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/security/cyrus-sasl2/distinfo,v
retrieving revision 1.29
diff -u -u -r1.29 distinfo
--- distinfo	15 May 2009 01:17:57 -0000	1.29
+++ distinfo	15 Nov 2010 14:20:20 -0000
@@ -1,3 +1,2 @@
-MD5 (cyrus-sasl-2.1.23.tar.gz) = 2eb0e48106f0e9cd8001e654f267ecbc
 SHA256 (cyrus-sasl-2.1.23.tar.gz) = 20efcc4040cbab6e89a636a07dcf5720ee07b5c62359a4e7bf2500ef6020b136
 SIZE (cyrus-sasl-2.1.23.tar.gz) = 1613642
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/security/cyrus-sasl2/pkg-plist,v
retrieving revision 1.39
diff -u -u -r1.39 pkg-plist
--- pkg-plist	1 Feb 2007 02:41:55 -0000	1.39
+++ pkg-plist	15 Nov 2010 14:20:20 -0000
@@ -109,5 +109,5 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/windows.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/sasl2
+@dirrmtry lib/sasl2
 @cwd %%PREFIX%%
--- cyrus-sasl-2.1.23.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ume 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Nov 15 16:37:45 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152261 
State-Changed-From-To: open->closed 
State-Changed-By: ume 
State-Changed-When: Wed Nov 24 11:49:00 UTC 2010 
State-Changed-Why:  
Thanks! committed with some modification. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/152261: commit references a PR
Date: Wed, 24 Nov 2010 11:48:19 +0000 (UTC)

 ume         2010-11-24 11:48:14 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/cyrus-sasl2 Makefile distinfo pkg-plist 
     security/cyrus-sasl2-saslauthd Makefile 
   Log:
   - Remove KERBEROS4 option which depends on a removed port
     (security/krb4)
   - Use dirrmtry on PREFIX/lib/sasl2 where configurations may stay
   - Remove MD5 in distinfo
   
   PR:             ports/152261
   Submitted by:   sunpoet
   
   Revision  Changes    Path
   1.56      +2 -9      ports/security/cyrus-sasl2-saslauthd/Makefile
   1.142     +4 -12     ports/security/cyrus-sasl2/Makefile
   1.30      +0 -1      ports/security/cyrus-sasl2/distinfo
   1.40      +1 -5      ports/security/cyrus-sasl2/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:
