From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Mar 16 13:50:03 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2B0FB5F4 for ; Sat, 16 Mar 2013 13:50:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 0F0E7EEB for ; Sat, 16 Mar 2013 13:50:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r2GDo2uj026537 for ; Sat, 16 Mar 2013 13:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r2GDo2oQ026536; Sat, 16 Mar 2013 13:50:02 GMT (envelope-from gnats) Resent-Date: Sat, 16 Mar 2013 13:50:02 GMT Resent-Message-Id: <201303161350.r2GDo2oQ026536@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yasuhiro KIMURA Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 8B4F34D6 for ; Sat, 16 Mar 2013 13:41:09 +0000 (UTC) (envelope-from yasu@home.utahime.org) Received: from gate.utahime.jp (gate.utahime.jp [183.180.29.210]) by mx1.freebsd.org (Postfix) with ESMTP id 0A1B0EC6 for ; Sat, 16 Mar 2013 13:41:08 +0000 (UTC) Received: from eastasia.home.utahime.org (mail.home.utahime.org [192.168.174.1]) by gate.utahime.jp (Postfix) with ESMTP id 41A6E61F9D; Sat, 16 Mar 2013 22:41:01 +0900 (JST) Received: from eastasia.home.utahime.org (localhost [127.0.0.1]) by localhost-backdoor.home.utahime.org (Postfix) with ESMTP id 12F4B4E637; Sat, 16 Mar 2013 22:41:01 +0900 (JST) Received: by eastasia.home.utahime.org (Postfix, from userid 1000) id DAA314E62D; Sat, 16 Mar 2013 22:41:00 +0900 (JST) Message-Id: <20130316134100.DAA314E62D@eastasia.home.utahime.org> Date: Sat, 16 Mar 2013 22:41:00 +0900 (JST) From: Yasuhiro KIMURA To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/177019: [PATCH] mail/postfix: update to 2.10.0 and etc. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2013 13:50:03 -0000 >Number: 177019 >Category: ports >Synopsis: [PATCH] mail/postfix: update to 2.10.0 and etc. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Mar 16 13:50:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Yasuhiro KIMURA >Release: FreeBSD 9.1-RELEASE-p1 amd64 >Organization: >Environment: System: FreeBSD xxxx 9.1-RELEASE-p1 FreeBSD 9.1-RELEASE-p1 #0 r246991: Wed Feb 20 04:01:53 JST 2013 xxxx amd64 >Description: - Update to 2.10.0. - Adapt to new options framework. - Trim makefile header. - Pet portlint. >How-To-Repeat: >Fix: Since it is minor version update, mail/postfix should be repo-copied to mail/postfix29 before applying attached patch. --- patch-postfix begins here --- Index: Makefile =================================================================== --- Makefile (revision 314331) +++ Makefile (working copy) @@ -1,12 +1,8 @@ -# New ports collection makefile for: postfix -# Date created: 18 Mar 1999 -# Whom: torstenb -# +# Created by: Torsten Blum # $FreeBSD$ -# PORTNAME= postfix -PORTVERSION= 2.9.5 +PORTVERSION= 2.10.0 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -20,8 +16,8 @@ MAINTAINER= sahil@FreeBSD.org COMMENT= A secure alternative to widely-used Sendmail -VDAVERSION= 2.9.5 -CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-8].* postfix-base-2.[0-8].* \ +VDAVERSION= 2.10.0 +CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-9].* postfix-base-2.[0-9].* \ postfix-current-2.* postfix-current-base-2.* sendmail-8.* \ sendmail+*-8.* smail-3.* zmailer-2.* opensmtpd-[0-9]* @@ -32,37 +28,29 @@ USE_PERL5_BUILD=yes SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}" -# back compat pull in settings from POSTFIX_OPTIONS for convenience when -# make config is run (happens first time port is built, too) -.for o in SASL2 SASLKRB5 SASLKRB5MIT TLS BDB MySQL PgSQL OpenLDAP CDB NIS VDA Test SPF -STATUS_${o}=off -.endfor -.if defined(POSTFIX_OPTIONS) -. for o in ${POSTFIX_OPTIONS} -STATUS_${o}=on -. endfor -.endif +OPTIONS_DEFINE= DOCS PCRE CYRUS TLS BDB MYSQL PGSQL SQLITE OPENLDAP LDAP_SASL CDB NIS VDA TEST SPF INST_BASE +OPTIONS_DEFAULT= PCRE +OPTIONS_RADIO= DOVECOT KRB5 +OPTIONS_RADIO_DOVECOT= DOVECOT1 DOVECOT2 +OPTIONS_RADIO_KRB5= KRB5BASE KRB5PORTS +CYRUS_DESC= Cyrus SASL v2 authentication +DOVECOT1_DESC= Dovecot 1.x SASL authentication +DOVECOT2_DESC= Dovecot 2.x SASL authentication +KRB5BASE_DESC= Use Kerberos 5 of base system +KRB5PORTS_DESC= Use Kerberos 5 of ports +BDB_DESC= Berkeley DB (uses WITH_BDB_VER) +MYSQL_DESC= MySQL maps (uses WITH_MYSQL_VER) +PGSLQ_DESC= PostgreSQL maps (uses DEFAULT_PGSQL_VER) +SQLITE_DESC= SQLite maps +OPENLDAP_DESC= OpenLDAP maps (uses WITH_OPENLDAP_VER) +LDAP_SASL_DESC= Enable OpenLDAP client-to-server SASL auth +CDB_DESC= CDB maps lookups +NIS_DESC= NIS maps lookups +VDA_DESC= VDA (Virtual Delivery Agent 32Bit) +TEST_DESC= SMTP/LMTP test server and generator +SPF_DESC= SPF support (via libspf2 1.2.x) +INST_BASE_DESC= Install into /usr and /etc/postfix -OPTIONS= PCRE "Perl Compatible Regular Expressions" on \ - 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" ${STATUS_SASLKRB5} \ - SASLKMIT "If your SASL req. MIT Kerberos5, select this" ${STATUS_SASLKRB5MIT} \ - TLS "Enable SSL and TLS support" ${STATUS_TLS} \ - 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 (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} \ - TEST "SMTP/LMTP test server and generator" ${STATUS_Test} \ - SPF "SPF support (via libspf2 1.2.x)" ${STATUS_SPF} \ - INST_BASE "Install into /usr and /etc/postfix" off - .include MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \ @@ -122,7 +110,7 @@ # Default requirement for postfix rc script _REQUIRE= LOGIN cleanvar -.if defined(WITH_PCRE) +.if ${PORT_OPTIONS:MPCRE} LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre @@ -130,18 +118,14 @@ POSTFIX_CCARGS+= -DNO_PCRE .endif -.if defined(WITH_SASL2) +.if ${PORT_OPTIONS:MSASL2} LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2 POSTFIX_CCARGS+= -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt .endif -.if defined(WITH_DOVECOT) && defined(WITH_DOVECOT2) -BROKEN= Select only one Dovecot option -.endif - -.if defined(WITH_DOVECOT) || defined(WITH_DOVECOT2) -.if defined(WITH_DOVECOT) +.if ${PORT_OPTIONS:MDOVECOT1} || ${PORT_OPTIONS:MDOVECOT2} +.if ${PORT_OPTIONS:MDOVECOT1} RUN_DEPENDS+= dovecot:${PORTSDIR}/mail/dovecot .else RUN_DEPENDS+= dovecot:${PORTSDIR}/mail/dovecot2 @@ -150,29 +134,23 @@ _REQUIRE+= dovecot .endif -.if defined(WITH_SASLKRB5) -.if defined(WITH_SASLKMIT) -BROKEN= Select only one SASL Kerberos option -.endif +.if ${PORT_OPTIONS:MKRB5BASE} POSTFIX_AUXLIBS+= -lkrb5 ${KRB5_EXTR} -lcrypto -lcrypt -lcom_err -lasn1 -lroken .endif -.if defined(WITH_SASLKMIT) -.if defined(WITH_SASLKRB5) -BROKEN= Select only one SASL Kerberos option -.endif -LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5 +.if ${PORT_OPTIONS:MKRB5PORTS} +LIB_DEPENDS+= krb5:${PORTSDIR}/security/krb5 POSTFIX_AUXLIBS+= -Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err .endif -.if defined(WITH_TLS) +.if ${PORT_OPTIONS:MTLS} .include "${PORTSDIR}/Mk/bsd.openssl.mk" POSTFIX_CCARGS+= -DUSE_TLS -I${OPENSSLINC} POSTFIX_AUXLIBS+= -L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto .endif -.if defined(WITH_SPF) -LIB_DEPENDS+= spf2.3:${PORTSDIR}/mail/libspf2 +.if ${PORT_OPTIONS:MSPF} +LIB_DEPENDS+= spf2:${PORTSDIR}/mail/libspf2 PATCH_SITES+= ${MASTER_SITE_LOCAL} PATCH_SITE_SUBDIR= mm PATCHFILES+= postfix-2.8.0-libspf2-1.2.x-0.patch.gz @@ -184,33 +162,33 @@ PLIST_SUB+= SPF="@comment " .endif -.if defined(WITH_BDB) +.if ${PORT_OPTIONS:MBDB} USE_BDB= yes POSTFIX_CCARGS+= -I${BDB_INCLUDE_DIR} POSTFIX_AUXLIBS+= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} .endif -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes POSTFIX_CCARGS+= -DHAS_MYSQL -I${LOCALBASE}/include/mysql POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib/mysql -lmysqlclient -lz -lcrypt -lm _REQUIRE+= mysql .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes POSTFIX_CCARGS+= -DHAS_PGSQL -I${LOCALBASE}/include -I${LOCALBASE}/pgsql/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib -lpq -lcrypt _REQUIRE+= postgresql .endif -.if defined(WITH_SQLITE) +.if ${PORT_OPTIONS:MSQLITE} USE_SQLITE= yes POSTFIX_CCARGS+= -DHAS_SQLITE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsqlite3 .endif -.if defined(WITH_OPENLDAP) +.if ${PORT_OPTIONS:MOPENLDAP} USE_OPENLDAP= yes .if defined(WITH_OPENLDAP_VER) WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} @@ -218,26 +196,26 @@ POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lldap -llber _REQUIRE+= slapd -.if defined(WITH_LDAP_SASL) -.if !defined(WITH_SASL2) +.if ${PORT_OPTIONS:MLDAP_SASL} +.if !{PORT_OPTIONS:MCYRUS} BROKEN= Compile with Cyrus SASL to use LDAP_SASL .endif POSTFIX_CCARGS+= -DUSE_LDAP_SASL .endif .endif -.if defined(WITH_CDB) +.if ${PORT_OPTIONS:MCDB} BUILD_DEPENDS+= ${LOCALBASE}/lib/libcdb.a:${PORTSDIR}/databases/tinycdb POSTFIX_CCARGS+= -DHAS_CDB -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lcdb .endif -.if defined(WITH_NIS) +.if ${PORT_OPTIONS:MNIS} POSTFIX_CCARGS+= -DHAS_NIS _REQUIRE+= ypserv .endif -.if defined(WITH_VDA) +.if ${PORT_OPTIONS:MVDA} PATCH_SITES+= http://vda.sourceforge.net/VDA/:vda PATCHFILES+= postfix-vda-v11-${VDAVERSION}.patch:vda PATCH_DIST_STRIP= -p1 @@ -246,7 +224,7 @@ PLIST_SUB+= VDA="@comment " .endif -.if defined(WITH_TEST) +.if ${PORT_OPTIONS:MTEST} BINTEST= qmqp-sink qmqp-source smtp-sink smtp-source MANTEST= qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1 MAN1+= ${MANTEST} @@ -255,7 +233,7 @@ PLIST_SUB+= TEST="@comment " .endif -.if defined(WITH_INST_BASE) +.if ${PORT_OPTIONS:MINST_BASE} PKGNAMESUFFIX= -base PREFIX= /usr ETCDIR= /etc/postfix @@ -268,10 +246,10 @@ PLIST_SUB+= PFETC=${ETCDIR} -.if defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} +READMEDIR= ${DOCSDIR} +.else READMEDIR= no -.else -READMEDIR= ${DOCSDIR} .endif DAEMONDIR= ${PREFIX}/libexec/postfix Index: distinfo =================================================================== --- distinfo (revision 314331) +++ distinfo (working copy) @@ -1,6 +1,2 @@ -SHA256 (postfix/postfix-2.9.5.tar.gz) = 590381cc0705a6d3fd2279760e79aff625adab6000cb895cf5336ae6a11ee6e4 -SIZE (postfix/postfix-2.9.5.tar.gz) = 3761272 -SHA256 (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = e5c38e5bc226cab109c02a4e530ab1aefd3bb06f2169f3e052bdf83d2727aacc -SIZE (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = 8191 -SHA256 (postfix/postfix-vda-v11-2.9.5.patch) = df30379c456971a514ae5587531bb5cd8492921a6a27e6d23f5014a1434945aa -SIZE (postfix/postfix-vda-v11-2.9.5.patch) = 55009 +SHA256 (postfix/postfix-2.10.0.tar.gz) = 4a42a6029af418cbd4a8668b4f8c7e1ea9975cbe9756df760649c0a941bfeb7b +SIZE (postfix/postfix-2.10.0.tar.gz) = 3826655 Index: pkg-descr =================================================================== --- pkg-descr (revision 314331) +++ pkg-descr (working copy) @@ -12,4 +12,4 @@ database, PostgreSQL database, Maildir and mailbox format, Virtual domains, VERP envelope return addresses and others. -WWW: http://www.postfix.org/ +WWW: http://www.postfix.org/ --- patch-postfix ends here --- >Release-Note: >Audit-Trail: >Unformatted: