Date: Tue, 4 Nov 2003 16:30:24 -0800 (PST) From: Foxfair Hu <foxfair@FreeBSD.org> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/58688: maintainer update of postfix-current Message-ID: <200311050030.hA50UOZJ085272@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/58688; it has been noted by GNATS. From: Foxfair Hu <foxfair@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org, vivek@khera.org Cc: Subject: Re: ports/58688: maintainer update of postfix-current Date: Wed, 5 Nov 2003 08:28:50 +0800 --Qxx1br4bt0+wmkIi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello, Here is a revised version of your patch base on current ports tree, please review it. If you have no objection, I can help commit it. foxfair --Qxx1br4bt0+wmkIi Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.postfix-current" diff -ruN /usr/ports/mail/postfix-current/Makefile ./Makefile --- /usr/ports/mail/postfix-current/Makefile Mon Nov 3 14:43:05 2003 +++ ./Makefile Wed Nov 5 08:15:04 2003 @@ -15,8 +15,8 @@ # NOTE: PCRE is enabled by default unless you specifically disable it. PORTNAME= postfix -PORTVERSION= 2.0.14.20030812 -PORTEPOCH= 2 +PORTVERSION= 2.0.16-20031026 +PORTEPOCH= 3 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ @@ -25,10 +25,10 @@ ftp://ftp.samurai.com/pub/postfix/experimental/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/experimental/&,} MASTER_SITE_SUBDIR= . old related/postfix -DISTNAME= postfix-${PORTVERSION:S/.200/-200/} +DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} -MAINTAINER= khera@kciLink.com +MAINTAINER= vivek@khera.org COMMENT= A secure alternative to widely-used Sendmail CONFLICTS= courier-0.* postfix-1.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* diff -ruN /usr/ports/mail/postfix-current/distinfo ./distinfo --- /usr/ports/mail/postfix-current/distinfo Wed Sep 10 21:02:12 2003 +++ ./distinfo Wed Nov 5 08:12:38 2003 @@ -1,4 +1,4 @@ -MD5 (postfix/postfix-2.0.14-20030812.tar.gz) = 7e78521f7c7241dd7c442924804ef10d -MD5 (postfix/tls+ipv6-1.17-pf-2.0.14-20030812.patch.gz) = 671a9792c9296d644b006e16c1c31a6c -MD5 (postfix/ipv6-1.17-pf-2.0.14-20030812.patch.gz) = 00ecc0be7dcbcc4dc8a5b5e4352b8036 -MD5 (postfix/pfixtls-0.8.15a-2.0.14-20030715-0.9.7b.tar.gz) = b7572506f62cd5c64614128a5f0491e3 +MD5 (postfix/postfix-2.0.16-20031026.tar.gz) = 6b01059afaf48737878c666af91005d9 +MD5 (postfix/ipv6-1.18b-pf-2.0.16-20030921.patch.gz) = cf5be9e0fefa4dbaafeeec5687b87265 +MD5 (postfix/tls+ipv6-1.18b-pf-2.0.16-20030921.patch.gz) = d744dbc5f3fe71d634a36573cee5f2b4 +MD5 (postfix/pfixtls-0.8.16-2.0.16-20031022-0.9.7c.tar.gz) = 741215e2bbbc7845eec266862d6721a8 diff -ruN /usr/ports/mail/postfix-current/scripts/configure.postfix ./scripts/configure.postfix --- /usr/ports/mail/postfix-current/scripts/configure.postfix Wed Sep 10 21:02:12 2003 +++ ./scripts/configure.postfix Wed Nov 5 08:12:45 2003 @@ -24,8 +24,8 @@ SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ TLS "SSL and TLS" "$status_TLS" \ -IPv6 "IPv6 support" "$status_IPv6" \ -IPv6TLS "IPv6 support with SSL and TLS" "$status_IPv6TLS" \ +IPv6 "IPv6 support (broken)" "$status_IPv6" \ +IPv6TLS "IPv6 support with SSL and TLS (broken)" "$status_IPv6TLS" \ DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ @@ -106,8 +106,8 @@ echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.15a-2.0.14-20030715-0.9.7b.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.15a-2.0.14-20030715-0.9.7b/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.16-2.0.16-20031022-0.9.7c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.16-2.0.16-20031022-0.9.7c/pfixtls.diff" echo "PATCH_STRIP= -p1" echo "TLS_SUFFIX= +tls" SUB_TLS="" @@ -197,7 +197,7 @@ exit 1 fi echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= ipv6-1.17-pf-2.0.14-20030812.patch.gz" + echo "PATCHFILES+= ipv6-1.18b-pf-2.0.16-20030921.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "IPv6_SUFFIX= +ipv6" echo "" @@ -215,7 +215,7 @@ echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= tls+ipv6-1.17-pf-2.0.14-20030812.patch.gz" + echo "PATCHFILES+= tls+ipv6-1.18b-pf-2.0.16-20030921.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "TLS_SUFFIX= +tls+ipv6" SUB_TLS="" diff -ruN /usr/ports/mail/postfix-current/scripts/configure.postfix.orig ./scripts/configure.postfix.orig --- /usr/ports/mail/postfix-current/scripts/configure.postfix.orig Thu Jan 1 08:00:00 1970 +++ ./scripts/configure.postfix.orig Wed Nov 5 08:12:12 2003 @@ -0,0 +1,241 @@ +#!/bin/sh +# $FreeBSD: ports/mail/postfix-current/scripts/configure.postfix,v 1.46 2003/08/28 08:07:33 erwin Exp $ + +if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then + exit +fi + +tempfile=`mktemp -t checklist` + +if [ "${POSTFIX_OPTIONS}" ]; then + set ${POSTFIX_OPTIONS} +fi + +for i; do + eval status_$i=ON +done + +if [ -z "${BATCH}" ]; then + /usr/bin/dialog --title "Postfix configuration options" --clear \ + --checklist "\n\ +Please select desired options:" -1 -1 16 \ +NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ +SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ +SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ +SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ +TLS "SSL and TLS" "$status_TLS" \ +IPv6 "IPv6 support" "$status_IPv6" \ +IPv6TLS "IPv6 support with SSL and TLS" "$status_IPv6TLS" \ +DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ +DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ +DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ +MySQL "MySQL map lookups" "$status_MySQL" \ +PgSQL "PostgreSQL v7.3 map lookups" "$status_PgSQL" \ +PgSQL72 "PostgreSQL v7.2 map lookups" "$status_PgSQL72" \ +OpenLDAP12 "OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \ +OpenLDAP20 "OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \ +OpenLDAP21 "OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \ +Test "SMTP/LMTP test server and generator" "$status_Test" \ +2> $tempfile + + retval=$? + + if [ -s $tempfile ]; then + set `sed 's/"//g' $tempfile` + fi + rm -f $tempfile + + case $retval in + 0) if [ -z "$*" ]; then + echo "Nothing selected" + fi + ;; + 1) echo "Cancel pressed." + exit 1 + ;; + esac +fi + +${MKDIR} ${WRKDIRPREFIX}${CURDIR} +exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc + +echo "PREFIX= ${PREFIX}" + +SUB_TLS="@comment " +SUB_TEST="@comment " +SUB_IPV6="@comment " + +while [ "$1" ]; do + case $1 in + NOPCRE) + echo "WITHOUT_PCRE= yes" + echo "NOPCRE_SUFFIX= +nopcre" + SUB_NOPCRE="" + ;; + SASL) + echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" + echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" + echo "SASL_SUFFIX= +sasl" + if [ -f ${PREFIX}/lib/libsasl.a ]; then + if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then + echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" + echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" + fi + fi + SUB_SASL="" + ;; + SASL2) + echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" + echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" + echo "SASL_SUFFIX= +sasl2" + if [ -f ${PREFIX}/lib/libsasl2.a ]; then + if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then + echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" + echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" + fi + fi + SUB_SASL="" + ;; + SASLKRB) + echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" + ;; + TLS) + echo "MAN8+= tlsmgr.8" + echo "USE_OPENSSL= yes" + echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" + echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.15a-2.0.14-20030715-0.9.7b.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.15a-2.0.14-20030715-0.9.7b/pfixtls.diff" + echo "PATCH_STRIP= -p1" + echo "TLS_SUFFIX= +tls" + SUB_TLS="" + ;; + DB3) + if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then + /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr + rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc + exit 1 + fi + echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" + echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" + echo "DB_SUFFIX= +db3" + DB3_SELECTED="YES" + ;; + DB40) + if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then + /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr + rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc + exit 1 + fi + echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" + echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" + echo "DB_SUFFIX= +db40" + DB40_SELECTED="YES" + ;; + DB41) + if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then + /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr + rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc + exit 1 + fi + echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" + echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" + echo "DB_SUFFIX= +db41" + DB41_SELECTED="YES" + ;; + MySQL) + echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client" + echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" + echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" + echo "MYSQL_SUFFIX= +mysql" + ;; + PgSQL) + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" + echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" + echo "PGSQL_SUFFIX= +pgsql" + ;; + PgSQL72) + echo "POSTGRESQL_PORT?= databases/postgresql72" + echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}" + echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" + echo "PGSQL_SUFFIX= +pgsql" + ;; + OpenLDAP12) + echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12" + echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" + echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" + echo "OPENLDAP_SUFFIX= +openldap12" + ;; + OpenLDAP20) + echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client" + echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" + echo "POSTFIX_AUXLIBS+= -lldap -llber" + echo "OPENLDAP_SUFFIX= +openldap20" + ;; + OpenLDAP21) + echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client" + echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" + echo "POSTFIX_AUXLIBS+= -lldap -llber" + echo "OPENLDAP_SUFFIX= +openldap21" + ;; + Test) + echo "BIN1= smtp-sink smtp-source" + SUB_TEST="" + ;; + IPv6) + if [ X$SUB_TLS = "X" ]; then + /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr + rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc + exit 1 + fi + echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" + echo "PATCHFILES+= ipv6-1.17-pf-2.0.14-20030812.patch.gz" + echo "PATCH_DIST_STRIP= -p1" + echo "IPv6_SUFFIX= +ipv6" + echo "" + IPv6SELECTED=YES + SUB_IPV6="" + ;; + IPv6TLS) + if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then + /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr + rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc + exit 1 + fi + echo "MAN8+= tlsmgr.8" + echo "USE_OPENSSL= yes" + echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" + echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" + echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" + echo "PATCHFILES+= tls+ipv6-1.17-pf-2.0.14-20030812.patch.gz" + echo "PATCH_DIST_STRIP= -p1" + echo "TLS_SUFFIX= +tls+ipv6" + SUB_TLS="" + SUB_IPV6="" + ;; + *) + echo "Unknown option(s): $*" > /dev/stderr + rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc + exit 1 + ;; + esac + shift +done + +echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" +echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" +echo "PLIST_SUB+= SUB_IPV6=\"${SUB_IPV6}\"" + +# for some reason, if we alter the pkg name this way, the first build (where +# we ask the configure questions) doesn't pick up the extensions, but +# any subsequent build will. so "make; make install" will build twice. +# don't do this for now. +#echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" --Qxx1br4bt0+wmkIi--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311050030.hA50UOZJ085272>