Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Nov 2011 04:30:52 -0800 (PST)
From:      Jeremy Chadwick <freebsd@jdc.parodius.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/162688: postfix: fix OPTIONS descriptions to honour dialog(1) limits
Message-ID:  <20111120123052.326CC102C1D@icarus.home.lan>
Resent-Message-ID: <201111201240.pAKCeAu3071246@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         162688
>Category:       ports
>Synopsis:       postfix: fix OPTIONS descriptions to honour dialog(1) limits
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 20 12:40:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Jeremy Chadwick
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD icarus.home.lan 8.2-STABLE FreeBSD 8.2-STABLE #0: Mon Nov 7 03:39:13 PST 2011 root@icarus.home.lan:/usr/obj/usr/src/sys/X7SBA_RELENG_8_amd64 amd64
>Description:
	postfix/Makefile and postfix2[567]/Makefile all have OPTIONS
	descriptions that exceed the region width defined when dialog(1)
	is called by the ports infrastructure.  The result is that some
	lines when selected "wrap" their text to the next item and mess
	up the dialog formatting.

	Example when doing "make config":

......................................................................
.                   Options for postfix 2.8.7,1                      .
. .................................................................. .
. .[X] PCRE       Perl Compatible Regular Expressions              . .
. .[X] SASL2      Cyrus SASLv2 (Simple Auth. and Sec. Layer)       . .
. .[ ] DOVECOT    Dovecot 1.x SASL authentication method           . .
. .[ ] DOVECOT2   Dovecot 2.x SASL authentication method           . .
. .[ ] SASLKRB5   If your SASL req. Kerberos5 select this option   . .
. .[ ] SASLKMIT   If your SASL req. MIT Kerberos5 select this optio. .
. .[X] TLS        Enable SSL and TLS support                       . .
. .[ ] BDB        Berkeley DB (choose version with WITH_BDB_VER)   . .
. .[ ] MYSQL      MySQL maps (choose version with WITH_MYSQL_VER)  . .
. .[ ] PGSQL      PostgreSQL maps (pick ver. with DEFAULT_PGSQL_VER. .
. .[ ] SQLITE     SQLite maps                                      . .
. .[ ] OPENLDAP   OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER. .
. .[ ] LDAP_SASL  Enable OpenLDAP client-to-server auth via SASL   . .
. .[ ] CDB        CDB maps lookups                                 . .
. .[ ] NIS        NIS maps lookups                                 . .
.......v(+)...........................................................
.                       [  OK  ]       Cancel                        .
......................................................................

	If you move the selection to SASLKMIT, PGSQL, or OPENLDAP,
	you end up with this (example has SASLKMIT selected):

......................................................................
.                   Options for postfix 2.8.7,1                      .
. .................................................................. .
. .[X] PCRE       Perl Compatible Regular Expressions              . .
. .[X] SASL2      Cyrus SASLv2 (Simple Auth. and Sec. Layer)       . .
. .[ ] DOVECOT    Dovecot 1.x SASL authentication method           . .
. .[ ] DOVECOT2   Dovecot 2.x SASL authentication method           . .
. .[ ] SASLKRB5   If your SASL req. Kerberos5 select this option   . .
. .[ ] SASLKMIT   If your SASL req. MIT Kerberos5 select this optio. .
. .nX] TLS        Enable SSL and TLS support                       . .
. .[ ] BDB        Berkeley DB (choose version with WITH_BDB_VER)   . .
. .[ ] MYSQL      MySQL maps (choose version with WITH_MYSQL_VER)  . .
. .[ ] PGSQL      PostgreSQL maps (pick ver. with DEFAULT_PGSQL_VER. .
. .[ ] SQLITE     SQLite maps                                      . .
. .[ ] OPENLDAP   OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER. .
. .[ ] LDAP_SASL  Enable OpenLDAP client-to-server auth via SASL   . .
. .[ ] CDB        CDB maps lookups                                 . .
. .[ ] NIS        NIS maps lookups                                 . .
.......v(+)...........................................................
.                       [  OK  ]       Cancel                        .
......................................................................

	Note the "n" in the word "option" wraps to the brackets on
	the item for TLS.
>How-To-Repeat:
	See above.
>Fix:
	The attached patches fix this by shortening the OPTIONS
	descriptions to something that fits within the width of
	the dialog(1) region.

	Patches will also be available for download, once I get a PR
	number from GNATS, at:

	http://jdc.parodius.com/freebsd/{prnum}

diff -ruN ports/mail/postfix/Makefile.orig ports/mail/postfix/Makefile
--- ports/mail/postfix/Makefile.orig	2011-11-20 00:52:09.000000000 -0800
+++ ports/mail/postfix/Makefile	2011-11-20 04:15:48.475392385 -0800
@@ -51,15 +51,15 @@
 		SASL2		"Cyrus SASLv2 (Simple Auth. and Sec. Layer)"		${STATUS_SASL2} \
 		DOVECOT		"Dovecot 1.x SASL authentication method"		off \
 		DOVECOT2	"Dovecot 2.x SASL authentication method"		off \
-		SASLKRB5	"If your SASL req. Kerberos5 select this option"	${STATUS_SASLKRB5} \
-		SASLKMIT	"If your SASL req. MIT Kerberos5 select this option"	${STATUS_SASLKRB5MIT} \
+		SASLKRB5	"If your SASL req. Kerberos5, select this"		${STATUS_SASLKRB5} \
+		SASLKMIT	"If your SASL req. MIT Kerberos5, select this"		${STATUS_SASLKRB5MIT} \
 		TLS		"Enable SSL and TLS support"				${STATUS_TLS} \
-		BDB		"Berkeley DB (choose version with WITH_BDB_VER)"	${STATUS_BDB} \
-		MYSQL		"MySQL maps (choose version with WITH_MYSQL_VER)"	${STATUS_MySQL} \
-		PGSQL		"PostgreSQL maps (pick ver. with DEFAULT_PGSQL_VER)"	${STATUS_PgSQL} \
+		BDB		"Berkeley DB (uses WITH_BDB_VER)"			${STATUS_BDB} \
+		MYSQL		"MySQL maps (uses WITH_MYSQL_VER)"			${STATUS_MySQL} \
+		PGSQL		"PostgreSQL maps (uses DEFAULT_PGSQL_VER)"		${STATUS_PgSQL} \
 		SQLITE		"SQLite maps"						off \
-		OPENLDAP	"OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)"	${STATUS_OpenLDAP} \
-		LDAP_SASL	"Enable OpenLDAP client-to-server auth via SASL"	off \
+		OPENLDAP	"OpenLDAP maps (uses WITH_OPENLDAP_VER)"		${STATUS_OpenLDAP} \
+		LDAP_SASL	"Enable OpenLDAP client-to-server SASL auth"		off \
 		CDB		"CDB maps lookups"					${STATUS_CDB} \
 		NIS		"NIS maps lookups"					${STATUS_NIS} \
 		VDA		"VDA (Virtual Delivery Agent 32Bit)"			${STATUS_VDA} \

diff -ruN ports/mail/postfix25/Makefile.orig ports/mail/postfix25/Makefile
--- ports/mail/postfix25/Makefile.orig	2011-11-20 00:52:09.000000000 -0800
+++ ports/mail/postfix25/Makefile	2011-11-20 04:16:24.567005823 -0800
@@ -44,14 +44,14 @@
 OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		SASL2		"Cyrus SASLv2 (Simple Auth. and Sec. Layer)"		${STATUS_SASL2} \
 		DOVECOT		"Dovecot SASL authentication method"			off \
-		SASLKRB		"If your SASL req. Kerberos select this option"		${STATUS_SASLKRB} \
-		SASLKRB5	"If your SASL req. Kerberos5 select this option"	${STATUS_SASLKRB5} \
-		SASLKMIT	"If your SASL req. MIT Kerberos5 select this option"	${STATUS_SASLKRB5MIT} \
+		SASLKRB		"If your SASL req. Kerberos, select this"		${STATUS_SASLKRB} \
+		SASLKRB5	"If your SASL req. Kerberos5, select this"		${STATUS_SASLKRB5} \
+		SASLKMIT	"If your SASL req. MIT Kerberos5, select this"		${STATUS_SASLKRB5MIT} \
 		TLS		"Enable SSL and TLS support"				${STATUS_TLS} \
-		BDB		"Berkeley DB (choose version with WITH_BDB_VER)"	${STATUS_BDB} \
-		MYSQL		"MySQL maps (choose version with WITH_MYSQL_VER)"	${STATUS_MySQL} \
-		PGSQL		"PostgreSQL maps (choose with DEFAULT_PGSQL_VER)"	${STATUS_PgSQL} \
-		OPENLDAP	"OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)"	${STATUS_OpenLDAP} \
+		BDB		"Berkeley DB (uses WITH_BDB_VER)"			${STATUS_BDB} \
+		MYSQL		"MySQL maps (uses WITH_MYSQL_VER)"			${STATUS_MySQL} \
+		PGSQL		"PostgreSQL maps (uses DEFAULT_PGSQL_VER)"		${STATUS_PgSQL} \
+		OPENLDAP	"OpenLDAP maps (uses WITH_OPENLDAP_VER)"		${STATUS_OpenLDAP} \
 		CDB		"CDB maps lookups"					${STATUS_CDB} \
 		NIS		"NIS maps lookups"					${STATUS_NIS} \
 		VDA		"VDA (Virtual Delivery Agent)"				${STATUS_VDA} \

diff -ruN ports/mail/postfix26/Makefile.orig ports/mail/postfix26/Makefile
--- ports/mail/postfix26/Makefile.orig	2011-11-20 00:52:09.000000000 -0800
+++ ports/mail/postfix26/Makefile	2011-11-20 04:17:09.260027788 -0800
@@ -47,14 +47,14 @@
 OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		SASL2		"Cyrus SASLv2 (Simple Auth. and Sec. Layer)"		${STATUS_SASL2} \
 		DOVECOT		"Dovecot SASL authentication method"			off \
-		SASLKRB		"If your SASL req. Kerberos select this option"		${STATUS_SASLKRB} \
-		SASLKRB5	"If your SASL req. Kerberos5 select this option"	${STATUS_SASLKRB5} \
-		SASLKMIT	"If your SASL req. MIT Kerberos5 select this option"	${STATUS_SASLKRB5MIT} \
+		SASLKRB		"If your SASL req. Kerberos, select this"		${STATUS_SASLKRB} \
+		SASLKRB5	"If your SASL req. Kerberos5, select this"		${STATUS_SASLKRB5} \
+		SASLKMIT	"If your SASL req. MIT Kerberos5, select this"		${STATUS_SASLKRB5MIT} \
 		TLS		"Enable SSL and TLS support"				${STATUS_TLS} \
-		BDB		"Berkeley DB (choose version with WITH_BDB_VER)"	${STATUS_BDB} \
-		MYSQL		"MySQL maps (choose version with WITH_MYSQL_VER)"	${STATUS_MySQL} \
-		PGSQL		"PostgreSQL maps (choose with DEFAULT_PGSQL_VER)"	${STATUS_PgSQL} \
-		OPENLDAP	"OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)"	${STATUS_OpenLDAP} \
+		BDB		"Berkeley DB (uses WITH_BDB_VER)"			${STATUS_BDB} \
+		MYSQL		"MySQL maps (uses WITH_MYSQL_VER)"			${STATUS_MySQL} \
+		PGSQL		"PostgreSQL maps (uses DEFAULT_PGSQL_VER)"		${STATUS_PgSQL} \
+		OPENLDAP	"OpenLDAP maps (uses WITH_OPENLDAP_VER)"		${STATUS_OpenLDAP} \
 		CDB		"CDB maps lookups"					${STATUS_CDB} \
 		NIS		"NIS maps lookups"					${STATUS_NIS} \
 		VDA		"VDA (Virtual Delivery Agent 32Bit)"			${STATUS_VDA} \

diff -ruN ports/mail/postfix27/Makefile.orig ports/mail/postfix27/Makefile
--- ports/mail/postfix27/Makefile.orig	2011-11-20 00:52:09.000000000 -0800
+++ ports/mail/postfix27/Makefile	2011-11-20 04:17:45.634640035 -0800
@@ -47,13 +47,13 @@
 		SASL2		"Cyrus SASLv2 (Simple Auth. and Sec. Layer)"		${STATUS_SASL2} \
 		DOVECOT		"Dovecot 1.x SASL authentication method"		off \
 		DOVECOT2	"Dovecot 2.x SASL authentication method"		off \
-		SASLKRB5	"If your SASL req. Kerberos5 select this option"	${STATUS_SASLKRB5} \
-		SASLKMIT	"If your SASL req. MIT Kerberos5 select this option"	${STATUS_SASLKRB5MIT} \
+		SASLKRB5	"If your SASL req. Kerberos5, select this"		${STATUS_SASLKRB5} \
+		SASLKMIT	"If your SASL req. MIT Kerberos5, select this"		${STATUS_SASLKRB5MIT} \
 		TLS		"Enable SSL and TLS support"				${STATUS_TLS} \
-		BDB		"Berkeley DB (choose version with WITH_BDB_VER)"	${STATUS_BDB} \
-		MYSQL		"MySQL maps (choose version with WITH_MYSQL_VER)"	${STATUS_MySQL} \
-		PGSQL		"PostgreSQL maps (choose with DEFAULT_PGSQL_VER)"	${STATUS_PgSQL} \
-		OPENLDAP	"OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)"	${STATUS_OpenLDAP} \
+		BDB		"Berkeley DB (uses WITH_BDB_VER)"			${STATUS_BDB} \
+		MYSQL		"MySQL maps (uses WITH_MYSQL_VER)"			${STATUS_MySQL} \
+		PGSQL		"PostgreSQL maps (uses DEFAULT_PGSQL_VER)"		${STATUS_PgSQL} \
+		OPENLDAP	"OpenLDAP maps (uses WITH_OPENLDAP_VER)"		${STATUS_OpenLDAP} \
 		CDB		"CDB maps lookups"					${STATUS_CDB} \
 		NIS		"NIS maps lookups"					${STATUS_NIS} \
 		VDA		"VDA (Virtual Delivery Agent 32Bit)"			${STATUS_VDA} \
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20111120123052.326CC102C1D>