From gabor@server.t-hosting.hu  Sat Apr 14 13:04:10 2007
Return-Path: <gabor@server.t-hosting.hu>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7702416A402
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 14 Apr 2007 13:04:10 +0000 (UTC)
	(envelope-from gabor@server.t-hosting.hu)
Received: from server.t-hosting.hu (server.t-hosting.hu [217.20.133.7])
	by mx1.freebsd.org (Postfix) with ESMTP id 01C2413C45D
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 14 Apr 2007 13:04:09 +0000 (UTC)
	(envelope-from gabor@server.t-hosting.hu)
Received: from localhost (localhost [127.0.0.1])
	by server.t-hosting.hu (Postfix) with ESMTP id 125E19F2E0A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 14 Apr 2007 15:04:08 +0200 (CEST)
Received: from server.t-hosting.hu ([127.0.0.1])
	by localhost (server.t-hosting.hu [127.0.0.1]) (amavisd-new, port 10024)
	with LMTP id LElo1kUuFajq for <FreeBSD-gnats-submit@freebsd.org>;
	Sat, 14 Apr 2007 15:04:04 +0200 (CEST)
Received: by server.t-hosting.hu (Postfix, from userid 1001)
	id EB06B9F2E03; Sat, 14 Apr 2007 15:04:03 +0200 (CEST)
Message-Id: <20070414130403.EB06B9F2E03@server.t-hosting.hu>
Date: Sat, 14 Apr 2007 15:04:03 +0200 (CEST)
From: Gabor Kovesdan <gabor@FreeBSD.org>
Reply-To: Gabor Kovesdan <gabor@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] mail/postfix-current: remove deprecated feaute
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         111565
>Category:       ports
>Synopsis:       [patch] mail/postfix-current: remove deprecated feaute
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mnag
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 14 13:10:01 GMT 2007
>Closed-Date:    Sat Apr 14 16:45:42 GMT 2007
>Last-Modified:  Sat Apr 14 16:50:07 GMT 2007
>Originator:     Gabor Kovesdan
>Release:        FreeBSD 6.2-RELEASE amd64
>Organization:
n/a
>Environment:
System: FreeBSD server.t-hosting.hu 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Fri Feb 2 11:51:40 CET 2007 gabor@server.t-hosting.hu:/usr/src/sys/amd64/compile/FREEBSD amd64

>Description:

The security/cyrus-sasl port is expired and should be remove but it is waiting
for the dependencies to drop support so that we can remove it. I have sent this
PR with the patch because the maintainer ignored my HEADSUP mail, in which I
asked the affected maintainers to modify their ports manually.

>How-To-Repeat:
>Fix:

--- mail-postfix-current.diff begins here ---
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/mail/postfix-current/Makefile,v
retrieving revision 1.205
diff -u -r1.205 Makefile
--- Makefile	3 Apr 2007 13:55:28 -0000	1.205
+++ Makefile	14 Apr 2007 12:57:39 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 DISTVERSION=	2.5-20070402
+PORTREVISION=	1
 PORTEPOCH=	4
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
@@ -30,7 +31,6 @@
 
 OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
 OPTIONS=	PCRE		"Perl Compatible Regular Expressions" 			on \
-		SASL		"Cyrus SASLv1 (Simple Auth. and Sec. Layer)"		off \
 		SASL2		"Cyrus SASLv2 (Simple Auth. and Sec. Layer)"		off \
 		DOVECOT		"Dovecot SASL authentication method"			off \
 		SASLKRB		"If your SASL req. Kerberos select this option"		off \
@@ -91,17 +91,8 @@
 POSTFIX_CCARGS+=	-DNO_PCRE
 .endif
 
-.if defined(WITH_SASL)
-.if defined(WITH_SASL2) || defined(WITH_DOVECOT)
-BROKEN=			Select only one SASL authentication method
-.endif
-LIB_DEPENDS+=		sasl.8:${PORTSDIR}/security/cyrus-sasl
-POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl1
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl -lpam -lcrypt
-.endif
-
 .if defined(WITH_SASL2)
-.if defined(WITH_SASL) || defined(WITH_DOVECOT)
+.if defined(WITH_DOVECOT)
 BROKEN=			Select only one SASL authentication method
 .endif
 LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
@@ -110,7 +101,7 @@
 .endif
 
 .if defined(WITH_DOVECOT)
-.if defined(WITH_SASL) || defined(WITH_SASL2)
+.if defined(WITH_SASL2)
 BROKEN=			Select only one SASL authentication method
 .endif
 RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot
@@ -204,17 +195,6 @@
 SUB_LIST+=	REQUIRE="${_REQUIRE}"
 
 pre-patch:
-.if defined(WITH_SASL) && !defined(WITH_MYSQL) && exists(${LOCALBASE}/lib/libsasl.a)
-	@if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | ${GREP} -wq "mysql_init"; then \
-		${ECHO_MSG}; \
-		${ECHO_MSG} "Your SASL library it's compiled with MYSQL"; \
-		${ECHO_MSG} "If you use MYSQL in ${PORTNAME} consider CTRL+C and"; \
-		${ECHO_MSG} "select MYSQL OPTION in config menu."; \
-		${ECHO_MSG} "# make clean config"; \
-		${ECHO_MSG}; \
-		sleep 5; \
-	fi
-.endif
 .if defined(WITH_SASL2) && !defined(WITH_MYSQL) && exists(${LOCALBASE}/lib/libsasl2.a)
 	@if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | ${GREP} -wq "mysql_init"; then \
 		${ECHO_MSG}; \
--- mail-postfix-current.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->mnag 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Apr 14 13:10:08 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111565 
State-Changed-From-To: open->closed 
State-Changed-By: mnag 
State-Changed-When: Sat Apr 14 16:45:41 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/111565: commit references a PR
Date: Sat, 14 Apr 2007 16:45:13 +0000 (UTC)

 mnag        2007-04-14 16:45:08 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/postfix         Makefile 
     mail/postfix-current Makefile 
     mail/postfix1        Makefile 
     mail/postfix21/scripts configure.postfix 
     mail/postfix22/scripts configure.postfix 
     mail/postfix23       Makefile 
   Log:
   - Remove SASL1 support. security/cyrus-sasl will be removed soon.
   
   PR:             111564, 111565, 111566
   Submitted by:   gabor (partially)
   Notified by:    gabor
   
   Revision  Changes    Path
   1.206     +2 -23     ports/mail/postfix-current/Makefile
   1.129     +3 -24     ports/mail/postfix/Makefile
   1.92      +0 -7      ports/mail/postfix1/Makefile
   1.65      +1 -16     ports/mail/postfix21/scripts/configure.postfix
   1.76      +1 -13     ports/mail/postfix22/scripts/configure.postfix
   1.128     +3 -24     ports/mail/postfix23/Makefile
 _______________________________________________
 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:
